Second Life viewer sources 1.20.2

author: Jacek Antonelli 2008-08-15 23:45:42 -0500
committer: Jacek Antonelli 2008-08-15 23:45:42 -0500
commit: ce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
tree: ef7b0501c4de4b631a916305cbc2a5fdc125e52d
parent: Second Life viewer sources 1.19.1.4b (diff)
download: meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
921 files changed, 48096 insertions, 30871 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 4706f39..93da3c9 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -8,6 +8,8 @@ Able Whitman
        VWR-650
        VWR-1460
        VWR-1691
+Adam Marker
+    VWR-2755
 Aimee Trescothick
        VWR-3903
        VWR-4083
@@ -39,6 +41,11 @@ Alissa Sabre
        VWR-3290
        VWR-4010
        VWR-3410
+        VWR-6386
+        VWR-6384
+        VWR-6385
+        VWR-5929
+        VWR-6430
 Angus Boyd
        VWR-592
 Argent Stonecutter
@@ -119,6 +126,7 @@ Gigs Taggart
        VWR-234
        VWR-315
        VWR-326
+        VWR-442
        VWR-493
        VWR-1203
        VWR-1217
@@ -254,6 +262,8 @@ Nicholaz Beresford
        VWR-2684
 Nounouch Hapmouche
        VWR-238
+Patric Mills
+    VWR-2645
 Paul Churchill
        VWR-20
        VWR-493
@@ -304,6 +314,8 @@ SpacedOut Frye
        VWR-123
        VWR-130
        VWR-1823
+Sporked Friis
+        VWR-4903
 Stevex Janus
        VWR-1182
 Still Defiant
@@ -319,6 +331,9 @@ Strife Onizuka
        WEB-164
        VWR-183
        VWR-2265
+        VWR-4111
+Teardrops Fall
+        VWR-5366
 tenebrous pau
        VWR-247
 TBBle Kurosawa
@@ -349,3 +364,5 @@ Zipherius Turas
        VWR-77
 Kerutsen Sellery
        VWR-1350
diff --git a/linden/doc/releasenotes-where.txt b/linden/doc/releasenotes-where.txt
new file mode 100644
index 0000000..89125d2
--- /dev/null
+++ b/linden/doc/releasenotes-where.txt
@@ -0,0 +1,5 @@
+For full release notes, see:
+        indra/newview/releasenotes.txt
+This is the same asset sourced by the viewer for displaying release notes.
diff --git a/linden/etc/message.xml b/linden/etc/message.xml
index c939e8b..331e6bb 100644
--- a/linden/etc/message.xml
+++ b/linden/etc/message.xml
@@ -258,6 +258,8 @@
                                        <string>template</string>
                                        <key>trusted-sender</key>
                                        <boolean>true</boolean>
+                                        <key>only-send-latest</key>
+                                        <boolean>true</boolean>                                 
                                </map>
                                <key>SimulatorLoad</key>
@@ -533,7 +535,12 @@
                        
                        <key>ParcelPropertiesUpdate</key>
                        <boolean>false</boolean>
+                        
+                        <key>EstateChangeInfo</key>
+                        <boolean>true</boolean>
                
+                        <key>FetchInventoryDescendents</key>
+                        <boolean>true</boolean>
                </map>
                <key>messageBans</key>
diff --git a/linden/indra/SConstruct b/linden/indra/SConstruct
index 9bc78c4..92e75b5 100644
--- a/linden/indra/SConstruct
+++ b/linden/indra/SConstruct
@@ -189,15 +189,19 @@ for build_target in targets:
    print 'Building ' + build_target + ' ' + version_server + ' on ' + system_str + ' (' + buildtype + ')'
    system_lib_dir = '../libraries/' + system_str 
+    havok_lib_dir = '../libraries/' + system_str 
+    lib_dir = './lib_' + buildtype + '_' + build_target + '/' + system_str
    if build_target == 'client':
        system_lib_dir += '/lib_release_client'
    elif buildtype == 'debug':
+        havok_lib_dir += '/lib_debug/havok/hk460'
        system_lib_dir += '/lib_debug'
+        lib_dir = './lib_debug_' + build_target + '/' + system_str
    else:
+        havok_lib_dir += '/lib_release/havok/hk460'
        system_lib_dir += '/lib_release'
+        lib_dir = './lib_release_' + build_target + '/' + system_str
-    lib_dir = './lib_' + buildtype + '_' + build_target + '/' + system_str
    try:
        build_dir_prefix = os.environ['TEMP_BUILD_DIR']
@@ -209,18 +213,19 @@ for build_target in targets:
    ### Base include directories ###
    include_dirs = Split("""
-        ./llcommon ./llmath ./llwindow ./llaudio ./llcharacter ./llcrashlogger
+        ./ ./llcommon ./llmath ./llwindow ./llaudio ./llcharacter ./llcrashlogger
-        ./lldatabase ./llhavok ./llimage ./llinventory ./llmedia ./llmessage
+        ./lldatabase ./llimage ./llinventory ./llmedia ./llmessage ./llphysics
        ./llprimitive ./llrender ./llscene ./llui ./llvfs ./llwindow
        ./llxml ./lscript ./lscript/lscript_compile
        ../libraries/include
-        ../libraries/include/havok
        """ +
        '../libraries/' + system_str + '/include' )
    client_external_libs = []
    system_link_flags = ''
+    include_dirs += Split('../libraries/include/havok/hk460/physics ../libraries/include/havok/hk460/common ')
    if platform != 'linux' and build_target == 'client' and enable_mozlib:
        ### Mozilla include directories ###
@@ -249,12 +254,18 @@ for build_target in targets:
    ##############
    # Generic GCC flags
-    cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions '
+    # cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions '
+    cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions '
    cxxflags = ''
-    cppflags = '-D_FORTIFY_SOURCE=2 '
+    #cppflags = '-D_FORTIFY_SOURCE=2 '
+    cppflags = ''
    if standalone:
        cppflags += '-DLL_STANDALONE '
+    if arch == 'i686':
+        cflags += '-m32 '
+        system_link_flags += '-m32 '
    if build_target == 'server':
        # Server flags
        cppflags += '-D_GNU_SOURCE -DLL_MESA_HEADLESS=1 -DLL_MESA=1 '
@@ -290,9 +301,9 @@ for build_target in targets:
            if standalone:
                include_dirs += [d[2:] for d in
                                 pkgconfig('--cflags-only-I').split()]
-                client_external_libs += [ 'boost_regex' ]
+                client_external_libs += [ 'boost_program_options-gcc34-mt', 'boost_signals-gcc34-mt', 'boost_regex-gcc34-mt']
            else:
-                client_external_libs += [ 'gtk-x11-2.0', 'atk-1.0', 'gmodule-2.0', 'gdk-x11-2.0', 'gdk_pixbuf-2.0', 'pango-1.0', 'pangoft2-1.0', 'pangox-1.0', 'pangoxft-1.0', 'Xinerama' , 'boost_regex']
+                client_external_libs += [ 'gtk-x11-2.0', 'atk-1.0', 'gmodule-2.0', 'gdk-x11-2.0', 'gdk_pixbuf-2.0', 'pango-1.0', 'pangoft2-1.0', 'pangox-1.0', 'pangoxft-1.0', 'Xinerama', 'boost_program_options-gcc34-mt', 'boost_signals-gcc34-mt', 'boost_regex-gcc34-mt']
                incdirs = [ 'ELFIO', 'atk-1.0', 'glib-2.0', 'gtk-2.0',
                            'llfreetype2', 'pango-1.0' ]
                include_dirs += ['../libraries/' + system_str + '/include/' + d
@@ -320,6 +331,8 @@ for build_target in targets:
                include_dirs += [ '../libraries/' + system_str + '/include/libxml2']
            else:
                cppflags += '-DLL_GSTREAMER_ENABLED=0 '
+        cppflags += '-DLL_CURRENT_HAVOK_VERSION=460 '
    else:
        # Mac-only flags
        cflags += '-x c++ -arch ppc -pipe -Wno-trigraphs -fpascal-strings -faltivec -fasm-blocks -g -fmessage-length=0 -mtune=G4 -Wno-deprecated-declarations -Wno-invalid-offsetof -mmacosx-version-min=10.3 -Wmost -Wno-sign-compare -Wno-switch -fconstant-cfstrings -ffor-scope -Wno-reorder -fexceptions '
@@ -395,7 +408,7 @@ for build_target in targets:
    base_env = Environment(CXX = compiler,
            CPPPATH = include_dirs,
-            LIBPATH = lib_path,
+            LIBPATH = [lib_dir] + [system_lib_dir] + [havok_lib_dir],
            LINKFLAGS = system_link_flags + '--no-keep-memory --reduce-memory-overheads ' )
    ### Environments for various build types ###
@@ -409,6 +422,11 @@ for build_target in targets:
                            CPPFLAGS=debug_cppflags,
                            CXXFLAGS=debug_cxxflags)
+    if buildtype == 'havok1debug':
+        env = base_env.Copy(CFLAGS=debug_cflags,
+                            CPPFLAGS=debug_cppflags,
+                            CXXFLAGS=debug_cxxflags)
    if buildtype == 'release':
        env = base_env.Copy(CFLAGS=release_cflags,
                            CPPFLAGS=release_cppflags,
@@ -627,6 +645,7 @@ for build_target in targets:
                                  pkgconfig('--libs-only-l', ['gtk+-2.0']).split()]
            else:
                external_libs = net_external_libs + [ 'db-4.2', 'gtk-x11-2.0' ]
+            external_libs += ['boost_signals-gcc34-mt']
            internal_libs = [ 'llui', 'llxml', 'llmessage', 'llvfs', 'llmath', 'llcommon' ]
            create_executable(output_crashlogger_bin + '-globalsyms',
                              'linux_crash_logger',
@@ -702,8 +721,8 @@ for build_target in targets:
    elif build_target == 'server':
        create_static_module('lldatabase')
+        create_static_module('llphysics', source_files='files.lst')
        create_static_module('llscene')
-        create_static_module('llhavok', '-fno-rtti')
        create_static_module_from_dir('llkdu', 'llkdustatic')
@@ -711,7 +730,7 @@ for build_target in targets:
        # BUILD SERVERS  #
        ##################
        file_suffix = ''
-        if buildtype == 'debug':
+        if buildtype == 'debug' or buildtype == 'havok1debug':
            file_suffix = '_debug'
        common_external_libs += [ 'pthread' ]
@@ -740,7 +759,7 @@ for build_target in targets:
        # Dataserver
        external_libs = common_external_libs + [
-            'boost_regex-gcc-mt', 'mysqlclient', 'tcmalloc', 'stacktrace',
+            'boost_regex-gcc33-mt', 'boost_signals-gcc33-mt', 'mysqlclient', 'tcmalloc', 'stacktrace',
            ]
        internal_libs = [ 'llcharacter', 'lldatabase', 'llimage', 'llimagej2coj', 'llinventory',
                'llscene', 'llmessage', 'llvfs', 'llxml', 'llcommon', 'llmath' ]
@@ -763,28 +782,46 @@ for build_target in targets:
        # Mapserver
        external_libs = common_external_libs + ['OSMesa16', 'kdu', 
-                'boost_regex-gcc-mt', 'iconv', 'jpeg', 'openjpeg', 'GL',
+                'boost_regex-gcc33-mt', 'boost_signals-gcc33-mt', 'iconv',
-                'mysqlclient', 'pthread', 'dl']
+                'jpeg', 'openjpeg', 'GL', 'mysqlclient', 'png12', 'pthread', 'dl']
        internal_libs = ['llrender', 'llwindow', 'llimage', 'llimagej2coj', 'lldatabase', 'llprimitive', 'llmessage', 'llkdustatic',
                'llxml', 'llvfs', 'llmath', 'llcommon']
        create_executable('mapserver/mapserver' + file_suffix, 'mapserver',
                            internal_libs + external_libs)
        
        # Simulator
-        external_libs = common_external_libs + [
+        Depends('newsim/simulator' + file_suffix, 'mapserver/mapserver' + file_suffix)
-            'hkdynamics', 'hkgeometry', 'hkmath', 'hkbase', 'hkcollide',
+        external_libs = common_external_libs + ['boost_regex-gcc33-mt', 'boost_signals-gcc33-mt', 'openjpeg', 'dl', 'kdu',
-            'hkactions', 'boost_regex-gcc-mt', 'openjpeg', 'dl', 'kdu',
+            'mysqlclient', 'iconv', 'tcmalloc', 'stacktrace', 'png12']
-            'mysqlclient', 'iconv', 'tcmalloc', 'stacktrace',
-            ]
+        # the order of the havok libs matters
+        external_libs += [ 
+                'libhkcompat.a', 
+                'libhkutilities.a', 
+                'libhkvisualize.a', 
+                'libhkdynamics.a', 
+                'libhkvehicle.a', 
+                'libhkcollide.a', 
+                'libhkinternal.a', 
+                'libhkconstraintsolver.a', 
+                'libhkmath.a', 
+                'libhkscenedata.a', 
+                'libhkserialize.a', 
+                'libhkgraphicsogl.a', 
+                'libhkgraphicsbridge.a', 
+                'libhkgraphics.a', 
+                'libhkdemoframework.a', 
+                'libhkbase.a'
+                ]
        internal_libs = [ 'lscript', 'llprimitive',
-                 'llscene', 'llhavok', 'llinventory', 'llimage', 'llimagej2coj',
+                 'llscene', 'llphysics', 'llinventory', 'llimage', 'llimagej2coj',
                 'llcharacter', 'llxml', 'lldatabase', 'llkdustatic',
                 'llmessage', 'llvfs', 'llmath', 'llcommon' ]
        create_executable('newsim/simulator' + file_suffix, 'newsim', 
                            internal_libs + external_libs)
        # texture upload verifier
-        external_libs = common_external_libs + [ 'kdu', 'openjpeg', 'dl' ]
+        external_libs = common_external_libs + ['boost_signals-gcc33-mt', 'kdu', 'openjpeg', 'png12', 'z', 'dl']
        internal_libs = [
            'llimage',
            'llimagej2coj',
@@ -816,8 +853,10 @@ for build_target in targets:
        # Test
        Depends('test/test', 'newsim/simulator' + file_suffix)
        external_libs = common_external_libs + ['mysqlclient']
+        if platform == 'linux':
+            external_libs += ['boost_signals-gcc33-mt']
        internal_libs = [ 'lldatabase', 'llinventory', 'llmessage', 'llxml',
-                'llvfs', 'llcharacter', 'llmath', 'llcommon' ]
+                'llvfs', 'llcharacter', 'llphysics', 'llprimitive', 'llmath', 'llcommon' ]
        test_executable = 'test/test' + file_suffix
        create_executable(test_executable, 'test', 
                            internal_libs + external_libs)
diff --git a/linden/indra/indra_complete/indra_complete.sln b/linden/indra/indra_complete/indra_complete.sln
index b9efa5a..e990489 100644
--- a/linden/indra/indra_complete/indra_complete.sln
+++ b/linden/indra/indra_complete/indra_complete.sln
@@ -112,7 +112,7 @@ EndProject
                {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}
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE} = {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}
        EndProjectSection
 EndProject
        ProjectSection(ProjectDependencies) = postProject
@@ -194,6 +194,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test.vcproj
                {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}
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE} = {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}
        EndProjectSection
 EndProject
        ProjectSection(ProjectDependencies) = postProject
@@ -209,6 +210,7 @@ EndProject
        EndProjectSection
 EndProject
        ProjectSection(ProjectDependencies) = postProject
+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F} = {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}
        EndProjectSection
 EndProject
        ProjectSection(ProjectDependencies) = postProject
@@ -239,6 +241,7 @@ EndProject
 Global
        GlobalSection(SolutionConfiguration) = preSolution
                Debug = Debug
+                DebugMesaHeadless = DebugMesaHeadless
                Release = Release
                ReleaseForDownload = ReleaseForDownload
                ReleaseNoOpt = ReleaseNoOpt
@@ -248,6 +251,7 @@ Global
        GlobalSection(ProjectConfiguration) = postSolution
                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug.ActiveCfg = Debug|Win32
                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Debug.Build.0 = Debug|Win32
+                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release.ActiveCfg = Release|Win32
                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.Release.Build.0 = Release|Win32
                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -256,6 +260,7 @@ Global
                {7BCB4B2C-8378-4186-88EA-5742B5ABE17F}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug.ActiveCfg = Debug|Win32
                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Debug.Build.0 = Debug|Win32
+                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release.ActiveCfg = Release|Win32
                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.Release.Build.0 = Release|Win32
                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -264,6 +269,7 @@ Global
                {E87FD9BE-BE42-4EA3-BF4D-D992223046D9}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug.ActiveCfg = Debug|Win32
                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Debug.Build.0 = Debug|Win32
+                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release.ActiveCfg = Release|Win32
                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.Release.Build.0 = Release|Win32
                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -272,6 +278,7 @@ Global
                {E5D94794-5671-4BD6-A16D-26EC18F3DB34}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {D37774F4-253D-4760-BF64-372A943224A1}.Debug.ActiveCfg = Debug|Win32
                {D37774F4-253D-4760-BF64-372A943224A1}.Debug.Build.0 = Debug|Win32
+                {D37774F4-253D-4760-BF64-372A943224A1}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {D37774F4-253D-4760-BF64-372A943224A1}.Release.ActiveCfg = Release|Win32
                {D37774F4-253D-4760-BF64-372A943224A1}.Release.Build.0 = Release|Win32
                {D37774F4-253D-4760-BF64-372A943224A1}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -280,6 +287,7 @@ Global
                {D37774F4-253D-4760-BF64-372A943224A1}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug.ActiveCfg = Debug|Win32
                {A5470DA6-0C3A-4602-B930-43DB25511A59}.Debug.Build.0 = Debug|Win32
+                {A5470DA6-0C3A-4602-B930-43DB25511A59}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {A5470DA6-0C3A-4602-B930-43DB25511A59}.Release.ActiveCfg = Release|Win32
                {A5470DA6-0C3A-4602-B930-43DB25511A59}.Release.Build.0 = Release|Win32
                {A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -288,6 +296,7 @@ Global
                {A5470DA6-0C3A-4602-B930-43DB25511A59}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {DE55D666-6A3D-476C-937F-109269B83681}.Debug.ActiveCfg = Debug|Win32
                {DE55D666-6A3D-476C-937F-109269B83681}.Debug.Build.0 = Debug|Win32
+                {DE55D666-6A3D-476C-937F-109269B83681}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {DE55D666-6A3D-476C-937F-109269B83681}.Release.ActiveCfg = Release|Win32
                {DE55D666-6A3D-476C-937F-109269B83681}.Release.Build.0 = Release|Win32
                {DE55D666-6A3D-476C-937F-109269B83681}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -296,6 +305,7 @@ Global
                {DE55D666-6A3D-476C-937F-109269B83681}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug.ActiveCfg = Debug|Win32
                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Debug.Build.0 = Debug|Win32
+                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release.ActiveCfg = Release|Win32
                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.Release.Build.0 = Release|Win32
                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -304,6 +314,7 @@ Global
                {681FDD6C-2FAE-4CB9-AF6D-B952F2B151C5}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug.ActiveCfg = Debug|Win32
                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Debug.Build.0 = Debug|Win32
+                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release.ActiveCfg = Release|Win32
                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.Release.Build.0 = Release|Win32
                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -312,6 +323,7 @@ Global
                {FCC4483C-5B84-4944-B91F-4589A219BC0B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug.ActiveCfg = Debug|Win32
                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Debug.Build.0 = Debug|Win32
+                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release.ActiveCfg = Release|Win32
                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.Release.Build.0 = Release|Win32
                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -320,6 +332,7 @@ Global
                {5EA5DDF0-C7E1-4F49-BEF5-9246A4656B2E}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug.ActiveCfg = Debug|Win32
                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Debug.Build.0 = Debug|Win32
+                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release.ActiveCfg = Release|Win32
                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.Release.Build.0 = Release|Win32
                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -328,6 +341,7 @@ Global
                {93B2BA29-FBE9-4376-92C1-6108DCFE09D3}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug.ActiveCfg = Debug|Win32
                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Debug.Build.0 = Debug|Win32
+                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release.ActiveCfg = Release|Win32
                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.Release.Build.0 = Release|Win32
                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -336,6 +350,7 @@ Global
                {2ADE3C14-94C4-40BF-B033-70F3C954EE90}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug.ActiveCfg = Debug|Win32
                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Debug.Build.0 = Debug|Win32
+                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release.ActiveCfg = Release|Win32
                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.Release.Build.0 = Release|Win32
                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -344,6 +359,7 @@ Global
                {328D1968-924F-4863-AAE8-5F9A95BA68E5}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug.ActiveCfg = Debug|Win32
                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Debug.Build.0 = Debug|Win32
+                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release.ActiveCfg = Release|Win32
                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.Release.Build.0 = Release|Win32
                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseForDownload.ActiveCfg = ReleaseForDownload|Win32
@@ -352,6 +368,7 @@ Global
                {E6F4CF1B-6109-4CA8-B58D-87FA936CDE08}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug.ActiveCfg = Debug|Win32
                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Debug.Build.0 = Debug|Win32
+                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release.ActiveCfg = Release|Win32
                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.Release.Build.0 = Release|Win32
                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -360,6 +377,7 @@ Global
                {B4B838C7-2C72-428E-BBFD-25764E659A8B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug.ActiveCfg = Debug|Win32
                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Debug.Build.0 = Debug|Win32
+                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.DebugMesaHeadless.ActiveCfg = DebugMesaHeadless|Win32
                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release.ActiveCfg = Release|Win32
                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.Release.Build.0 = Release|Win32
                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -368,6 +386,7 @@ Global
                {B5B53617-416F-404A-BF10-22EBCCA0E4FB}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug.ActiveCfg = Debug|Win32
                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Debug.Build.0 = Debug|Win32
+                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release.ActiveCfg = Release|Win32
                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.Release.Build.0 = Release|Win32
                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -376,6 +395,7 @@ Global
                {BFA102B0-C891-4E13-B1CF-C2F28073DA8E}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug.ActiveCfg = Debug|Win32
                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Debug.Build.0 = Debug|Win32
+                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release.ActiveCfg = Release|Win32
                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.Release.Build.0 = Release|Win32
                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -384,6 +404,7 @@ Global
                {F882263E-4F2A-43D9-A45A-FA4C8EC66552}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug.ActiveCfg = Debug|Win32
                {44CE6D82-7320-4609-8FC3-5965C19F4808}.Debug.Build.0 = Debug|Win32
+                {44CE6D82-7320-4609-8FC3-5965C19F4808}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {44CE6D82-7320-4609-8FC3-5965C19F4808}.Release.ActiveCfg = Release|Win32
                {44CE6D82-7320-4609-8FC3-5965C19F4808}.Release.Build.0 = Release|Win32
                {44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -392,6 +413,7 @@ Global
                {44CE6D82-7320-4609-8FC3-5965C19F4808}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug.ActiveCfg = Debug|Win32
                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Debug.Build.0 = Debug|Win32
+                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release.ActiveCfg = Release|Win32
                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.Release.Build.0 = Release|Win32
                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -400,6 +422,7 @@ Global
                {D0FDC1C3-A589-40F2-ABCA-A84FF3835624}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug.ActiveCfg = Debug|Win32
                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Debug.Build.0 = Debug|Win32
+                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release.ActiveCfg = Release|Win32
                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.Release.Build.0 = Release|Win32
                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -408,6 +431,7 @@ Global
                {C6CA76F5-DCB4-4789-BBA7-43D11EE7C8E2}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug.ActiveCfg = Debug|Win32
                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Debug.Build.0 = Debug|Win32
+                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release.ActiveCfg = Release|Win32
                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.Release.Build.0 = Release|Win32
                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -416,6 +440,7 @@ Global
                {A5504A1E-8BA4-45D2-8144-1B6937E37E98}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug.ActiveCfg = Debug|Win32
                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Debug.Build.0 = Debug|Win32
+                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release.ActiveCfg = Release|Win32
                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.Release.Build.0 = Release|Win32
                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -424,18 +449,21 @@ Global
                {B771CF1B-E253-47BD-8B0A-6B0440CC9228}.ReleaseNoOpt.Build.0 = Release|Win32
                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug.ActiveCfg = Debug|Win32
                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Debug.Build.0 = Debug|Win32
+                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release.ActiveCfg = Release|Win32
                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.Release.Build.0 = Release|Win32
                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseForDownload.ActiveCfg = Release|Win32
                {777F38BE-2DFE-4051-9AAD-2832ABC474CC}.ReleaseNoOpt.ActiveCfg = Release|Win32
                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug.ActiveCfg = Debug|Win32
                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Debug.Build.0 = Debug|Win32
+                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release.ActiveCfg = Release|Win32
                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.Release.Build.0 = Release|Win32
                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseForDownload.ActiveCfg = Release|Win32
                {EC2A989E-3F8F-4B8B-9AE6-7C7EA37C84BC}.ReleaseNoOpt.ActiveCfg = Release|Win32
                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug.ActiveCfg = Debug|Win32
                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Debug.Build.0 = Debug|Win32
+                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release.ActiveCfg = Release|Win32
                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.Release.Build.0 = Release|Win32
                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -444,6 +472,7 @@ Global
                {648685F3-8760-4CC5-BB2B-CAF9DECC25A4}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug.ActiveCfg = Debug|Win32
                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Debug.Build.0 = Debug|Win32
+                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release.ActiveCfg = Release|Win32
                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.Release.Build.0 = Release|Win32
                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -451,11 +480,13 @@ Global
                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
                {E928F33B-E090-4FA8-818B-6B5D8B0F1F4B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {F56CA265-93E9-4068-8A67-8B104C876D70}.Debug.ActiveCfg = Debug|Win32
+                {F56CA265-93E9-4068-8A67-8B104C876D70}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {F56CA265-93E9-4068-8A67-8B104C876D70}.Release.ActiveCfg = Release|Win32
                {F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseForDownload.ActiveCfg = Release|Win32
                {F56CA265-93E9-4068-8A67-8B104C876D70}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug.ActiveCfg = Debug|Win32
                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Debug.Build.0 = Debug|Win32
+                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release.ActiveCfg = Release|Win32
                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.Release.Build.0 = Release|Win32
                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -464,6 +495,7 @@ Global
                {9D0C7E02-6506-4EE7-BC5C-75671D28D594}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug.ActiveCfg = Debug|Win32
                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Debug.Build.0 = Debug|Win32
+                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release.ActiveCfg = Release|Win32
                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.Release.Build.0 = Release|Win32
                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -472,6 +504,7 @@ Global
                {4B19F64E-AB97-4FB9-8E1D-74A8104DE0C4}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug.ActiveCfg = Debug|Win32
                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Debug.Build.0 = Debug|Win32
+                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release.ActiveCfg = Release|Win32
                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.Release.Build.0 = Release|Win32
                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -479,22 +512,26 @@ Global
                {BBAA6588-CA96-4A87-A988-B02270B8D02B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug.ActiveCfg = Debug|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Debug.Build.0 = Debug|Win32
+                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release.ActiveCfg = Release|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.Release.Build.0 = Release|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload.ActiveCfg = Release|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload.Build.0 = Release|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Debug.ActiveCfg = Debug|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Debug.ActiveCfg = Debug|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Debug.Build.0 = Debug|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Debug.Build.0 = Debug|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Release.ActiveCfg = Release|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugMesaHeadless.ActiveCfg = DebugHk460|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.Release.Build.0 = Release|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.DebugMesaHeadless.Build.0 = DebugHk460|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseForDownload.ActiveCfg = Release|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Release.ActiveCfg = Release|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseForDownload.Build.0 = Release|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.Release.Build.0 = Release|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseForDownload.ActiveCfg = Release|Win32
-                {023011F7-3ADB-49D3-9EC5-6D392F6D15FE}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseForDownload.Build.0 = Release|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseNoOpt.ActiveCfg = ReleaseNoOpt|Win32
+                {020311F7-3DAB-4D93-9CE5-6D3926FD15FE}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug.ActiveCfg = Debug|Win32
                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Debug.Build.0 = Debug|Win32
+                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release.ActiveCfg = Release|Win32
                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.Release.Build.0 = Release|Win32
                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -503,6 +540,7 @@ Global
                {6AEE004D-BFE8-4082-B4D3-E51163B01EEB}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {076DD042-2E58-42EA-9401-53210B65C1FC}.Debug.ActiveCfg = Debug|Win32
                {076DD042-2E58-42EA-9401-53210B65C1FC}.Debug.Build.0 = Debug|Win32
+                {076DD042-2E58-42EA-9401-53210B65C1FC}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {076DD042-2E58-42EA-9401-53210B65C1FC}.Release.ActiveCfg = Release|Win32
                {076DD042-2E58-42EA-9401-53210B65C1FC}.Release.Build.0 = Release|Win32
                {076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -511,6 +549,7 @@ Global
                {076DD042-2E58-42EA-9401-53210B65C1FC}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug.ActiveCfg = Debug|Win32
                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Debug.Build.0 = Debug|Win32
+                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release.ActiveCfg = Release|Win32
                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.Release.Build.0 = Release|Win32
                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseForDownload.ActiveCfg = Release|Win32
@@ -519,6 +558,7 @@ Global
                {AF2D801E-EEE7-4B52-A025-F8E648ADC34B}.ReleaseNoOpt.Build.0 = ReleaseNoOpt|Win32
                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug.ActiveCfg = Debug|Win32
                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Debug.Build.0 = Debug|Win32
+                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.DebugMesaHeadless.ActiveCfg = Debug|Win32
                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release.ActiveCfg = Release|Win32
                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.Release.Build.0 = Release|Win32
                {4C8D64D5-649F-481E-96BE-EF1E82A77ACB}.ReleaseForDownload.ActiveCfg = Release|Win32
diff --git a/linden/indra/indra_complete/indra_complete_vc8.sln b/linden/indra/indra_complete/indra_complete_vc8.sln
index e35c0f9..54bad30 100644
--- a/linden/indra/indra_complete/indra_complete_vc8.sln
+++ b/linden/indra/indra_complete/indra_complete_vc8.sln
@@ -83,7 +83,6 @@ EndProject
                {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
@@ -129,19 +128,6 @@ EndProject
                {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
@@ -175,7 +161,6 @@ EndProject
        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}
@@ -193,8 +178,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimagej2coj", "..\llimagej
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile_fb_vc8", "..\lscript\lscript_compile\lscript_compile_fb_vc8.vcproj", "{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "web-plugin-asset-upload", "..\web\doc\web-plugin-asset-upload_vc8.vcproj", "{0332E7B1-8913-4669-AD7E-7E2EB6204A75}"
-EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -454,15 +437,6 @@ Global
                {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
@@ -502,16 +476,6 @@ Global
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload|Win32.Build.0 = Release|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.Build.0 = 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
@@ -562,16 +526,6 @@ Global
                {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
-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.Debug|Win32.ActiveCfg = Debug|Win32
-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.Debug|Win32.Build.0 = Debug|Win32
-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.DebugMesaHeadless|Win32.ActiveCfg = Debug|Win32
-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.DebugMesaHeadless|Win32.Build.0 = Debug|Win32
-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.Release|Win32.ActiveCfg = Release|Win32
-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.Release|Win32.Build.0 = Release|Win32
-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.ReleaseForDownload|Win32.ActiveCfg = Release|Win32
-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.ReleaseForDownload|Win32.Build.0 = Release|Win32
-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.ReleaseNoOpt|Win32.ActiveCfg = Release|Win32
-                {0332E7B1-8913-4669-AD7E-7E2EB6204A75}.ReleaseNoOpt|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/linden/indra/indra_complete/indra_complete_vc9.sln b/linden/indra/indra_complete/indra_complete_vc9.sln
index 8424eb3..d7e781d 100644
--- a/linden/indra/indra_complete/indra_complete_vc9.sln
+++ b/linden/indra/indra_complete/indra_complete_vc9.sln
@@ -83,7 +83,6 @@ EndProject
                {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
@@ -129,19 +128,6 @@ EndProject
                {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_vc9.vcproj", "{9D0C7E02-6506-4EE7-BC5C-75671D28D594}"
 EndProject
 EndProject
@@ -175,7 +161,6 @@ EndProject
        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}
@@ -191,7 +176,7 @@ EndProject
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llimagej2coj", "..\llimagej2coj\llimagej2coj_vc9.vcproj", "{4C8D64D5-649F-481E-96BE-EF1E82A77ACB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile_fb_vc9", "..\lscript\lscript_compile\lscript_compile_fb_vc9.vcproj", "{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lscript_compile_fb_vc8", "..\lscript\lscript_compile\lscript_compile_fb_vc9.vcproj", "{B771CF1B-E253-47BD-8B0A-6B0440CC9228}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -455,15 +440,6 @@ Global
                {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
@@ -503,16 +479,6 @@ Global
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseForDownload|Win32.Build.0 = Release|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.ActiveCfg = ReleaseNoOpt|Win32
                {E9F5BD55-F8E8-4C61-B9B5-CCE7C1048241}.ReleaseNoOpt|Win32.Build.0 = 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
diff --git a/linden/indra/lib/python/indra/base/llsd.py b/linden/indra/lib/python/indra/base/llsd.py
index 71282bc..26ac3a2 100644
--- a/linden/indra/lib/python/indra/base/llsd.py
+++ b/linden/indra/lib/python/indra/base/llsd.py
@@ -842,16 +842,6 @@ try:
 except:
    print "Couldn't import mulib.stacked, not registering LLSD converters"
 else:
-    def llsd_convert_json(llsd_stuff, request):
-        callback = request.get_header('callback')
-        if callback is not None:
-            ## See Yahoo's ajax documentation for information about using this
-            ## callback style of programming
-            ## http://developer.yahoo.com/common/json.html#callbackparam
-            req.write("%s(%s)" % (callback, simplejson.dumps(llsd_stuff)))
-        else:
-            req.write(simplejson.dumps(llsd_stuff))
    def llsd_convert_xml(llsd_stuff, request):
        request.write(format_xml(llsd_stuff))
@@ -859,8 +849,6 @@ else:
        request.write(format_binary(llsd_stuff))
    for typ in [LLSD, dict, list, tuple, str, int, float, bool, unicode, type(None)]:
-        stacked.add_producer(typ, llsd_convert_json, 'application/json')
        stacked.add_producer(typ, llsd_convert_xml, 'application/llsd+xml')
        stacked.add_producer(typ, llsd_convert_xml, 'application/xml')
        stacked.add_producer(typ, llsd_convert_xml, 'text/xml')
diff --git a/linden/indra/lib/python/indra/ipc/llsdhttp.py b/linden/indra/lib/python/indra/ipc/llsdhttp.py
index 1bb335e..378c1c2 100644
--- a/linden/indra/lib/python/indra/ipc/llsdhttp.py
+++ b/linden/indra/lib/python/indra/ipc/llsdhttp.py
@@ -34,45 +34,54 @@ from indra.base import llsd
 from eventlet import httpc
+suite = httpc.HttpSuite(llsd.format_xml, llsd.parse, 'application/xml+llsd')
-get, put, delete, post = httpc.make_suite(
+delete = suite.delete
-    llsd.format_xml, llsd.parse, 'application/xml+llsd')
+delete_ = suite.delete_
+get = suite.get
+get_ = suite.get_
+head = suite.head
+head_ = suite.head_
+post = suite.post
+post_ = suite.post_
+put = suite.put
+put_ = suite.put_
+request = suite.request
+request_ = suite.request_
 for x in (httpc.ConnectionError, httpc.NotFound, httpc.Forbidden):
    globals()[x.__name__] = x
-def postFile(url, filename, verbose=False):
+def postFile(url, filename):
    f = open(filename)
    body = f.read()
    f.close()
    llsd_body = llsd.parse(body)
-    return post(url, llsd_body, verbose=verbose)
+    return post_(url, llsd_body)
 def getStatus(url, use_proxy=False):
-    status, _headers, _body = get(url, use_proxy=use_proxy, verbose=True)
+    status, _headers, _body = get_(url, use_proxy=use_proxy)
    return status
 def putStatus(url, data):
-    status, _headers, _body = put(url, data, verbose=True)
+    status, _headers, _body = put_(url, data)
    return status
 def deleteStatus(url):
-    status, _headers, _body = delete(url, verbose=True)
+    status, _headers, _body = delete_(url)
    return status
 def postStatus(url, data):
-    status, _headers, _body = post(url, data, verbose=True)
+    status, _headers, _body = post_(url, data)
    return status
 def postFileStatus(url, filename):
-    status, _headers, body = postFile(url, filename, verbose=True)
+    status, _headers, body = postFile(url, filename)
    return status, body
diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index 1bd44ae..89c14e8 100644
--- a/linden/indra/lib/python/indra/util/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -94,7 +94,7 @@ def get_channel(srctree):
    for p in paths:
        if os.path.exists(p):
            contents = open(p, 'r').read()
-            channel = re.search("LL_CHANNEL\s=\s\"([\w\s]+)\"", contents).group(1)
+            channel = re.search("LL_CHANNEL\s=\s\"(.+)\";\s*$", contents, flags = re.M).group(1)
            return channel
    
diff --git a/linden/indra/llcharacter/lljoint.cpp b/linden/indra/llcharacter/lljoint.cpp
index b7a51f1..4611f52 100644
--- a/linden/indra/llcharacter/lljoint.cpp
+++ b/linden/indra/llcharacter/lljoint.cpp
@@ -189,11 +189,12 @@ void LLJoint::removeChild(LLJoint* joint)
        child_list_t::iterator iter = std::find(mChildren.begin(), mChildren.end(), joint);
        if (iter != mChildren.end())
        {
-                this->mChildren.erase(iter);
+                mChildren.erase(iter);
+        
+                joint->mXform.setParent(NULL);
+                joint->mParent = NULL;
+                joint->touch();
        }
-        joint->mXform.setParent(NULL);
-        joint->mParent = NULL;
-        joint->touch();
 }
diff --git a/linden/indra/llcharacter/llstatemachine.h b/linden/indra/llcharacter/llstatemachine.h
index 12a71b7..873e938 100644
--- a/linden/indra/llcharacter/llstatemachine.h
+++ b/linden/indra/llcharacter/llstatemachine.h
@@ -54,7 +54,7 @@ class LLFSMTransition : public LLUniqueID
 {
 public:
        LLFSMTransition() : LLUniqueID(){};
-        virtual std::string getName(){ return "unnamed"; }
+        virtual std::string getName()const { return "unnamed"; }
 };
 class LLFSMState : public LLUniqueID
@@ -64,7 +64,7 @@ public:
        virtual void onEntry(void *){};
        virtual void onExit(void *){};
        virtual void execute(void *){};
-        virtual std::string getName(){ return "unnamed"; }
+        virtual std::string getName() const { return "unnamed"; }
 };
 class LLStateDiagram
diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h
index 4a1e221..9361479 100644
--- a/linden/indra/llcommon/imageids.h
+++ b/linden/indra/llcommon/imageids.h
@@ -43,60 +43,34 @@
                                                                                                                                                        // pre-cached on viewer
 // Grass Images
-//const LLUUID IMG_GRASS1                       ("990c4086-46ce-49bd-8cae-afcc23a08f4e"); // dataserver
-//const LLUUID IMG_GRASS2                       ("869e2dcf-21b9-402d-a36d-9a23365cf723"); // dataserver
-//const LLUUID IMG_GRASS3                       ("8f97e7a7-f664-4967-9e8f-8d9e8039c1b7"); // dataserver
-//const LLUUID IMG_GRASS4                       ("8a05131d-35b7-4812-bcfc-a989b0f954ef"); // dataserver
-//const LLUUID IMG_GRASS5                       ("7d092acb-c69a-4122-b09b-f285e009b185"); // dataserver
-const LLUUID IMG_CLEAR                  ("11ee27f5-43c0-414e-afd5-d7f5688c351f");  // VIEWER
 const LLUUID IMG_SMOKE                  ("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
-//const LLUUID IMG_ROCK                 ("402f8b24-5f9d-4905-b5f8-37baff603e88"); // VIEWER 1.2k
-//const LLUUID IMG_ROCKFACE             ("9c88539c-fd04-46b8-bea2-ddf1bcffe3bd"); // VIEWER 1.2k
 const LLUUID IMG_SUN                    ("cce0f112-878f-4586-a2e2-a8f104bba271"); // dataserver
 const LLUUID IMG_MOON                   ("d07f6eed-b96a-47cd-b51d-400ad4a1c428"); // dataserver
 const LLUUID IMG_CLOUD_POOF             ("fc4b9f0b-d008-45c6-96a4-01dd947ac621"); // dataserver
 const LLUUID IMG_SHOT                   ("35f217a3-f618-49cf-bbca-c86d486551a9"); // dataserver
 const LLUUID IMG_SPARK                  ("d2e75ac1-d0fb-4532-820e-a20034ac814d"); // dataserver
 const LLUUID IMG_FIRE                   ("aca40aa8-44cf-44ca-a0fa-93e1a2986f82"); // dataserver
-//const LLUUID IMG_WATER                        ("e510b068-d20d-4612-a08d-fde4d5c15789"); // VIEWER
 const LLUUID IMG_FACE_SELECT    ("a85ac674-cb75-4af6-9499-df7c5aaf7a28"); // face selector
-//const LLUUID IMG_SHADOW                       ("5e1de0a8-f9f8-4237-9396-d221126a7c4a"); // dataserver
-//const LLUUID IMG_AVATARSHADOW ("c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d"); // dataserver
-//const LLUUID IMG_BOXSHADOW            ("8d86b8cc-4889-408a-8b72-c1961bae53d7"); // dataserver
-//const LLUUID IMG_EYE                  ("5e3551ae-9971-4814-af99-5117591e937b"); // dataserver
-//const LLUUID IMG_BLUE_FLAME           ("d8b62059-7b31-4511-a479-1fe45117948f"); // dataserver
 const LLUUID IMG_DEFAULT_AVATAR ("c228d1cf-4b5d-4ba8-84f4-899a0796aa97"); // dataserver
-//const LLUUID IMG_ENERGY_BEAM  ("09e7bc54-11b9-442a-ae3d-f52e599e466a"); // dataserver
-//const LLUUID IMG_ENERGY_BEAM2 ("de651394-f926-48db-b666-e49d83af1bbc"); // dataserver
-//const LLUUID IMG_BRICK_PATH           ("a9d0019b-3783-4c7f-959c-322d301918bc"); // dataserver
 const LLUUID IMG_EXPLOSION                              ("68edcf47-ccd7-45b8-9f90-1649d7f12806"); // On dataserver
 const LLUUID IMG_EXPLOSION_2                    ("21ce046c-83fe-430a-b629-c7660ac78d7c"); // On dataserver
 const LLUUID IMG_EXPLOSION_3                    ("fedea30a-1be8-47a6-bc06-337a04a39c4b"); // On dataserver
 const LLUUID IMG_EXPLOSION_4                    ("abf0d56b-82e5-47a2-a8ad-74741bb2c29e"); // On dataserver
-//const LLUUID IMG_EXPLOSION_5                  ("60f2dec7-675b-4950-b614-85b907d552ea"); // On dataserver
-//const LLUUID IMG_SPLASH_SPRITE                        ("8a101f63-fe45-49e7-9f8a-e64817daa475"); // On dataserver
 const LLUUID IMG_SMOKE_POOF                             ("1e63e323-5fe0-452e-92f8-b98bd0f764e3"); // On dataserver
 const LLUUID IMG_BIG_EXPLOSION_1                ("5e47a0dc-97bf-44e0-8b40-de06718cee9d"); // On dataserver
 const LLUUID IMG_BIG_EXPLOSION_2                ("9c8eca51-53d5-42a7-bb58-cef070395db8"); // On dataserver
-//const LLUUID IMG_BLUE_BLOOD                           ("8bc2e3f8-097e-4c87-b417-b0d699d07189"); // On dataserver
-const LLUUID IMG_BLOOM1                             ("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef");
+const LLUUID IMG_BLOOM1                             ("3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"); // VIEWER
-//const LLUUID IMG_BLOOM2                                   ("9fb76e81-eca0-4b6a-96e1-a6c5a685150b");
+const LLUUID TERRAIN_DIRT_DETAIL                ("0bc58228-74a0-7e83-89bc-5c23464bcec5"); // VIEWER
-//const LLUUID IMG_BLOOM3                                   ("fb1fecba-9585-415b-ad15-6e6e3d6c5479");
+const LLUUID TERRAIN_GRASS_DETAIL               ("63338ede-0037-c4fd-855b-015d77112fc8"); // VIEWER
+const LLUUID TERRAIN_MOUNTAIN_DETAIL    ("303cd381-8560-7579-23f1-f0a880799740"); // VIEWER
+const LLUUID TERRAIN_ROCK_DETAIL                ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER
-const LLUUID IMG_PTT_SPEAKER            ("89e9fc7c-0b16-457d-be4f-136270759c4d"); // On cache
+const LLUUID DEFAULT_WATER_NORMAL               ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
 #endif
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index eceb576..77f3d8c 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -38,9 +38,10 @@
 // At 45 Hz collisions seem stable and objects seem
 // to settle down at a reasonable rate.
 // JC 3/18/2003
-const F32 HAVOK_TIMESTEP = 1.f / 45.f;
+const F32 PHYSICS_TIMESTEP = 1.f / 45.f;
 const F32 COLLISION_TOLERANCE = 0.1f;
+const F32 HALF_COLLISION_TOLERANCE = COLLISION_TOLERANCE * 0.5f;
 // Time constants
 const U32 HOURS_PER_LINDEN_DAY          = 4;    
@@ -53,6 +54,8 @@ const F32 REGION_WIDTH_METERS = 256.f;
 const S32 REGION_WIDTH_UNITS = 256;
 const U32 REGION_WIDTH_U32 = 256;
+const F32 REGION_HEIGHT_METERS = 4096.f;
 // Bits for simulator performance query flags
 enum LAND_STAT_FLAGS
 {
@@ -87,7 +90,7 @@ const 	F32 	MAX_AGENT_HEIGHT		= 2.65f - 2.0f * COLLISION_TOLERANCE;
 // For linked sets
 const S32 MAX_CHILDREN_PER_TASK = 255;
-const S32 MAX_CHILDREN_PER_PHYSICAL_TASK = 31;
+const S32 MAX_CHILDREN_PER_PHYSICAL_TASK = 32;
 const S32 MAX_JOINTS_PER_OBJECT = 1;    // limiting to 1 until Havok 2.x
@@ -339,7 +342,7 @@ const U32 MAP_ITEM_LAND_FOR_SALE = 0x07;
 const U32 MAP_ITEM_CLASSIFIED = 0x08;
 // Crash reporter behavior
-const char* const CRASH_SETTINGS_FILE = "crash_settings.xml";
+const char* const CRASH_SETTINGS_FILE = "settings_crash_behavior.xml";
 const char* const CRASH_BEHAVIOR_SETTING = "CrashSubmitBehavior";
 const S32 CRASH_BEHAVIOR_ASK = 0;
 const S32 CRASH_BEHAVIOR_ALWAYS_SEND = 1;
diff --git a/linden/indra/llcommon/llagentconstants.h b/linden/indra/llcommon/llagentconstants.h
index 5757751..48c097a 100644
--- a/linden/indra/llcommon/llagentconstants.h
+++ b/linden/indra/llcommon/llagentconstants.h
@@ -67,43 +67,43 @@ const U32 CONTROL_ML_LBUTTON_DOWN_INDEX		= 30;
 const U32 CONTROL_ML_LBUTTON_UP_INDEX           = 31;
 const U32 TOTAL_CONTROLS                                        = 32;
-const U32 AGENT_CONTROL_AT_POS              = 0x1 << CONTROL_AT_POS_INDEX;
+const U32 AGENT_CONTROL_AT_POS              = 0x1 << CONTROL_AT_POS_INDEX;                      // 0x00000001
-const U32 AGENT_CONTROL_AT_NEG              = 0x1 << CONTROL_AT_NEG_INDEX;
+const U32 AGENT_CONTROL_AT_NEG              = 0x1 << CONTROL_AT_NEG_INDEX;                      // 0x00000002
-const U32 AGENT_CONTROL_LEFT_POS            = 0x1 << CONTROL_LEFT_POS_INDEX;
+const U32 AGENT_CONTROL_LEFT_POS            = 0x1 << CONTROL_LEFT_POS_INDEX;            // 0x00000004
-const U32 AGENT_CONTROL_LEFT_NEG            = 0x1 << CONTROL_LEFT_NEG_INDEX;
+const U32 AGENT_CONTROL_LEFT_NEG            = 0x1 << CONTROL_LEFT_NEG_INDEX;            // 0x00000008
-const U32 AGENT_CONTROL_UP_POS              = 0x1 << CONTROL_UP_POS_INDEX;
+const U32 AGENT_CONTROL_UP_POS              = 0x1 << CONTROL_UP_POS_INDEX;                      // 0x00000010
-const U32 AGENT_CONTROL_UP_NEG              = 0x1 << CONTROL_UP_NEG_INDEX;
+const U32 AGENT_CONTROL_UP_NEG              = 0x1 << CONTROL_UP_NEG_INDEX;                      // 0x00000020
-const U32 AGENT_CONTROL_PITCH_POS           = 0x1 << CONTROL_PITCH_POS_INDEX;
+const U32 AGENT_CONTROL_PITCH_POS           = 0x1 << CONTROL_PITCH_POS_INDEX;           // 0x00000040
-const U32 AGENT_CONTROL_PITCH_NEG           = 0x1 << CONTROL_PITCH_NEG_INDEX;
+const U32 AGENT_CONTROL_PITCH_NEG           = 0x1 << CONTROL_PITCH_NEG_INDEX;           // 0x00000080
-const U32 AGENT_CONTROL_YAW_POS             = 0x1 << CONTROL_YAW_POS_INDEX;
+const U32 AGENT_CONTROL_YAW_POS             = 0x1 << CONTROL_YAW_POS_INDEX;                     // 0x00000100
-const U32 AGENT_CONTROL_YAW_NEG             = 0x1 << CONTROL_YAW_NEG_INDEX;
+const U32 AGENT_CONTROL_YAW_NEG             = 0x1 << CONTROL_YAW_NEG_INDEX;                     // 0x00000200
-const U32 AGENT_CONTROL_FAST_AT             = 0x1 << CONTROL_FAST_AT_INDEX;
+const U32 AGENT_CONTROL_FAST_AT             = 0x1 << CONTROL_FAST_AT_INDEX;                     // 0x00000400
-const U32 AGENT_CONTROL_FAST_LEFT           = 0x1 << CONTROL_FAST_LEFT_INDEX;
+const U32 AGENT_CONTROL_FAST_LEFT           = 0x1 << CONTROL_FAST_LEFT_INDEX;           // 0x00000800
-const U32 AGENT_CONTROL_FAST_UP             = 0x1 << CONTROL_FAST_UP_INDEX;
+const U32 AGENT_CONTROL_FAST_UP             = 0x1 << CONTROL_FAST_UP_INDEX;                     // 0x00001000
-const U32 AGENT_CONTROL_FLY                                     = 0x1 << CONTROL_FLY_INDEX;
+const U32 AGENT_CONTROL_FLY                                     = 0x1 << CONTROL_FLY_INDEX;                             // 0x00002000
-const U32 AGENT_CONTROL_STOP                            = 0x1 << CONTROL_STOP_INDEX;
+const U32 AGENT_CONTROL_STOP                            = 0x1 << CONTROL_STOP_INDEX;                    // 0x00004000
-const U32 AGENT_CONTROL_FINISH_ANIM                     = 0x1 << CONTROL_FINISH_ANIM_INDEX;
+const U32 AGENT_CONTROL_FINISH_ANIM                     = 0x1 << CONTROL_FINISH_ANIM_INDEX;             // 0x00008000
-const U32 AGENT_CONTROL_STAND_UP                        = 0x1 << CONTROL_STAND_UP_INDEX;
+const U32 AGENT_CONTROL_STAND_UP                        = 0x1 << CONTROL_STAND_UP_INDEX;                // 0x00010000
-const U32 AGENT_CONTROL_SIT_ON_GROUND           = 0x1 << CONTROL_SIT_ON_GROUND_INDEX;
+const U32 AGENT_CONTROL_SIT_ON_GROUND           = 0x1 << CONTROL_SIT_ON_GROUND_INDEX;   // 0x00020000
-const U32 AGENT_CONTROL_MOUSELOOK                       = 0x1 << CONTROL_MOUSELOOK_INDEX;
+const U32 AGENT_CONTROL_MOUSELOOK                       = 0x1 << CONTROL_MOUSELOOK_INDEX;               // 0x00040000
-const U32 AGENT_CONTROL_NUDGE_AT_POS        = 0x1 << CONTROL_NUDGE_AT_POS_INDEX;
+const U32 AGENT_CONTROL_NUDGE_AT_POS        = 0x1 << CONTROL_NUDGE_AT_POS_INDEX;        // 0x00080000
-const U32 AGENT_CONTROL_NUDGE_AT_NEG        = 0x1 << CONTROL_NUDGE_AT_NEG_INDEX;
+const U32 AGENT_CONTROL_NUDGE_AT_NEG        = 0x1 << CONTROL_NUDGE_AT_NEG_INDEX;        // 0x00100000
-const U32 AGENT_CONTROL_NUDGE_LEFT_POS      = 0x1 << CONTROL_NUDGE_LEFT_POS_INDEX;
+const U32 AGENT_CONTROL_NUDGE_LEFT_POS      = 0x1 << CONTROL_NUDGE_LEFT_POS_INDEX;      // 0x00200000
-const U32 AGENT_CONTROL_NUDGE_LEFT_NEG      = 0x1 << CONTROL_NUDGE_LEFT_NEG_INDEX;
+const U32 AGENT_CONTROL_NUDGE_LEFT_NEG      = 0x1 << CONTROL_NUDGE_LEFT_NEG_INDEX;      // 0x00400000
-const U32 AGENT_CONTROL_NUDGE_UP_POS        = 0x1 << CONTROL_NUDGE_UP_POS_INDEX;
+const U32 AGENT_CONTROL_NUDGE_UP_POS        = 0x1 << CONTROL_NUDGE_UP_POS_INDEX;        // 0x00800000
-const U32 AGENT_CONTROL_NUDGE_UP_NEG        = 0x1 << CONTROL_NUDGE_UP_NEG_INDEX;
+const U32 AGENT_CONTROL_NUDGE_UP_NEG        = 0x1 << CONTROL_NUDGE_UP_NEG_INDEX;        // 0x01000000
-const U32 AGENT_CONTROL_TURN_LEFT               = 0x1 << CONTROL_TURN_LEFT_INDEX;
+const U32 AGENT_CONTROL_TURN_LEFT               = 0x1 << CONTROL_TURN_LEFT_INDEX;               // 0x02000000
-const U32 AGENT_CONTROL_TURN_RIGHT              = 0x1 << CONTROL_TURN_RIGHT_INDEX;
+const U32 AGENT_CONTROL_TURN_RIGHT              = 0x1 << CONTROL_TURN_RIGHT_INDEX;              // 0x04000000
-const U32 AGENT_CONTROL_AWAY                            = 0x1 << CONTROL_AWAY_INDEX;
+const U32 AGENT_CONTROL_AWAY                            = 0x1 << CONTROL_AWAY_INDEX;                    // 0x08000000
-const U32 AGENT_CONTROL_LBUTTON_DOWN            = 0x1 << CONTROL_LBUTTON_DOWN_INDEX;
+const U32 AGENT_CONTROL_LBUTTON_DOWN            = 0x1 << CONTROL_LBUTTON_DOWN_INDEX;    // 0x10000000
-const U32 AGENT_CONTROL_LBUTTON_UP                      = 0x1 << CONTROL_LBUTTON_UP_INDEX;
+const U32 AGENT_CONTROL_LBUTTON_UP                      = 0x1 << CONTROL_LBUTTON_UP_INDEX;              // 0x20000000
-const U32 AGENT_CONTROL_ML_LBUTTON_DOWN         = 0x1 << CONTROL_ML_LBUTTON_DOWN_INDEX;
+const U32 AGENT_CONTROL_ML_LBUTTON_DOWN         = 0x1 << CONTROL_ML_LBUTTON_DOWN_INDEX; // 0x40000000
-const U32 AGENT_CONTROL_ML_LBUTTON_UP           = ((U32)0x1) << CONTROL_ML_LBUTTON_UP_INDEX;
+const U32 AGENT_CONTROL_ML_LBUTTON_UP           = ((U32)0x1) << CONTROL_ML_LBUTTON_UP_INDEX;    // 0x80000000
 const U32 AGENT_CONTROL_AT              = AGENT_CONTROL_AT_POS 
                                                                  | AGENT_CONTROL_AT_NEG 
diff --git a/linden/indra/llcommon/llapp.cpp b/linden/indra/llcommon/llapp.cpp
index a10436a..bd2e377 100644
--- a/linden/indra/llcommon/llapp.cpp
+++ b/linden/indra/llcommon/llapp.cpp
@@ -65,6 +65,7 @@ BOOL LLApp::sLogInSignal = FALSE;
 // static
 LLApp::EAppStatus LLApp::sStatus = LLApp::APP_STATUS_STOPPED; // Keeps track of application status
 LLAppErrorHandler LLApp::sErrorHandler = NULL;
+LLAppErrorHandler LLApp::sSyncErrorHandler = NULL;
 BOOL LLApp::sErrorThreadRunning = FALSE;
 #if !LL_WINDOWS
 LLApp::child_map LLApp::sChildMap;
@@ -262,6 +263,21 @@ void LLApp::setErrorHandler(LLAppErrorHandler handler)
        LLApp::sErrorHandler = handler;
 }
+void LLApp::setSyncErrorHandler(LLAppErrorHandler handler)
+{
+        LLApp::sSyncErrorHandler = handler;
+}
+// static
+void LLApp::runSyncErrorHandler()
+{
+        if (LLApp::sSyncErrorHandler)
+        {
+                LLApp::sSyncErrorHandler();
+        }
+}
 // static
 void LLApp::runErrorHandler()
 {
@@ -285,7 +301,13 @@ void LLApp::setStatus(EAppStatus status)
 // static
 void LLApp::setError()
 {
-        setStatus(APP_STATUS_ERROR);
+        if (!isError())
+        {
+                // perform any needed synchronous error-handling
+                runSyncErrorHandler();
+                // set app status to ERROR so that the LLErrorThread notices
+                setStatus(APP_STATUS_ERROR);
+        }
 }
diff --git a/linden/indra/llcommon/llapp.h b/linden/indra/llcommon/llapp.h
index 1a700cc..50a70ae 100644
--- a/linden/indra/llcommon/llapp.h
+++ b/linden/indra/llcommon/llapp.h
@@ -189,6 +189,7 @@ public:
        // Error handling methods
        //
        void setErrorHandler(LLAppErrorHandler handler);
+        void setSyncErrorHandler(LLAppErrorHandler handler);
 #if !LL_WINDOWS
        //
@@ -245,13 +246,15 @@ protected:
 private:
        void setupErrorHandling();              // Do platform-specific error-handling setup (signals, structured exceptions)
-        static void runErrorHandler();
+        static void runErrorHandler(); // run shortly after we detect an error, ran in the relatively robust context of the LLErrorThread - preferred.
+        static void runSyncErrorHandler(); // run IMMEDIATELY when we get an error, ran in the context of the faulting thread.
        // *NOTE: On Windows, we need a routine to reset the structured
        // exception handler when some evil driver has taken it over for
        // their own purposes
        typedef int(*signal_handler_func)(int signum);
        static LLAppErrorHandler sErrorHandler;
+        static LLAppErrorHandler sSyncErrorHandler;
        // Default application threads
        LLErrorThread* mThreadErrorp;           // Waits for app to go to status ERROR, then runs the error callback
diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index 770cd3f..08c40a4 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -116,8 +116,10 @@ void LLScopedLock::unlock()
 bool ll_apr_warn_status(apr_status_t status)
 {
        if(APR_SUCCESS == status) return false;
+#ifndef LL_WINDOWS
        char buf[MAX_STRING];   /* Flawfinder: ignore */
        llwarns << "APR: " << apr_strerror(status, buf, MAX_STRING) << llendl;
+#endif
        return true;
 }
diff --git a/linden/indra/llcommon/llcommon.vcproj b/linden/indra/llcommon/llcommon.vcproj
index 6b4a0e8..ab4e67a 100644
--- a/linden/indra/llcommon/llcommon.vcproj
+++ b/linden/indra/llcommon/llcommon.vcproj
@@ -432,10 +432,10 @@
                                RelativePath=".\lllivefile.h">
                        </File>
                        <File
-                                RelativePath=".\lllog.h">
+                                RelativePath=".\lllocalidhashmap.h">
                        </File>
                        <File
-                                RelativePath=".\lllocalidhashmap.h">
+                                RelativePath=".\lllog.h">
                        </File>
                        <File
                                RelativePath=".\lllslconstants.h">
@@ -504,6 +504,9 @@
                                RelativePath=".\llskipmap.h">
                        </File>
                        <File
+                                RelativePath=".\llsmoothstep.h">
+                        </File>
+                        <File
                                RelativePath=".\llstat.h">
                        </File>
                        <File
diff --git a/linden/indra/llcommon/lldarray.h b/linden/indra/llcommon/lldarray.h
index 9bffd63..45e564f 100644
--- a/linden/indra/llcommon/lldarray.h
+++ b/linden/indra/llcommon/lldarray.h
@@ -119,11 +119,12 @@ inline S32 LLDynamicArray<Type,BlockSize>::removeObj(const Type& obj)
        typename std::vector<Type>::iterator iter = std::find(this->begin(), this->end(), obj);
        if (iter != this->end())
        {
+                S32 res = iter - this->begin();
                typename std::vector<Type>::iterator last = this->end(); 
                --last;
                *iter = *last;
                this->pop_back();
-                return iter - this->begin();
+                return res;
        }
        return FAIL;
 }
diff --git a/linden/indra/llcommon/lldefs.h b/linden/indra/llcommon/lldefs.h
index d081245..0e69626 100644
--- a/linden/indra/llcommon/lldefs.h
+++ b/linden/indra/llcommon/lldefs.h
@@ -218,7 +218,15 @@ inline LLDATATYPE llmin(const LLDATATYPE& d1, const LLDATATYPE& d2, const LLDATA
 template <class LLDATATYPE> 
 inline LLDATATYPE llclamp(const LLDATATYPE& a, const LLDATATYPE& minval, const LLDATATYPE& maxval)
 {
-        return llmin(llmax(a, minval), maxval);
+        if ( a < minval )
+        {
+                return minval;
+        }
+        else if ( a > maxval )
+        {
+                return maxval;
+        }
+        return a;
 }
 template <class LLDATATYPE> 
@@ -234,3 +242,4 @@ inline LLDATATYPE llclampb(const LLDATATYPE& a)
 }
 #endif // LL_LLDEFS_H
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index d9ab57c..0e7db89 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -37,15 +37,16 @@
 #include <cctype>
 #ifdef __GNUC__
-#include <cxxabi.h>
+# include <cxxabi.h>
-#endif
+#endif // __GNUC__
 #include <sstream>
 #if !LL_WINDOWS
-#include <syslog.h>
+# include <syslog.h>
-#endif
+# include <unistd.h>
+#endif // !LL_WINDOWS
 #if LL_WINDOWS
-#include <windows.h>
+# include <windows.h>
-#endif
+#endif // LL_WINDOWS
 #include <vector>
 #include "llapp.h"
@@ -133,18 +134,58 @@ namespace {
        class RecordToStderr : public LLError::Recorder
        {
        public:
-                RecordToStderr(bool timestamp) : mTimestamp(timestamp) { }
+                RecordToStderr(bool timestamp) : mTimestamp(timestamp), mUseANSI(ANSI_PROBE) { }
                virtual bool wantsTime() { return mTimestamp; }
                
                virtual void recordMessage(LLError::ELevel level,
-                                                                        const std::string& message)
+                                           const std::string& message)
                {
+                        if (ANSI_PROBE == mUseANSI)
+                                mUseANSI = (checkANSI() ? ANSI_YES : ANSI_NO);
+                        if (ANSI_YES == mUseANSI)
+                        {
+                                // Default all message levels to bold so we can distinguish our own messages from those dumped by subprocesses and libraries.
+                                colorANSI("1"); // bold
+                                switch (level) {
+                                case LLError::LEVEL_ERROR:
+                                        colorANSI("31"); // red
+                                        break;
+                                case LLError::LEVEL_WARN:
+                                        colorANSI("34"); // blue
+                                        break;
+                                case LLError::LEVEL_DEBUG:
+                                        colorANSI("35"); // magenta
+                                        break;
+                                default:
+                                        break;
+                                }
+                        }
                        fprintf(stderr, "%s\n", message.c_str());
+                        if (ANSI_YES == mUseANSI) colorANSI("0"); // reset
                }
        
        private:
                bool mTimestamp;
+                typedef enum ANSIState {ANSI_PROBE, ANSI_YES, ANSI_NO};
+                ANSIState mUseANSI;
+                void colorANSI(const std::string color)
+                {
+                        // ANSI color code escape sequence
+                        fprintf(stderr, "\033[%sm", color.c_str() );
+                };
+                bool checkANSI(void)
+                {
+#if LL_LINUX || LL_DARWIN
+                        // Check whether it's okay to use ANSI; if stderr is
+                        // a tty then we assume yes.  Can be turned off with
+                        // the LL_NO_ANSI_COLOR env var.
+                        return (0 != isatty(2)) &&
+                                (NULL == getenv("LL_NO_ANSI_COLOR"));
+#endif // LL_LINUX
+                        return false;
+                };
        };
        class RecordToFixedBuffer : public LLError::Recorder
diff --git a/linden/indra/llcommon/llevent.h b/linden/indra/llcommon/llevent.h
index 83cb79f..ef96ef7 100644
--- a/linden/indra/llcommon/llevent.h
+++ b/linden/indra/llcommon/llevent.h
@@ -185,13 +185,6 @@ protected:
        LLPointer<LLEventDispatcher> mDispatcher;
 };
-// Utility mixer class which fires & handles events
-class LLSimpleListenerObservable : public LLObservable, public LLSimpleListener
-{
-public:
-        virtual bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) = 0;
-};
 class LLValueChangedEvent : public LLEvent
 {
 public:
diff --git a/linden/indra/llcommon/llfile.cpp b/linden/indra/llcommon/llfile.cpp
index d551f28..32e9622 100644
--- a/linden/indra/llcommon/llfile.cpp
+++ b/linden/indra/llcommon/llfile.cpp
@@ -272,9 +272,11 @@ void llofstream::open(const char* _Filename,	/* Flawfinder: ignore */
 void llofstream::close()
 {       // close the C stream
-        llassert(_Filebuffer);
+        if(is_open())
-        if (_Filebuffer->close() == 0)
+        {
-                _Myios::setstate(ios_base::failbit);    /*Flawfinder: ignore*/
+                if (_Filebuffer->close() == 0)
+                        _Myios::setstate(ios_base::failbit);    /*Flawfinder: ignore*/
+        }
 }
 llofstream::llofstream(const char *_Filename,
@@ -286,7 +288,8 @@ llofstream::llofstream(const char *_Filename,
 }
 llofstream::~llofstream()
-{       // destroy the object
+{       
+        // destroy the object
        if (_ShouldClose)
        {
                close();
diff --git a/linden/indra/llcommon/llframetimer.cpp b/linden/indra/llcommon/llframetimer.cpp
index 9de3be2..96e5014 100644
--- a/linden/indra/llcommon/llframetimer.cpp
+++ b/linden/indra/llcommon/llframetimer.cpp
@@ -140,3 +140,18 @@ F32 LLFrameTimer::getFrameDeltaTimeF32()
 {
        return (F32)(U64_to_F64(sFrameDeltaTime) * USEC_TO_SEC_F64); 
 }
+//      static 
+// Return seconds since the current frame started
+F32  LLFrameTimer::getCurrentFrameTime()
+{
+        U64 frame_time = totalTime() - sTotalTime;
+        return (F32)(U64_to_F64(frame_time) * USEC_TO_SEC_F64); 
+}
+// Glue code to avoid full class .h file #includes
+F32  getCurrentFrameTime()
+{
+        return (F32)(LLFrameTimer::getCurrentFrameTime());
+}
diff --git a/linden/indra/llcommon/llframetimer.h b/linden/indra/llcommon/llframetimer.h
index bc0d79d..11c4cfc 100644
--- a/linden/indra/llcommon/llframetimer.h
+++ b/linden/indra/llcommon/llframetimer.h
@@ -74,6 +74,9 @@ public:
        static F32      getFrameDeltaTimeF32();
+        // Return seconds since the current frame started
+        static F32  getCurrentFrameTime();
        // MANIPULATORS
        void start();
        void stop();
@@ -144,4 +147,7 @@ protected:
        BOOL mStarted;
 };
+// Glue code for Havok (or anything else that doesn't want the full .h files)
+extern F32  getCurrentFrameTime();
 #endif  // LL_LLFRAMETIMER_H
diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h
index ba39098..508fb42 100644
--- a/linden/indra/llcommon/lllslconstants.h
+++ b/linden/indra/llcommon/lllslconstants.h
@@ -70,6 +70,7 @@ const S32 LSL_PRIM_FLEXIBLE		= 21;
 const S32 LSL_PRIM_TEXGEN               = 22;
 const S32 LSL_PRIM_POINT_LIGHT  = 23;
 const S32 LSL_PRIM_CAST_SHADOWS = 24;
+const S32 LSL_PRIM_GLOW         = 25;
 const S32 LSL_PRIM_TYPE_BOX             = 0;
 const S32 LSL_PRIM_TYPE_CYLINDER= 1;
diff --git a/linden/indra/llcommon/llmemory.h b/linden/indra/llcommon/llmemory.h
index e1af7ba..c10661a 100644
--- a/linden/indra/llcommon/llmemory.h
+++ b/linden/indra/llcommon/llmemory.h
@@ -419,6 +419,31 @@ protected:
 //   Foo* instance = FooSingleton::getInstance();
 //
 // As currently written, it is not thread-safe.
+#if LL_WINDOWS && _MSC_VER < 1400 // this is Visual C++ 2003 or earlier
+// workaround for VC7 compiler bug
+// adapted from http://www.codeproject.com/KB/tips/VC2003MeyersSingletonBug.aspx
+// our version doesn't introduce a nested struct so that you can still declare LLSingleton<MyClass>
+// a friend and hide your constructor
+template <typename T>
+class LLSingleton
+{
+public:
+        static T* getInstance()
+    {
+        LLSingleton<T> singleton;
+        return singleton.get();
+    }
+private:
+        T* get()
+    {
+        static T instance;
+        return &instance;
+    }
+};
+#else
 template <typename T>
 class LLSingleton
 {
@@ -430,6 +455,8 @@ public:
        }
 };
+#endif
 //----------------------------------------------------------------------------
 // Return the resident set size of the current process, in bytes.
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index 8d38904..e99b103 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -79,9 +79,16 @@
 #endif
 // Deal with the differeneces on Windows
 #if LL_MSVC
-#define snprintf safe_snprintf          /* Flawfinder: ignore */
+namespace snprintf_hack
+{
+        int snprintf(char *str, size_t size, const char *format, ...);
+}
+// #define snprintf safe_snprintf               /* Flawfinder: ignore */
+using snprintf_hack::snprintf;
 #endif  // LL_MSVC
 // Static linking with apr on windows needs to be declared.
diff --git a/linden/indra/llcommon/llptrskiplist.h b/linden/indra/llcommon/llptrskiplist.h
index df35d30..f1df27a 100644
--- a/linden/indra/llcommon/llptrskiplist.h
+++ b/linden/indra/llcommon/llptrskiplist.h
@@ -34,6 +34,7 @@
 #include "llerror.h"
 //#include "vmath.h"
+#include "llrand.h"
 /////////////////////////////////////////////
 //
diff --git a/linden/indra/llcommon/llskiplist.h b/linden/indra/llcommon/llskiplist.h
index 78e6f0a..c88b310 100644
--- a/linden/indra/llcommon/llskiplist.h
+++ b/linden/indra/llcommon/llskiplist.h
@@ -32,6 +32,7 @@
 #define LL_LLSKIPLIST_H
 #include "llrand.h"
+#include "llrand.h"
 // NOTA BENE: Insert first needs to be < NOT <=
 // Binary depth must be >= 2
diff --git a/linden/indra/newview/llsphere.h b/linden/indra/llcommon/llsmoothstep.h
index 3a827c9..c2b3447 100644
--- a/linden/indra/newview/llsphere.h
+++ b/linden/indra/llcommon/llsmoothstep.h
@@ -1,6 +1,6 @@
 /** 
- * @file llsphere.h
+ * @file llsmoothstep.h
- * @brief interface for the LLSphere class.
+ * @brief Smoothstep - transition from 0 to 1 - function, first and second derivatives all continuous (smooth)
 *
 * $LicenseInfo:firstyear=2001&license=viewergpl$
 * 
@@ -29,30 +29,22 @@
 * $/LicenseInfo$
 */
-#ifndef LL_LLSPHERE_H
+#ifndef LL_LLSMOOTHSTEP_H
-#define LL_LLSPHERE_H
+#define LL_LLSMOOTHSTEP_H
-//#include "vmath.h"
+template <class LLDATATYPE>
-#include "llmath.h"
+inline LLDATATYPE llsmoothstep(const LLDATATYPE& edge0, const LLDATATYPE& edge1, const LLDATATYPE& value)
-#include "v3math.h"
+{
-#include "v4math.h"
+    if (value < edge0)
-#include "m3math.h"
+                return (LLDATATYPE)0;
-#include "m4math.h"
-#include "v4color.h"
-#include "llgl.h"
-void lat2xyz(LLVector3 * result, F32 lat, F32 lon);                     // utility routine
+        if (value >= edge1)
+                return (LLDATATYPE)1;
-class LLSphere  
+        // Scale/bias into [0..1] range
-{
+        LLDATATYPE scaled_value = (value - edge0) / (edge1 - edge0);
-public:
-        LLGLuint        mDList[5];
-        void prerender();
+        return scaled_value * scaled_value * (3 - 2 * scaled_value);
-        void cleanupGL();
+}
-        void render(F32 pixel_area);            // of a box of size 1.0 at that position
-        void render();                                          // render at highest LOD
-};
-extern LLSphere gSphere;
+#endif // LL_LLSMOOTHSTEP_H
-#endif
diff --git a/linden/indra/llcommon/llstatenums.h b/linden/indra/llcommon/llstatenums.h
index 6fa61e1..bde6ade 100644
--- a/linden/indra/llcommon/llstatenums.h
+++ b/linden/indra/llcommon/llstatenums.h
@@ -57,7 +57,13 @@ enum
        LL_SIM_STAT_VIRTUAL_SIZE_KB,
        LL_SIM_STAT_RESIDENT_SIZE_KB,
        LL_SIM_STAT_PENDING_LOCAL_UPLOADS,
-        LL_SIM_STAT_TOTAL_UNACKED_BYTES
+        LL_SIM_STAT_TOTAL_UNACKED_BYTES,
+        LL_SIM_STAT_PHYSICS_PINNED_TASKS,
+        LL_SIM_STAT_PHYSICS_LOD_TASKS,
+        LL_SIM_STAT_SIMPHYSICSSTEPMS,
+        LL_SIM_STAT_SIMPHYSICSSHAPEMS,
+        LL_SIM_STAT_SIMPHYSICSOTHERMS,
+        LL_SIM_STAT_SIMPHYSICSMEMORY
 };
 #endif
diff --git a/linden/indra/llcommon/llstl.h b/linden/indra/llcommon/llstl.h
index 2719888..9a24185 100644
--- a/linden/indra/llcommon/llstl.h
+++ b/linden/indra/llcommon/llstl.h
@@ -33,6 +33,9 @@
 #define LL_LLSTL_H
 #include <functional>
+#include <algorithm>
+#include <map>
+#include <vector>
 #include <set>
 #include <deque>
diff --git a/linden/indra/llcommon/llstreamtools.cpp b/linden/indra/llcommon/llstreamtools.cpp
index 669bdd0..b95ee60 100644
--- a/linden/indra/llcommon/llstreamtools.cpp
+++ b/linden/indra/llcommon/llstreamtools.cpp
@@ -263,20 +263,14 @@ bool get_word(std::string& output_string, std::istream& input_stream, int n)
 // get everything up to and including the next newline
 bool get_line(std::string& output_string, std::istream& input_stream)
 {
+        output_string.clear();
        char c = input_stream.get();
        while (input_stream.good())
        {
-                if ('\r' == c)
+                output_string += c;
-                {
+                if ('\n' == c)
-                        // skip carriage returns
-                }
-                else
                {
-                        output_string += c;
+                        break;
-                        if ('\n' == c)
-                        {
-                                break;
-                        }
                }
                c = input_stream.get();
        } 
@@ -288,27 +282,21 @@ bool get_line(std::string& output_string, std::istream& input_stream)
 // add a newline on the end if bail before actual line ending
 bool get_line(std::string& output_string, std::istream& input_stream, int n)
 {
+        output_string.clear();
        int char_count = 0;
        char c = input_stream.get();
        while (input_stream.good() && char_count < n)
        {
                char_count++;
                output_string += c;
-                if ('\r' == c)
+                if ('\n' == c)
                {
-                        // skip carriage returns
+                        break;
                }
-                else
+                if (char_count >= n)
                {
-                        if ('\n' == c)
+                        output_string.append("\n");
-                        {
+                        break;
-                                break;
-                        }
-                        if (char_count >= n)
-                        {
-                                output_string.append("\n");
-                                break;
-                        }
                }
                c = input_stream.get();
        } 
@@ -408,49 +396,6 @@ void replace_newlines_with_whitespace(std::string& line)
        }
 }
-// returns 1 for solitary "{"
-// returns -1 for solitary "}"
-// otherwise returns 0
-int get_brace_count(const std::string& line)
-{
-        int index = 0;
-        int line_size = line.size();
-        char c = 0;
-        while (index < line_size)
-        {
-                c = line[index];
-                index++;
-                if (!isspace(c))
-                {
-                        break;
-                }
-        }
-        char brace = c;
-        // make sure the rest of the line is whitespace
-        while (index < line_size)
-        {
-                c = line[index];
-                if (!isspace(c))
-                {
-                        break;
-                }
-                index++;
-        }
-        if ('\n' != c)
-        {
-                return 0;
-        }
-        if ('{' == brace)
-        {
-                return 1;
-        }
-        else if ('}' == brace)
-        {
-                return -1;
-        }
-        return 0;
-}
 // erases any double-quote characters in 'line'
 void remove_double_quotes(std::string& line)
 {
@@ -498,7 +443,7 @@ void get_keyword_and_value(std::string& keyword,
        }
        // get the keyword
-        keyword.assign("");
+        keyword.clear();
        while (line_index < line_size)
        {
                c = line[line_index];
@@ -510,6 +455,8 @@ void get_keyword_and_value(std::string& keyword,
                line_index++;
        }
+        // get the value
+        value.clear();
        if (keyword.size() > 0
                && '\r' != line[line_index]
                && '\n' != line[line_index])
@@ -523,8 +470,6 @@ void get_keyword_and_value(std::string& keyword,
                        line_index++;
                }
-                // get the value
-                value.assign("");
                while (line_index < line_size)
                {
                        c = line[line_index];
diff --git a/linden/indra/llcommon/llstreamtools.h b/linden/indra/llcommon/llstreamtools.h
index 9db90c8..d84e53b 100644
--- a/linden/indra/llcommon/llstreamtools.h
+++ b/linden/indra/llcommon/llstreamtools.h
@@ -96,11 +96,6 @@ void escape_string(std::string& line);
 // replaces each '\n' character with ' '
 void replace_newlines_with_whitespace(std::string& line);
-// returns 1 for solitary "{"
-// returns -1 for solitary "}"
-// otherwise returns 0
-int get_brace_count(const std::string& line);
 // erases any double-quote characters in line
 void remove_double_quotes(std::string& line);
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index 73c80e7..a1f19ad 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -804,16 +804,19 @@ std::string utf8str_removeCRLF(const std::string& utf8str)
 #if LL_WINDOWS
 // documentation moved to header. Phoenix 2007-11-27
-int safe_snprintf(char *str, size_t size, const char *format, ...)
+namespace snprintf_hack
 {
-        va_list args;
+        int snprintf(char *str, size_t size, const char *format, ...)
-        va_start(args, format);
+        {
+                va_list args;
-        int num_written = _vsnprintf(str, size, format, args); /* Flawfinder: ignore */
+                va_start(args, format);
-        va_end(args);
-        
+                int num_written = _vsnprintf(str, size, format, args); /* Flawfinder: ignore */
-        str[size-1] = '\0'; // always null terminate
+                va_end(args);
-        return num_written;
+                
+                str[size-1] = '\0'; // always null terminate
+                return num_written;
+        }
 }
 std::string ll_convert_wide_to_string(const wchar_t* in)
diff --git a/linden/indra/llcommon/llversionserver.h b/linden/indra/llcommon/llversionserver.h
index 05ac9b3..e865b6a 100644
--- a/linden/indra/llcommon/llversionserver.h
+++ b/linden/indra/llcommon/llversionserver.h
@@ -33,9 +33,9 @@
 #define LL_LLVERSIONSERVER_H
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 19;
+const S32 LL_VERSION_MINOR = 20;
-const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 3;
+const S32 LL_VERSION_BUILD = 83892;
 const char * const LL_CHANNEL = "Second Life Server";
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index f00657a..06f6a82 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -33,9 +33,9 @@
 #define LL_LLVERSIONVIEWER_H
 const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 19;
+const S32 LL_VERSION_MINOR = 20;
-const S32 LL_VERSION_PATCH = 1;
+const S32 LL_VERSION_PATCH = 2;
-const S32 LL_VERSION_BUILD = 4;
+const S32 LL_VERSION_BUILD = 0;
 const char * const LL_CHANNEL = "Second Life Release";
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index bcd9463..3600cce 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -43,6 +43,7 @@
 #if JPEG_SUPPORT
 #include "llimagejpeg.h"
 #endif
+#include "llimagepng.h"
 #include "llimagedxt.h"
 //---------------------------------------------------------------------------
@@ -490,8 +491,8 @@ void LLImageRaw::composite( LLImageRaw* src )
 {
        LLImageRaw* dst = this;  // Just for clarity.
-        llassert( (3 == src->getComponents()) || (4 == src->getComponents()) );
+        llassert(3 == src->getComponents());
-        llassert( (3 == dst->getComponents()) || (4 == dst->getComponents()) );
+        llassert(3 == dst->getComponents());
        if( 3 == dst->getComponents() )
        {
@@ -519,11 +520,6 @@ void LLImageRaw::composite( LLImageRaw* src )
                        }
                }
        }
-        else
-        {
-                // 4 == dst->mComponents
-                llassert(0); // not implemented yet.
-        }
 }
 // Src and dst can be any size.  Src has 4 components.  Dst has 3 components.
@@ -689,7 +685,7 @@ void LLImageRaw::copyUnscaled(LLImageRaw* src)
 {
        LLImageRaw* dst = this;  // Just for clarity.
-        llassert( (3 == src->getComponents()) || (4 == src->getComponents()) );
+        llassert( (1 == src->getComponents()) || (3 == src->getComponents()) || (4 == src->getComponents()) );
        llassert( src->getComponents() == dst->getComponents() );
        llassert( (src->getWidth() == dst->getWidth()) && (src->getHeight() == dst->getHeight()) );
@@ -772,7 +768,7 @@ void LLImageRaw::copyScaled( LLImageRaw* src )
        LLMemType mt1((LLMemType::EMemType)mMemType);
        LLImageRaw* dst = this;  // Just for clarity.
-        llassert( (3 == src->getComponents()) || (4 == src->getComponents()) );
+        llassert( (1 == src->getComponents()) || (3 == src->getComponents()) || (4 == src->getComponents()) );
        llassert( src->getComponents() == dst->getComponents() );
        if( (src->getWidth() == dst->getWidth()) && (src->getHeight() == dst->getHeight()) )
@@ -803,7 +799,7 @@ void LLImageRaw::copyScaled( LLImageRaw* src )
 void LLImageRaw::scale( S32 new_width, S32 new_height, BOOL scale_image_data )
 {
        LLMemType mt1((LLMemType::EMemType)mMemType);
-        llassert( (3 == getComponents()) || (4 == getComponents()) );
+        llassert((1 == getComponents()) || (3 == getComponents()) || (4 == getComponents()) );
        S32 old_width = getWidth();
        S32 old_height = getHeight();
@@ -1093,7 +1089,7 @@ void LLImageRaw::compositeRowScaled4onto3( U8* in, U8* out, S32 in_pixel_len, S3
 static struct
 {
        const char* exten;
-        S8 codec;
+        EImageCodec codec;
 }
 file_extensions[] =
 {
@@ -1128,7 +1124,7 @@ static LLString find_file(LLString &name, S8 *codec)
        return LLString("");
 }
-static S8 get_codec(const LLString& exten)
+EImageCodec LLImageBase::getCodecFromExtension(const LLString& exten)
 {
        for (int i=0; i<(int)(NUM_FILE_EXTENSIONS); i++)
        {
@@ -1151,7 +1147,7 @@ bool LLImageRaw::createFromFile(const LLString &filename, bool j2c_lowest_mip_on
        {
                exten = name.substr(dotidx+1);
                LLString::toLower(exten);
-                codec = get_codec(exten);
+                codec = getCodecFromExtension(exten);
        }
        else
        {
@@ -1294,6 +1290,9 @@ LLImageFormatted* LLImageFormatted::createFromType(S8 codec)
          case IMG_CODEC_DXT:
                image = new LLImageDXT();
                break;
+          case IMG_CODEC_PNG:
+                image = new LLImagePNG();
+                break;
          default:
                image = NULL;
                break;
@@ -1314,7 +1313,7 @@ LLImageFormatted* LLImageFormatted::createFromExtension(const LLString& instring
        {
                exten = instring;
        }
-        S8 codec = get_codec(exten);
+        S8 codec = getCodecFromExtension(exten);
        return createFromType(codec);
 }
 //----------------------------------------------------------------------------
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index 199dc07..0393d13 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -60,7 +60,7 @@ class LLImageFormatted;
 class LLImageRaw;
 class LLColor4U;
-enum
+typedef enum e_image_codec
 {
        IMG_CODEC_INVALID  = 0,
        IMG_CODEC_RGB  = 1,
@@ -71,7 +71,7 @@ enum
        IMG_CODEC_DXT  = 6,
        IMG_CODEC_PNG  = 7,
        IMG_CODEC_EOF  = 8
-};
+} EImageCodec;
 //============================================================================
@@ -125,6 +125,8 @@ public:
        static void setSizeOverride(BOOL enabled) { sSizeOverride = enabled; }
+        static EImageCodec getCodecFromExtension(const LLString& exten);
+        
 private:
        U8 *mData;
        S32 mDataSize;
diff --git a/linden/indra/llimagej2coj/llimagej2coj.cpp b/linden/indra/llimagej2coj/llimagej2coj.cpp
index 3ca271c..01868fd 100644
--- a/linden/indra/llimagej2coj/llimagej2coj.cpp
+++ b/linden/indra/llimagej2coj/llimagej2coj.cpp
@@ -158,6 +158,18 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
                return TRUE; // done
        }
+        // sometimes we get bad data out of the cache - check to see if the decode succeeded
+        for (S32 i = 0; i < image->numcomps; i++)
+        {
+                if (image->comps[i].factor != base.getRawDiscardLevel())
+                {
+                        // if we didn't get the discard level we're expecting, fail
+                        opj_image_destroy(image);
+                        base.mDecoding = FALSE;
+                        return TRUE;
+                }
+        }
+        
        // Copy image data into our raw image format (instead of the separate channel format
        S32 img_components = image->numcomps;
diff --git a/linden/indra/llinventory/lleconomy.cpp b/linden/indra/llinventory/lleconomy.cpp
index 6ed0510..619c5f9 100644
--- a/linden/indra/llinventory/lleconomy.cpp
+++ b/linden/indra/llinventory/lleconomy.cpp
@@ -35,7 +35,6 @@
 #include "message.h"
 #include "v3math.h"
-LLGlobalEconomy *gGlobalEconomy = NULL;
 LLGlobalEconomy::LLGlobalEconomy()
 :       mObjectCount( -1 ),
@@ -55,35 +54,33 @@ LLGlobalEconomy::~LLGlobalEconomy()
 { }
 // static
-void LLGlobalEconomy::processEconomyData(LLMessageSystem *msg, void** user_data)
+void LLGlobalEconomy::processEconomyData(LLMessageSystem *msg, LLGlobalEconomy* econ_data)
 {
        S32 i;
        F32 f;
-        LLGlobalEconomy *this_ptr = (LLGlobalEconomy*)user_data;
        msg->getS32Fast(_PREHASH_Info, _PREHASH_ObjectCapacity, i);
-        this_ptr->setObjectCapacity(i);
+        econ_data->setObjectCapacity(i);
        msg->getS32Fast(_PREHASH_Info, _PREHASH_ObjectCount, i);
-        this_ptr->setObjectCount(i);
+        econ_data->setObjectCount(i);
        msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceEnergyUnit, i);
-        this_ptr->setPriceEnergyUnit(i);
+        econ_data->setPriceEnergyUnit(i);
        msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceObjectClaim, i);
-        this_ptr->setPriceObjectClaim(i);
+        econ_data->setPriceObjectClaim(i);
        msg->getS32Fast(_PREHASH_Info, _PREHASH_PricePublicObjectDecay, i);
-        this_ptr->setPricePublicObjectDecay(i);
+        econ_data->setPricePublicObjectDecay(i);
        msg->getS32Fast(_PREHASH_Info, _PREHASH_PricePublicObjectDelete, i);
-        this_ptr->setPricePublicObjectDelete(i);
+        econ_data->setPricePublicObjectDelete(i);
        msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceUpload, i);
-        this_ptr->setPriceUpload(i);
+        econ_data->setPriceUpload(i);
        msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceRentLight, i);
-        this_ptr->setPriceRentLight(i);
+        econ_data->setPriceRentLight(i);
        msg->getS32Fast(_PREHASH_Info, _PREHASH_TeleportMinPrice, i);
-        this_ptr->setTeleportMinPrice(i);
+        econ_data->setTeleportMinPrice(i);
        msg->getF32Fast(_PREHASH_Info, _PREHASH_TeleportPriceExponent, f);
-        this_ptr->setTeleportPriceExponent(f);
+        econ_data->setTeleportPriceExponent(f);
        msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceGroupCreate, i);
-        this_ptr->setPriceGroupCreate(i);
+        econ_data->setPriceGroupCreate(i);
 }
 S32     LLGlobalEconomy::calculateTeleportCost(F32 distance) const
@@ -154,10 +151,10 @@ void LLRegionEconomy::processEconomyData(LLMessageSystem *msg, void** user_data)
        S32 i;
        F32 f;
-        LLGlobalEconomy::processEconomyData(msg, user_data);
        LLRegionEconomy *this_ptr = (LLRegionEconomy*)user_data;
+        LLGlobalEconomy::processEconomyData(msg, this_ptr);
        msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceParcelClaim, i);
        this_ptr->setBasePriceParcelClaimDefault(i);
        msg->getF32(_PREHASH_Info, _PREHASH_PriceParcelClaimFactor, f);
diff --git a/linden/indra/llinventory/lleconomy.h b/linden/indra/llinventory/lleconomy.h
index c5caa42..dcc97b2 100644
--- a/linden/indra/llinventory/lleconomy.h
+++ b/linden/indra/llinventory/lleconomy.h
@@ -31,6 +31,8 @@
 #ifndef LL_LLECONOMY_H
 #define LL_LLECONOMY_H
+#include "llmemory.h"
 class LLMessageSystem;
 class LLVector3;
@@ -40,9 +42,14 @@ public:
        LLGlobalEconomy();
        virtual ~LLGlobalEconomy();
+        // This class defines its singleton internally as a typedef instead of inheriting from
+        // LLSingleton like most others because the LLRegionEconomy sub-class might also
+        // become a singleton and this pattern will more easily disambiguate them.
+        typedef LLSingleton<LLGlobalEconomy> Singleton;
        virtual void print();
-        static void processEconomyData(LLMessageSystem *msg, void **user_data);
+        static void processEconomyData(LLMessageSystem *msg, LLGlobalEconomy* econ_data);
        S32             calculateTeleportCost(F32 distance) const;
        S32             calculateLightRent(const LLVector3& object_size) const;
@@ -136,6 +143,4 @@ private:
 };
-extern LLGlobalEconomy* gGlobalEconomy;
 #endif
diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index 3afa2be..4c58789 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -940,6 +940,7 @@ LLSD LLInventoryItem::asLLSD() const
        }
        else
        {
+                // *TODO: get rid of this. Phoenix 2008-01-30
                LLUUID shadow_id(mAssetUUID);
                LLXORCipher cipher(MAGIC_ID.mData, UUID_BYTES);
                cipher.encrypt(shadow_id.mData, UUID_BYTES);
diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h
index 1623edf..b4199db 100644
--- a/linden/indra/llinventory/llinventory.h
+++ b/linden/indra/llinventory/llinventory.h
@@ -135,15 +135,40 @@ protected:
        S32 mCreationDate;      // seconds from 1/1/1970, UTC
 public:
+        /**
+         * Anonymous enumeration for specifying the inventory item flags.
+         */
        enum
        {
-                // The meaning of LLInventoryItem::mFlags is distinct for each
+                // The shared flags at the top are shared among all inventory
-                // inventory type.
+                // types. After that section, all values of flags are type
+                // dependent.  The shared flags will start at 2^30 and work
+                // down while item type specific flags will start at 2^0 and
+                // work up.
                II_FLAGS_NONE = 0,
-                // landmark flags
+                //
+                // Shared flags
+                //
+                //
+                // This value means that the asset has only one reference in
+                // the system. If the inventory item is deleted, or the asset
+                // id updated, then we can remove the old reference.
+                II_FLAGS_SHARED_SINGLE_REFERENCE = 0x40000000,
+                //
+                // Landmark flags
+                //
                II_FLAGS_LANDMARK_VISITED = 1,
+                //
+                // Object flags
+                //
                // flag to indicate that object permissions should have next
                // owner perm be more restrictive on rez. We bump this into
                // the second byte of the flags since the low byte is used to
@@ -169,8 +194,11 @@ public:
                // of muiltiple items or not.
                II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS                      = 0x200000,
+                //
                // wearables use the low order byte of flags to store the
                // EWearableType enumeration found in newview/llwearable.h
+                //
+                II_FLAGS_WEARABLES_MASK = 0xff,
        };
 protected:
diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 5f8a000..1390f72 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -216,8 +216,8 @@ void LLParcel::init(const LLUUID &owner_id,
        mMediaID.setNull();
        mMediaAutoScale = 0;
        mMediaLoop = TRUE;
-        mObscureMedia = 0;
+        mObscureMedia = 1;
-        mObscureMusic = 0;
+        mObscureMusic = 1;
        mMediaWidth = 0;
        mMediaHeight = 0;
@@ -1856,8 +1856,8 @@ void LLParcel::clearParcel()
    setMediaDesc(NULL);
        setMediaAutoScale(0);
        setMediaLoop(TRUE);
-        mObscureMedia = 0;
+        mObscureMedia = 1;
-        mObscureMusic = 0;
+        mObscureMusic = 1;
        mMediaWidth = 0;
        mMediaHeight = 0;
        setMusicURL(NULL);
diff --git a/linden/indra/llinventory/llparcelflags.h b/linden/indra/llinventory/llparcelflags.h
index 1bf744b..62a6acf 100644
--- a/linden/indra/llinventory/llparcelflags.h
+++ b/linden/indra/llinventory/llparcelflags.h
@@ -81,7 +81,7 @@ const U32 PF_USE_RESTRICTED_ACCESS = PF_USE_ACCESS_GROUP
                                                                                | PF_DENY_ANONYMOUS
                                                                                | PF_DENY_AGEUNVERIFIED;
 const U32 PF_NONE = 0x00000000;
-const U32 PF_ALL  = 0x7FFFFFFF;
+const U32 PF_ALL  = 0xFFFFFFFF;
 const U32 PF_DEFAULT =  PF_ALLOW_FLY
                                                | PF_ALLOW_OTHER_SCRIPTS
                                                | PF_ALLOW_GROUP_SCRIPTS
diff --git a/linden/indra/llmath/files.lst b/linden/indra/llmath/files.lst
index cfd635a..1001a6d 100644
--- a/linden/indra/llmath/files.lst
+++ b/linden/indra/llmath/files.lst
@@ -2,11 +2,13 @@ llmath/llbboxlocal.cpp
 llmath/llcamera.cpp
 llmath/llcoordframe.cpp
 llmath/llcrc.cpp
+llmath/llline.cpp
 llmath/llmd5.cpp
 llmath/llperlin.cpp
 llmath/llquaternion.cpp
 llmath/llrand.cpp
 llmath/llrect.cpp
+llmath/llsphere.cpp
 llmath/lluuid.cpp
 llmath/llvolume.cpp
 llmath/llvolumemgr.cpp
diff --git a/linden/indra/llmath/llline.cpp b/linden/indra/llmath/llline.cpp
new file mode 100644
index 0000000..9c41efb
--- /dev/null
+++ b/linden/indra/llmath/llline.cpp
@@ -0,0 +1,189 @@
+/** 
+ * @file llline.cpp
+ * @author Andrew Meadows
+ * @brief Simple line class that can compute nearest approach between two lines
+ *
+ * $LicenseInfo:firstyear=2001&license=internal$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llline.h"
+#include "llrand.h"
+const F32 SOME_SMALL_NUMBER = 1.0e-5f;
+const F32 SOME_VERY_SMALL_NUMBER = 1.0e-8f;
+LLLine::LLLine()
+:       mPoint(0.f, 0.f, 0.f),
+        mDirection(1.f, 0.f, 0.f)
+{ }
+LLLine::LLLine( const LLVector3& first_point, const LLVector3& second_point )
+{
+        setPoints(first_point, second_point);
+}
+void LLLine::setPoints( const LLVector3& first_point, const LLVector3& second_point )
+{
+        mPoint = first_point;
+        mDirection = second_point - first_point;
+        mDirection.normalize();
+}
+void LLLine::setPointDirection( const LLVector3& first_point, const LLVector3& second_point )
+{
+        setPoints(first_point, first_point + second_point);
+}
+bool LLLine::intersects( const LLVector3& point, F32 radius ) const
+{
+        LLVector3 other_direction = point - mPoint;
+        LLVector3 nearest_point = mPoint + mDirection * (other_direction * mDirection);
+        F32 nearest_approach = (nearest_point - point).length();
+        return (nearest_approach <= radius);
+}
+// returns the point on this line that is closest to some_point
+LLVector3 LLLine::nearestApproach( const LLVector3& some_point ) const
+{
+        return (mPoint + mDirection * ((some_point - mPoint) * mDirection));
+}
+// the accuracy of this method sucks when you give it two nearly
+// parallel lines, so you should probably check for parallelism
+// before you call this
+// 
+// returns the point on this line that is closest to other_line
+LLVector3 LLLine::nearestApproach( const LLLine& other_line ) const
+{
+        LLVector3 between_points = other_line.mPoint - mPoint;
+        F32 dir_dot_dir = mDirection * other_line.mDirection;
+        F32 one_minus_dir_dot_dir = 1.0f - fabs(dir_dot_dir);
+        if ( one_minus_dir_dot_dir < SOME_VERY_SMALL_NUMBER )
+        {
+#ifdef LL_DEBUG
+                llwarns << "LLLine::nearestApproach() was given two very "
+                        << "nearly parallel lines dir1 = " << mDirection 
+                        << " dir2 = " << other_line.mDirection << " with 1-dot_product = " 
+                        << one_minus_dir_dot_dir << llendl;
+#endif
+                // the lines are approximately parallel
+                // We shouldn't fall in here because this check should have been made
+                // BEFORE this function was called.  We dare not continue with the 
+                // computations for fear of division by zero, but we have to return 
+                // something so we return a bogus point -- caller beware.
+                return 0.5f * (mPoint + other_line.mPoint);
+        }
+        F32 odir_dot_bp = other_line.mDirection * between_points;
+        F32 numerator = 0;
+        F32 denominator = 0;
+        for (S32 i=0; i<3; i++)
+        {
+                F32 factor = dir_dot_dir * other_line.mDirection.mV[i] - mDirection.mV[i];
+                numerator += ( between_points.mV[i] - odir_dot_bp * other_line.mDirection.mV[i] ) * factor;
+                denominator -= factor * factor;
+        }
+        F32 length_to_nearest_approach = numerator / denominator;
+        return mPoint + length_to_nearest_approach * mDirection;
+}
+std::ostream& operator<<( std::ostream& output_stream, const LLLine& line )
+{
+        output_stream << "{point=" << line.mPoint << "," << "dir=" << line.mDirection << "}";
+        return output_stream;
+}
+F32 ALMOST_PARALLEL = 0.99f;
+F32 TOO_SMALL_FOR_DIVISION = 0.0001f;
+// returns 'true' if this line intersects the plane
+// on success stores the intersection point in 'result'
+bool LLLine::intersectsPlane( LLVector3& result, const LLLine& plane ) const
+{
+        // p = P + l * d     equation for a line
+        // 
+        // N * p = D         equation for a point
+        //
+        // N * (P + l * d) = D
+        // N*P + l * (N*d) = D
+        // l * (N*d) = D - N*P
+        // l =  ( D - N*P ) / ( N*d )
+        //
+        F32 dot = plane.mDirection * mDirection;
+        if (fabs(dot) < TOO_SMALL_FOR_DIVISION)
+        {
+                return false;
+        }
+        F32 plane_dot = plane.mDirection * plane.mPoint;
+        F32 length = ( plane_dot - (plane.mDirection * mPoint) ) / dot;
+        result = mPoint + length * mDirection;
+        return true;
+}
+//static 
+// returns 'true' if planes intersect, and stores the result 
+// the second and third arguments are treated as planes
+// where mPoint is on the plane and mDirection is the normal
+// result.mPoint will be the intersection line's closest approach 
+// to first_plane.mPoint
+bool LLLine::getIntersectionBetweenTwoPlanes( LLLine& result, const LLLine& first_plane, const LLLine& second_plane )
+{
+        // TODO -- if we ever get some generic matrix solving code in our libs
+        // then we should just use that, since this problem is really just
+        // linear algebra.
+        F32 dot = fabs(first_plane.mDirection * second_plane.mDirection);
+        if (dot > ALMOST_PARALLEL)
+        {
+                // the planes are nearly parallel
+                return false;
+        }
+        LLVector3 direction = first_plane.mDirection % second_plane.mDirection;
+        direction.normalize();
+        LLVector3 first_intersection;
+        {
+                LLLine intersection_line(first_plane);
+                intersection_line.mDirection = direction % first_plane.mDirection;
+                intersection_line.mDirection.normalize();
+                intersection_line.intersectsPlane(first_intersection, second_plane);
+        }
+        /*
+        LLVector3 second_intersection;
+        {
+                LLLine intersection_line(second_plane);
+                intersection_line.mDirection = direction % second_plane.mDirection;
+                intersection_line.mDirection.normalize();
+                intersection_line.intersectsPlane(second_intersection, first_plane);
+        }
+        */
+        result.mPoint = first_intersection;
+        result.mDirection = direction;
+        return true;
+}
diff --git a/linden/indra/llmath/llline.h b/linden/indra/llmath/llline.h
new file mode 100644
index 0000000..ca454c5
--- /dev/null
+++ b/linden/indra/llmath/llline.h
@@ -0,0 +1,75 @@
+// llline.h
+/**
+ * @file llline.cpp
+ * @author Andrew Meadows
+ * @brief Simple line for computing nearest approach between two infinite lines
+ *
+ * $LicenseInfo:firstyear=2006&license=internal$
+ * 
+ * Copyright (c) 2006-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LL_LINE_H
+#define LL_LINE_H
+#include <iostream>
+#include "stdtypes.h"
+#include "v3math.h"
+const F32 DEFAULT_INTERSECTION_ERROR = 0.000001f;
+class LLLine
+{
+public:
+        LLLine();
+        LLLine( const LLVector3& first_point, const LLVector3& second_point );
+        virtual ~LLLine() {};
+        void setPointDirection( const LLVector3& first_point, const LLVector3& second_point );
+        void setPoints( const LLVector3& first_point, const LLVector3& second_point );
+        bool intersects( const LLVector3& point, F32 radius = DEFAULT_INTERSECTION_ERROR ) const;
+        // returns the point on this line that is closest to some_point
+        LLVector3 nearestApproach( const LLVector3& some_point ) const;
+        // returns the point on this line that is closest to other_line
+        LLVector3 nearestApproach( const LLLine& other_line ) const;
+        friend std::ostream& operator<<( std::ostream& output_stream, const LLLine& line );
+        // returns 'true' if this line intersects the plane
+        // on success stores the intersection point in 'result'
+        bool intersectsPlane( LLVector3& result, const LLLine& plane ) const;
+        // returns 'true' if planes intersect, and stores the result 
+        // the second and third arguments are treated as planes
+        // where mPoint is on the plane and mDirection is the normal
+        // result.mPoint will be the intersection line's closest approach 
+        // to first_plane.mPoint
+        static bool getIntersectionBetweenTwoPlanes( LLLine& result, const LLLine& first_plane, const LLLine& second_plane );
+        const LLVector3& getPoint() const { return mPoint; }
+        const LLVector3& getDirection() const { return mDirection; }
+protected:
+        // these are protected because some code assumes that the normal is 
+        // always correct and properly normalized.
+        LLVector3 mPoint;
+        LLVector3 mDirection;
+};
+#endif
diff --git a/linden/indra/llmath/llmath.h b/linden/indra/llmath/llmath.h
index d3c0d86..4a6358d 100644
--- a/linden/indra/llmath/llmath.h
+++ b/linden/indra/llmath/llmath.h
@@ -32,8 +32,14 @@
 #ifndef LLMATH_H
 #define LLMATH_H
+#include <cmath>
+//#include <math.h>
+//#include <stdlib.h>
+#include "lldefs.h"
 // work around for Windows & older gcc non-standard function names.
 #if LL_WINDOWS
+#include <float.h>
 #define llisnan(val)    _isnan(val)
 #define llfinite(val)   _finite(val)
 #elif (LL_LINUX && __GNUC__ <= 2)
@@ -99,6 +105,12 @@ inline BOOL is_approx_equal(F32 x, F32 y)
        return (abs((S32) ((U32&)x - (U32&)y) ) < COMPARE_MANTISSA_UP_TO_BIT);
 }
+inline BOOL is_approx_equal(F64 x, F64 y)
+{
+        const S64 COMPARE_MANTISSA_UP_TO_BIT = 0x02;
+        return (abs((S32) ((U64&)x - (U64&)y) ) < COMPARE_MANTISSA_UP_TO_BIT);
+}
 inline BOOL is_approx_equal_fraction(F32 x, F32 y, U32 frac_bits)
 {
        BOOL ret = TRUE;
@@ -120,6 +132,27 @@ inline BOOL is_approx_equal_fraction(F32 x, F32 y, U32 frac_bits)
        return ret;
 }
+inline BOOL is_approx_equal_fraction(F64 x, F64 y, U32 frac_bits)
+{
+        BOOL ret = TRUE;
+        F64 diff = (F64) fabs(x - y);
+        S32 diffInt = (S32) diff;
+        S32 diffFracTolerance = (S32) ((diff - (F64) diffInt) * (1 << frac_bits));
+        
+        // if integer portion is not equal, not enough bits were used for packing
+        // so error out since either the use case is not correct OR there is
+        // an issue with pack/unpack. should fail in either case.
+        // for decimal portion, make sure that the delta is no more than 1
+        // based on the number of bits used for packing decimal portion.
+        if (diffInt != 0 || diffFracTolerance > 1)
+        {
+                ret = FALSE;
+        }
+        return ret;
+}
 inline S32 llabs(const S32 a)
 {
        return S32(labs(a));
diff --git a/linden/indra/llmath/llmath.vcproj b/linden/indra/llmath/llmath.vcproj
index 79e472a..d05505e 100644
--- a/linden/indra/llmath/llmath.vcproj
+++ b/linden/indra/llmath/llmath.vcproj
@@ -164,6 +164,9 @@
                                RelativePath=".\llcrc.cpp">
                        </File>
                        <File
+                                RelativePath=".\llline.cpp">
+                        </File>
+                        <File
                                RelativePath=".\llmd5.cpp">
                        </File>
                        <File
@@ -179,6 +182,9 @@
                                RelativePath=".\llrect.cpp">
                        </File>
                        <File
+                                RelativePath=".\llsphere.cpp">
+                        </File>
+                        <File
                                RelativePath=".\lluuid.cpp">
                        </File>
                        <File
@@ -244,6 +250,9 @@
                                RelativePath=".\llinterp.h">
                        </File>
                        <File
+                                RelativePath=".\llline.h">
+                        </File>
+                        <File
                                RelativePath=".\llmath.h">
                        </File>
                        <File
@@ -268,6 +277,9 @@
                                RelativePath=".\llrect.h">
                        </File>
                        <File
+                                RelativePath=".\llsphere.h">
+                        </File>
+                        <File
                                RelativePath=".\lltreenode.h">
                        </File>
                        <File
diff --git a/linden/indra/llmath/llquaternion.cpp b/linden/indra/llmath/llquaternion.cpp
index ea51e28..ab4855b 100644
--- a/linden/indra/llmath/llquaternion.cpp
+++ b/linden/indra/llmath/llquaternion.cpp
@@ -51,19 +51,19 @@ const LLQuaternion LLQuaternion::DEFAULT;
 LLQuaternion::LLQuaternion(const LLMatrix4 &mat)
 {
        *this = mat.quaternion();
-        normQuat();
+        normalize();
 }
 LLQuaternion::LLQuaternion(const LLMatrix3 &mat)
 {
        *this = mat.quaternion();
-        normQuat();
+        normalize();
 }
 LLQuaternion::LLQuaternion(F32 angle, const LLVector4 &vec)
 {
        LLVector3 v(vec.mV[VX], vec.mV[VY], vec.mV[VZ]);
-        v.normVec();
+        v.normalize();
        F32 c, s;
        c = cosf(angle*0.5f);
@@ -73,13 +73,13 @@ LLQuaternion::LLQuaternion(F32 angle, const LLVector4 &vec)
        mQ[VY] = v.mV[VY] * s;
        mQ[VZ] = v.mV[VZ] * s;
        mQ[VW] = c;
-        normQuat();
+        normalize();
 }
 LLQuaternion::LLQuaternion(F32 angle, const LLVector3 &vec)
 {
        LLVector3 v(vec);
-        v.normVec();
+        v.normalize();
        F32 c, s;
        c = cosf(angle*0.5f);
@@ -89,7 +89,7 @@ LLQuaternion::LLQuaternion(F32 angle, const LLVector3 &vec)
        mQ[VY] = v.mV[VY] * s;
        mQ[VZ] = v.mV[VZ] * s;
        mQ[VW] = c;
-        normQuat();
+        normalize();
 }
 LLQuaternion::LLQuaternion(const LLVector3 &x_axis,
@@ -99,7 +99,7 @@ LLQuaternion::LLQuaternion(const LLVector3 &x_axis,
        LLMatrix3 mat;
        mat.setRows(x_axis, y_axis, z_axis);
        *this = mat.quaternion();
-        normQuat();
+        normalize();
 }
 // Quatizations
@@ -138,10 +138,93 @@ void	LLQuaternion::quantize8(F32 lower, F32 upper)
 // Set LLQuaternion routines
+const LLQuaternion&     LLQuaternion::setAngleAxis(F32 angle, F32 x, F32 y, F32 z)
+{
+        LLVector3 vec(x, y, z);
+        vec.normalize();
+        angle *= 0.5f;
+        F32 c, s;
+        c = cosf(angle);
+        s = sinf(angle);
+        mQ[VX] = vec.mV[VX]*s;
+        mQ[VY] = vec.mV[VY]*s;
+        mQ[VZ] = vec.mV[VZ]*s;
+        mQ[VW] = c;
+        normalize();
+        return (*this);
+}
+const LLQuaternion&     LLQuaternion::setAngleAxis(F32 angle, const LLVector3 &vec)
+{
+        LLVector3 v(vec);
+        v.normalize();
+        angle *= 0.5f;
+        F32 c, s;
+        c = cosf(angle);
+        s = sinf(angle);
+        mQ[VX] = v.mV[VX]*s;
+        mQ[VY] = v.mV[VY]*s;
+        mQ[VZ] = v.mV[VZ]*s;
+        mQ[VW] = c;
+        normalize();
+        return (*this);
+}
+const LLQuaternion&     LLQuaternion::setAngleAxis(F32 angle, const LLVector4 &vec)
+{
+        LLVector3 v(vec.mV[VX], vec.mV[VY], vec.mV[VZ]);
+        v.normalize();
+        F32 c, s;
+        c = cosf(angle*0.5f);
+        s = sinf(angle*0.5f);
+        mQ[VX] = v.mV[VX]*s;
+        mQ[VY] = v.mV[VY]*s;
+        mQ[VZ] = v.mV[VZ]*s;
+        mQ[VW] = c;
+        normalize();
+        return (*this);
+}
+const LLQuaternion&     LLQuaternion::setEulerAngles(F32 roll, F32 pitch, F32 yaw)
+{
+        LLMatrix3 rot_mat(roll, pitch, yaw);
+        rot_mat.orthogonalize();
+        *this = rot_mat.quaternion();
+                
+        normalize();
+        return (*this);
+}
+// deprecated
+const LLQuaternion&     LLQuaternion::set(const LLMatrix3 &mat)
+{
+        *this = mat.quaternion();
+        normalize();
+        return (*this);
+}
+// deprecated
+const LLQuaternion&     LLQuaternion::set(const LLMatrix4 &mat)
+{
+        *this = mat.quaternion();
+        normalize();
+        return (*this);
+}
+// deprecated
 const LLQuaternion&     LLQuaternion::setQuat(F32 angle, F32 x, F32 y, F32 z)
 {
        LLVector3 vec(x, y, z);
-        vec.normVec();
+        vec.normalize();
        angle *= 0.5f;
        F32 c, s;
@@ -153,14 +236,15 @@ const LLQuaternion&	LLQuaternion::setQuat(F32 angle, F32 x, F32 y, F32 z)
        mQ[VZ] = vec.mV[VZ]*s;
        mQ[VW] = c;
-        normQuat();
+        normalize();
        return (*this);
 }
+// deprecated
 const LLQuaternion&     LLQuaternion::setQuat(F32 angle, const LLVector3 &vec)
 {
        LLVector3 v(vec);
-        v.normVec();
+        v.normalize();
        angle *= 0.5f;
        F32 c, s;
@@ -172,14 +256,14 @@ const LLQuaternion&	LLQuaternion::setQuat(F32 angle, const LLVector3 &vec)
        mQ[VZ] = v.mV[VZ]*s;
        mQ[VW] = c;
-        normQuat();
+        normalize();
        return (*this);
 }
 const LLQuaternion&     LLQuaternion::setQuat(F32 angle, const LLVector4 &vec)
 {
        LLVector3 v(vec.mV[VX], vec.mV[VY], vec.mV[VZ]);
-        v.normVec();
+        v.normalize();
        F32 c, s;
        c = cosf(angle*0.5f);
@@ -190,7 +274,7 @@ const LLQuaternion&	LLQuaternion::setQuat(F32 angle, const LLVector4 &vec)
        mQ[VZ] = v.mV[VZ]*s;
        mQ[VW] = c;
-        normQuat();
+        normalize();
        return (*this);
 }
@@ -200,7 +284,21 @@ const LLQuaternion&	LLQuaternion::setQuat(F32 roll, F32 pitch, F32 yaw)
        rot_mat.orthogonalize();
        *this = rot_mat.quaternion();
                
-        normQuat();
+        normalize();
+        return (*this);
+}
+const LLQuaternion&     LLQuaternion::setQuat(const LLMatrix3 &mat)
+{
+        *this = mat.quaternion();
+        normalize();
+        return (*this);
+}
+const LLQuaternion&     LLQuaternion::setQuat(const LLMatrix4 &mat)
+{
+        *this = mat.quaternion();
+        normalize();
        return (*this);
 //#if 1
 //      // NOTE: LLQuaternion's are actually inverted with respect to
@@ -337,8 +435,8 @@ void LLQuaternion::shortestArc(const LLVector3 &a, const LLVector3 &b)
        // Make sure neither vector is zero length.  Also normalize
        // the vectors while we are at it.
-        F32 vec_a_mag = vec_a.normVec();
+        F32 vec_a_mag = vec_a.normalize();
-        F32 vec_b_mag = vec_b.normVec();
+        F32 vec_b_mag = vec_b.normalize();
        if (vec_a_mag < F_APPROXIMATELY_ZERO ||
                vec_b_mag < F_APPROXIMATELY_ZERO)
        {
@@ -370,7 +468,7 @@ void LLQuaternion::shortestArc(const LLVector3 &a, const LLVector3 &b)
                ortho_axis -= proj;
                
                // Turn this into an orthonormal axis.
-                F32 ortho_length = ortho_axis.normVec();
+                F32 ortho_length = ortho_axis.normalize();
                // If the axis' length is 0, then our guess at an orthogonal axis
                // was wrong (a is parallel to the x-axis).
                if (ortho_length < F_APPROXIMATELY_ZERO)
@@ -391,7 +489,7 @@ void LLQuaternion::shortestArc(const LLVector3 &a, const LLVector3 &b)
                // Return the rotation between these vectors.
                F32 theta = (F32)acos(cos_theta);
-                setQuat(theta, axis);
+                setAngleAxis(theta, axis);
        }
 }
@@ -516,7 +614,7 @@ LLQuaternion lerp(F32 t, const LLQuaternion &p, const LLQuaternion &q)
 {
        LLQuaternion r;
        r = t * (q - p) + p;
-        r.normQuat();
+        r.normalize();
        return r;
 }
 #endif
@@ -529,7 +627,7 @@ LLQuaternion lerp(F32 t, const LLQuaternion &q)
        r.mQ[VY] = t * q.mQ[VY];
        r.mQ[VZ] = t * q.mQ[VZ];
        r.mQ[VW] = t * (q.mQ[VZ] - 1.f) + 1.f;
-        r.normQuat();
+        r.normalize();
        return r;
 }
@@ -544,7 +642,7 @@ LLQuaternion lerp(F32 t, const LLQuaternion &p, const LLQuaternion &q)
        r.mQ[VY] = t * q.mQ[VY] + (inv_t * p.mQ[VY]);
        r.mQ[VZ] = t * q.mQ[VZ] + (inv_t * p.mQ[VZ]);
        r.mQ[VW] = t * q.mQ[VW] + (inv_t * p.mQ[VW]);
-        r.normQuat();
+        r.normalize();
        return r;
 }
@@ -640,8 +738,8 @@ LLQuaternion slerp(F32 t, const LLQuaternion &q)
        // when c < 0.0 then theta > PI/2 
        // since quat and -quat are the same rotation we invert one of  
        // p or q to reduce unecessary spins
-        // A equivalent way to do it is to convert acos(c) as if it had been negative,
+        // A equivalent way to do it is to convert acos(c) as if it had 
-        // and to negate stp 
+                // been negative, and to negate stp 
        angle   = (F32) acos(-c); 
        stp     = -(F32) sin(angle * (1.f - t));
        stq     = (F32) sin(angle * t);
@@ -742,20 +840,6 @@ LLQuaternion::Order StringToOrder( const char *str )
        return LLQuaternion::XYZ;
 }
-const LLQuaternion&     LLQuaternion::setQuat(const LLMatrix3 &mat)
-{
-        *this = mat.quaternion();
-        normQuat();
-        return (*this);
-}
-const LLQuaternion&     LLQuaternion::setQuat(const LLMatrix4 &mat)
-{
-        *this = mat.quaternion();
-        normQuat();
-        return (*this);
-}
 void LLQuaternion::getAngleAxis(F32* angle, LLVector3 &vec) const
 {
        F32 cos_a = mQ[VW];
@@ -769,10 +853,28 @@ void LLQuaternion::getAngleAxis(F32* angle, LLVector3 &vec) const
        else
                sin_a = 1.f/sin_a;
-    *angle = 2.0f * (F32) acos( cos_a );
+    F32 temp_angle = 2.0f * (F32) acos( cos_a );
-    vec.mV[VX] = mQ[VX] * sin_a;
+        if (temp_angle > F_PI)
-    vec.mV[VY] = mQ[VY] * sin_a;
+        {
-    vec.mV[VZ] = mQ[VZ] * sin_a;
+                // The (angle,axis) pair should never have angles outside [PI, -PI]
+                // since we want the _shortest_ (angle,axis) solution.
+                // Since acos is defined for [0, PI], and we multiply by 2.0, we
+                // can push the angle outside the acceptible range.
+                // When this happens we set the angle to the other portion of a 
+                // full 2PI rotation, and negate the axis, which reverses the 
+                // direction of the rotation (by the right-hand rule).
+                *angle = 2.f * F_PI - temp_angle;
+        vec.mV[VX] = - mQ[VX] * sin_a;
+        vec.mV[VY] = - mQ[VY] * sin_a;
+        vec.mV[VZ] = - mQ[VZ] * sin_a;
+        }
+        else
+        {
+                *angle = temp_angle;
+        vec.mV[VX] = mQ[VX] * sin_a;
+        vec.mV[VY] = mQ[VY] * sin_a;
+        vec.mV[VZ] = mQ[VZ] * sin_a;
+        }
 }
@@ -846,7 +948,7 @@ BOOL LLQuaternion::parseQuat(const char* buf, LLQuaternion* value)
        S32 count = sscanf( buf, "%f %f %f %f", quat.mQ + 0, quat.mQ + 1, quat.mQ + 2, quat.mQ + 3 );
        if( 4 == count )
        {
-                value->setQuat( quat );
+                value->set( quat );
                return TRUE;
        }
diff --git a/linden/indra/llmath/llquaternion.h b/linden/indra/llmath/llquaternion.h
index 6805437..048db2d 100644
--- a/linden/indra/llmath/llquaternion.h
+++ b/linden/indra/llmath/llquaternion.h
@@ -57,10 +57,10 @@ public:
        LLQuaternion();                                                                 // Initializes Quaternion to (0,0,0,1)
        explicit LLQuaternion(const LLMatrix4 &mat);                            // Initializes Quaternion from Matrix4
        explicit LLQuaternion(const LLMatrix3 &mat);                            // Initializes Quaternion from Matrix3
-        LLQuaternion(F32 x, F32 y, F32 z, F32 w);               // Initializes Quaternion to normQuat(x, y, z, w)
+        LLQuaternion(F32 x, F32 y, F32 z, F32 w);               // Initializes Quaternion to normalize(x, y, z, w)
        LLQuaternion(F32 angle, const LLVector4 &vec);  // Initializes Quaternion to axis_angle2quat(angle, vec)
        LLQuaternion(F32 angle, const LLVector3 &vec);  // Initializes Quaternion to axis_angle2quat(angle, vec)
-        LLQuaternion(const F32 *q);                                             // Initializes Quaternion to normQuat(x, y, z, w)
+        LLQuaternion(const F32 *q);                                             // Initializes Quaternion to normalize(x, y, z, w)
        LLQuaternion(const LLVector3 &x_axis,
                                 const LLVector3 &y_axis,
                                 const LLVector3 &z_axis);                      // Initializes Quaternion from Matrix3 = [x_axis ; y_axis ; z_axis]
@@ -71,15 +71,27 @@ public:
        void quantize16(F32 lower, F32 upper);                                  // changes the vector to reflect quatization
        void quantize8(F32 lower, F32 upper);                                                   // changes the vector to reflect quatization
        void loadIdentity();                                                                                    // Loads the quaternion that represents the identity rotation
-        const LLQuaternion&     setQuatInit(F32 x, F32 y, F32 z, F32 w);        // Sets Quaternion to normQuat(x, y, z, w)
-        const LLQuaternion&     setQuat(const LLQuaternion &quat);                      // Copies Quaternion
+        const LLQuaternion&     set(F32 x, F32 y, F32 z, F32 w);                // Sets Quaternion to normalize(x, y, z, w)
-        const LLQuaternion&     setQuat(const F32 *q);                                          // Sets Quaternion to normQuat(quat[VX], quat[VY], quat[VZ], quat[VW])
+        const LLQuaternion&     set(const LLQuaternion &quat);                  // Copies Quaternion
-        const LLQuaternion&     setQuat(const LLMatrix3 &mat);                          // Sets Quaternion to mat2quat(mat)
+        const LLQuaternion&     set(const F32 *q);                                              // Sets Quaternion to normalize(quat[VX], quat[VY], quat[VZ], quat[VW])
-        const LLQuaternion&     setQuat(const LLMatrix4 &mat);                          // Sets Quaternion to mat2quat(mat)
+        const LLQuaternion&     set(const LLMatrix3 &mat);                              // Sets Quaternion to mat2quat(mat)
-        const LLQuaternion&     setQuat(F32 angle, F32 x, F32 y, F32 z);        // Sets Quaternion to axis_angle2quat(angle, x, y, z)
+        const LLQuaternion&     set(const LLMatrix4 &mat);                              // Sets Quaternion to mat2quat(mat)
-        const LLQuaternion&     setQuat(F32 angle, const LLVector3 &vec);       // Sets Quaternion to axis_angle2quat(angle, vec)
-        const LLQuaternion&     setQuat(F32 angle, const LLVector4 &vec);       // Sets Quaternion to axis_angle2quat(angle, vec)
+        const LLQuaternion&     setAngleAxis(F32 angle, F32 x, F32 y, F32 z);   // Sets Quaternion to axis_angle2quat(angle, x, y, z)
-        const LLQuaternion&     setQuat(F32 roll, F32 pitch, F32 yaw);          // Sets Quaternion to euler2quat(pitch, yaw, roll)
+        const LLQuaternion&     setAngleAxis(F32 angle, const LLVector3 &vec);  // Sets Quaternion to axis_angle2quat(angle, vec)
+        const LLQuaternion&     setAngleAxis(F32 angle, const LLVector4 &vec);  // Sets Quaternion to axis_angle2quat(angle, vec)
+        const LLQuaternion&     setEulerAngles(F32 roll, F32 pitch, F32 yaw);   // Sets Quaternion to euler2quat(pitch, yaw, roll)
+        const LLQuaternion&     setQuatInit(F32 x, F32 y, F32 z, F32 w);        // deprecated
+        const LLQuaternion&     setQuat(const LLQuaternion &quat);                      // deprecated
+        const LLQuaternion&     setQuat(const F32 *q);                                          // deprecated
+        const LLQuaternion&     setQuat(const LLMatrix3 &mat);                          // deprecated
+        const LLQuaternion&     setQuat(const LLMatrix4 &mat);                          // deprecated
+        const LLQuaternion&     setQuat(F32 angle, F32 x, F32 y, F32 z);        // deprecated
+        const LLQuaternion&     setQuat(F32 angle, const LLVector3 &vec);       // deprecated
+        const LLQuaternion&     setQuat(F32 angle, const LLVector4 &vec);       // deprecated
+        const LLQuaternion&     setQuat(F32 roll, F32 pitch, F32 yaw);          // deprecated
        LLMatrix4       getMatrix4(void) const;                                                 // Returns the Matrix4 equivalent of Quaternion
        LLMatrix3       getMatrix3(void) const;                                                 // Returns the Matrix3 equivalent of Quaternion
@@ -87,11 +99,16 @@ public:
        void            getAngleAxis(F32* angle, LLVector3 &vec) const;
        void            getEulerAngles(F32 *roll, F32* pitch, F32 *yaw) const;
-        F32                             normQuat();                                     // Normalizes Quaternion and returns magnitude
+        F32     normalize();    // Normalizes Quaternion and returns magnitude
-        const LLQuaternion&     conjQuat(void);                         // Conjugates Quaternion and returns result
+        F32     normQuat();             // deprecated
+        const LLQuaternion&     conjugate(void);        // Conjugates Quaternion and returns result
+        const LLQuaternion&     conjQuat(void);         // deprecated
        // Other useful methods
-        const LLQuaternion&     transQuat();                                                                                    // Transpose
+        const LLQuaternion&     transpose();            // transpose (same as conjugate)
+        const LLQuaternion&     transQuat();            // deprecated
        void                    shortestArc(const LLVector3 &a, const LLVector3 &b);    // shortest rotation from a to b
        const LLQuaternion& constrain(F32 radians);                                             // constrains rotation to a cone angle specified in radians
@@ -189,7 +206,7 @@ inline LLQuaternion::LLQuaternion(F32 x, F32 y, F32 z, F32 w)
        mQ[VS] = w;
        //RN: don't normalize this case as its used mainly for temporaries during calculations
-        //normQuat();
+        //normalize();
        /*
        F32 mag = sqrtf(mQ[VX]*mQ[VX] + mQ[VY]*mQ[VY] + mQ[VZ]*mQ[VZ] + mQ[VS]*mQ[VS]);
        mag -= 1.f;
@@ -205,7 +222,7 @@ inline LLQuaternion::LLQuaternion(const F32 *q)
        mQ[VZ] = q[VZ];
        mQ[VS] = q[VW];
-        normQuat();
+        normalize();
        /*
        F32 mag = sqrtf(mQ[VX]*mQ[VX] + mQ[VY]*mQ[VY] + mQ[VZ]*mQ[VZ] + mQ[VS]*mQ[VS]);
        mag -= 1.f;
@@ -224,33 +241,67 @@ inline void LLQuaternion::loadIdentity()
 }
+inline const LLQuaternion&      LLQuaternion::set(F32 x, F32 y, F32 z, F32 w)
+{
+        mQ[VX] = x;
+        mQ[VY] = y;
+        mQ[VZ] = z;
+        mQ[VS] = w;
+        normalize();
+        return (*this);
+}
+inline const LLQuaternion&      LLQuaternion::set(const LLQuaternion &quat)
+{
+        mQ[VX] = quat.mQ[VX];
+        mQ[VY] = quat.mQ[VY];
+        mQ[VZ] = quat.mQ[VZ];
+        mQ[VW] = quat.mQ[VW];
+        normalize();
+        return (*this);
+}
+inline const LLQuaternion&      LLQuaternion::set(const F32 *q)
+{
+        mQ[VX] = q[VX];
+        mQ[VY] = q[VY];
+        mQ[VZ] = q[VZ];
+        mQ[VS] = q[VW];
+        normalize();
+        return (*this);
+}
+// deprecated
 inline const LLQuaternion&      LLQuaternion::setQuatInit(F32 x, F32 y, F32 z, F32 w)
 {
        mQ[VX] = x;
        mQ[VY] = y;
        mQ[VZ] = z;
        mQ[VS] = w;
-        normQuat();
+        normalize();
        return (*this);
 }
+// deprecated
 inline const LLQuaternion&      LLQuaternion::setQuat(const LLQuaternion &quat)
 {
        mQ[VX] = quat.mQ[VX];
        mQ[VY] = quat.mQ[VY];
        mQ[VZ] = quat.mQ[VZ];
        mQ[VW] = quat.mQ[VW];
-        normQuat();
+        normalize();
        return (*this);
 }
+// deprecated
 inline const LLQuaternion&      LLQuaternion::setQuat(const F32 *q)
 {
        mQ[VX] = q[VX];
        mQ[VY] = q[VY];
        mQ[VZ] = q[VZ];
        mQ[VS] = q[VW];
-        normQuat();
+        normalize();
        return (*this);
 }
@@ -270,10 +321,36 @@ inline void LLQuaternion::getAngleAxis(F32* angle, F32* x, F32* y, F32* z) const
        else
                sin_a = 1.f/sin_a;
-    *angle = 2.0f * (F32) acos( cos_a );
+    F32 temp_angle = 2.0f * (F32) acos( cos_a );
-    *x = mQ[VX] * sin_a;
+        if (temp_angle > F_PI)
-    *y = mQ[VY] * sin_a;
+        {
-    *z = mQ[VZ] * sin_a;
+                // The (angle,axis) pair should never have angles outside [PI, -PI]
+                // since we want the _shortest_ (angle,axis) solution.
+                // Since acos is defined for [0, PI], and we multiply by 2.0, we
+                // can push the angle outside the acceptible range.
+                // When this happens we set the angle to the other portion of a 
+                // full 2PI rotation, and negate the axis, which reverses the 
+                // direction of the rotation (by the right-hand rule).
+                *angle = 2.f * F_PI - temp_angle;
+        *x = - mQ[VX] * sin_a;
+        *y = - mQ[VY] * sin_a;
+        *z = - mQ[VZ] * sin_a;
+        }
+        else
+        {
+                *angle = temp_angle;
+        *x = mQ[VX] * sin_a;
+        *y = mQ[VY] * sin_a;
+        *z = mQ[VZ] * sin_a;
+        }
+}
+inline const LLQuaternion& LLQuaternion::conjugate()
+{
+        mQ[VX] *= -1.f;
+        mQ[VY] *= -1.f;
+        mQ[VZ] *= -1.f;
+        return (*this);
 }
 inline const LLQuaternion& LLQuaternion::conjQuat()
@@ -285,12 +362,21 @@ inline const LLQuaternion& LLQuaternion::conjQuat()
 }
 // Transpose
+inline const LLQuaternion& LLQuaternion::transpose()
+{
+        mQ[VX] *= -1.f;
+        mQ[VY] *= -1.f;
+        mQ[VZ] *= -1.f;
+        return (*this);
+}
+// deprecated
 inline const LLQuaternion& LLQuaternion::transQuat()
 {
-        mQ[VX] = -mQ[VX];
+        mQ[VX] *= -1.f;
-        mQ[VY] = -mQ[VY];
+        mQ[VY] *= -1.f;
-        mQ[VZ] = -mQ[VZ];
+        mQ[VZ] *= -1.f;
-        return *this;
+        return (*this);
 }
@@ -382,6 +468,30 @@ inline const LLQuaternion&	operator*=(LLQuaternion &a, const LLQuaternion &b)
        return a;
 }
+inline F32      LLQuaternion::normalize()
+{
+        F32 mag = sqrtf(mQ[VX]*mQ[VX] + mQ[VY]*mQ[VY] + mQ[VZ]*mQ[VZ] + mQ[VS]*mQ[VS]);
+        if (mag > FP_MAG_THRESHOLD)
+        {
+                F32 oomag = 1.f/mag;
+                mQ[VX] *= oomag;
+                mQ[VY] *= oomag;
+                mQ[VZ] *= oomag;
+                mQ[VS] *= oomag;
+        }
+        else
+        {
+                mQ[VX] = 0.f;
+                mQ[VY] = 0.f;
+                mQ[VZ] = 0.f;
+                mQ[VS] = 1.f;
+        }
+        return mag;
+}
+// deprecated
 inline F32      LLQuaternion::normQuat()
 {
        F32 mag = sqrtf(mQ[VX]*mQ[VX] + mQ[VY]*mQ[VY] + mQ[VZ]*mQ[VZ] + mQ[VS]*mQ[VS]);
diff --git a/linden/indra/llmath/llrect.h b/linden/indra/llmath/llrect.h
index 9aadf9f..f2a5d75 100644
--- a/linden/indra/llmath/llrect.h
+++ b/linden/indra/llmath/llrect.h
@@ -227,6 +227,11 @@ public:
                return mLeft == mRight || mBottom == mTop;
        }
+        bool notNull() const
+        {
+                return !isNull();
+        }
        LLRectBase& unionWith(const LLRectBase &other)
        {
                mLeft = llmin(mLeft, other.mLeft);
diff --git a/linden/indra/llmath/llsphere.cpp b/linden/indra/llmath/llsphere.cpp
new file mode 100644
index 0000000..62f6e27
--- /dev/null
+++ b/linden/indra/llmath/llsphere.cpp
@@ -0,0 +1,364 @@
+/** 
+ * @file llsphere.cpp
+ * @author Andrew Meadows
+ * @brief Simple line class that can compute nearest approach between two lines
+ *
+ * $LicenseInfo:firstyear=2006&license=internal$
+ * 
+ * Copyright (c) 2006-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llsphere.h"
+LLSphere::LLSphere()
+:       mCenter(0.f, 0.f, 0.f),
+        mRadius(0.f)
+{ }
+LLSphere::LLSphere( const LLVector3& center, F32 radius)
+{
+        set(center, radius);
+}
+void LLSphere::set( const LLVector3& center, F32 radius )
+{
+        mCenter = center;
+        setRadius(radius);
+}
+void LLSphere::setCenter( const LLVector3& center)
+{
+        mCenter = center;
+}
+void LLSphere::setRadius( F32 radius)
+{
+        if (radius < 0.f)
+        {
+                radius = -radius;
+        }
+        mRadius = radius;
+}
+        
+const LLVector3& LLSphere::getCenter() const
+{
+        return mCenter;
+}
+F32 LLSphere::getRadius() const
+{
+        return mRadius;
+}
+// returns 'TRUE' if this sphere completely contains other_sphere
+BOOL LLSphere::contains(const LLSphere& other_sphere) const
+{
+        F32 separation = (mCenter - other_sphere.mCenter).length();
+        return (mRadius >= separation + other_sphere.mRadius) ? TRUE : FALSE;
+}
+// returns 'TRUE' if this sphere completely contains other_sphere
+BOOL LLSphere::overlaps(const LLSphere& other_sphere) const
+{
+        F32 separation = (mCenter - other_sphere.mCenter).length();
+        return (separation <= mRadius + other_sphere.mRadius) ? TRUE : FALSE;
+}
+// returns overlap
+// negative overlap is closest approach
+F32 LLSphere::getOverlap(const LLSphere& other_sphere) const
+{
+        // separation is distance from other_sphere's edge and this center
+        return (mCenter - other_sphere.mCenter).length() - mRadius - other_sphere.mRadius;
+}
+bool LLSphere::operator==(const LLSphere& rhs) const
+{
+        // TODO? -- use approximate equality for centers?
+        return (mRadius == rhs.mRadius
+                        && mCenter == rhs.mCenter);
+}
+std::ostream& operator<<( std::ostream& output_stream, const LLSphere& sphere)
+{
+        output_stream << "{center=" << sphere.mCenter << "," << "radius=" << sphere.mRadius << "}";
+        return output_stream;
+}
+// static 
+// removes any spheres that are contained in others
+void LLSphere::collapse(std::vector<LLSphere>& sphere_list)
+{
+        std::vector<LLSphere>::iterator first_itr = sphere_list.begin();
+        while (first_itr != sphere_list.end())
+        {
+                bool delete_from_front = false;
+                std::vector<LLSphere>::iterator second_itr = first_itr;
+                ++second_itr;
+                while (second_itr != sphere_list.end())
+                {
+                        if (second_itr->contains(*first_itr))
+                        {
+                                delete_from_front = true;
+                                break;
+                        }
+                        else if (first_itr->contains(*second_itr))
+                        {
+                                sphere_list.erase(second_itr++);
+                        }
+                        else
+                        {
+                                ++second_itr;
+                        }
+                }
+                if (delete_from_front)
+                {
+                        sphere_list.erase(first_itr++);
+                }
+                else
+                {
+                        ++first_itr;
+                }
+        }
+}
+// static
+// returns the bounding sphere that contains both spheres
+LLSphere LLSphere::getBoundingSphere(const LLSphere& first_sphere, const LLSphere& second_sphere)
+{
+        LLVector3 direction = second_sphere.mCenter - first_sphere.mCenter;
+        // HACK -- it is possible to get enough floating point error in the 
+        // other getBoundingSphere() method that we have to add some slop
+        // at the end.  Unfortunately, this breaks the link-order invarience
+        // for the linkability tests... unless we also apply the same slop
+        // here.
+        F32 half_milimeter = 0.0005f;
+        F32 distance = direction.length();
+        if (0.f == distance)
+        {
+                direction.setVec(1.f, 0.f, 0.f);
+        }
+        else
+        {
+                direction.normVec();
+        }
+        // the 'edge' is measured from the first_sphere's center
+        F32 max_edge = 0.f;
+        F32 min_edge = 0.f;
+        max_edge = llmax(max_edge + first_sphere.getRadius(), max_edge + distance + second_sphere.getRadius() + half_milimeter);
+        min_edge = llmin(min_edge - first_sphere.getRadius(), min_edge + distance - second_sphere.getRadius() - half_milimeter);
+        F32 radius = 0.5f * (max_edge - min_edge);
+        LLVector3 center = first_sphere.mCenter + (0.5f * (max_edge + min_edge)) * direction;
+        return LLSphere(center, radius);
+}
+// static
+// returns the bounding sphere that contains an arbitrary set of spheres
+LLSphere LLSphere::getBoundingSphere(const std::vector<LLSphere>& sphere_list)
+{
+        // this algorithm can get relatively inaccurate when the sphere 
+        // collection is 'small' (contained within a bounding sphere of about 
+        // 2 meters or less)
+        // TODO -- improve the accuracy for small collections of spheres
+        LLSphere bounding_sphere( LLVector3(0.f, 0.f, 0.f), 0.f );
+        S32 sphere_count = sphere_list.size();
+        if (1 == sphere_count)
+        {
+                // trivial case -- single sphere
+                std::vector<LLSphere>::const_iterator sphere_itr = sphere_list.begin();
+                bounding_sphere = *sphere_itr;
+        }
+        else if (2 == sphere_count)
+        {
+                // trivial case -- two spheres
+                std::vector<LLSphere>::const_iterator first_sphere = sphere_list.begin();
+                std::vector<LLSphere>::const_iterator second_sphere = first_sphere;
+                ++second_sphere;
+                bounding_sphere = LLSphere::getBoundingSphere(*first_sphere, *second_sphere);
+        }
+        else if (sphere_count > 0)
+        {
+                // non-trivial case -- we will approximate the solution
+                //
+                // NOTE -- there is a fancy/fast way to do this for large 
+                // numbers of arbirary N-dimensional spheres -- you can look it
+                // up on the net.  We're dealing with 3D spheres at collection
+                // sizes of 256 spheres or smaller, so we just use this
+                // brute force method.
+                // TODO -- perhaps would be worthwile to test for the solution where
+                // the largest spanning radius just happens to work.  That is, where
+                // there are really two spheres that determine the bounding sphere,
+                // and all others are contained therein.
+                // compute the AABB
+                std::vector<LLSphere>::const_iterator first_itr = sphere_list.begin();
+                LLVector3 max_corner = first_itr->getCenter() + first_itr->getRadius() * LLVector3(1.f, 1.f, 1.f);
+                LLVector3 min_corner = first_itr->getCenter() - first_itr->getRadius() * LLVector3(1.f, 1.f, 1.f);
+                {
+                        std::vector<LLSphere>::const_iterator sphere_itr = sphere_list.begin();
+                        for (++sphere_itr; sphere_itr != sphere_list.end(); ++sphere_itr)
+                        {
+                                LLVector3 center = sphere_itr->getCenter();
+                                F32 radius = sphere_itr->getRadius();
+                                for (S32 i=0; i<3; ++i)
+                                {
+                                        if (center.mV[i] + radius > max_corner.mV[i])
+                                        {
+                                                max_corner.mV[i] = center.mV[i] + radius;
+                                        }
+                                        if (center.mV[i] - radius < min_corner.mV[i])
+                                        {
+                                                min_corner.mV[i] = center.mV[i] - radius;
+                                        }
+                                }
+                        }
+                }
+                // get the starting center and radius from the AABB
+                LLVector3 diagonal = max_corner - min_corner;
+                F32 bounding_radius = 0.5f * diagonal.length();
+                LLVector3 bounding_center = 0.5f * (max_corner + min_corner);
+                // compute the starting step-size
+                F32 minimum_radius = 0.5f * llmin(diagonal.mV[VX], llmin(diagonal.mV[VY], diagonal.mV[VZ]));
+                F32 step_length = bounding_radius - minimum_radius;
+                S32 step_count = 0;
+                S32 max_step_count = 12;
+                F32 half_milimeter = 0.0005f;
+                // wander the center around in search of tighter solutions
+                S32 last_dx = 2;        // 2 is out of bounds --> no match
+                S32 last_dy = 2;
+                S32 last_dz = 2;
+                while (step_length > half_milimeter
+                                && step_count < max_step_count)
+                {
+                        // the algorithm for testing the maximum radius could be expensive enough
+                        // that it makes sense to NOT duplicate testing when possible, so we keep
+                        // track of where we last tested, and only test the new points
+                        S32 best_dx = 0;
+                        S32 best_dy = 0;
+                        S32 best_dz = 0;
+                        // sample near the center of the box
+                        bool found_better_center = false;
+                        for (S32 dx = -1; dx < 2; ++dx)
+                        {
+                                for (S32 dy = -1; dy < 2; ++dy)
+                                {
+                                        for (S32 dz = -1; dz < 2; ++dz)
+                                        {
+                                                if (dx == 0 && dy == 0 && dz == 0)
+                                                {
+                                                        continue;
+                                                }
+                                                // count the number of indecies that match the last_*'s
+                                                S32 match_count = 0;
+                                                if (last_dx == dx) ++match_count;
+                                                if (last_dy == dy) ++match_count;
+                                                if (last_dz == dz) ++match_count;
+                                                if (match_count == 2)
+                                                {
+                                                        // we've already tested this point
+                                                        continue;
+                                                }
+                                                LLVector3 center = bounding_center;
+                                                center.mV[VX] += (F32) dx * step_length;
+                                                center.mV[VY] += (F32) dy * step_length;
+                                                center.mV[VZ] += (F32) dz * step_length;
+                                                // compute the radius of the bounding sphere
+                                                F32 max_radius = 0.f;
+                                                std::vector<LLSphere>::const_iterator sphere_itr;
+                                                for (sphere_itr = sphere_list.begin(); sphere_itr != sphere_list.end(); ++sphere_itr)
+                                                {
+                                                        F32 radius = (sphere_itr->getCenter() - center).length() + sphere_itr->getRadius();
+                                                        if (radius > max_radius)
+                                                        {
+                                                                max_radius = radius;
+                                                        }
+                                                }
+                                                if (max_radius < bounding_radius)
+                                                {
+                                                        best_dx = dx;
+                                                        best_dy = dy;
+                                                        best_dz = dz;
+                                                        bounding_center = center;
+                                                        bounding_radius = max_radius;
+                                                        found_better_center = true;
+                                                }
+                                        }
+                                }
+                        }
+                        if (found_better_center)
+                        {
+                                // remember where we came from so we can avoid retesting
+                                last_dx = -best_dx;
+                                last_dy = -best_dy;
+                                last_dz = -best_dz;
+                        }
+                        else
+                        {
+                                // reduce the step size
+                                step_length *= 0.5f;
+                                //++step_count;
+                                // reset the last_*'s
+                                last_dx = 2;    // 2 is out of bounds --> no match
+                                last_dy = 2;
+                                last_dz = 2;
+                        }
+                }
+                // HACK -- it is possible to get enough floating point error for the
+                // bounding sphere to too small on the order of 10e-6, but we only need
+                // it to be accurate to within about half a millimeter
+                bounding_radius += half_milimeter;
+                // this algorithm can get relatively inaccurate when the sphere 
+                // collection is 'small' (contained within a bounding sphere of about 
+                // 2 meters or less)
+                // TODO -- fix this
+                /* debug code
+                {
+                        std::vector<LLSphere>::const_iterator sphere_itr;
+                        for (sphere_itr = sphere_list.begin(); sphere_itr != sphere_list.end(); ++sphere_itr)
+                        {
+                                F32 radius = (sphere_itr->getCenter() - bounding_center).length() + sphere_itr->getRadius();
+                                if (radius + 0.1f > bounding_radius)
+                                {
+                                        std::cout << " rad = " << radius << "  bounding - rad = " << (bounding_radius - radius) << std::endl;
+                                }
+                        }
+                        std::cout << "\n" << std::endl;
+                }
+                */ 
+                bounding_sphere.set(bounding_center, bounding_radius);
+        }
+        return bounding_sphere;
+}
diff --git a/linden/indra/llmath/llsphere.h b/linden/indra/llmath/llsphere.h
new file mode 100644
index 0000000..4d7cd7a
--- /dev/null
+++ b/linden/indra/llmath/llsphere.h
@@ -0,0 +1,72 @@
+// llsphere.h
+/**
+ * @file llsphere.cpp
+ * @author Andrew Meadows
+ * @brief Simple sphere implementation for basic geometric operations
+ *
+ * $LicenseInfo:firstyear=2001&license=internal$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LL_SPHERE_H
+#define LL_SPHERE_H
+#include "stdtypes.h"
+#include "v3math.h"
+#include <iostream>
+#include <vector>
+class LLSphere
+{
+public:
+        LLSphere();
+        LLSphere( const LLVector3& center, F32 radius );
+        void set( const LLVector3& center, F32 radius );
+        void setCenter( const LLVector3& center );
+        void setRadius( F32 radius );
+        const LLVector3& getCenter() const;
+        F32 getRadius() const;
+        // returns TRUE if this sphere completely contains other_sphere
+        BOOL contains(const LLSphere& other_sphere) const;
+        // returns TRUE if this sphere overlaps other_sphere
+        BOOL overlaps(const LLSphere& other_sphere) const;
+        // returns overlap distance
+        // negative overlap is closest approach
+        F32 getOverlap(const LLSphere& other_sphere) const;
+        // removes any spheres that are contained in others
+        static void collapse(std::vector<LLSphere>& sphere_list);
+        // returns minimum sphere bounding sphere for a set of spheres
+        static LLSphere getBoundingSphere(const LLSphere& first_sphere, const LLSphere& second_sphere);
+        static LLSphere getBoundingSphere(const std::vector<LLSphere>& sphere_list);
+        bool operator==(const LLSphere& rhs) const;
+        friend std::ostream& operator<<( std::ostream& output_stream, const LLSphere& line );
+protected:
+        LLVector3 mCenter;
+        F32 mRadius;
+};
+#endif
diff --git a/linden/indra/llmath/lluuid.cpp b/linden/indra/llmath/lluuid.cpp
index db9e869..d835cbc 100644
--- a/linden/indra/llmath/lluuid.cpp
+++ b/linden/indra/llmath/lluuid.cpp
@@ -867,6 +867,11 @@ void LLUUID::generate()
    time_last = timestamp;
 }
+void LLUUID::generate(std::string hash_string)
+{
+        LLMD5 md5_uuid((U8*)hash_string.c_str());
+        md5_uuid.raw_digest(mData);
+}
 U32 LLUUID::getRandomSeed()
 {
diff --git a/linden/indra/llmath/lluuid.h b/linden/indra/llmath/lluuid.h
index 190b772..48308f2 100644
--- a/linden/indra/llmath/lluuid.h
+++ b/linden/indra/llmath/lluuid.h
@@ -64,6 +64,7 @@ public:
        // MANIPULATORS
        //
        void    generate();                                     // Generate a new UUID
+        void    generate(std::string stream); //Generate a new UUID based on hash of input stream
        BOOL    set(const char *in_string, BOOL emit = TRUE);   // Convert from string, if emit is FALSE, do not emit warnings
        BOOL    set(const std::string& in_string, BOOL emit = TRUE);    // Convert from string, if emit is FALSE, do not emit warnings
        void    setNull();                                      // Faster than setting to LLUUID::null.
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index 4f1c260..9c19220 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -1858,9 +1858,6 @@ inline U32 sculpt_xy_to_index(U32 x, U32 y, U16 sculpt_width, U16 sculpt_height,
 {
        U32 index = (x + y * sculpt_width) * sculpt_components;
-        // attempt to resolve DEV-11158 - remove assert later.
-        //llassert(index < sculpt_width * sculpt_height * sculpt_components);
-        
        return index;
 }
@@ -2513,12 +2510,19 @@ bool LLVolumeParams::validate(U8 prof_curve, F32 prof_begin, F32 prof_end, F32 h
        return true;
 }
-#define MAX_INDEX 10000
 S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
 {
-        S32 index[MAX_INDEX];
+        S32 expected_num_triangle_indices = getNumTriangleIndices();
+        if (expected_num_triangle_indices > MAX_VOLUME_TRIANGLE_INDICES)
+        {
+                // we don't allow LLVolumes with this many vertices
+                llwarns << "Couldn't allocate triangle indices" << llendl;
+                num_indices = 0;
+                return NULL;
+        }
+        S32* index = new S32[expected_num_triangle_indices];
        S32 count = 0;
-        S32 *indices = NULL;
        // Let's do this totally diffently, as we don't care about faces...
        // Counter-clockwise triangles are forward facing...
@@ -2532,6 +2536,9 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
        size_s_out = getProfile().getTotalOut();
        size_t = getPath().mPath.size();
+        // NOTE -- if the construction of the triangles below ever changes
+        // then getNumTriangleIndices() method may also have to be updated.
        if (open)               /* Flawfinder: ignore */
        {
                if (hollow)
@@ -2539,9 +2546,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                        // Open hollow -- much like the closed solid, except we 
                        // we need to stitch up the gap between s=0 and s=size_s-1
-                        if ( (size_t - 1) * (((size_s -1) * 6) + 6) >= MAX_INDEX)
-                                goto noindices;
                        for (t = 0; t < size_t - 1; t++)
                        {
                                // The outer face, first cut, and inner face
@@ -2655,8 +2659,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                                        if (use_tri1a2)
                                        {
-                                                if (count + 3 >= MAX_INDEX)
-                                                        goto noindices;
                                                index[count++] = pt1 + i;
                                                index[count++] = pt1 + 1 + i;
                                                index[count++] = pt2 + i;
@@ -2664,8 +2666,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                                        }
                                        else
                                        {
-                                                if (count + 3 >= MAX_INDEX)
-                                                        goto noindices;
                                                index[count++] = pt1 + i;
                                                index[count++] = pt2 - 1 + i;
                                                index[count++] = pt2 + i;
@@ -2756,8 +2756,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                                        if (use_tri1a2)
                                        {
-                                                if (count + 3 >= MAX_INDEX)
-                                                        goto noindices;
                                                index[count++] = pt1;
                                                index[count++] = pt2;
                                                index[count++] = pt1 + 1;
@@ -2765,8 +2763,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                                        }
                                        else
                                        {
-                                                if (count + 3 >= MAX_INDEX)
-                                                        goto noindices;
                                                index[count++] = pt1;
                                                index[count++] = pt2;
                                                index[count++] = pt2 - 1;
@@ -2779,9 +2775,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                {
                        // Open solid
-                        if ( (size_t - 1) * (((size_s -1) * 6) + 6) >= MAX_INDEX)
-                                goto noindices;
                        for (t = 0; t < size_t - 1; t++)
                        {
                                // Outer face + 1 cut face
@@ -2811,8 +2804,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                        // Do the top and bottom caps, if necessary
                        if (path_open)
                        {
-                                if ( count + (size_s - 2) * 3 >= MAX_INDEX)
-                                        goto noindices;
                                for (s = 0; s < size_s - 2; s++)
                                {
                                        index[count++] = s+1;
@@ -2822,8 +2813,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                                // We've got a top cap
                                S32 offset = (size_t - 1)*size_s;
-                                if ( count + (size_s - 2) * 3 >= MAX_INDEX)
-                                        goto noindices;
                                for (s = 0; s < size_s - 2; s++)
                                {
                                        // Inverted ordering from bottom cap.
@@ -2839,8 +2828,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                // Closed hollow
                // Outer face
                
-                if ( (size_t - 1) * (size_s_out - 1) * 6 >= MAX_INDEX)
-                        goto noindices;
                for (t = 0; t < size_t - 1; t++)
                {
                        for (s = 0; s < size_s_out - 1; s++)
@@ -2859,8 +2846,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                // Inner face
                // Invert facing from outer face
-                if ( count + (size_t - 1) * ((size_s - 1) - size_s_out) * 6 >= MAX_INDEX)
-                        goto noindices;
                for (t = 0; t < size_t - 1; t++)
                {
                        for (s = size_s_out; s < size_s - 1; s++)
@@ -2965,8 +2950,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                                if (use_tri1a2)
                                {
-                                        if (count + 3 >= MAX_INDEX)
-                                                goto noindices;
                                        index[count++] = pt1 + i;
                                        index[count++] = pt1 + 1 + i;
                                        index[count++] = pt2 + i;
@@ -2974,8 +2957,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                                }
                                else
                                {
-                                        if (count + 3 >= MAX_INDEX)
-                                                goto noindices;
                                        index[count++] = pt1 + i;
                                        index[count++] = pt2 - 1 + i;
                                        index[count++] = pt2 + i;
@@ -3066,8 +3047,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                                if (use_tri1a2)
                                {
-                                        if (count + 3 >= MAX_INDEX)
-                                                goto noindices;
                                        index[count++] = pt1;
                                        index[count++] = pt2;
                                        index[count++] = pt1 + 1;
@@ -3075,8 +3054,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                                }
                                else
                                {
-                                        if (count + 3 >= MAX_INDEX)
-                                                goto noindices;
                                        index[count++] = pt1;
                                        index[count++] = pt2;
                                        index[count++] = pt2 - 1;
@@ -3088,8 +3065,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
        else
        {
                // Closed solid.  Easy case.
-                if ( (size_t - 1) * (size_s - 1) * 6 > MAX_INDEX)
-                        goto noindices;
                for (t = 0; t < size_t - 1; t++)
                {
                        for (s = 0; s < size_s - 1; s++)
@@ -3111,8 +3086,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                if (path_open)
                {
                        // bottom cap
-                        if ( count + (size_s - 2 - 1) * 3 >= MAX_INDEX)
-                                goto noindices;
                        for (s = 1; s < size_s - 2; s++)
                        {
                                index[count++] = s+1;
@@ -3122,8 +3095,6 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                        // top cap
                        S32 offset = (size_t - 1)*size_s;
-                        if ( count + (size_s - 2 - 1) * 3 >= MAX_INDEX)
-                                goto noindices;
                        for (s = 1; s < size_s - 2; s++)
                        {
                                // Inverted ordering from bottom cap.
@@ -3134,7 +3105,18 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
                }
        }
+#ifdef LL_DEBUG
+        // assert that we computed the correct number of indices
+        if (count != expected_num_triangle_indices )
+        {
+                llerrs << "bad index count prediciton:"
+                        << "  expected=" << expected_num_triangle_indices 
+                        << " actual=" << count << llendl;
+        }
+#endif
 #if 0
+        // verify that each index does not point beyond the size of the mesh
        S32 num_vertices = mMesh.size();
        for (i = 0; i < count; i+=3)
        {
@@ -3145,17 +3127,65 @@ S32 *LLVolume::getTriangleIndices(U32 &num_indices) const
        }
 #endif
-        indices = new S32[count];
+        num_indices = count;
-noindices:
+        return index;
-        if (!indices)
+}
+S32 LLVolume::getNumTriangleIndices() const
+{
+        BOOL profile_open = getProfile().isOpen();
+        BOOL hollow = getProfile().isHollow();
+        BOOL path_open = getPath().isOpen();
+        S32 size_s, size_s_out, size_t;
+        size_s = getProfile().getTotal();
+        size_s_out = getProfile().getTotalOut();
+        size_t = getPath().mPath.size();
+        S32 count = 0;
+        if (profile_open)               /* Flawfinder: ignore */
        {
-                llwarns << "Couldn't allocate triangle indices" << llendl;
+                if (hollow)
-                num_indices = 0;
+                {
-                return NULL;
+                        // Open hollow -- much like the closed solid, except we 
+                        // we need to stitch up the gap between s=0 and s=size_s-1
+                        count = (size_t - 1) * (((size_s -1) * 6) + 6);
+                }
+                else
+                {
+                        count = (size_t - 1) * (((size_s -1) * 6) + 6); 
+                }
        }
-        num_indices = count;
+        else if (hollow)
-        memcpy(indices, index, count * sizeof(S32));            /* Flawfinder: ignore */
+        {
-        return indices;
+                // Closed hollow
+                // Outer face
+                count = (size_t - 1) * (size_s_out - 1) * 6;
+                // Inner face
+                count += (size_t - 1) * ((size_s - 1) - size_s_out) * 6;
+        }
+        else
+        {
+                // Closed solid.  Easy case.
+                count = (size_t - 1) * (size_s - 1) * 6;
+        }
+        if (path_open)
+        {
+                S32 cap_triangle_count = size_s - 3;
+                if ( profile_open
+                        || hollow )
+                {
+                        cap_triangle_count = size_s - 2;
+                }
+                if ( cap_triangle_count > 0 )
+                {
+                        // top and bottom caps
+                        count += cap_triangle_count * 2 * 3;
+                }
+        }
+        return count;
 }
 //-----------------------------------------------------------------------------
@@ -3486,7 +3516,7 @@ struct lessTriangle
 BOOL equalTriangle(const S32 *a, const S32 *b)
 {
-        if ((*a == *b) && (*(a+1) == *(b+1)) && ((*a+2) == (*b+2)))
+        if ((*a == *b) && (*(a+1) == *(b+1)) && (*(a+2) == *(b+2)))
        {
                return TRUE;
        }
@@ -3502,6 +3532,21 @@ BOOL LLVolume::cleanupTriangleData( const S32 num_input_vertices,
                                                                        S32 &num_output_triangles,
                                                                        S32 **output_triangles)
 {
+        /* Testing: avoid any cleanup
+        num_output_vertices = num_input_vertices;
+        num_output_triangles = num_input_triangles;
+        *output_vertices = new LLVector3[num_input_vertices];
+        for (S32 i = 0; i < num_input_vertices; i++)
+        {
+                (*output_vertices)[i] = input_vertices[i].mPos;
+        }
+        *output_triangles = new S32[num_input_triangles*3];
+        memcpy(*output_triangles, input_triangles, 3*num_input_triangles*sizeof(S32));          // Flawfinder: ignore
+        return TRUE;
+        */
        // Here's how we do this:
        // Create a structure which contains the original vertex index and the
        // LLVector3 data.
@@ -3552,7 +3597,7 @@ BOOL LLVolume::cleanupTriangleData( const S32 num_input_vertices,
                }
                else
                {
-                        //llinfos << "Removed duplicate vertex " << pairp->mVertex << llendl;
+                        //llinfos << "Removed duplicate vertex " << pairp->mVertex << ", distance magVecSquared() is " << (pairp->mVertex - prev_pairp->mVertex).magVecSquared() << llendl;
                }
                vertex_mapping[pairp->mIndex] = new_num_vertices - 1;
        }
@@ -3564,50 +3609,54 @@ BOOL LLVolume::cleanupTriangleData( const S32 num_input_vertices,
        for (i = 0; i < num_input_triangles; i++)
        {
-                //llinfos << "Checking triangle " << input_triangles[i*3] << ":" << input_triangles[i*3+1] << ":" << input_triangles[i*3+2] << llendl;
+                S32 v1 = i*3;
-                input_triangles[i*3] = vertex_mapping[input_triangles[i*3]];
+                S32 v2 = i*3 + 1;
-                input_triangles[i*3+1] = vertex_mapping[input_triangles[i*3+1]];
+                S32 v3 = i*3 + 2;
-                input_triangles[i*3+2] = vertex_mapping[input_triangles[i*3+2]];
+                //llinfos << "Checking triangle " << input_triangles[v1] << ":" << input_triangles[v2] << ":" << input_triangles[v3] << llendl;
+                input_triangles[v1] = vertex_mapping[input_triangles[v1]];
+                input_triangles[v2] = vertex_mapping[input_triangles[v2]];
+                input_triangles[v3] = vertex_mapping[input_triangles[v3]];
-                if ((input_triangles[i*3] == input_triangles[i*3+1])
+                if ((input_triangles[v1] == input_triangles[v2])
-                        || (input_triangles[i*3] == input_triangles[i*3+2])
+                        || (input_triangles[v1] == input_triangles[v3])
-                        || (input_triangles[i*3+1] == input_triangles[i*3+2]))
+                        || (input_triangles[v2] == input_triangles[v3]))
                {
-                        //llinfos << "Removing degenerate triangle " << input_triangles[i*3] << ":" << input_triangles[i*3+1] << ":" << input_triangles[i*3+2] << llendl;
+                        //llinfos << "Removing degenerate triangle " << input_triangles[v1] << ":" << input_triangles[v2] << ":" << input_triangles[v3] << llendl;
                        // Degenerate triangle, skip
                        continue;
                }
-                if (input_triangles[i*3] < input_triangles[i*3+1])
+                if (input_triangles[v1] < input_triangles[v2])
                {
-                        if (input_triangles[i*3] < input_triangles[i*3+2])
+                        if (input_triangles[v1] < input_triangles[v3])
                        {
                                // (0 < 1) && (0 < 2)
-                                new_triangles[new_num_triangles*3] = input_triangles[i*3];
+                                new_triangles[new_num_triangles*3] = input_triangles[v1];
-                                new_triangles[new_num_triangles*3+1] = input_triangles[i*3+1];
+                                new_triangles[new_num_triangles*3+1] = input_triangles[v2];
-                                new_triangles[new_num_triangles*3+2] = input_triangles[i*3+2];
+                                new_triangles[new_num_triangles*3+2] = input_triangles[v3];
                        }
                        else
                        {
                                // (0 < 1) && (2 < 0)
-                                new_triangles[new_num_triangles*3] = input_triangles[i*3+2];
+                                new_triangles[new_num_triangles*3] = input_triangles[v3];
-                                new_triangles[new_num_triangles*3+1] = input_triangles[i*3];
+                                new_triangles[new_num_triangles*3+1] = input_triangles[v1];
-                                new_triangles[new_num_triangles*3+2] = input_triangles[i*3+1];
+                                new_triangles[new_num_triangles*3+2] = input_triangles[v2];
                        }
                }
-                else if (input_triangles[i*3+1] < input_triangles[i*3+2])
+                else if (input_triangles[v2] < input_triangles[v3])
                {
                        // (1 < 0) && (1 < 2)
-                        new_triangles[new_num_triangles*3] = input_triangles[i*3+1];
+                        new_triangles[new_num_triangles*3] = input_triangles[v2];
-                        new_triangles[new_num_triangles*3+1] = input_triangles[i*3+2];
+                        new_triangles[new_num_triangles*3+1] = input_triangles[v3];
-                        new_triangles[new_num_triangles*3+2] = input_triangles[i*3];
+                        new_triangles[new_num_triangles*3+2] = input_triangles[v1];
                }
                else
                {
                        // (1 < 0) && (2 < 1)
-                        new_triangles[new_num_triangles*3] = input_triangles[i*3+2];
+                        new_triangles[new_num_triangles*3] = input_triangles[v3];
-                        new_triangles[new_num_triangles*3+1] = input_triangles[i*3];
+                        new_triangles[new_num_triangles*3+1] = input_triangles[v1];
-                        new_triangles[new_num_triangles*3+2] = input_triangles[i*3+1];
+                        new_triangles[new_num_triangles*3+2] = input_triangles[v2];
                }
                new_num_triangles++;
        }
@@ -3848,23 +3897,44 @@ void LLVolumeParams::reduceT(F32 begin, F32 end)
        mPathParams.setEnd(a + end * (b - a));
 }
+const F32 MIN_CONCAVE_PROFILE_WEDGE = 0.125f;   // 1/8 unity
+const F32 MIN_CONCAVE_PATH_WEDGE = 0.111111f;   // 1/9 unity
+// returns TRUE if the shape can be approximated with a convex shape 
+// for collison purposes
 BOOL LLVolumeParams::isConvex() const
 {
-        // The logic for determining convexity is a little convoluted.
+        F32 path_length = mPathParams.getEnd() - mPathParams.getBegin();
         
-        // Do we need to take getTwistBegin into account?  DK 08/12/04
+        if ( mPathParams.getTwist() != mPathParams.getTwistBegin()
-        if (   mProfileParams.getHollow() != 0.0f 
+                && path_length > MIN_CONCAVE_PATH_WEDGE )
-                || mPathParams.getTwist() != mPathParams.getTwistBegin() )
        {
-                // hollow or twist gaurantees concavity
+                // twist along a "not too short" path is concave
                return FALSE;
        }
        F32 profile_length = mProfileParams.getEnd() - mProfileParams.getBegin();
-        BOOL concave_profile = (profile_length < 1.0f) && (profile_length > 0.5f);
+        F32 hollow = mProfileParams.getHollow();
-        if (concave_profile)
+        BOOL same_hole = hollow == 0.f 
+                                         || (mProfileParams.getCurveType() & LL_PCODE_HOLE_MASK) == LL_PCODE_HOLE_SAME;
+        F32 min_profile_wedge = MIN_CONCAVE_PROFILE_WEDGE;
+        U8 profile_type = mProfileParams.getCurveType() & LL_PCODE_PROFILE_MASK;
+        if ( LL_PCODE_PROFILE_CIRCLE_HALF == profile_type )
        {
-                // concave profile
+                // it is a sphere and spheres get twice the minimum profile wedge
+                min_profile_wedge = 2.f * MIN_CONCAVE_PROFILE_WEDGE;
+        }
+        BOOL convex_profile = ( ( profile_length == 1.f
+                                                     || profile_length <= 0.5f )
+                                                   && hollow == 0.f )                                           // trivially convex
+                                                  || ( profile_length <= min_profile_wedge
+                                                          && same_hole );                                               // effectvely convex (even when hollow)
+        if (!convex_profile)
+        {
+                // profile is concave
                return FALSE;
        }
@@ -3875,7 +3945,6 @@ BOOL LLVolumeParams::isConvex() const
                return TRUE;
        }
-        F32 path_length = mPathParams.getEnd() - mPathParams.getBegin();
        BOOL concave_path = (path_length < 1.0f) && (path_length > 0.5f);
        if (concave_path)
        {
@@ -3883,17 +3952,43 @@ BOOL LLVolumeParams::isConvex() const
        }
        // we're left with spheres, toroids and tubes
-        // only the spheres can be convex
-        U8 profile_type = mProfileParams.getCurveType() & LL_PCODE_PROFILE_MASK;
        if ( LL_PCODE_PROFILE_CIRCLE_HALF == profile_type )
        {
+                // at this stage all spheres must be convex
                return TRUE;
        }
        // it's a toroid or tube                
+        if ( path_length <= MIN_CONCAVE_PATH_WEDGE )
+        {
+                // effectively convex
+                return TRUE;
+        }
        return FALSE;
 }
+// debug
+void LLVolumeParams::setCube()
+{
+        mProfileParams.setCurveType(LL_PCODE_PROFILE_SQUARE);
+        mProfileParams.setBegin(0.f);
+        mProfileParams.setEnd(1.f);
+        mProfileParams.setHollow(0.f);
+        mPathParams.setBegin(0.f);
+        mPathParams.setEnd(1.f);
+        mPathParams.setScale(1.f, 1.f);
+        mPathParams.setShear(0.f, 0.f);
+        mPathParams.setCurveType(LL_PCODE_PATH_LINE);
+        mPathParams.setTwistBegin(0.f);
+        mPathParams.setTwistEnd(0.f);
+        mPathParams.setRadiusOffset(0.f);
+        mPathParams.setTaper(0.f, 0.f);
+        mPathParams.setRevolutions(0.f);
+        mPathParams.setSkew(0.f);
+}
 LLFaceID LLVolume::generateFaceMask()
 {
        LLFaceID new_mask = 0x0000;
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h
index 5ec7997..9dbea7a 100644
--- a/linden/indra/llmath/llvolume.h
+++ b/linden/indra/llmath/llvolume.h
@@ -72,6 +72,8 @@ const F32 TAPER_QUANTA  = 0.01f;
 const F32 REV_QUANTA    = 0.015f;
 const F32 HOLLOW_QUANTA = 0.00002f;
+const S32 MAX_VOLUME_TRIANGLE_INDICES = 10000;
 //============================================================================
 // useful masks
@@ -187,10 +189,10 @@ class LLProfileParams
 public:
        LLProfileParams()
        {
-                mBegin     = 0;
-                mEnd       = 1;
-                mHollow    = 0;
                mCurveType = LL_PCODE_PROFILE_SQUARE;
+                mBegin     = 0.f;
+                mEnd       = 1.f;
+                mHollow    = 0.f;
        }
        LLProfileParams(U8 curve, F32 begin, F32 end, F32 hollow)
@@ -307,17 +309,17 @@ class LLPathParams
 public:
        LLPathParams()
        {
-                mBegin     = 0;
+                mBegin     = 0.f;
-                mEnd       = 1;
+                mEnd       = 1.f;
-                mScale.setVec(1,1);
+                mScale.setVec(1.f,1.f);
-                mShear.setVec(0,0);
+                mShear.setVec(0.f,0.f);
                mCurveType = LL_PCODE_PATH_LINE;
-                mTwistBegin             = 0;
+                mTwistBegin             = 0.f;
-                mTwistEnd       = 0;
+                mTwistEnd       = 0.f;
-                mRadiusOffset   = 0;
+                mRadiusOffset   = 0.f;
-                mTaper.setVec(0,0);
+                mTaper.setVec(0.f,0.f);
-                mRevolutions    = 1;
+                mRevolutions    = 1.f;
-                mSkew                   = 0;
+                mSkew                   = 0.f;
        }
        LLPathParams(U8 curve, F32 begin, F32 end, F32 scx, F32 scy, F32 shx, F32 shy, F32 twistend, F32 twistbegin, F32 radiusoffset, F32 tx, F32 ty, F32 revolutions, F32 skew)
@@ -627,6 +629,9 @@ public:
        
        friend std::ostream& operator<<(std::ostream &s, const LLVolumeParams &volume_params);
+        // debug helper functions
+        void setCube();
 protected:
        LLProfileParams mProfileParams;
        LLPathParams    mPathParams;
@@ -869,6 +874,10 @@ public:
        S32 getSculptLevel() const                              { return mSculptLevel; }
        
        S32 *getTriangleIndices(U32 &num_indices) const;
+        // returns number of triangle indeces required for path/profile mesh
+        S32 getNumTriangleIndices() const;
        void generateSilhouetteVertices(std::vector<LLVector3> &vertices, std::vector<LLVector3> &normals, std::vector<S32> &segments, const LLVector3& view_vec,
                                                                                          const LLMatrix4& mat,
                                                                                  const LLMatrix3& norm_mat);
diff --git a/linden/indra/llmath/llvolumemgr.cpp b/linden/indra/llmath/llvolumemgr.cpp
index db99959..d9bca70 100644
--- a/linden/indra/llmath/llvolumemgr.cpp
+++ b/linden/indra/llmath/llvolumemgr.cpp
@@ -36,7 +36,7 @@
 //#define DEBUG_VOLUME
-LLVolumeMgr* gVolumeMgr = 0;
+//LLVolumeMgr* gVolumeMgr = 0;
 const F32 BASE_THRESHOLD = 0.03f;
@@ -49,37 +49,23 @@ F32 LLVolumeLODGroup::mDetailThresholds[NUM_LODS] = {BASE_THRESHOLD,
 //static
 F32 LLVolumeLODGroup::mDetailScales[NUM_LODS] = {1.f, 1.5f, 2.5f, 4.f};
-//============================================================================
-//static
-void LLVolumeMgr::initClass()
-{
-        gVolumeMgr = new LLVolumeMgr();
-}
-//static
-BOOL LLVolumeMgr::cleanupClass()
-{
-        BOOL res = FALSE;
-        if (gVolumeMgr) {
-                res = gVolumeMgr->cleanup();
-                delete gVolumeMgr;
-                gVolumeMgr = 0;
-        }
-        return res;
-}
 //============================================================================
 LLVolumeMgr::LLVolumeMgr()
+:       mDataMutex(NULL)
 {
-        mDataMutex = new LLMutex(gAPRPoolp);
+        // the LLMutex magic interferes with easy unit testing,
-//      mNumVolumes = 0;
+        // so you now must manually call useMutex() to use it
+        //mDataMutex = new LLMutex(gAPRPoolp);
 }
 LLVolumeMgr::~LLVolumeMgr()
 {
        cleanup();
        delete mDataMutex;
+        mDataMutex = NULL;
 }
 BOOL LLVolumeMgr::cleanup()
@@ -90,7 +76,10 @@ BOOL LLVolumeMgr::cleanup()
        }
        #endif
        BOOL no_refs = TRUE;
-        mDataMutex->lock();
+        if (mDataMutex)
+        {
+                mDataMutex->lock();
+        }
        for (volume_lod_group_map_t::iterator iter = mVolumeLODGroups.begin(),
                         end = mVolumeLODGroups.end();
                 iter != end; iter++)
@@ -106,29 +95,37 @@ BOOL LLVolumeMgr::cleanup()
                volgroupp->unref();// this );
        }
        mVolumeLODGroups.clear();
-        mDataMutex->unlock();
+        if (mDataMutex)
+        {
+                mDataMutex->unlock();
+        }
        return no_refs;
 }
+// whatever calls getVolume() never owns the LLVolume* and
+// cannot keep references for long since it may be deleted
+// later.  For best results hold it in an LLPointer<LLVolume>.
 LLVolume *LLVolumeMgr::getVolume(const LLVolumeParams &volume_params, const S32 detail)
 {
        LLVolumeLODGroup* volgroupp;
-        mDataMutex->lock();
+        if (mDataMutex)
+        {
+                mDataMutex->lock();
+        }
        volume_lod_group_map_t::iterator iter = mVolumeLODGroups.find(&volume_params);
        if( iter == mVolumeLODGroups.end() )
        {
-                volgroupp = new LLVolumeLODGroup(volume_params);
+                volgroupp = createNewGroup(volume_params);
-                const LLVolumeParams* params = &(volgroupp->getParams());
-                mVolumeLODGroups[params] = volgroupp;
-                volgroupp->ref(); // initial reference
        }
        else
        {
                volgroupp = iter->second;
        }
-        volgroupp->ref();// this );
+        volgroupp->ref();
-        mDataMutex->unlock();
+        if (mDataMutex)
-        //      mNumVolumes++;
+        {
+                mDataMutex->unlock();
+        }
        #ifdef DEBUG_VOLUME
        {
                lldebugs << "LLVolumeMgr::getVolume() " << (*this) << llendl;
@@ -137,6 +134,27 @@ LLVolume *LLVolumeMgr::getVolume(const LLVolumeParams &volume_params, const S32
        return volgroupp->getLOD(detail);
 }
+// virtual
+LLVolumeLODGroup* LLVolumeMgr::getGroup( const LLVolumeParams& volume_params ) const
+{
+        LLVolumeLODGroup* volgroupp = NULL;
+        if (mDataMutex)
+        {
+                mDataMutex->lock();
+        }
+        volume_lod_group_map_t::const_iterator iter = mVolumeLODGroups.find(&volume_params);
+        if( iter != mVolumeLODGroups.end() )
+        {
+                volgroupp = iter->second;
+        }
+        if (mDataMutex)
+        {
+                mDataMutex->unlock();
+        }
+        return volgroupp;
+}
+// virtual
 void LLVolumeMgr::cleanupVolume(LLVolume *volumep)
 {
        if (volumep->isUnique())
@@ -145,12 +163,18 @@ void LLVolumeMgr::cleanupVolume(LLVolume *volumep)
                return;
        }
        LLVolumeParams* params = (LLVolumeParams*) &(volumep->getParams());
-        mDataMutex->lock();
+        if (mDataMutex)
+        {
+                mDataMutex->lock();
+        }
        volume_lod_group_map_t::iterator iter = mVolumeLODGroups.find(params);
        if( iter == mVolumeLODGroups.end() )
        {
                llerrs << "Warning! Tried to cleanup unknown volume type! " << *params << llendl;
-                mDataMutex->unlock();
+                if (mDataMutex)
+                {
+                        mDataMutex->unlock();
+                }
                return;
        }
        else
@@ -164,9 +188,11 @@ void LLVolumeMgr::cleanupVolume(LLVolume *volumep)
                        mVolumeLODGroups.erase(params);
                        volgroupp->unref();// this );
                }
-                //      mNumVolumes--;
        }
-        mDataMutex->unlock();
+        if (mDataMutex)
+        {
+                mDataMutex->unlock();
+        }
        #ifdef DEBUG_VOLUME
        {
@@ -175,10 +201,43 @@ void LLVolumeMgr::cleanupVolume(LLVolume *volumep)
        #endif
 }
+#ifdef DEBUG_VOLUME
+S32 LLVolumeMgr::getTotalRefCount() const
+{
+        S32 total_ref_count = 0;
+        for ( volume_lod_group_map_t::const_iterator iter = mVolumeLODGroups.begin(),
+                         end = mVolumeLODGroups.end();
+                 iter != end; iter++)
+        {
+                total_ref_count += iter->second->getTotalVolumeRefCount();
+        }
+        return total_ref_count;
+}
+S32 LLVolumeMgr::getGroupCount() const
+{
+        return mVolumeLODGroups.size();
+}
+#endif
+// protected
+LLVolumeLODGroup* LLVolumeMgr::createNewGroup(const LLVolumeParams& volume_params)
+{
+        LLVolumeLODGroup* group = new LLVolumeLODGroup(volume_params);
+        const LLVolumeParams* params = &(group->getParams());
+        mVolumeLODGroups[params] = group;
+        group->ref(); // initial reference
+        return group;
+}
+// virtual
 void LLVolumeMgr::dump()
 {
        F32 avg = 0.f;
-        mDataMutex->lock();
+        if (mDataMutex)
+        {
+                mDataMutex->lock();
+        }
        for (volume_lod_group_map_t::iterator iter = mVolumeLODGroups.begin(),
                         end = mVolumeLODGroups.end();
                 iter != end; iter++)
@@ -188,16 +247,30 @@ void LLVolumeMgr::dump()
        }
        int count = (int)mVolumeLODGroups.size();
        avg = count ? avg / (F32)count : 0.0f;
-        mDataMutex->unlock();
+        if (mDataMutex)
+        {
+                mDataMutex->unlock();
+        }
        llinfos << "Average usage of LODs " << avg << llendl;
 }
+void LLVolumeMgr::useMutex()
+{ 
+        if (!mDataMutex)
+        {
+                mDataMutex = new LLMutex(gAPRPoolp);
+        }
+}
 std::ostream& operator<<(std::ostream& s, const LLVolumeMgr& volume_mgr)
 {
        s << "{ numLODgroups=" << volume_mgr.mVolumeLODGroups.size() << ", ";
        S32 total_refs = 0;
-        volume_mgr.mDataMutex->lock();
+        if (volume_mgr.mDataMutex)
+        {
+                volume_mgr.mDataMutex->lock();
+        }
        LLVolumeMgr::volume_lod_group_map_iter iter = volume_mgr.mVolumeLODGroups.begin();
        LLVolumeMgr::volume_lod_group_map_iter end  = volume_mgr.mVolumeLODGroups.end();
@@ -208,7 +281,10 @@ std::ostream& operator<<(std::ostream& s, const LLVolumeMgr& volume_mgr)
                s << ", " << (*volgroupp);
        }
-        volume_mgr.mDataMutex->unlock();
+        if (volume_mgr.mDataMutex)
+        {
+                volume_mgr.mDataMutex->unlock();
+        }
        s << ", total_refs=" << total_refs << " }";
        return s;
@@ -222,15 +298,39 @@ LLVolumeLODGroup::LLVolumeLODGroup(const LLVolumeParams &params)
        for (i = 0; i < NUM_LODS; i++)
        {
                mLODRefs[i] = 0;
-                mVolumeLODs[i] = NULL;
+                // no need to initialize mVolumeLODs, they are smart pointers
+                //mVolumeLODs[i] = NULL;
                mAccessCount[i] = 0;
        }
 }
+#ifdef DEBUG_VOLUME
+S32 LLVolumeLODGroup::getTotalVolumeRefCount() const
+{
+        S32 total_ref_count = 0;
+        for (S32 i = 0; i < NUM_LODS; i++)
+        {
+                total_ref_count += mLODRefs[i];
+        }
+        return total_ref_count;
+}
+#endif
+// protected
 LLVolumeLODGroup::~LLVolumeLODGroup()
 {
+        destroy();
 }
+// protected
+void LLVolumeLODGroup::destroy()
+{
+        for (S32 i = 0; i < NUM_LODS; i++)
+        {
+                // remember that mVolumeLODs are smart pointers!
+                mVolumeLODs[i] = NULL;
+        }
+}
 LLVolume * LLVolumeLODGroup::getLOD(const S32 detail)
 {
@@ -242,7 +342,7 @@ LLVolume * LLVolumeLODGroup::getLOD(const S32 detail)
                mVolumeLODs[detail] = new LLVolume(mParams, mDetailScales[detail]);
        }
        mLODRefs[detail]++;
-        return mVolumeLODs[detail];
+        return mVolumeLODs[detail].get();
 }
 BOOL LLVolumeLODGroup::derefLOD(LLVolume *volumep)
diff --git a/linden/indra/llmath/llvolumemgr.h b/linden/indra/llmath/llvolumemgr.h
index 889bc56..0a2249e 100644
--- a/linden/indra/llmath/llvolumemgr.h
+++ b/linden/indra/llmath/llvolumemgr.h
@@ -43,9 +43,6 @@ class LLVolumeLODGroup;
 class LLVolumeLODGroup : public LLThreadSafeRefCount
 {
-protected:
-        ~LLVolumeLODGroup();
-        
 public:
        enum
        {
@@ -60,11 +57,19 @@ public:
        static F32 getVolumeScaleFromDetail(const S32 detail);
        LLVolume *getLOD(const S32 detail);
-        const LLVolumeParams &getParams() const { return mParams; };
+        const LLVolumeParams& getParams() const { return mParams; };
        F32     dump();
        friend std::ostream& operator<<(std::ostream& s, const LLVolumeLODGroup& volgroup);
+#ifdef DEBUG_VOLUME
+        S32 getTotalVolumeRefCount() const;
+#endif
+protected:
+        virtual ~LLVolumeLODGroup();
+        void destroy();
+        
 protected:
        LLVolumeParams mParams;
@@ -77,30 +82,50 @@ protected:
 class LLVolumeMgr
 {
-public:
+//public:
-        static void initClass();
+//      static void initClass();
-        static BOOL cleanupClass();
+//      static BOOL cleanupClass();
        
 public:
        LLVolumeMgr();
-        ~LLVolumeMgr();
+        virtual ~LLVolumeMgr();
        BOOL cleanup();                 // Cleanup all volumes being managed, returns TRUE if no dangling references
+        virtual LLVolumeLODGroup* getGroup( const LLVolumeParams& volume_params ) const;
+        // whatever calls getVolume() never owns the LLVolume* and
+        // cannot keep references for long since it may be deleted
+        // later.  For best results hold it in an LLPointer<LLVolume>.
        LLVolume *getVolume(const LLVolumeParams &volume_params, const S32 detail);
        void cleanupVolume(LLVolume *volumep);
        void dump();
+        // manually call this for mutex magic
+        void useMutex();
+#ifdef DEBUG_VOLUME
+        S32 getTotalRefCount() const;
+        S32 getGroupCount() const;
+#endif
        friend std::ostream& operator<<(std::ostream& s, const LLVolumeMgr& volume_mgr);
 protected:
+        virtual LLVolumeLODGroup* createNewGroup(const LLVolumeParams& volume_params);
+protected:
        typedef std::map<const LLVolumeParams*, LLVolumeLODGroup*, LLVolumeParams::compare> volume_lod_group_map_t;
        typedef volume_lod_group_map_t::const_iterator volume_lod_group_map_iter;
        volume_lod_group_map_t mVolumeLODGroups;
        LLMutex* mDataMutex;
-        
-//      S32 mNumVolumes;
+        // We need to be able to disable threadsafe checks to prevent 
+        // some unit_tests from blocking on failure
+        bool mThreadSafe;
 };
-extern LLVolumeMgr* gVolumeMgr;
+//extern LLVolumeMgr* gVolumeMgr;
 #endif // LL_LLVOLUMEMGR_H
diff --git a/linden/indra/llmath/m3math.cpp b/linden/indra/llmath/m3math.cpp
index 6741f05..5c3eb08 100644
--- a/linden/indra/llmath/m3math.cpp
+++ b/linden/indra/llmath/m3math.cpp
@@ -136,7 +136,7 @@ void LLMatrix3::getEulerAngles(F32 *roll, F32 *pitch, F32 *yaw) const
 // Clear and Assignment Functions
-const LLMatrix3&        LLMatrix3::identity()
+const LLMatrix3&        LLMatrix3::setIdentity()
 {
        mMatrix[0][0] = 1.f;
        mMatrix[0][1] = 0.f;
@@ -152,7 +152,23 @@ const LLMatrix3&	LLMatrix3::identity()
        return (*this);
 }
-const LLMatrix3&        LLMatrix3::zero()
+const LLMatrix3&        LLMatrix3::clear()
+{
+        mMatrix[0][0] = 0.f;
+        mMatrix[0][1] = 0.f;
+        mMatrix[0][2] = 0.f;
+        mMatrix[1][0] = 0.f;
+        mMatrix[1][1] = 0.f;
+        mMatrix[1][2] = 0.f;
+        mMatrix[2][0] = 0.f;
+        mMatrix[2][1] = 0.f;
+        mMatrix[2][2] = 0.f;
+        return (*this);
+}
+const LLMatrix3&        LLMatrix3::setZero()
 {
        mMatrix[0][0] = 0.f;
        mMatrix[0][1] = 0.f;
@@ -190,15 +206,26 @@ F32		LLMatrix3::determinant() const
                        mMatrix[0][2] * (mMatrix[1][0] * mMatrix[2][1] - mMatrix[1][1] * mMatrix[2][0]); 
 }
-// This is identical to the transMat3() method because we assume a rotation matrix
+// inverts this matrix
-const LLMatrix3&        LLMatrix3::invert()
+void LLMatrix3::invert()
 {
-        // transpose the matrix
+        // fails silently if determinant is zero too small
-        F32 temp;
+        F32 det = determinant();
-        temp = mMatrix[VX][VY]; mMatrix[VX][VY] = mMatrix[VY][VX]; mMatrix[VY][VX] = temp;
+        const F32 VERY_SMALL_DETERMINANT = 0.000001f;
-        temp = mMatrix[VX][VZ]; mMatrix[VX][VZ] = mMatrix[VZ][VX]; mMatrix[VZ][VX] = temp;
+        if (fabs(det) > VERY_SMALL_DETERMINANT)
-        temp = mMatrix[VY][VZ]; mMatrix[VY][VZ] = mMatrix[VZ][VY]; mMatrix[VZ][VY] = temp;
+        {
-        return *this;
+                // invertiable
+                LLMatrix3 t(*this);
+                mMatrix[VX][VX] = ( t.mMatrix[VY][VY] * t.mMatrix[VZ][VZ] - t.mMatrix[VY][VZ] * t.mMatrix[VZ][VY] ) / det;
+                mMatrix[VY][VX] = ( t.mMatrix[VY][VZ] * t.mMatrix[VZ][VX] - t.mMatrix[VY][VX] * t.mMatrix[VZ][VZ] ) / det;
+                mMatrix[VZ][VX] = ( t.mMatrix[VY][VX] * t.mMatrix[VZ][VY] - t.mMatrix[VY][VY] * t.mMatrix[VZ][VX] ) / det;
+                mMatrix[VX][VY] = ( t.mMatrix[VZ][VY] * t.mMatrix[VX][VZ] - t.mMatrix[VZ][VZ] * t.mMatrix[VX][VY] ) / det;
+                mMatrix[VY][VY] = ( t.mMatrix[VZ][VZ] * t.mMatrix[VX][VX] - t.mMatrix[VZ][VX] * t.mMatrix[VX][VZ] ) / det;
+                mMatrix[VZ][VY] = ( t.mMatrix[VZ][VX] * t.mMatrix[VX][VY] - t.mMatrix[VZ][VY] * t.mMatrix[VX][VX] ) / det;
+                mMatrix[VX][VZ] = ( t.mMatrix[VX][VY] * t.mMatrix[VY][VZ] - t.mMatrix[VX][VZ] * t.mMatrix[VY][VY] ) / det;
+                mMatrix[VY][VZ] = ( t.mMatrix[VX][VZ] * t.mMatrix[VY][VX] - t.mMatrix[VX][VX] * t.mMatrix[VY][VZ] ) / det;
+                mMatrix[VZ][VZ] = ( t.mMatrix[VX][VX] * t.mMatrix[VY][VY] - t.mMatrix[VX][VY] * t.mMatrix[VY][VX] ) / det;
+        }
 }
 // does not assume a rotation matrix, and does not divide by determinant, assuming results will be renormalized
@@ -351,6 +378,27 @@ const LLMatrix3&	LLMatrix3::setRows(const LLVector3 &fwd, const LLVector3 &left,
        return *this;
 }
+const LLMatrix3& LLMatrix3::setRow( U32 rowIndex, const LLVector3& row )
+{
+        llassert( rowIndex >= 0 && rowIndex < NUM_VALUES_IN_MAT3 );
+        mMatrix[rowIndex][0] = row[0];
+        mMatrix[rowIndex][1] = row[1];
+        mMatrix[rowIndex][2] = row[2];
+        return *this;
+}
+const LLMatrix3& LLMatrix3::setCol( U32 colIndex, const LLVector3& col )
+{
+        llassert( colIndex >= 0 && colIndex < NUM_VALUES_IN_MAT3 );
+        mMatrix[0][colIndex] = col[0];
+        mMatrix[1][colIndex] = col[1];
+        mMatrix[2][colIndex] = col[2];
+        return *this;
+}
                
 // Rotate exisitng mMatrix
 const LLMatrix3&        LLMatrix3::rotate(const F32 angle, const F32 x, const F32 y, const F32 z)
@@ -384,6 +432,16 @@ const LLMatrix3&	LLMatrix3::rotate(const LLQuaternion &q)
        return *this;
 }
+void LLMatrix3::add(const LLMatrix3& other_matrix)
+{
+        for (S32 i = 0; i < 3; ++i)
+        {
+                for (S32 j = 0; j < 3; ++j)
+                {
+                        mMatrix[i][j] += other_matrix.mMatrix[i][j];
+                }
+        }
+}
 LLVector3       LLMatrix3::getFwdRow() const
 {
@@ -536,6 +594,19 @@ const LLMatrix3& operator*=(LLMatrix3 &a, const LLMatrix3 &b)
        return a;
 }
+const LLMatrix3& operator*=(LLMatrix3 &a, F32 scalar )
+{
+        for( U32 i = 0; i < NUM_VALUES_IN_MAT3; ++i )
+        {
+                for( U32 j = 0; j < NUM_VALUES_IN_MAT3; ++j )
+                {
+                        a.mMatrix[i][j] *= scalar;
+                }
+        }
+        return a;
+}
 std::ostream& operator<<(std::ostream& s, const LLMatrix3 &a) 
 {
        s << "{ " 
diff --git a/linden/indra/llmath/m3math.h b/linden/indra/llmath/m3math.h
index 8bd94d8..cd22a86 100644
--- a/linden/indra/llmath/m3math.h
+++ b/linden/indra/llmath/m3math.h
@@ -33,6 +33,7 @@
 #define LL_M3MATH_H
 #include "llerror.h"
+#include "stdtypes.h"
 class LLVector4;
 class LLVector3;
@@ -76,8 +77,9 @@ class LLMatrix3
                //
                // various useful matrix functions
-                const LLMatrix3& identity();                            // Load identity matrix
+                const LLMatrix3& setIdentity();                         // Load identity matrix
-                const LLMatrix3& zero();                                        // Clears Matrix to zero
+                const LLMatrix3& clear();                                       // Clears Matrix to zero
+                const LLMatrix3& setZero();                                     // Clears Matrix to zero
                ///////////////////////////
                //
@@ -91,6 +93,9 @@ class LLMatrix3
                const LLMatrix3& setRot(const LLQuaternion &q);                 // Transform matrix by Euler angles and translating by pos
                const LLMatrix3& setRows(const LLVector3 &x_axis, const LLVector3 &y_axis, const LLVector3 &z_axis);
+                const LLMatrix3& setRow( U32 rowIndex, const LLVector3& row );
+                const LLMatrix3& setCol( U32 colIndex, const LLVector3& col );
                
                ///////////////////////////
                //
@@ -103,29 +108,31 @@ class LLMatrix3
                LLVector3 getFwdRow() const;
                LLVector3 getLeftRow() const;
                LLVector3 getUpRow() const;
-                F32      determinant() const;                                           // Return determinant
+                F32      determinant() const;                   // Return determinant
                ///////////////////////////
                //
                // Operations on an existing matrix
                //
-                const LLMatrix3& transpose();                                   // Transpose MAT4
+                const LLMatrix3& transpose();           // Transpose MAT4
-                const LLMatrix3& invert();                                      // Invert MAT4
+                const LLMatrix3& orthogonalize();       // Orthogonalizes X, then Y, then Z
-                const LLMatrix3& orthogonalize();                                               // Orthogonalizes X, then Y, then Z
+                void invert();                  // Invert MAT4
-                const LLMatrix3& adjointTranspose();            // returns transpose of matrix adjoint, for multiplying normals
+                const LLMatrix3& adjointTranspose();// returns transpose of matrix adjoint, for multiplying normals
                
                // Rotate existing matrix  
                // Note: the two lines below are equivalent:
                //      foo.rotate(bar) 
                //      foo = foo * bar
-                // That is, foo.rotMat3(bar) multiplies foo by bar FROM THE RIGHT
+                // That is, foo.rotate(bar) multiplies foo by bar FROM THE RIGHT
                const LLMatrix3& rotate(const F32 angle, const F32 x, const F32 y, const F32 z);        // Rotate matrix by rotating angle radians about (x, y, z)
                const LLMatrix3& rotate(const F32 angle, const LLVector3 &vec);                                         // Rotate matrix by rotating angle radians about vec
                const LLMatrix3& rotate(const F32 roll, const F32 pitch, const F32 yaw);                        // Rotate matrix by roll (about x), pitch (about y), and yaw (about z)
                const LLMatrix3& rotate(const LLQuaternion &q);                 // Transform matrix by Euler angles and translating by pos
+                void add(const LLMatrix3& other_matrix);        // add other_matrix to this one
 // This operator is misleading as to operation direction
 //              friend LLVector3 operator*(const LLMatrix3 &a, const LLVector3 &b);                     // Apply rotation a to vector b
@@ -137,6 +144,7 @@ class LLMatrix3
                friend bool operator!=(const LLMatrix3 &a, const LLMatrix3 &b);                         // Return a != b
                friend const LLMatrix3& operator*=(LLMatrix3 &a, const LLMatrix3 &b);                           // Return a * b
+                friend const LLMatrix3& operator*=(LLMatrix3 &a, F32 scalar );                                          // Return a * scalar
                friend std::ostream&     operator<<(std::ostream& s, const LLMatrix3 &a);       // Stream a
 };
diff --git a/linden/indra/llmath/m4math.cpp b/linden/indra/llmath/m4math.cpp
index 2b51db1..f2db478 100644
--- a/linden/indra/llmath/m4math.cpp
+++ b/linden/indra/llmath/m4math.cpp
@@ -163,7 +163,7 @@ LLMatrix4::~LLMatrix4(void)
 // Clear and Assignment Functions
-const LLMatrix4& LLMatrix4::zero()
+const LLMatrix4& LLMatrix4::setZero()
 {
        mMatrix[0][0] = 0.f;
        mMatrix[0][1] = 0.f;
diff --git a/linden/indra/llmath/m4math.h b/linden/indra/llmath/m4math.h
index 7a51eb2..27eb865 100644
--- a/linden/indra/llmath/m4math.h
+++ b/linden/indra/llmath/m4math.h
@@ -132,8 +132,8 @@ public:
                                  const LLVector4 &row3);
        // various useful matrix functions
-        const LLMatrix4& identity();                                    // Load identity matrix
+        const LLMatrix4& setIdentity();                                 // Load identity matrix
-        const LLMatrix4& zero();                                                // Clears matrix to all zeros.
+        const LLMatrix4& setZero();                                             // Clears matrix to all zeros.
        const LLMatrix4& initRotation(const F32 angle, const F32 x, const F32 y, const F32 z);  // Calculate rotation matrix by rotating angle radians about (x, y, z)
        const LLMatrix4& initRotation(const F32 angle, const LLVector4 &axis);  // Calculate rotation matrix for rotating angle radians about vec
@@ -243,10 +243,10 @@ public:
 inline LLMatrix4::LLMatrix4()
 {
-        identity();
+        setIdentity();
 }
-inline const LLMatrix4& LLMatrix4::identity()
+inline const LLMatrix4& LLMatrix4::setIdentity()
 {
        mMatrix[0][0] = 1.f;
        mMatrix[0][1] = 0.f;
diff --git a/linden/indra/llmath/v2math.h b/linden/indra/llmath/v2math.h
index b951786..5a520d2 100644
--- a/linden/indra/llmath/v2math.h
+++ b/linden/indra/llmath/v2math.h
@@ -54,18 +54,26 @@ class LLVector2
                LLVector2(const F32 *vec);                              // Initializes LLVector2 to (vec[0]. vec[1])
                
                // Clears LLVector2 to (0, 0).  DEPRECATED - prefer zeroVec.
-                void    clearVec();
+                void    clear();
+                void    setZero();
+                void    clearVec();     // deprecated
+                void    zeroVec();      // deprecated
-                // Zero LLVector2 to (0, 0)
+                void    set(F32 x, F32 y);              // Sets LLVector2 to (x, y)
-                void    zeroVec();
+                void    set(const LLVector2 &vec);      // Sets LLVector2 to vec
+                void    set(const F32 *vec);                    // Sets LLVector2 to vec
-                void    setVec(F32 x, F32 y);           // Sets LLVector2 to (x, y)
+                void    setVec(F32 x, F32 y);           // deprecated
-                void    setVec(const LLVector2 &vec);   // Sets LLVector2 to vec
+                void    setVec(const LLVector2 &vec);   // deprecated
-                void    setVec(const F32 *vec);                 // Sets LLVector2 to vec
+                void    setVec(const F32 *vec);                 // deprecated
-                F32             magVec() const;                         // Returns magnitude of LLVector2
+                F32             length() const;                         // Returns magnitude of LLVector2
-                F32             magVecSquared() const;          // Returns magnitude squared of LLVector2
+                F32             lengthSquared() const;          // Returns magnitude squared of LLVector2
-                F32             normVec();                                      // Normalizes and returns the magnitude of LLVector2
+                F32             normalize();                                    // Normalizes and returns the magnitude of LLVector2
+                F32             magVec() const;                         // deprecated
+                F32             magVecSquared() const;          // deprecated
+                F32             normVec();                                      // deprecated
                BOOL            abs();                                          // sets all values to absolute value of original value (first octant), returns TRUE if changed
@@ -132,30 +140,66 @@ inline LLVector2::LLVector2(const F32 *vec)
 // Clear and Assignment Functions
+inline void     LLVector2::clear(void)
+{
+        mV[VX] = 0.f;
+        mV[VY] = 0.f;
+}
+inline void     LLVector2::setZero(void)
+{
+        mV[VX] = 0.f;
+        mV[VY] = 0.f;
+}
+// deprecated
 inline void     LLVector2::clearVec(void)
 {
        mV[VX] = 0.f;
        mV[VY] = 0.f;
 }
+// deprecated
 inline void     LLVector2::zeroVec(void)
 {
        mV[VX] = 0.f;
        mV[VY] = 0.f;
 }
+inline void     LLVector2::set(F32 x, F32 y)
+{
+        mV[VX] = x;
+        mV[VY] = y;
+}
+inline void     LLVector2::set(const LLVector2 &vec)
+{
+        mV[VX] = vec.mV[VX];
+        mV[VY] = vec.mV[VY];
+}
+inline void     LLVector2::set(const F32 *vec)
+{
+        mV[VX] = vec[VX];
+        mV[VY] = vec[VY];
+}
+// deprecated
 inline void     LLVector2::setVec(F32 x, F32 y)
 {
        mV[VX] = x;
        mV[VY] = y;
 }
+// deprecated
 inline void     LLVector2::setVec(const LLVector2 &vec)
 {
        mV[VX] = vec.mV[VX];
        mV[VY] = vec.mV[VY];
 }
+// deprecated
 inline void     LLVector2::setVec(const F32 *vec)
 {
        mV[VX] = vec[VX];
@@ -164,16 +208,49 @@ inline void	LLVector2::setVec(const F32 *vec)
 // LLVector2 Magnitude and Normalization Functions
+inline F32 LLVector2::length(void) const
+{
+        return fsqrtf(mV[0]*mV[0] + mV[1]*mV[1]);
+}
+inline F32 LLVector2::lengthSquared(void) const
+{
+        return mV[0]*mV[0] + mV[1]*mV[1];
+}
+inline F32              LLVector2::normalize(void)
+{
+        F32 mag = fsqrtf(mV[0]*mV[0] + mV[1]*mV[1]);
+        F32 oomag;
+        if (mag > FP_MAG_THRESHOLD)
+        {
+                oomag = 1.f/mag;
+                mV[0] *= oomag;
+                mV[1] *= oomag;
+        }
+        else
+        {
+                mV[0] = 0.f;
+                mV[1] = 0.f;
+                mag = 0;
+        }
+        return (mag);
+}
+// deprecated
 inline F32              LLVector2::magVec(void) const
 {
        return fsqrtf(mV[0]*mV[0] + mV[1]*mV[1]);
 }
+// deprecated
 inline F32              LLVector2::magVecSquared(void) const
 {
        return mV[0]*mV[0] + mV[1]*mV[1];
 }
+// deprecated
 inline F32              LLVector2::normVec(void)
 {
        F32 mag = fsqrtf(mV[0]*mV[0] + mV[1]*mV[1]);
diff --git a/linden/indra/llmath/v3dmath.h b/linden/indra/llmath/v3dmath.h
index 60757ba..9bd80b8 100644
--- a/linden/indra/llmath/v3dmath.h
+++ b/linden/indra/llmath/v3dmath.h
@@ -83,8 +83,9 @@ class LLVector3d
                BOOL            clamp(const F64 min, const F64 max);            // Clamps all values to (min,max), returns TRUE if data changed
                BOOL            abs();                                          // sets all values to absolute value of original value (first octant), returns TRUE if changed
-                inline const LLVector3d&        clearVec();                                             // Clears LLVector3d to (0, 0, 0, 1)
+                inline const LLVector3d&        clearVec();             // Clears LLVector3d to (0, 0, 0, 1)
-                inline const LLVector3d&        zeroVec();                                              // Zero LLVector3d to (0, 0, 0, 0)
+                inline const LLVector3d&        setZero();              // Zero LLVector3d to (0, 0, 0, 0)
+                inline const LLVector3d&        zeroVec();              // deprecated
                inline const LLVector3d&        setVec(const F64 x, const F64 y, const F64 z);  // Sets LLVector3d to (x, y, z, 1)
                inline const LLVector3d&        setVec(const LLVector3d &vec);  // Sets LLVector3d to vec
                inline const LLVector3d&        setVec(const F64 *vec);                 // Sets LLVector3d to vec
@@ -198,6 +199,14 @@ inline const LLVector3d&	LLVector3d::clearVec(void)
        return (*this);
 }
+inline const LLVector3d&        LLVector3d::setZero(void)
+{
+        mdV[0] = 0.f;
+        mdV[1] = 0.f;
+        mdV[2] = 0.f;
+        return (*this);
+}
 inline const LLVector3d&        LLVector3d::zeroVec(void)
 {
        mdV[0] = 0.f;
diff --git a/linden/indra/llmath/v3math.cpp b/linden/indra/llmath/v3math.cpp
index 34cce06..bbe460f 100644
--- a/linden/indra/llmath/v3math.cpp
+++ b/linden/indra/llmath/v3math.cpp
@@ -172,6 +172,22 @@ LLVector3			LLVector3::scaledVec(const LLVector3& vec) const
        return ret;
 }
+const LLVector3&        LLVector3::set(const LLVector3d &vec)
+{
+        mV[0] = (F32)vec.mdV[0];
+        mV[1] = (F32)vec.mdV[1];
+        mV[2] = (F32)vec.mdV[2];
+        return (*this);
+}
+const LLVector3&        LLVector3::set(const LLVector4 &vec)
+{
+        mV[0] = vec.mV[0];
+        mV[1] = vec.mV[1];
+        mV[2] = vec.mV[2];
+        return (*this);
+}
 const LLVector3&        LLVector3::setVec(const LLVector3d &vec)
 {
        mV[0] = (F32)vec.mdV[0];
diff --git a/linden/indra/llmath/v3math.h b/linden/indra/llmath/v3math.h
index f1c1b39..ddb5e1f 100644
--- a/linden/indra/llmath/v3math.h
+++ b/linden/indra/llmath/v3math.h
@@ -81,18 +81,33 @@ class LLVector3
                BOOL            abs();                                          // sets all values to absolute value of original value (first octant), returns TRUE if changed
                
-                inline void     clearVec();                                             // Clears LLVector3 to (0, 0, 0, 1)
+                inline void     clear();                                                // Clears LLVector3 to (0, 0, 0)
-                inline void     zeroVec();                                              // Zero LLVector3 to (0, 0, 0, 0)
+                inline void     setZero();                                              // Clears LLVector3 to (0, 0, 0)
-                inline void     setVec(F32 x, F32 y, F32 z);    // Sets LLVector3 to (x, y, z, 1)
+                inline void     clearVec();                                             // deprecated
-                inline void     setVec(const LLVector3 &vec);   // Sets LLVector3 to vec
+                inline void     zeroVec();                                              // deprecated
-                inline void     setVec(const F32 *vec);                 // Sets LLVector3 to vec
-                const LLVector3& setVec(const LLVector4 &vec);
+                inline void     set(F32 x, F32 y, F32 z);               // Sets LLVector3 to (x, y, z, 1)
-                const LLVector3& setVec(const LLVector3d &vec); // Sets LLVector3 to vec
+                inline void     set(const LLVector3 &vec);              // Sets LLVector3 to vec
+                inline void     set(const F32 *vec);                    // Sets LLVector3 to vec
+                const LLVector3& set(const LLVector4 &vec);
+                const LLVector3& set(const LLVector3d &vec);// Sets LLVector3 to vec
-                F32             magVec() const;                         // Returns magnitude of LLVector3
+                inline void     setVec(F32 x, F32 y, F32 z);    // deprecated
-                F32             magVecSquared() const;          // Returns magnitude squared of LLVector3
+                inline void     setVec(const LLVector3 &vec);   // deprecated
-                inline F32              normVec();                                      // Normalizes and returns the magnitude of LLVector3
+                inline void     setVec(const F32 *vec);                 // deprecated
+                const LLVector3& setVec(const LLVector4 &vec);  // deprecated
+                const LLVector3& setVec(const LLVector3d &vec); // deprecated
+                F32             length() const;                 // Returns magnitude of LLVector3
+                F32             lengthSquared() const;  // Returns magnitude squared of LLVector3
+                F32             magVec() const;                 // deprecated
+                F32             magVecSquared() const;  // deprecated
+                inline F32              normalize();    // Normalizes and returns the magnitude of LLVector3
+                inline F32              normVec();              // deprecated
+                inline BOOL inRange( F32 min, F32 max ) const; // Returns true if all values of the vector are between min and max
                const LLVector3&        rotVec(F32 angle, const LLVector3 &vec);        // Rotates about vec by angle radians
                const LLVector3&        rotVec(F32 angle, F32 x, F32 y, F32 z);         // Rotates about x,y,z by angle radians
@@ -188,6 +203,20 @@ inline BOOL LLVector3::isFinite() const
 // Clear and Assignment Functions
+inline void     LLVector3::clear(void)
+{
+        mV[0] = 0.f;
+        mV[1] = 0.f;
+        mV[2] = 0.f;
+}
+inline void     LLVector3::setZero(void)
+{
+        mV[0] = 0.f;
+        mV[1] = 0.f;
+        mV[2] = 0.f;
+}
 inline void     LLVector3::clearVec(void)
 {
        mV[0] = 0.f;
@@ -202,6 +231,28 @@ inline void	LLVector3::zeroVec(void)
        mV[2] = 0.f;
 }
+inline void     LLVector3::set(F32 x, F32 y, F32 z)
+{
+        mV[VX] = x;
+        mV[VY] = y;
+        mV[VZ] = z;
+}
+inline void     LLVector3::set(const LLVector3 &vec)
+{
+        mV[0] = vec.mV[0];
+        mV[1] = vec.mV[1];
+        mV[2] = vec.mV[2];
+}
+inline void     LLVector3::set(const F32 *vec)
+{
+        mV[0] = vec[0];
+        mV[1] = vec[1];
+        mV[2] = vec[2];
+}
+// deprecated
 inline void     LLVector3::setVec(F32 x, F32 y, F32 z)
 {
        mV[VX] = x;
@@ -209,6 +260,7 @@ inline void	LLVector3::setVec(F32 x, F32 y, F32 z)
        mV[VZ] = z;
 }
+// deprecated
 inline void     LLVector3::setVec(const LLVector3 &vec)
 {
        mV[0] = vec.mV[0];
@@ -216,6 +268,7 @@ inline void	LLVector3::setVec(const LLVector3 &vec)
        mV[2] = vec.mV[2];
 }
+// deprecated
 inline void     LLVector3::setVec(const F32 *vec)
 {
        mV[0] = vec[0];
@@ -223,6 +276,29 @@ inline void	LLVector3::setVec(const F32 *vec)
        mV[2] = vec[2];
 }
+inline F32 LLVector3::normalize(void)
+{
+        F32 mag = fsqrtf(mV[0]*mV[0] + mV[1]*mV[1] + mV[2]*mV[2]);
+        F32 oomag;
+        if (mag > FP_MAG_THRESHOLD)
+        {
+                oomag = 1.f/mag;
+                mV[0] *= oomag;
+                mV[1] *= oomag;
+                mV[2] *= oomag;
+        }
+        else
+        {
+                mV[0] = 0.f;
+                mV[1] = 0.f;
+                mV[2] = 0.f;
+                mag = 0;
+        }
+        return (mag);
+}
+// deprecated
 inline F32 LLVector3::normVec(void)
 {
        F32 mag = fsqrtf(mV[0]*mV[0] + mV[1]*mV[1] + mV[2]*mV[2]);
@@ -247,6 +323,16 @@ inline F32 LLVector3::normVec(void)
 // LLVector3 Magnitude and Normalization Functions
+inline F32      LLVector3::length(void) const
+{
+        return fsqrtf(mV[0]*mV[0] + mV[1]*mV[1] + mV[2]*mV[2]);
+}
+inline F32      LLVector3::lengthSquared(void) const
+{
+        return mV[0]*mV[0] + mV[1]*mV[1] + mV[2]*mV[2];
+}
 inline F32      LLVector3::magVec(void) const
 {
        return fsqrtf(mV[0]*mV[0] + mV[1]*mV[1] + mV[2]*mV[2]);
@@ -257,6 +343,13 @@ inline F32	LLVector3::magVecSquared(void) const
        return mV[0]*mV[0] + mV[1]*mV[1] + mV[2]*mV[2];
 }
+inline BOOL LLVector3::inRange( F32 min, F32 max ) const
+{
+        return mV[0] >= min && mV[0] <= max &&
+                   mV[1] >= min && mV[1] <= max &&
+                   mV[2] >= min && mV[2] <= max;                
+}
 inline LLVector3 operator+(const LLVector3 &a, const LLVector3 &b)
 {
        LLVector3 c(a);
@@ -397,7 +490,7 @@ inline F32	dist_vec_squared2D(const LLVector3 &a, const LLVector3 &b)
 inline LLVector3 projected_vec(const LLVector3 &a, const LLVector3 &b)
 {
        LLVector3 project_axis = b;
-        project_axis.normVec();
+        project_axis.normalize();
        return project_axis * (a * project_axis);
 }
@@ -438,8 +531,8 @@ inline F32 angle_between(const LLVector3& a, const LLVector3& b)
 {
        LLVector3 an = a;
        LLVector3 bn = b;
-        an.normVec();
+        an.normalize();
-        bn.normVec();
+        bn.normalize();
        F32 cosine = an * bn;
        F32 angle = (cosine >= 1.0f) ? 0.0f :
                                (cosine <= -1.0f) ? F_PI :
@@ -451,8 +544,8 @@ inline BOOL are_parallel(const LLVector3 &a, const LLVector3 &b, F32 epsilon)
 {
        LLVector3 an = a;
        LLVector3 bn = b;
-        an.normVec();
+        an.normalize();
-        bn.normVec();
+        bn.normalize();
        F32 dot = an * bn;
        if ( (1.0f - fabs(dot)) < epsilon)
        {
diff --git a/linden/indra/llmath/v4math.cpp b/linden/indra/llmath/v4math.cpp
index 26a47ff..34b8f07 100644
--- a/linden/indra/llmath/v4math.cpp
+++ b/linden/indra/llmath/v4math.cpp
@@ -113,8 +113,8 @@ F32 angle_between( const LLVector4& a, const LLVector4& b )
 {
        LLVector4 an = a;
        LLVector4 bn = b;
-        an.normVec();
+        an.normalize();
-        bn.normVec();
+        bn.normalize();
        F32 cosine = an * bn;
        F32 angle = (cosine >= 1.0f) ? 0.0f :
                (cosine <= -1.0f) ? F_PI :
@@ -126,8 +126,8 @@ BOOL are_parallel(const LLVector4 &a, const LLVector4 &b, F32 epsilon)
 {
        LLVector4 an = a;
        LLVector4 bn = b;
-        an.normVec();
+        an.normalize();
-        bn.normVec();
+        bn.normalize();
        F32 dot = an * bn;
        if ( (1.0f - fabs(dot)) < epsilon)
                return TRUE;
diff --git a/linden/indra/llmath/v4math.h b/linden/indra/llmath/v4math.h
index 60e30e3..4ef2d32 100644
--- a/linden/indra/llmath/v4math.h
+++ b/linden/indra/llmath/v4math.h
@@ -68,17 +68,29 @@ class LLVector4
                inline BOOL isFinite() const;                                                                   // checks to see if all values of LLVector3 are finite
-                inline void     clearVec();                                                     // Clears LLVector4 to (0, 0, 0, 1)
+                inline void     clear();                // Clears LLVector4 to (0, 0, 0, 1)
-                inline void     zeroVec();                                                      // zero LLVector4 to (0, 0, 0, 0)
+                inline void     clearVec();             // deprecated
-                inline void     setVec(F32 x, F32 y, F32 z);            // Sets LLVector4 to (x, y, z, 1)
+                inline void     zeroVec();              // deprecated
-                inline void     setVec(F32 x, F32 y, F32 z, F32 w);     // Sets LLVector4 to (x, y, z, w)
-                inline void     setVec(const LLVector4 &vec);           // Sets LLVector4 to vec
+                inline void     set(F32 x, F32 y, F32 z);                       // Sets LLVector4 to (x, y, z, 1)
-                inline void     setVec(const LLVector3 &vec, F32 w = 1.f); // Sets LLVector4 to LLVector3 vec
+                inline void     set(F32 x, F32 y, F32 z, F32 w);        // Sets LLVector4 to (x, y, z, w)
-                inline void     setVec(const F32 *vec);                         // Sets LLVector4 to vec
+                inline void     set(const LLVector4 &vec);                      // Sets LLVector4 to vec
+                inline void     set(const LLVector3 &vec, F32 w = 1.f); // Sets LLVector4 to LLVector3 vec
-                F32                     magVec() const;                         // Returns magnitude of LLVector4
+                inline void     set(const F32 *vec);                            // Sets LLVector4 to vec
-                F32                     magVecSquared() const;          // Returns magnitude squared of LLVector4
-                F32                     normVec();                                      // Normalizes and returns the magnitude of LLVector4
+                inline void     setVec(F32 x, F32 y, F32 z);            // deprecated
+                inline void     setVec(F32 x, F32 y, F32 z, F32 w);     // deprecated
+                inline void     setVec(const LLVector4 &vec);           // deprecated
+                inline void     setVec(const LLVector3 &vec, F32 w = 1.f); // deprecated
+                inline void     setVec(const F32 *vec);                         // deprecated
+                F32     length() const;                         // Returns magnitude of LLVector4
+                F32     lengthSquared() const;          // Returns magnitude squared of LLVector4
+                F32     normalize();                            // Normalizes and returns the magnitude of LLVector4
+                F32                     magVec() const;                         // deprecated
+                F32                     magVecSquared() const;          // deprecated
+                F32                     normVec();                                      // deprecated
                // Sets all values to absolute value of their original values
                // Returns TRUE if data changed
@@ -192,6 +204,15 @@ inline BOOL LLVector4::isFinite() const
 // Clear and Assignment Functions
+inline void     LLVector4::clear(void)
+{
+        mV[VX] = 0.f;
+        mV[VY] = 0.f;
+        mV[VZ] = 0.f;
+        mV[VW] = 1.f;
+}
+// deprecated
 inline void     LLVector4::clearVec(void)
 {
        mV[VX] = 0.f;
@@ -200,6 +221,7 @@ inline void	LLVector4::clearVec(void)
        mV[VW] = 1.f;
 }
+// deprecated
 inline void     LLVector4::zeroVec(void)
 {
        mV[VX] = 0.f;
@@ -208,6 +230,48 @@ inline void	LLVector4::zeroVec(void)
        mV[VW] = 0.f;
 }
+inline void     LLVector4::set(F32 x, F32 y, F32 z)
+{
+        mV[VX] = x;
+        mV[VY] = y;
+        mV[VZ] = z;
+        mV[VW] = 1.f;
+}
+inline void     LLVector4::set(F32 x, F32 y, F32 z, F32 w)
+{
+        mV[VX] = x;
+        mV[VY] = y;
+        mV[VZ] = z;
+        mV[VW] = w;
+}
+inline void     LLVector4::set(const LLVector4 &vec)
+{
+        mV[VX] = vec.mV[VX];
+        mV[VY] = vec.mV[VY];
+        mV[VZ] = vec.mV[VZ];
+        mV[VW] = vec.mV[VW];
+}
+inline void     LLVector4::set(const LLVector3 &vec, F32 w)
+{
+        mV[VX] = vec.mV[VX];
+        mV[VY] = vec.mV[VY];
+        mV[VZ] = vec.mV[VZ];
+        mV[VW] = w;
+}
+inline void     LLVector4::set(const F32 *vec)
+{
+        mV[VX] = vec[VX];
+        mV[VY] = vec[VY];
+        mV[VZ] = vec[VZ];
+        mV[VW] = vec[VW];
+}
+// deprecated
 inline void     LLVector4::setVec(F32 x, F32 y, F32 z)
 {
        mV[VX] = x;
@@ -216,6 +280,7 @@ inline void	LLVector4::setVec(F32 x, F32 y, F32 z)
        mV[VW] = 1.f;
 }
+// deprecated
 inline void     LLVector4::setVec(F32 x, F32 y, F32 z, F32 w)
 {
        mV[VX] = x;
@@ -224,6 +289,7 @@ inline void	LLVector4::setVec(F32 x, F32 y, F32 z, F32 w)
        mV[VW] = w;
 }
+// deprecated
 inline void     LLVector4::setVec(const LLVector4 &vec)
 {
        mV[VX] = vec.mV[VX];
@@ -232,6 +298,7 @@ inline void	LLVector4::setVec(const LLVector4 &vec)
        mV[VW] = vec.mV[VW];
 }
+// deprecated
 inline void     LLVector4::setVec(const LLVector3 &vec, F32 w)
 {
        mV[VX] = vec.mV[VX];
@@ -240,6 +307,7 @@ inline void	LLVector4::setVec(const LLVector3 &vec, F32 w)
        mV[VW] = w;
 }
+// deprecated
 inline void     LLVector4::setVec(const F32 *vec)
 {
        mV[VX] = vec[VX];
@@ -250,6 +318,16 @@ inline void	LLVector4::setVec(const F32 *vec)
 // LLVector4 Magnitude and Normalization Functions
+inline F32              LLVector4::length(void) const
+{
+        return fsqrtf(mV[VX]*mV[VX] + mV[VY]*mV[VY] + mV[VZ]*mV[VZ]);
+}
+inline F32              LLVector4::lengthSquared(void) const
+{
+        return mV[VX]*mV[VX] + mV[VY]*mV[VY] + mV[VZ]*mV[VZ];
+}
 inline F32              LLVector4::magVec(void) const
 {
        return fsqrtf(mV[VX]*mV[VX] + mV[VY]*mV[VY] + mV[VZ]*mV[VZ]);
@@ -364,13 +442,13 @@ inline LLVector4 operator-(const LLVector4 &a)
 inline F32      dist_vec(const LLVector4 &a, const LLVector4 &b)
 {
        LLVector4 vec = a - b;
-        return (vec.magVec());
+        return (vec.length());
 }
 inline F32      dist_vec_squared(const LLVector4 &a, const LLVector4 &b)
 {
        LLVector4 vec = a - b;
-        return (vec.magVecSquared());
+        return (vec.lengthSquared());
 }
 inline LLVector4 lerp(const LLVector4 &a, const LLVector4 &b, F32 u)
@@ -382,6 +460,29 @@ inline LLVector4 lerp(const LLVector4 &a, const LLVector4 &b, F32 u)
                a.mV[VW] + (b.mV[VW] - a.mV[VW]) * u);
 }
+inline F32              LLVector4::normalize(void)
+{
+        F32 mag = fsqrtf(mV[VX]*mV[VX] + mV[VY]*mV[VY] + mV[VZ]*mV[VZ]);
+        F32 oomag;
+        if (mag > FP_MAG_THRESHOLD)
+        {
+                oomag = 1.f/mag;
+                mV[VX] *= oomag;
+                mV[VY] *= oomag;
+                mV[VZ] *= oomag;
+        }
+        else
+        {
+                mV[0] = 0.f;
+                mV[1] = 0.f;
+                mV[2] = 0.f;
+                mag = 0;
+        }
+        return (mag);
+}
+// deprecated
 inline F32              LLVector4::normVec(void)
 {
        F32 mag = fsqrtf(mV[VX]*mV[VX] + mV[VY]*mV[VY] + mV[VZ]*mV[VZ]);
diff --git a/linden/indra/llmath/xform.h b/linden/indra/llmath/xform.h
index 8fd1e9e..ad2a944 100644
--- a/linden/indra/llmath/xform.h
+++ b/linden/indra/llmath/xform.h
@@ -35,10 +35,12 @@
 #include "m4math.h"
 #include "llquaternion.h"
-const F32 MAX_OBJECT_Z          = 768.f;
+const F32 MAX_OBJECT_Z          = 4096.f; // should match REGION_HEIGHT_METERS, Pre-havok4: 768.f
 const F32 MIN_OBJECT_Z          = -256.f;
-const F32 MIN_OBJECT_SCALE      = 0.01f;
+const F32 DEFAULT_MAX_PRIM_SCALE = 10.f;
-const F32 MAX_OBJECT_SCALE      = 10.f;
+const F32 MIN_PRIM_SCALE = 0.01f;
+const F32 MAX_PRIM_SCALE = 65536.f;     // something very high but not near FLT_MAX
 class LLXform
 {
@@ -138,7 +140,7 @@ public:
        void init()
        {
-                mWorldMatrix.identity();
+                mWorldMatrix.setIdentity();
                mMin.clearVec();
                mMax.clearVec();
diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp
index 5efaa59..53cb344 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.cpp
+++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp
@@ -289,7 +289,7 @@ void LLMediaImplLLMozLib::onPageChanged( const EventType& eventIn )
 // virtual
 void LLMediaImplLLMozLib::onClickLinkHref( const EventType& eventIn )
 {
-        LLMediaEvent event( this, eventIn.getStringValue() );
+        LLMediaEvent event( this, eventIn.getStringValue(), eventIn.getStringValue2() );
        mEventEmitter.update( &LLMediaObserver::onClickLinkHref, event );
 }
diff --git a/linden/indra/llmedia/llmediaimplquicktime.cpp b/linden/indra/llmedia/llmediaimplquicktime.cpp
index f9a3b05..b126e2f 100644
--- a/linden/indra/llmedia/llmediaimplquicktime.cpp
+++ b/linden/indra/llmedia/llmediaimplquicktime.cpp
@@ -256,17 +256,6 @@ bool LLMediaImplQuickTime::sizeChanged()
                SetMovieGWorld( mMovieHandle, mGWorldHandle, GetGWorldDevice ( mGWorldHandle ) );
        }
-        // flip movie to match the way the client expects textures (sigh!)
-        MatrixRecord transform;
-        SetIdentityMatrix( &transform );        // transforms are additive so start from identify matrix
-        double scaleX = 1.0 / (double)LLMediaManager::textureWidthFromMediaWidth( width );
-        double scaleY = -1.0 / (double)LLMediaManager::textureHeightFromMediaHeight( height );
-        double centerX = width / 2.0;
-        double centerY = height / 2.0;
-        ScaleMatrix( &transform, X2Fix ( scaleX ), X2Fix ( scaleY ), X2Fix ( centerX ), X2Fix ( centerY ) );
-        SetMovieMatrix( mMovieHandle, &transform );
-        std::cout << "LLMEDIA> Flipping stream to match expected OpenGL orientation size=" << width << " x " << height << std::endl;
        // update movie controller
        if ( mMovieController )
        {
@@ -454,10 +443,14 @@ bool LLMediaImplQuickTime::processState()
 bool LLMediaImplQuickTime::setMovieBoxEnhanced( Rect* rect )
 {
        // get movie rect
-        GetMovieBox( mMovieHandle, rect );
+        GetMovieNaturalBoundsRect( mMovieHandle, rect );
-        int width = ( rect->right - rect->left );
-        int height = ( rect->bottom - rect->top );
+        int natural_width  = ( rect->right - rect->left );
+        int natural_height = ( rect->bottom - rect->top );
+        int width  = natural_width;
+        int height = natural_height;
+        
        // if the user has requested a specific size, use it:
        if ((mMediaRequestedWidth != 0) && (mMediaRequestedHeight != 0))
        {
@@ -485,12 +478,22 @@ bool LLMediaImplQuickTime::setMovieBoxEnhanced( Rect* rect )
        if ( height > mMaxHeight )
                height = mMaxHeight;
-        // tell quicktime about new size
+        
+        // scale movie to fit rect and invert vertically to match opengl image format
+        MatrixRecord transform;
+        SetIdentityMatrix( &transform );        // transforms are additive so start from identify matrix
+        double scaleX = (double) width / natural_width;
+        double scaleY = -1.0 * (double) height / natural_height;
+        double centerX = width / 2.0;
+        double centerY = height / 2.0;
+        ScaleMatrix( &transform, X2Fix ( scaleX ), X2Fix ( scaleY ), X2Fix ( centerX ), X2Fix ( centerY ) );
+        SetMovieMatrix( mMovieHandle, &transform );
+        // return the new rect
        rect->right = width;
        rect->bottom = height;
        rect->left = 0;
        rect->top = 0;
-        SetMovieBox( mMovieHandle, rect );
        return true;
 }
diff --git a/linden/indra/llmedia/llmediaobserver.h b/linden/indra/llmedia/llmediaobserver.h
index aeb2c39..ec9f881 100644
--- a/linden/indra/llmedia/llmediaobserver.h
+++ b/linden/indra/llmedia/llmediaobserver.h
@@ -47,6 +47,11 @@ class LLMediaEvent
                        {
                        };
+                LLMediaEvent( LLMediaBase* subject, std::string string_in, std::string string_ex_in ) :
+                        mSubject( subject ), mStringValue(string_in), mStringValueEx(string_ex_in)
+                        {
+                        };
                LLMediaEvent( LLMediaBase* subject, std::string string_in, int int_in ) :
                        mSubject( subject ), mStringValue(string_in), mIntValue(int_in)
                        {
@@ -74,10 +79,16 @@ class LLMediaEvent
                                return mStringValue;
                        }
+                std::string getStringValueEx() const
+                        {
+                                return mStringValueEx;
+                        }
        private:
                LLMediaBase* mSubject;
                int mIntValue;
                std::string mStringValue;
+                std::string mStringValueEx;
 };
 class LLMediaObserver
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 6075958..e8208cc 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -43,9 +43,10 @@
 #include "message.h"
 // Constants
-const char* CN_WAITING = "(waiting)";
+// probably need a setUIString() call in the interface
-const char* CN_NOBODY = "(nobody)";
+const char* const CN_WAITING = "(Loading...)"; // *TODO: translate
-const char* CN_NONE = "(none)";
+const char* const CN_NOBODY = "(nobody)"; // *TODO: translate
+const char* const CN_NONE = "(none)"; // *TODO: translate
 // llsd serialization constants
 static const std::string AGENTS("agents");
diff --git a/linden/indra/llmessage/llhttpnode.h b/linden/indra/llmessage/llhttpnode.h
index 7d9cb95..02e8ceb 100644
--- a/linden/indra/llmessage/llhttpnode.h
+++ b/linden/indra/llmessage/llhttpnode.h
@@ -108,7 +108,6 @@ public:
                virtual void get(ResponsePtr, const LLSD& context) const;
                virtual void put(ResponsePtr, const LLSD& context, const LLSD& input) const;
                virtual void post(ResponsePtr, const LLSD& context, const LLSD& input) const;
-        
                virtual void del(ResponsePtr, const LLSD& context) const;
        //@}
        
diff --git a/linden/indra/llmessage/llinstantmessage.h b/linden/indra/llmessage/llinstantmessage.h
index c6319da..35127c3 100644
--- a/linden/indra/llmessage/llinstantmessage.h
+++ b/linden/indra/llmessage/llinstantmessage.h
@@ -177,7 +177,7 @@ enum EGodlikeRequest
        GOD_WANTS_NOTHING,
        // for requesting physics information about an object
-        GOD_WANTS_HAVOK_INFO,
+        GOD_WANTS_PHYSICS_INFO,
        
        // two unused requests that can be appropriated for debug 
        // purposes (no viewer recompile necessary)
diff --git a/linden/indra/llmessage/lliohttpserver.cpp b/linden/indra/llmessage/lliohttpserver.cpp
index 6e94ec6..2ebf117 100644
--- a/linden/indra/llmessage/lliohttpserver.cpp
+++ b/linden/indra/llmessage/lliohttpserver.cpp
@@ -203,7 +203,9 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                }
                // Log all HTTP transactions.
-                llinfos << verb << " " << context[CONTEXT_REQUEST]["path"].asString()
+                // TODO: Add a way to log these to their own file instead of indra.log
+                // It is just too spammy to be in indra.log.
+                lldebugs << verb << " " << context[CONTEXT_REQUEST]["path"].asString()
                        << " " << mStatusCode << " " <<  mStatusMessage << " " << delta
                        << "s" << llendl;
@@ -723,8 +725,8 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
                const LLHTTPNode* node = mRootNode.traverse(mPath, context);
                if(node)
                {
-                        lldebugs << "LLHTTPResponder::process_impl found node for "
+                        //llinfos << "LLHTTPResponder::process_impl found node for "
-                                << mAbsPathAndQuery << llendl;
+                        //      << mAbsPathAndQuery << llendl;
                        // Copy everything after mLast read to the out.
                        LLBufferArray::segment_iterator_t seg_iter;
diff --git a/linden/indra/llmessage/llmessageconfig.cpp b/linden/indra/llmessage/llmessageconfig.cpp
index 0e7f768..807a35b 100644
--- a/linden/indra/llmessage/llmessageconfig.cpp
+++ b/linden/indra/llmessage/llmessageconfig.cpp
@@ -252,6 +252,14 @@ bool LLMessageConfig::isValidMessage(const std::string& msg_name)
        return file.mMessages.has(msg_name);
 }
+//static
+bool LLMessageConfig::onlySendLatest(const std::string& msg_name)
+{
+        LLMessageConfigFile& file = LLMessageConfigFile::instance();
+        LLSD config = file.mMessages[msg_name];
+        return config["only-send-latest"].asBoolean();
+}
 bool LLMessageConfig::isCapBanned(const std::string& cap_name)
 {
        return LLMessageConfigFile::instance().isCapBanned(cap_name);
diff --git a/linden/indra/llmessage/llmessageconfig.h b/linden/indra/llmessage/llmessageconfig.h
index 32702e8..9b62f06 100644
--- a/linden/indra/llmessage/llmessageconfig.h
+++ b/linden/indra/llmessage/llmessageconfig.h
@@ -53,6 +53,7 @@ public:
        static Flavor getMessageFlavor(const std::string& msg_name);
        static SenderTrust getSenderTrustedness(const std::string& msg_name);
        static bool isValidMessage(const std::string& msg_name);
+        static bool onlySendLatest(const std::string& msg_name);
        static bool isCapBanned(const std::string& cap_name);
        static LLSD getConfigForMessage(const std::string& msg_name);
 };
diff --git a/linden/indra/llmessage/llmessagetemplate.h b/linden/indra/llmessage/llmessagetemplate.h
index d0ef945..f92c4b7 100644
--- a/linden/indra/llmessage/llmessagetemplate.h
+++ b/linden/indra/llmessage/llmessagetemplate.h
@@ -156,7 +156,7 @@ public:
        LLMessageVariable(const char *name, const EMsgVariableType type, const S32 size) : mType(type), mSize(size) 
        {
-                mName = gMessageStringTable.getString(name); 
+                mName = LLMessageStringTable::getInstance()->getString(name); 
        }
        
        ~LLMessageVariable() {}
@@ -187,7 +187,7 @@ class LLMessageBlock
 public:
        LLMessageBlock(const char *name, EMsgBlockType type, S32 number = 1) : mType(type), mNumber(number), mTotalSize(0) 
        { 
-                mName = gMessageStringTable.getString(name);
+                mName = LLMessageStringTable::getInstance()->getString(name);
        }
        ~LLMessageBlock()
@@ -293,7 +293,7 @@ public:
                mHandlerFunc(NULL), 
                mUserData(NULL)
        { 
-                mName = gMessageStringTable.getString(name);
+                mName = LLMessageStringTable::getInstance()->getString(name);
        }
        ~LLMessageTemplate()
diff --git a/linden/indra/llmessage/llnamevalue.cpp b/linden/indra/llmessage/llnamevalue.cpp
index 6c8a2c4..18bd5ac 100644
--- a/linden/indra/llmessage/llnamevalue.cpp
+++ b/linden/indra/llmessage/llnamevalue.cpp
@@ -34,12 +34,12 @@
 #include "linden_common.h"
-#include <map>
 #include "llnamevalue.h"
 #include "u64.h"
 #include "llstring.h"
 #include "llcamera.h"
+#include "string_table.h"
 // Anonymous enumeration to provide constants in this file.
 // *NOTE: These values may be used in sscanf statements below as their
@@ -51,17 +51,7 @@ enum
        U64_BUFFER_LEN = 64
 };
-struct user_callback_t
+LLStringTable   gNVNameTable(256);
-{
-        user_callback_t() {};
-        user_callback_t(TNameValueCallback cb, void** data) : m_Callback(cb), m_Data(data) {}
-        TNameValueCallback      m_Callback;
-        void **                         m_Data;
-};
-typedef std::map<char *, user_callback_t> user_callback_map_t;
-user_callback_map_t gUserCallbackMap;
-LLStringTable   gNVNameTable(16384);
 char NameValueTypeStrings[NVT_EOF][NAME_VALUE_TYPE_STRING_LENGTH] = /*Flawfinder: Ignore*/
 {
@@ -80,8 +70,7 @@ char NameValueClassStrings[NVC_EOF][NAME_VALUE_CLASS_STRING_LENGTH] = /*Flawfind
 {
        "NULL",
        "R",                    // read only
-        "RW",                   // read write
+        "RW"                    // read write
-        "CB"                    // callback
 };              
 char NameValueSendtoStrings[NVS_EOF][NAME_VALUE_SENDTO_STRING_LENGTH] = /*Flawfinder: Ignore*/
@@ -94,13 +83,6 @@ char NameValueSendtoStrings[NVS_EOF][NAME_VALUE_SENDTO_STRING_LENGTH] = /*Flawfi
 };              /*Flawfinder: Ignore*/
-void add_use_callback(char *name, TNameValueCallback ucb, void **user_data)
-{
-        char *temp = gNVNameTable.addString(name);
-        gUserCallbackMap[temp] = user_callback_t(ucb,user_data);
-}
 //
 // Class
 //
@@ -125,12 +107,9 @@ void LLNameValue::baseInit()
        
        mSendto = NVS_NULL;
        mStringSendto = NameValueSendtoStrings[NVS_NULL];
-        mNameValueCB = NULL;
-        mUserData = NULL;
 }
-void LLNameValue::init(const char *name, const char *data, const char *type, const char *nvclass, const char *nvsendto, TNameValueCallback nvcb, void **user_data)
+void LLNameValue::init(const char *name, const char *data, const char *type, const char *nvclass, const char *nvsendto)
 {
        mNVNameTable = &gNVNameTable;
@@ -254,40 +233,11 @@ void LLNameValue::init(const char *name, const char *data, const char *type, con
                mClass = NVC_READ_WRITE;
                mStringClass = mNVNameTable->addString("RW");
        }
-        else if (!strcmp(nvclass, "CB") ||
-                        !strcmp(nvclass, "CALLBACK"))           // legacy
-        {
-                mClass = NVC_CALLBACK;
-                mStringClass = mNVNameTable->addString("CB");
-                mNameValueCB = nvcb;
-                mUserData = user_data;
-        }
        else
        {
                // assume it's bad
                mClass = NVC_NULL;
                mStringClass = mNVNameTable->addString(nvclass);
-                mNameValueCB = NULL;
-                mUserData = NULL;
-                // are we a user-defined call back?
-                for (user_callback_map_t::iterator iter = gUserCallbackMap.begin();
-                         iter != gUserCallbackMap.end(); iter++)
-                {
-                        char* tname = iter->first;
-                        if (tname == mStringClass)
-                        {
-                                mClass = NVC_CALLBACK;
-                                mNameValueCB = (iter->second).m_Callback;
-                                mUserData = (iter->second).m_Data;
-                        }
-                }
-                // Warn if we didn't find a callback
-                if (mClass == NVC_NULL)
-                {
-                        llwarns << "Unknown user callback in name value init() for " << mName << llendl;
-                }
        }
        // Initialize the sendto variable
@@ -326,24 +276,24 @@ void LLNameValue::init(const char *name, const char *data, const char *type, con
 }
-LLNameValue::LLNameValue(const char *name, const char *data, const char *type, const char *nvclass, TNameValueCallback nvcb, void **user_data)
+LLNameValue::LLNameValue(const char *name, const char *data, const char *type, const char *nvclass)
 {
        baseInit();
        // if not specified, send to simulator only
-        init(name, data, type, nvclass, "SIM", nvcb, user_data);
+        init(name, data, type, nvclass, "SIM");
 }
-LLNameValue::LLNameValue(const char *name, const char *data, const char *type, const char *nvclass, const char *nvsendto, TNameValueCallback nvcb, void **user_data)
+LLNameValue::LLNameValue(const char *name, const char *data, const char *type, const char *nvclass, const char *nvsendto)
 {
        baseInit();
-        init(name, data, type, nvclass, nvsendto, nvcb, user_data);
+        init(name, data, type, nvclass, nvsendto);
 }
 // Initialize without any initial data.
-LLNameValue::LLNameValue(const char *name, const char *type, const char *nvclass, TNameValueCallback nvcb, void **user_data)
+LLNameValue::LLNameValue(const char *name, const char *type, const char *nvclass)
 {
        baseInit();
        mName = mNVNameTable->addString(name);
@@ -401,11 +351,9 @@ LLNameValue::LLNameValue(const char *name, const char *type, const char *nvclass
        {
                mClass = NVC_READ_WRITE;
        }
-        else if (!strcmp(mStringClass, "CALLBACK"))
+        else
        {
-                mClass = NVC_READ_WRITE;
+                mClass = NVC_NULL;
-                mNameValueCB = nvcb;
-                mUserData = user_data;
        }
        // Initialize the sendto variable
@@ -734,46 +682,6 @@ LLVector3	*LLNameValue::getVec3()
 }
-F32 LLNameValue::magnitude()
-{
-        switch(mType)
-        {
-        case NVT_STRING:
-                return (F32)(strlen(mNameValueReference.string));               /* Flawfinder: ignore */
-                break;
-        case NVT_F32:
-                return (fabsf(*mNameValueReference.f32));
-                break;
-        case NVT_S32:
-                return (fabsf((F32)(*mNameValueReference.s32)));
-                break;
-        case NVT_VEC3:
-                return (mNameValueReference.vec3->magVec());
-                break;
-        case NVT_U32:
-                return (F32)(*mNameValueReference.u32);
-                break;
-        default:
-                llerrs << "No magnitude operation for NV type " << mStringType << llendl;
-                break;
-        }
-        return 0.f;
-}
-void LLNameValue::callCallback()
-{
-        if (mNameValueCB)
-        {
-                (*mNameValueCB)(this, mUserData);
-        }
-        else
-        {
-                llinfos << mName << " has no callback!" << llendl;
-        }
-}
 BOOL LLNameValue::sendToData() const
 {
        return (mSendto == NVS_DATA_SIM || mSendto == NVS_DATA_SIM_VIEWER);
@@ -795,13 +703,6 @@ LLNameValue &LLNameValue::operator=(const LLNameValue &a)
        if (mClass == NVC_READ_ONLY)
                return *this;
-        BOOL b_changed = FALSE;
-        if (  (mClass == NVC_CALLBACK)
-                &&(*this != a))
-        {
-                b_changed = TRUE;
-        }
        switch(a.mType)
        {
        case NVT_STRING:
@@ -835,11 +736,6 @@ LLNameValue &LLNameValue::operator=(const LLNameValue &a)
                break;
        }
-        if (b_changed)
-        {
-                callCallback();
-        }
        return *this;
 }
@@ -847,19 +743,12 @@ void LLNameValue::setString(const char *a)
 {
        if (mClass == NVC_READ_ONLY)
                return;
-        BOOL b_changed = FALSE;
        switch(mType)
        {
        case NVT_STRING:
                if (a)
                {
-                        if (  (mClass == NVC_CALLBACK)
-                                &&(strcmp(this->mNameValueReference.string,a)))
-                        {
-                                b_changed = TRUE;
-                        }
                        if (mNameValueReference.string)
                        {
                                delete [] mNameValueReference.string;
@@ -870,11 +759,6 @@ void LLNameValue::setString(const char *a)
                        {
                                strcpy(mNameValueReference.string,  a);         /* Flawfinder: ignore */
                        }
-                        
-                        if (b_changed)
-                        {
-                                callCallback();
-                        }
                }
                else
                {
@@ -889,11 +773,6 @@ void LLNameValue::setString(const char *a)
                break;
        }
-        if (b_changed)
-        {
-                callCallback();
-        }
        return;
 }
@@ -902,19 +781,12 @@ void LLNameValue::setAsset(const char *a)
 {
        if (mClass == NVC_READ_ONLY)
                return;
-        BOOL b_changed = FALSE;
        switch(mType)
        {
        case NVT_ASSET:
                if (a)
                {
-                        if (  (mClass == NVC_CALLBACK)
-                                &&(strcmp(this->mNameValueReference.string,a)))
-                        {
-                                b_changed = TRUE;
-                        }
                        if (mNameValueReference.string)
                        {
                                delete [] mNameValueReference.string;
@@ -924,11 +796,6 @@ void LLNameValue::setAsset(const char *a)
                        {
                                strcpy(mNameValueReference.string,  a);         /* Flawfinder: ignore */
                        }
-                        
-                        if (b_changed)
-                        {
-                                callCallback();
-                        }
                }
                else
                {
@@ -942,10 +809,6 @@ void LLNameValue::setAsset(const char *a)
        default:
                break;
        }
-        if (b_changed)
-        {
-                callCallback();
-        }
 }
@@ -953,29 +816,15 @@ void LLNameValue::setF32(const F32 a)
 {
        if (mClass == NVC_READ_ONLY)
                return;
-        BOOL b_changed = FALSE;
        switch(mType)
        {
        case NVT_F32:
-                if (  (mClass == NVC_CALLBACK)
-                        &&(*this->mNameValueReference.f32 != a))
-                {
-                        b_changed = TRUE;
-                }
                *mNameValueReference.f32 = a;
-                if (b_changed)
-                {
-                        callCallback();
-                }
                break;
        default:
                break;
        }
-        if (b_changed)
-        {
-                callCallback();
-        }
        return;
 }
@@ -985,53 +834,21 @@ void LLNameValue::setS32(const S32 a)
 {
        if (mClass == NVC_READ_ONLY)
                return;
-        BOOL b_changed = FALSE;
        switch(mType)
        {
        case NVT_S32:
-                if (  (mClass == NVC_CALLBACK)
-                        &&(*this->mNameValueReference.s32 != a))
-                {
-                        b_changed = TRUE;
-                }
                *mNameValueReference.s32 = a;
-                if (b_changed)
-                {
-                        callCallback();
-                }
                break;
        case NVT_U32:
-                if (  (mClass == NVC_CALLBACK)
-                        && ((S32) (*this->mNameValueReference.u32) != a))
-                {
-                        b_changed = TRUE;
-                }
                *mNameValueReference.u32 = a;
-                if (b_changed)
-                {
-                        callCallback();
-                }
                break;
        case NVT_F32:
-                if (  (mClass == NVC_CALLBACK)
-                        &&(*this->mNameValueReference.f32 != a))
-                {
-                        b_changed = TRUE;
-                }
                *mNameValueReference.f32 = (F32)a;
-                if (b_changed)
-                {
-                        callCallback();
-                }
                break;
        default:
                break;
        }
-        if (b_changed)
-        {
-                callCallback();
-        }
        return;
 }
@@ -1041,45 +858,17 @@ void LLNameValue::setU32(const U32 a)
 {
        if (mClass == NVC_READ_ONLY)
                return;
-        BOOL b_changed = FALSE;
        switch(mType)
        {
        case NVT_S32:
-                if (  (mClass == NVC_CALLBACK)
-                        &&(*this->mNameValueReference.s32 != (S32) a))
-                {
-                        b_changed = TRUE;
-                }
                *mNameValueReference.s32 = a;
-                if (b_changed)
-                {
-                        callCallback();
-                }
                break;
        case NVT_U32:
-                if (  (mClass == NVC_CALLBACK)
-                        &&(*this->mNameValueReference.u32 != a))
-                {
-                        b_changed = TRUE;
-                }
                *mNameValueReference.u32 = a;
-                if (b_changed)
-                {
-                        callCallback();
-                }
                break;
        case NVT_F32:
-                if (  (mClass == NVC_CALLBACK)
-                        &&(*this->mNameValueReference.f32 != a))
-                {
-                        b_changed = TRUE;
-                }
                *mNameValueReference.f32 = (F32)a;
-                if (b_changed)
-                {
-                        callCallback();
-                }
                break;
        default:
                llerrs << "NameValue: Trying to set U32 into a " << mStringType << ", unknown conversion" << llendl;
@@ -1093,21 +882,11 @@ void LLNameValue::setVec3(const LLVector3 &a)
 {
        if (mClass == NVC_READ_ONLY)
                return;
-        BOOL b_changed = FALSE;
        switch(mType)
        {
        case NVT_VEC3:
-                if (  (mClass == NVC_CALLBACK)
-                        &&(*this->mNameValueReference.vec3 != a))
-                {
-                        b_changed = TRUE;
-                }
                *mNameValueReference.vec3 = a;
-                if (b_changed)
-                {
-                        callCallback();
-                }
                break;
        default:
                llerrs << "NameValue: Trying to set LLVector3 into a " << mStringType << ", unknown conversion" << llendl;
@@ -1117,29 +896,6 @@ void LLNameValue::setVec3(const LLVector3 &a)
 }
-BOOL LLNameValue::nonzero()
-{
-        switch(mType)
-        {
-        case NVT_STRING:
-                if (!mNameValueReference.string)
-                        return 0;
-                return (mNameValueReference.string[0] != 0);
-        case NVT_F32:
-                return (*mNameValueReference.f32 != 0.f);
-        case NVT_S32:
-                return (*mNameValueReference.s32 != 0);
-        case NVT_U32:
-                return (*mNameValueReference.u32 != 0);
-        case NVT_VEC3:
-                return (mNameValueReference.vec3->magVecSquared() != 0.f);
-        default:
-                llerrs << "NameValue: Trying to call nonzero on a " << mStringType << ", unknown conversion" << llendl;
-                break;
-        }
-        return FALSE;
-}
 std::string LLNameValue::printNameValue()
 {
        std::string buffer;
@@ -1217,951 +973,3 @@ std::ostream&		operator<<(std::ostream& s, const LLNameValue &a)
        return s;
 }
-// nota bene: return values aren't static for now to prevent memory leaks
-LLNameValue     &operator+(const LLNameValue &a, const LLNameValue &b)
-{
-        static LLNameValue retval;
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                if (b.mType == NVT_STRING)
-                {
-                        retval.mType = a.mType;
-                        retval.mStringType = NameValueTypeStrings[a.mType];
-                        S32 length1 = (S32)strlen(a.mNameValueReference.string);                /* Flawfinder: Ignore */
-                        S32 length2 = (S32)strlen(b.mNameValueReference.string);                /* Flawfinder: Ignore */
-                        delete [] retval.mNameValueReference.string;
-                        retval.mNameValueReference.string = new char[length1 + length2 + 1];
-                        if(retval.mNameValueReference.string != NULL)
-                        {
-                                strcpy(retval.mNameValueReference.string, a.mNameValueReference.string);        /* Flawfinder: Ignore */
-                                strcat(retval.mNameValueReference.string, b.mNameValueReference.string);                /* Flawfinder: Ignore */
-                        }
-                }
-                break;
-        case NVT_F32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 + *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 + *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 + *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_S32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.s32 + *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.s32 + *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.s32 + *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_U32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.u32 + *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.u32 + *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_U32;
-                        retval.mStringType = NameValueTypeStrings[NVT_U32];
-                        delete retval.mNameValueReference.u32;
-                        retval.mNameValueReference.u32 = new U32(*a.mNameValueReference.u32 + *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_VEC3:
-                if (  (a.mType == b.mType)
-                        &&(a.mType == NVT_VEC3))
-                {
-                        retval.mType = a.mType;
-                        retval.mStringType = NameValueTypeStrings[a.mType];
-                        delete retval.mNameValueReference.vec3;
-                        retval.mNameValueReference.vec3 = new LLVector3(*a.mNameValueReference.vec3 + *b.mNameValueReference.vec3);
-                }
-                break;
-        default:
-                llerrs << "Unknown add of NV type " << a.mStringType << " to " << b.mStringType << llendl;
-                break;
-        }
-        return retval;
-}
-LLNameValue     &operator-(const LLNameValue &a, const LLNameValue &b)
-{
-        static LLNameValue retval;
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                break;
-        case NVT_F32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 - *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 - *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 - *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_S32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.s32 - *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.s32 - *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.s32 - *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_U32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.u32 - *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.u32 - *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_U32;
-                        retval.mStringType = NameValueTypeStrings[NVT_U32];
-                        delete retval.mNameValueReference.u32;
-                        retval.mNameValueReference.u32 = new U32(*a.mNameValueReference.u32 - *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_VEC3:
-                if (  (a.mType == b.mType)
-                        &&(a.mType == NVT_VEC3))
-                {
-                        retval.mType = a.mType;
-                        retval.mStringType = NameValueTypeStrings[a.mType];
-                        delete retval.mNameValueReference.vec3;
-                        retval.mNameValueReference.vec3 = new LLVector3(*a.mNameValueReference.vec3 - *b.mNameValueReference.vec3);
-                }
-                break;
-        default:
-                llerrs << "Unknown subtract of NV type " << a.mStringType << " to " << b.mStringType << llendl;
-                break;
-        }
-        return retval;
-}
-LLNameValue     &operator*(const LLNameValue &a, const LLNameValue &b)
-{
-        static LLNameValue retval;
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                break;
-        case NVT_F32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 * *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 * *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 * *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_S32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.s32 * *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.s32 * *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.s32 * *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_U32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.u32 * *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.u32 * *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_U32;
-                        retval.mStringType = NameValueTypeStrings[NVT_U32];
-                        delete retval.mNameValueReference.u32;
-                        retval.mNameValueReference.u32 = new U32(*a.mNameValueReference.u32 * *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_VEC3:
-                if (  (a.mType == b.mType)
-                        &&(a.mType == NVT_VEC3))
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[a.mType];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32((*a.mNameValueReference.vec3) * (*b.mNameValueReference.vec3));
-                }
-                break;
-        default:
-                llerrs << "Unknown multiply of NV type " << a.mStringType << " to " << b.mStringType << llendl;
-                break;
-        }
-        return retval;
-}
-LLNameValue     &operator/(const LLNameValue &a, const LLNameValue &b)
-{
-        static LLNameValue retval;
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                break;
-        case NVT_F32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 / *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 / *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 / *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_S32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.s32 / *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.s32 / *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.s32 / *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_U32:
-                if (b.mType == NVT_F32)
-                {
-                        retval.mType = NVT_F32;
-                        retval.mStringType = NameValueTypeStrings[NVT_F32];
-                        delete retval.mNameValueReference.f32;
-                        retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.u32 / *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.u32 / *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_U32;
-                        retval.mStringType = NameValueTypeStrings[NVT_U32];
-                        delete retval.mNameValueReference.u32;
-                        retval.mNameValueReference.u32 = new U32(*a.mNameValueReference.u32 / *b.mNameValueReference.u32);
-                }
-                break;
-        default:
-                llerrs << "Unknown divide of NV type " << a.mStringType << " to " << b.mStringType << llendl;
-                break;
-        }
-        return retval;
-}
-LLNameValue     &operator%(const LLNameValue &a, const LLNameValue &b)
-{
-        static LLNameValue retval;
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                break;
-        case NVT_F32:
-                break;
-        case NVT_S32:
-                if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.s32 % *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.s32 % *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_U32:
-                if (b.mType == NVT_S32)
-                {
-                        retval.mType = NVT_S32;
-                        retval.mStringType = NameValueTypeStrings[NVT_S32];
-                        delete retval.mNameValueReference.s32;
-                        retval.mNameValueReference.s32 = new S32(*a.mNameValueReference.u32 % *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        retval.mType = NVT_U32;
-                        retval.mStringType = NameValueTypeStrings[NVT_U32];
-                        delete retval.mNameValueReference.u32;
-                        retval.mNameValueReference.u32 = new U32(*a.mNameValueReference.u32 % *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_VEC3:
-                if (  (a.mType == b.mType)
-                        &&(a.mType == NVT_VEC3))
-                {
-                        retval.mType = a.mType;
-                        retval.mStringType = NameValueTypeStrings[a.mType];
-                        delete retval.mNameValueReference.vec3;
-                        retval.mNameValueReference.vec3 = new LLVector3(*a.mNameValueReference.vec3 % *b.mNameValueReference.vec3);
-                }
-                break;
-        default:
-                llerrs << "Unknown % of NV type " << a.mStringType << " to " << b.mStringType << llendl;
-                break;
-        }
-        return retval;
-}
-// Multiplying anything times a float gives you some floats
-LLNameValue     &operator*(const LLNameValue &a, F32 k)
-{
-        static LLNameValue retval;
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                break;
-        case NVT_F32:
-                retval.mType = NVT_F32;
-                retval.mStringType = NameValueTypeStrings[NVT_F32];
-                delete retval.mNameValueReference.f32;
-                retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 * k);
-                break;
-        case NVT_S32:
-                retval.mType = NVT_F32;
-                retval.mStringType = NameValueTypeStrings[NVT_F32];
-                delete retval.mNameValueReference.f32;
-                retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.s32 * k);
-                break;
-        case NVT_U32:
-                retval.mType = NVT_F32;
-                retval.mStringType = NameValueTypeStrings[NVT_F32];
-                delete retval.mNameValueReference.f32;
-                retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.u32 * k);
-                break;
-        case NVT_VEC3:
-                retval.mType = a.mType;
-                retval.mStringType = NameValueTypeStrings[a.mType];
-                delete retval.mNameValueReference.vec3;
-                retval.mNameValueReference.vec3 = new LLVector3(*a.mNameValueReference.vec3 * k);
-                break;
-        default:
-                llerrs << "Unknown multiply of NV type " << a.mStringType << " with F32" << llendl;
-                break;
-        }
-        return retval;
-}
-LLNameValue     &operator*(F32 k, const LLNameValue &a)
-{
-        static LLNameValue retval;
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                break;
-        case NVT_F32:
-                retval.mType = NVT_F32;
-                retval.mStringType = NameValueTypeStrings[NVT_F32];
-                delete retval.mNameValueReference.f32;
-                retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.f32 * k);
-                break;
-        case NVT_S32:
-                retval.mType = NVT_F32;
-                retval.mStringType = NameValueTypeStrings[NVT_F32];
-                delete retval.mNameValueReference.f32;
-                retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.s32 * k);
-                break;
-        case NVT_U32:
-                retval.mType = NVT_F32;
-                retval.mStringType = NameValueTypeStrings[NVT_F32];
-                delete retval.mNameValueReference.f32;
-                retval.mNameValueReference.f32 = new F32(*a.mNameValueReference.u32 * k);
-                break;
-        case NVT_VEC3:
-                retval.mType = a.mType;
-                retval.mStringType = NameValueTypeStrings[a.mType];
-                delete retval.mNameValueReference.vec3;
-                retval.mNameValueReference.vec3 = new LLVector3(*a.mNameValueReference.vec3 * k);
-                break;
-        default:
-                llerrs << "Unknown multiply of NV type " << a.mStringType << " with F32" << llendl;
-                break;
-        }
-        return retval;
-}
-bool operator==(const LLNameValue &a, const LLNameValue &b)
-{
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                if (b.mType == NVT_STRING)
-                {
-                        if (!a.mNameValueReference.string)
-                                return FALSE;
-                        if (!b.mNameValueReference.string)
-                                return FALSE;
-                        return (!strcmp(a.mNameValueReference.string, b.mNameValueReference.string));
-                }
-                break;
-        case NVT_F32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.f32 == *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.f32 == *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.f32 == *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_S32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.s32 == *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.s32 == *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.s32 == (S32) *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_U32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.u32 == *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return ((S32) *a.mNameValueReference.u32 == *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.u32 == *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_VEC3:
-                if (  (a.mType == b.mType)
-                        &&(a.mType == NVT_VEC3))
-                {
-                        return (*a.mNameValueReference.vec3 == *b.mNameValueReference.vec3);
-                }
-                break;
-        default:
-                llerrs << "Unknown == NV type " << a.mStringType << " with " << b.mStringType << llendl;
-                break;
-        }
-        return FALSE;
-}
-bool operator<=(const LLNameValue &a, const LLNameValue &b)
-{
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                if (b.mType == NVT_STRING)
-                {
-                        S32 retval = strcmp(a.mNameValueReference.string, b.mNameValueReference.string);
-                        return (retval <= 0);
-                }
-                break;
-        case NVT_F32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.f32 <= *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.f32 <= *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.f32 <= *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_S32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.s32 <= *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.s32 <= *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.s32 <= (S32) *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_U32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.u32 <= *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return ((S32) *a.mNameValueReference.u32 <= *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.u32 <= *b.mNameValueReference.u32);
-                }
-                break;
-        default:
-                llerrs << "Unknown <= NV type " << a.mStringType << " with " << b.mStringType << llendl;
-                break;
-        }
-        return FALSE;
-}
-bool                    operator>=(const LLNameValue &a, const LLNameValue &b)
-{
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                if (  (a.mType == b.mType)
-                        &&(a.mType == NVT_STRING))
-                {
-                        S32 retval = strcmp(a.mNameValueReference.string, b.mNameValueReference.string);
-                        return (retval >= 0);
-                }
-                break;
-        case NVT_F32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.f32 >= *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.f32 >= *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.f32 >= *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_S32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.s32 >= *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.s32 >= *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.s32 >= (S32) *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_U32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.u32 >= *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return ((S32) *a.mNameValueReference.u32 >= *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.u32 >= *b.mNameValueReference.u32);
-                }
-                break;
-        default:
-                llerrs << "Unknown >= NV type " << a.mStringType << " with " << b.mStringType << llendl;
-                break;
-        }
-        return FALSE;
-}
-bool                    operator<(const LLNameValue &a, const LLNameValue &b)
-{
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                if (  (a.mType == b.mType)
-                        &&(a.mType == NVT_STRING))
-                {
-                        S32 retval = strcmp(a.mNameValueReference.string, b.mNameValueReference.string);
-                        return (retval < 0);
-                }
-                break;
-        case NVT_F32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.f32 < *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.f32 < *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.f32 < *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_S32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.s32 < *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.s32 < *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.s32 < (S32) *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_U32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.u32 < *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return ((S32) *a.mNameValueReference.u32 < *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.u32 < *b.mNameValueReference.u32);
-                }
-                break;
-        default:
-                llerrs << "Unknown < NV type " << a.mStringType << " with " << b.mStringType << llendl;
-                break;
-        }
-        return FALSE;
-}
-bool                    operator>(const LLNameValue &a, const LLNameValue &b)
-{
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                if (  (a.mType == b.mType)
-                        &&(a.mType == NVT_STRING))
-                {
-                        S32 retval = strcmp(a.mNameValueReference.string, b.mNameValueReference.string);
-                        return (retval > 0);
-                }
-                break;
-        case NVT_F32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.f32 > *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.f32 > *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.f32 > *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_S32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.s32 > *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.s32 > *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.s32 > (S32) *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_U32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.u32 > *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return ((S32) *a.mNameValueReference.u32 > *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.u32 > *b.mNameValueReference.u32);
-                }
-                break;
-        default:
-                llerrs << "Unknown > NV type " << a.mStringType << " with " << b.mStringType << llendl;
-                break;
-        }
-        return FALSE;
-}
-bool                    operator!=(const LLNameValue &a, const LLNameValue &b)
-{
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                if (  (a.mType == b.mType)
-                        &&(a.mType == NVT_STRING))
-                {
-                        return (strcmp(a.mNameValueReference.string, b.mNameValueReference.string)) ? true : false;
-                }
-                break;
-        case NVT_F32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.f32 != *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.f32 != *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.f32 != *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_S32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.s32 != *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return (*a.mNameValueReference.s32 != *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.s32 != (S32) *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_U32:
-                if (b.mType == NVT_F32)
-                {
-                        return (*a.mNameValueReference.u32 != *b.mNameValueReference.f32);
-                }
-                else if (b.mType == NVT_S32)
-                {
-                        return ((S32) *a.mNameValueReference.u32 != *b.mNameValueReference.s32);
-                }
-                else if (b.mType == NVT_U32)
-                {
-                        return (*a.mNameValueReference.u32 != *b.mNameValueReference.u32);
-                }
-                break;
-        case NVT_VEC3:
-                if (  (a.mType == b.mType)
-                        &&(a.mType == NVT_VEC3))
-                {
-                        return (*a.mNameValueReference.vec3 != *b.mNameValueReference.vec3);
-                }
-                break;
-        default:
-                llerrs << "Unknown != NV type " << a.mStringType << " with " << b.mStringType << llendl;
-                break;
-        }
-        return FALSE;
-}
-LLNameValue     &operator-(const LLNameValue &a)
-{
-        static LLNameValue retval;
-        switch(a.mType)
-        {
-        case NVT_STRING:
-                break;
-        case NVT_F32:
-                retval.mType = a.mType;
-                retval.mStringType = NameValueTypeStrings[a.mType];
-                delete retval.mNameValueReference.f32;
-                retval.mNameValueReference.f32 = new F32(-*a.mNameValueReference.f32);
-                break;
-        case NVT_S32:
-                retval.mType = a.mType;
-                retval.mStringType = NameValueTypeStrings[a.mType];
-                delete retval.mNameValueReference.s32;
-                retval.mNameValueReference.s32 = new S32(-*a.mNameValueReference.s32);
-                break;
-        case NVT_U32:
-                retval.mType = NVT_S32;
-                retval.mStringType = NameValueTypeStrings[NVT_S32];
-                delete retval.mNameValueReference.s32;
-                // Can't do unary minus on U32, doesn't work.
-                retval.mNameValueReference.s32 = new S32(-S32(*a.mNameValueReference.u32));
-                break;
-        case NVT_VEC3:
-                retval.mType = a.mType;
-                retval.mStringType = NameValueTypeStrings[a.mType];
-                delete retval.mNameValueReference.vec3;
-                retval.mNameValueReference.vec3 = new LLVector3(-*a.mNameValueReference.vec3);
-                break;
-        default:
-                llerrs << "Unknown - NV type " << a.mStringType << llendl;
-                break;
-        }
-        return retval;
-}
diff --git a/linden/indra/llmessage/llnamevalue.h b/linden/indra/llmessage/llnamevalue.h
index c58172a..52beb07 100644
--- a/linden/indra/llmessage/llnamevalue.h
+++ b/linden/indra/llmessage/llnamevalue.h
@@ -32,15 +32,27 @@
 #ifndef LL_LLNAMEVALUE_H
 #define LL_LLNAMEVALUE_H
+// As of January 2008, I believe we only use the following name-value
+// pairs.  This is hard to prove because they are initialized from
+// strings.  JC
+//
+// FirstName STRING
+// LastName STRING
+// AttachPt U32
+// AttachmentItemId STRING
+// Title STRING
+// AttachmentOffset VEC3
+// AttachmentOrientation VEC3
+// SitObject STRING
+// SitPosition VEC3
 #include "string_table.h"
 #include "llmath.h"
 #include "v3math.h"
 #include "lldbstrings.h"
 class LLNameValue;
-typedef void (*TNameValueCallback)(LLNameValue *changed, void **user_data);
+class LLStringTable;
-void add_use_callback(char *name, TNameValueCallback ucb, void **user_data);
 typedef enum e_name_value_types
 {
@@ -61,7 +73,6 @@ typedef enum e_name_value_class
        NVC_NULL,
        NVC_READ_ONLY,
        NVC_READ_WRITE,
-        NVC_CALLBACK,
        NVC_EOF
 } ENameValueClass;
@@ -110,17 +121,13 @@ class LLNameValue
 {
 public:
        void baseInit();
-        void init(const char *name, const char *data, const char *type, const char *nvclass, const char *nvsendto, 
+        void init(const char *name, const char *data, const char *type, const char *nvclass, const char *nvsendto );
-                                TNameValueCallback nvcb = NULL, void **user_data = NULL);
        LLNameValue();
        LLNameValue(const char *data);
-        LLNameValue(const char *name, const char *type, const char *nvclass, 
+        LLNameValue(const char *name, const char *type, const char *nvclass );
-                                TNameValueCallback nvcb = NULL, void **user_data = NULL);
+        LLNameValue(const char *name, const char *data, const char *type, const char *nvclass );
-        LLNameValue(const char *name, const char *data, const char *type, const char *nvclass, 
+        LLNameValue(const char *name, const char *data, const char *type, const char *nvclass, const char *nvsendto );
-                                TNameValueCallback nvcb = NULL, void **user_data = NULL);
-        LLNameValue(const char *name, const char *data, const char *type, const char *nvclass, const char *nvsendto, 
-                                TNameValueCallback nvcb = NULL, void **user_data = NULL);
        ~LLNameValue();
@@ -130,7 +137,6 @@ public:
        S32                             *getS32();
        void                    getVec3(LLVector3 &vec);
        LLVector3               *getVec3();
-        F32                             magnitude();
        U32                             *getU32();
        U64                             *getU64();
@@ -157,27 +163,8 @@ public:
        void                    setVec3(const LLVector3 &a);
        void                    setU32(const U32 a);
-        BOOL                    nonzero();
        friend std::ostream&            operator<<(std::ostream& s, const LLNameValue &a);
-        friend LLNameValue      &operator+(const LLNameValue &a, const LLNameValue &b);
-        friend LLNameValue      &operator-(const LLNameValue &a, const LLNameValue &b);
-        friend LLNameValue      &operator*(const LLNameValue &a, const LLNameValue &b);
-        friend LLNameValue      &operator/(const LLNameValue &a, const LLNameValue &b);
-        friend LLNameValue      &operator%(const LLNameValue &a, const LLNameValue &b);
-        friend LLNameValue      &operator*(const LLNameValue &a, F32 k);
-        friend LLNameValue      &operator*(F32 k, const LLNameValue &a);
-        friend bool                     operator==(const LLNameValue &a, const LLNameValue &b); 
-        friend bool                     operator<=(const LLNameValue &a, const LLNameValue &b); 
-        friend bool                     operator>=(const LLNameValue &a, const LLNameValue &b); 
-        friend bool                     operator<(const LLNameValue &a, const LLNameValue &b);  
-        friend bool                     operator>(const LLNameValue &a, const LLNameValue &b);  
-        friend bool                     operator!=(const LLNameValue &a, const LLNameValue &b); 
-        friend LLNameValue      &operator-(const LLNameValue &a);       
 private:
        void                    printNameValue(std::ostream& s);
        
@@ -193,8 +180,6 @@ public:
        UNameValueReference                     mNameValueReference;
        LLStringTable                           *mNVNameTable;
-        TNameValueCallback                      mNameValueCB;
-        void                                            **mUserData;
 };
 extern LLStringTable    gNVNameTable;
diff --git a/linden/indra/llmessage/llregionflags.h b/linden/indra/llmessage/llregionflags.h
index 96b66ca..1675478 100644
--- a/linden/indra/llmessage/llregionflags.h
+++ b/linden/indra/llmessage/llregionflags.h
@@ -140,7 +140,7 @@ const U32 ESTATE_MAINLAND = 1;
 const U32 ESTATE_ORIENTATION = 2;
 const U32 ESTATE_INTERNAL = 3;
 const U32 ESTATE_SHOWCASE = 4;
-const U32 ESTATE_KIDGRID = 5;
+const U32 ESTATE_TEEN = 5;
 const U32 ESTATE_LAST_LINDEN = 5; // last linden owned/managed estate
 // for EstateOwnerRequest, setaccess message
@@ -172,9 +172,10 @@ const U32 ESTATE_ACCESS_BANNED_AGENT_ADD			= 1 << 6;
 const U32 ESTATE_ACCESS_BANNED_AGENT_REMOVE                     = 1 << 7;
 const U32 ESTATE_ACCESS_MANAGER_ADD                                     = 1 << 8;
 const U32 ESTATE_ACCESS_MANAGER_REMOVE                          = 1 << 9;
+const U32 ESTATE_ACCESS_NO_REPLY                                  = 1 << 10;
 const S32 ESTATE_MAX_MANAGERS = 10;
-const S32 ESTATE_MAX_ACCESS_IDS = 300;  // max for access, banned
+const S32 ESTATE_MAX_ACCESS_IDS = 500;  // max for access, banned
 const S32 ESTATE_MAX_GROUP_IDS = (S32) ESTATE_ACCESS_MAX_ENTRIES_PER_PACKET;
 // 'Sim Wide Delete' flags
diff --git a/linden/indra/llmessage/llservicebuilder.cpp b/linden/indra/llmessage/llservicebuilder.cpp
index 195e24b..138ab2d 100644
--- a/linden/indra/llmessage/llservicebuilder.cpp
+++ b/linden/indra/llmessage/llservicebuilder.cpp
@@ -134,6 +134,9 @@ std::string LLServiceBuilder::buildServiceURI(
                        std::string::iterator end(service_url.end());
                        std::string::iterator deepest_node(service_url.end());
                        std::string::iterator deepest_node_end(service_url.end());
+                        //parse out the variables to replace by going through {}s one at a time,
+                        // starting with the "deepest" in series {{}},
+                        // and otherwise replacing right-to-left
                        for(; iter != end; ++iter)
                        {
                                switch(*iter)
@@ -163,7 +166,7 @@ std::string LLServiceBuilder::buildServiceURI(
                        {
                                break;
                        }
+                        //replace the variable we found in the {} above.
                        // *NOTE: since the c++ implementation only understands
                        // params and straight string substitution, so it's a
                        // known distance of 2 to skip the directive.
@@ -181,7 +184,7 @@ std::string LLServiceBuilder::buildServiceURI(
                                }
                                else
                                {
-                                        llinfos << "Unknown key: " << key << llendl;
+                                        llwarns << "Unknown key: " << key << " in option map: " << LLSDOStreamer<LLSDNotationFormatter>(option_map) << llendl;
                                        keep_looping = false;
                                }
                                break;
diff --git a/linden/indra/llmessage/llurlrequest.cpp b/linden/indra/llmessage/llurlrequest.cpp
index eabd951..5760197 100644
--- a/linden/indra/llmessage/llurlrequest.cpp
+++ b/linden/indra/llmessage/llurlrequest.cpp
@@ -34,7 +34,6 @@
 #include "linden_common.h"
 #include "llurlrequest.h"
-#include <curl/curl.h>
 #include <algorithm>
 #include "llcurl.h"
@@ -192,6 +191,11 @@ void LLURLRequest::useProxy(bool use_proxy)
    }
 }
+void LLURLRequest::useProxy(const std::string &proxy)
+{
+    mDetail->mCurlRequest->setoptString(CURLOPT_PROXY, proxy);
+}
 // virtual
 LLIOPipe::EStatus LLURLRequest::handleError(
        LLIOPipe::EStatus status,
diff --git a/linden/indra/llmessage/llurlrequest.h b/linden/indra/llmessage/llurlrequest.h
index dd82a9f..b6da56b 100644
--- a/linden/indra/llmessage/llurlrequest.h
+++ b/linden/indra/llmessage/llurlrequest.h
@@ -166,6 +166,11 @@ public:
     */
    void useProxy(bool use_proxy);
+    /**
+     * @ brief Set the CURLOPT_PROXY header to the given value.
+     */
+        void useProxy(const std::string& proxy);
 public:
        /** 
         * @brief Give this pipe a chance to handle a generated error
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index ee295d7..c572341 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -201,7 +201,7 @@ void LLMessageHandlerBridge::post(LLHTTPNode::ResponsePtr response,
                                                        const LLSD& context, const LLSD& input) const
 {
        std::string name = context["request"]["wildcard"]["message-name"];
-        char* namePtr = gMessageStringTable.getString(name.c_str());
+        char* namePtr = LLMessageStringTable::getInstance()->getString(name.c_str());
        
        lldebugs << "Setting mLastSender " << input["sender"].asString() << llendl;
        gMessageSystem->mLastSender = LLHost(input["sender"].asString());
@@ -469,7 +469,7 @@ static LLMessageSystem::message_template_name_map_t::const_iterator
 findTemplate(const LLMessageSystem::message_template_name_map_t& templates, 
                         std::string name)
 {
-        const char* namePrehash = gMessageStringTable.getString(name.c_str());
+        const char* namePrehash = LLMessageStringTable::getInstance()->getString(name.c_str());
        if(NULL == namePrehash) {return templates.end();}
        return templates.find(namePrehash);
 }
@@ -770,7 +770,7 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
                                /* Code for dumping the complete contents of a message.  Keep for future use in optimizing messages.
                                if( 1 )
                                {
-                                        static char* object_update = gMessageStringTable.getString("ObjectUpdate");
+                                        static char* object_update = LLMessageStringTable::getInstance()->getString("ObjectUpdate");
                                        if(object_update == mTemplateMessageReader->getMessageName() )
                                        {
                                                llinfos << "ObjectUpdate:" << llendl;
@@ -1018,7 +1018,7 @@ BOOL LLMessageSystem::isSendFull(const char* blockname)
        char* stringTableName = NULL;
        if(NULL != blockname)
        {
-                stringTableName = gMessageStringTable.getString(blockname);
+                stringTableName = LLMessageStringTable::getInstance()->getString(blockname);
        }
        return isSendFullFast(stringTableName);
 }
@@ -2139,7 +2139,7 @@ void LLMessageSystem::dispatch(
        LLHTTPNode::ResponsePtr responsep)
 {
        if ((gMessageSystem->mMessageTemplates.find
-                        (gMessageStringTable.getString(msg_name.c_str())) ==
+                        (LLMessageStringTable::getInstance()->getString(msg_name.c_str())) ==
                                gMessageSystem->mMessageTemplates.end()) &&
                !LLMessageConfig::isValidMessage(msg_name))
        {
@@ -2173,7 +2173,7 @@ static void check_for_unrecognized_messages(
                        end = map.endMap();
                 iter != end; ++iter)
        {
-                const char* name = gMessageStringTable.getString(iter->first.c_str());
+                const char* name = LLMessageStringTable::getInstance()->getString(iter->first.c_str());
                if (templates.find(name) == templates.end())
                {
@@ -2441,13 +2441,11 @@ void dump_prehash_files()
                fprintf(fp, "\n\nextern F32 gPrehashVersionNumber;\n\n");
                for (i = 0; i < MESSAGE_NUMBER_OF_HASH_BUCKETS; i++)
                {
-                        if (!gMessageStringTable.mEmpty[i] && gMessageStringTable.mString[i][0] != '.')
+                        if (!LLMessageStringTable::getInstance()->mEmpty[i] && LLMessageStringTable::getInstance()->mString[i][0] != '.')
                        {
-                                fprintf(fp, "extern char * _PREHASH_%s;\n", gMessageStringTable.mString[i]);
+                                fprintf(fp, "extern char * _PREHASH_%s;\n", LLMessageStringTable::getInstance()->mString[i]);
                        }
                }
-                fprintf(fp, "\n\nvoid init_prehash_data();\n\n");
-                fprintf(fp, "\n\n");
                fprintf(fp, "\n\n#endif\n");
                fclose(fp);
        }
@@ -2472,21 +2470,11 @@ void dump_prehash_files()
                fprintf(fp, "\n\nF32 gPrehashVersionNumber = %.3ff;\n\n", gMessageSystem->mMessageFileVersionNumber);
                for (i = 0; i < MESSAGE_NUMBER_OF_HASH_BUCKETS; i++)
                {
-                        if (!gMessageStringTable.mEmpty[i] && gMessageStringTable.mString[i][0] != '.')
+                        if (!LLMessageStringTable::getInstance()->mEmpty[i] && LLMessageStringTable::getInstance()->mString[i][0] != '.')
                        {
-                                fprintf(fp, "char * _PREHASH_%s;\n", gMessageStringTable.mString[i]);
+                                fprintf(fp, "char * _PREHASH_%s = LLMessageStringTable::getInstance()->getString(\"%s\");\n", LLMessageStringTable::getInstance()->mString[i], LLMessageStringTable::getInstance()->mString[i]);
                        }
                }
-                fprintf(fp, "\nvoid init_prehash_data()\n");
-                fprintf(fp, "{\n");
-                for (i = 0; i < MESSAGE_NUMBER_OF_HASH_BUCKETS; i++)
-                {
-                        if (!gMessageStringTable.mEmpty[i] && gMessageStringTable.mString[i][0] != '.')
-                        {
-                                fprintf(fp, "\t_PREHASH_%s = gMessageStringTable.getString(\"%s\");\n", gMessageStringTable.mString[i], gMessageStringTable.mString[i]);
-                        }
-                }
-                fprintf(fp, "}\n");
                fclose(fp);
        }
 }
@@ -2528,7 +2516,6 @@ BOOL start_messaging_system(
        }
        else
        {
-                init_prehash_data();
                if (gMessageSystem->mMessageFileVersionNumber != gPrehashVersionNumber)
                {
                        llinfos << "Message template version does not match prehash version number" << llendl;
@@ -2991,7 +2978,7 @@ void LLMessageSystem::setHandlerFuncFast(const char *name, void (*handler_func)(
 bool LLMessageSystem::callHandler(const char *name,
                bool trustedSource, LLMessageSystem* msg)
 {
-        name = gMessageStringTable.getString(name);
+        name = LLMessageStringTable::getInstance()->getString(name);
        message_template_name_map_t::const_iterator iter;
        iter = mMessageTemplates.find(name);
        if(iter == mMessageTemplates.end())
@@ -3474,7 +3461,7 @@ void LLMessageSystem::newMessageFast(const char *name)
        
 void LLMessageSystem::newMessage(const char *name)
 {
-        newMessageFast(gMessageStringTable.getString(name));
+        newMessageFast(LLMessageStringTable::getInstance()->getString(name));
 }
 void LLMessageSystem::addBinaryDataFast(const char *varname, const void *data, S32 size)
@@ -3484,7 +3471,7 @@ void LLMessageSystem::addBinaryDataFast(const char *varname, const void *data, S
 void LLMessageSystem::addBinaryData(const char *varname, const void *data, S32 size)
 {
-        mMessageBuilder->addBinaryData(gMessageStringTable.getString(varname),data, size);
+        mMessageBuilder->addBinaryData(LLMessageStringTable::getInstance()->getString(varname),data, size);
 }
 void LLMessageSystem::addS8Fast(const char *varname, S8 v)
@@ -3494,7 +3481,7 @@ void LLMessageSystem::addS8Fast(const char *varname, S8 v)
 void LLMessageSystem::addS8(const char *varname, S8 v)
 {
-        mMessageBuilder->addS8(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addS8(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addU8Fast(const char *varname, U8 v)
@@ -3504,7 +3491,7 @@ void LLMessageSystem::addU8Fast(const char *varname, U8 v)
 void LLMessageSystem::addU8(const char *varname, U8 v)
 {
-        mMessageBuilder->addU8(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addU8(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addS16Fast(const char *varname, S16 v)
@@ -3514,7 +3501,7 @@ void LLMessageSystem::addS16Fast(const char *varname, S16 v)
 void LLMessageSystem::addS16(const char *varname, S16 v)
 {
-        mMessageBuilder->addS16(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addS16(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addU16Fast(const char *varname, U16 v)
@@ -3524,7 +3511,7 @@ void LLMessageSystem::addU16Fast(const char *varname, U16 v)
 void LLMessageSystem::addU16(const char *varname, U16 v)
 {
-        mMessageBuilder->addU16(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addU16(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addF32Fast(const char *varname, F32 v)
@@ -3534,7 +3521,7 @@ void LLMessageSystem::addF32Fast(const char *varname, F32 v)
 void LLMessageSystem::addF32(const char *varname, F32 v)
 {
-        mMessageBuilder->addF32(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addF32(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addS32Fast(const char *varname, S32 v)
@@ -3544,7 +3531,7 @@ void LLMessageSystem::addS32Fast(const char *varname, S32 v)
 void LLMessageSystem::addS32(const char *varname, S32 v)
 {
-        mMessageBuilder->addS32(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addS32(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addU32Fast(const char *varname, U32 v)
@@ -3554,7 +3541,7 @@ void LLMessageSystem::addU32Fast(const char *varname, U32 v)
 void LLMessageSystem::addU32(const char *varname, U32 v)
 {
-        mMessageBuilder->addU32(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addU32(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addU64Fast(const char *varname, U64 v)
@@ -3564,7 +3551,7 @@ void LLMessageSystem::addU64Fast(const char *varname, U64 v)
 void LLMessageSystem::addU64(const char *varname, U64 v)
 {
-        mMessageBuilder->addU64(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addU64(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addF64Fast(const char *varname, F64 v)
@@ -3574,7 +3561,7 @@ void LLMessageSystem::addF64Fast(const char *varname, F64 v)
 void LLMessageSystem::addF64(const char *varname, F64 v)
 {
-        mMessageBuilder->addF64(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addF64(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addIPAddrFast(const char *varname, U32 v)
@@ -3584,7 +3571,7 @@ void LLMessageSystem::addIPAddrFast(const char *varname, U32 v)
 void LLMessageSystem::addIPAddr(const char *varname, U32 v)
 {
-        mMessageBuilder->addIPAddr(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addIPAddr(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addIPPortFast(const char *varname, U16 v)
@@ -3594,7 +3581,7 @@ void LLMessageSystem::addIPPortFast(const char *varname, U16 v)
 void LLMessageSystem::addIPPort(const char *varname, U16 v)
 {
-        mMessageBuilder->addIPPort(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addIPPort(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addBOOLFast(const char* varname, BOOL v)
@@ -3604,7 +3591,7 @@ void LLMessageSystem::addBOOLFast(const char* varname, BOOL v)
 void LLMessageSystem::addBOOL(const char* varname, BOOL v)
 {
-        mMessageBuilder->addBOOL(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addBOOL(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addStringFast(const char* varname, const char* v)
@@ -3614,7 +3601,7 @@ void LLMessageSystem::addStringFast(const char* varname, const char* v)
 void LLMessageSystem::addString(const char* varname, const char* v)
 {
-        mMessageBuilder->addString(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addString(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addStringFast(const char* varname, const std::string& v)
@@ -3624,7 +3611,7 @@ void LLMessageSystem::addStringFast(const char* varname, const std::string& v)
 void LLMessageSystem::addString(const char* varname, const std::string& v)
 {
-        mMessageBuilder->addString(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addString(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addVector3Fast(const char *varname, const LLVector3& v)
@@ -3634,7 +3621,7 @@ void LLMessageSystem::addVector3Fast(const char *varname, const LLVector3& v)
 void LLMessageSystem::addVector3(const char *varname, const LLVector3& v)
 {
-        mMessageBuilder->addVector3(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addVector3(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addVector4Fast(const char *varname, const LLVector4& v)
@@ -3644,7 +3631,7 @@ void LLMessageSystem::addVector4Fast(const char *varname, const LLVector4& v)
 void LLMessageSystem::addVector4(const char *varname, const LLVector4& v)
 {
-        mMessageBuilder->addVector4(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addVector4(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addVector3dFast(const char *varname, const LLVector3d& v)
@@ -3654,7 +3641,7 @@ void LLMessageSystem::addVector3dFast(const char *varname, const LLVector3d& v)
 void LLMessageSystem::addVector3d(const char *varname, const LLVector3d& v)
 {
-        mMessageBuilder->addVector3d(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addVector3d(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 void LLMessageSystem::addQuatFast(const char *varname, const LLQuaternion& v)
@@ -3664,7 +3651,7 @@ void LLMessageSystem::addQuatFast(const char *varname, const LLQuaternion& v)
 void LLMessageSystem::addQuat(const char *varname, const LLQuaternion& v)
 {
-        mMessageBuilder->addQuat(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addQuat(LLMessageStringTable::getInstance()->getString(varname), v);
 }
@@ -3675,7 +3662,7 @@ void LLMessageSystem::addUUIDFast(const char *varname, const LLUUID& v)
 void LLMessageSystem::addUUID(const char *varname, const LLUUID& v)
 {
-        mMessageBuilder->addUUID(gMessageStringTable.getString(varname), v);
+        mMessageBuilder->addUUID(LLMessageStringTable::getInstance()->getString(varname), v);
 }
 S32 LLMessageSystem::getCurrentSendTotal() const
@@ -3692,8 +3679,8 @@ void LLMessageSystem::getS8Fast(const char *block, const char *var, S8 &u,
 void LLMessageSystem::getS8(const char *block, const char *var, S8 &u, 
                                                        S32 blocknum)
 {
-        getS8Fast(gMessageStringTable.getString(block), 
+        getS8Fast(LLMessageStringTable::getInstance()->getString(block), 
-                          gMessageStringTable.getString(var), u, blocknum);
+                          LLMessageStringTable::getInstance()->getString(var), u, blocknum);
 }
 void LLMessageSystem::getU8Fast(const char *block, const char *var, U8 &u, 
@@ -3705,8 +3692,8 @@ void LLMessageSystem::getU8Fast(const char *block, const char *var, U8 &u,
 void LLMessageSystem::getU8(const char *block, const char *var, U8 &u, 
                                                        S32 blocknum)
 {
-        getU8Fast(gMessageStringTable.getString(block), 
+        getU8Fast(LLMessageStringTable::getInstance()->getString(block), 
-                                gMessageStringTable.getString(var), u, blocknum);
+                                LLMessageStringTable::getInstance()->getString(var), u, blocknum);
 }
 void LLMessageSystem::getBOOLFast(const char *block, const char *var, BOOL &b,
@@ -3718,8 +3705,8 @@ void LLMessageSystem::getBOOLFast(const char *block, const char *var, BOOL &b,
 void LLMessageSystem::getBOOL(const char *block, const char *var, BOOL &b, 
                                                          S32 blocknum)
 {
-        getBOOLFast(gMessageStringTable.getString(block), 
+        getBOOLFast(LLMessageStringTable::getInstance()->getString(block), 
-                                gMessageStringTable.getString(var), b, blocknum);
+                                LLMessageStringTable::getInstance()->getString(var), b, blocknum);
 }
 void LLMessageSystem::getS16Fast(const char *block, const char *var, S16 &d, 
@@ -3731,8 +3718,8 @@ void LLMessageSystem::getS16Fast(const char *block, const char *var, S16 &d,
 void LLMessageSystem::getS16(const char *block, const char *var, S16 &d, 
                                                         S32 blocknum)
 {
-        getS16Fast(gMessageStringTable.getString(block), 
+        getS16Fast(LLMessageStringTable::getInstance()->getString(block), 
-                           gMessageStringTable.getString(var), d, blocknum);
+                           LLMessageStringTable::getInstance()->getString(var), d, blocknum);
 }
 void LLMessageSystem::getU16Fast(const char *block, const char *var, U16 &d, 
@@ -3744,8 +3731,8 @@ void LLMessageSystem::getU16Fast(const char *block, const char *var, U16 &d,
 void LLMessageSystem::getU16(const char *block, const char *var, U16 &d, 
                                                         S32 blocknum)
 {
-        getU16Fast(gMessageStringTable.getString(block), 
+        getU16Fast(LLMessageStringTable::getInstance()->getString(block), 
-                           gMessageStringTable.getString(var), d, blocknum);
+                           LLMessageStringTable::getInstance()->getString(var), d, blocknum);
 }
 void LLMessageSystem::getS32Fast(const char *block, const char *var, S32 &d, 
@@ -3757,8 +3744,8 @@ void LLMessageSystem::getS32Fast(const char *block, const char *var, S32 &d,
 void LLMessageSystem::getS32(const char *block, const char *var, S32 &d, 
                                                         S32 blocknum)
 {
-        getS32Fast(gMessageStringTable.getString(block), 
+        getS32Fast(LLMessageStringTable::getInstance()->getString(block), 
-                           gMessageStringTable.getString(var), d, blocknum);
+                           LLMessageStringTable::getInstance()->getString(var), d, blocknum);
 }
 void LLMessageSystem::getU32Fast(const char *block, const char *var, U32 &d, 
@@ -3770,8 +3757,8 @@ void LLMessageSystem::getU32Fast(const char *block, const char *var, U32 &d,
 void LLMessageSystem::getU32(const char *block, const char *var, U32 &d, 
                                                         S32 blocknum)
 {
-        getU32Fast(gMessageStringTable.getString(block), 
+        getU32Fast(LLMessageStringTable::getInstance()->getString(block), 
-                                gMessageStringTable.getString(var), d, blocknum);
+                                LLMessageStringTable::getInstance()->getString(var), d, blocknum);
 }
 void LLMessageSystem::getU64Fast(const char *block, const char *var, U64 &d, 
@@ -3784,8 +3771,8 @@ void LLMessageSystem::getU64(const char *block, const char *var, U64 &d,
                                                         S32 blocknum)
 {
        
-        getU64Fast(gMessageStringTable.getString(block), 
+        getU64Fast(LLMessageStringTable::getInstance()->getString(block), 
-                           gMessageStringTable.getString(var), d, blocknum);
+                           LLMessageStringTable::getInstance()->getString(var), d, blocknum);
 }
 void LLMessageSystem::getBinaryDataFast(const char *blockname, 
@@ -3802,8 +3789,8 @@ void LLMessageSystem::getBinaryData(const char *blockname,
                                                                        void *datap, S32 size, 
                                                                        S32 blocknum, S32 max_size)
 {
-        getBinaryDataFast(gMessageStringTable.getString(blockname), 
+        getBinaryDataFast(LLMessageStringTable::getInstance()->getString(blockname), 
-                                          gMessageStringTable.getString(varname), 
+                                          LLMessageStringTable::getInstance()->getString(varname), 
                                          datap, size, blocknum, max_size);
 }
@@ -3816,8 +3803,8 @@ void LLMessageSystem::getF32Fast(const char *block, const char *var, F32 &d,
 void LLMessageSystem::getF32(const char *block, const char *var, F32 &d, 
                                                         S32 blocknum)
 {
-        getF32Fast(gMessageStringTable.getString(block), 
+        getF32Fast(LLMessageStringTable::getInstance()->getString(block), 
-                           gMessageStringTable.getString(var), d, blocknum);
+                           LLMessageStringTable::getInstance()->getString(var), d, blocknum);
 }
 void LLMessageSystem::getF64Fast(const char *block, const char *var, F64 &d, 
@@ -3829,8 +3816,8 @@ void LLMessageSystem::getF64Fast(const char *block, const char *var, F64 &d,
 void LLMessageSystem::getF64(const char *block, const char *var, F64 &d, 
                                                         S32 blocknum)
 {
-        getF64Fast(gMessageStringTable.getString(block), 
+        getF64Fast(LLMessageStringTable::getInstance()->getString(block), 
-                                gMessageStringTable.getString(var), d, blocknum);
+                                LLMessageStringTable::getInstance()->getString(var), d, blocknum);
 }
@@ -3843,8 +3830,8 @@ void LLMessageSystem::getVector3Fast(const char *block, const char *var,
 void LLMessageSystem::getVector3(const char *block, const char *var, 
                                                                 LLVector3 &v, S32 blocknum )
 {
-        getVector3Fast(gMessageStringTable.getString(block), 
+        getVector3Fast(LLMessageStringTable::getInstance()->getString(block), 
-                                   gMessageStringTable.getString(var), v, blocknum);
+                                   LLMessageStringTable::getInstance()->getString(var), v, blocknum);
 }
 void LLMessageSystem::getVector4Fast(const char *block, const char *var, 
@@ -3856,8 +3843,8 @@ void LLMessageSystem::getVector4Fast(const char *block, const char *var,
 void LLMessageSystem::getVector4(const char *block, const char *var, 
                                                                 LLVector4 &v, S32 blocknum )
 {
-        getVector4Fast(gMessageStringTable.getString(block), 
+        getVector4Fast(LLMessageStringTable::getInstance()->getString(block), 
-                                   gMessageStringTable.getString(var), v, blocknum);
+                                   LLMessageStringTable::getInstance()->getString(var), v, blocknum);
 }
 void LLMessageSystem::getVector3dFast(const char *block, const char *var, 
@@ -3869,8 +3856,8 @@ void LLMessageSystem::getVector3dFast(const char *block, const char *var,
 void LLMessageSystem::getVector3d(const char *block, const char *var, 
                                                                  LLVector3d &v, S32 blocknum )
 {
-        getVector3dFast(gMessageStringTable.getString(block), 
+        getVector3dFast(LLMessageStringTable::getInstance()->getString(block), 
-                                gMessageStringTable.getString(var), v, blocknum);
+                                LLMessageStringTable::getInstance()->getString(var), v, blocknum);
 }
 void LLMessageSystem::getQuatFast(const char *block, const char *var, 
@@ -3882,8 +3869,8 @@ void LLMessageSystem::getQuatFast(const char *block, const char *var,
 void LLMessageSystem::getQuat(const char *block, const char *var, 
                                                          LLQuaternion &q, S32 blocknum)
 {
-        getQuatFast(gMessageStringTable.getString(block), 
+        getQuatFast(LLMessageStringTable::getInstance()->getString(block), 
-                        gMessageStringTable.getString(var), q, blocknum);
+                        LLMessageStringTable::getInstance()->getString(var), q, blocknum);
 }
 void LLMessageSystem::getUUIDFast(const char *block, const char *var, 
@@ -3895,8 +3882,8 @@ void LLMessageSystem::getUUIDFast(const char *block, const char *var,
 void LLMessageSystem::getUUID(const char *block, const char *var, LLUUID &u, 
                                                          S32 blocknum )
 {
-        getUUIDFast(gMessageStringTable.getString(block), 
+        getUUIDFast(LLMessageStringTable::getInstance()->getString(block), 
-                                gMessageStringTable.getString(var), u, blocknum);
+                                LLMessageStringTable::getInstance()->getString(var), u, blocknum);
 }
 void LLMessageSystem::getIPAddrFast(const char *block, const char *var, 
@@ -3908,8 +3895,8 @@ void LLMessageSystem::getIPAddrFast(const char *block, const char *var,
 void LLMessageSystem::getIPAddr(const char *block, const char *var, U32 &u, 
                                                                S32 blocknum)
 {
-        getIPAddrFast(gMessageStringTable.getString(block), 
+        getIPAddrFast(LLMessageStringTable::getInstance()->getString(block), 
-                                  gMessageStringTable.getString(var), u, blocknum);
+                                  LLMessageStringTable::getInstance()->getString(var), u, blocknum);
 }
 void LLMessageSystem::getIPPortFast(const char *block, const char *var, 
@@ -3921,8 +3908,8 @@ void LLMessageSystem::getIPPortFast(const char *block, const char *var,
 void LLMessageSystem::getIPPort(const char *block, const char *var, U16 &u, 
                                                                S32 blocknum)
 {
-        getIPPortFast(gMessageStringTable.getString(block), 
+        getIPPortFast(LLMessageStringTable::getInstance()->getString(block), 
-                                  gMessageStringTable.getString(var), u, 
+                                  LLMessageStringTable::getInstance()->getString(var), u, 
                                  blocknum);
 }
@@ -3940,8 +3927,8 @@ void LLMessageSystem::getStringFast(const char *block, const char *var,
 void LLMessageSystem::getString(const char *block, const char *var, 
                                                                S32 buffer_size, char *s, S32 blocknum )
 {
-        getStringFast(gMessageStringTable.getString(block), 
+        getStringFast(LLMessageStringTable::getInstance()->getString(block), 
-                                  gMessageStringTable.getString(var), buffer_size, s, 
+                                  LLMessageStringTable::getInstance()->getString(var), buffer_size, s, 
                                  blocknum);
 }
@@ -3952,7 +3939,7 @@ S32	LLMessageSystem::getNumberOfBlocksFast(const char *blockname)
 S32     LLMessageSystem::getNumberOfBlocks(const char *blockname)
 {
-        return getNumberOfBlocksFast(gMessageStringTable.getString(blockname));
+        return getNumberOfBlocksFast(LLMessageStringTable::getInstance()->getString(blockname));
 }
        
 S32     LLMessageSystem::getSizeFast(const char *blockname, const char *varname)
@@ -3962,8 +3949,8 @@ S32	LLMessageSystem::getSizeFast(const char *blockname, const char *varname)
 S32     LLMessageSystem::getSize(const char *blockname, const char *varname)
 {
-        return getSizeFast(gMessageStringTable.getString(blockname), 
+        return getSizeFast(LLMessageStringTable::getInstance()->getString(blockname), 
-                                           gMessageStringTable.getString(varname));
+                                           LLMessageStringTable::getInstance()->getString(varname));
 }
        
 // size in bytes of variable length data
@@ -3976,8 +3963,8 @@ S32	LLMessageSystem::getSizeFast(const char *blockname, S32 blocknum,
 S32     LLMessageSystem::getSize(const char *blockname, S32 blocknum, 
                                                         const char *varname)
 {
-        return getSizeFast(gMessageStringTable.getString(blockname), blocknum, 
+        return getSizeFast(LLMessageStringTable::getInstance()->getString(blockname), blocknum, 
-                                           gMessageStringTable.getString(varname));
+                                           LLMessageStringTable::getInstance()->getString(varname));
 }
 S32 LLMessageSystem::getReceiveSize() const
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index 05aa592..00abff4 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -68,7 +68,7 @@ const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
 const S32 MESSAGE_MAX_PER_FRAME = 400;
-class LLMessageStringTable
+class LLMessageStringTable : public LLSingleton<LLMessageStringTable>
 {
 public:
        LLMessageStringTable();
@@ -81,7 +81,6 @@ public:
        char mString[MESSAGE_NUMBER_OF_HASH_BUCKETS][MESSAGE_MAX_STRINGS_LENGTH];       /* Flawfinder: ignore */
 };
-extern LLMessageStringTable gMessageStringTable;
 // Individual Messages are described with the following format
 // Note that to ease parsing, keywords are used
@@ -302,7 +301,7 @@ public:
        void    setHandlerFuncFast(const char *name, void (*handler_func)(LLMessageSystem *msgsystem, void **user_data), void **user_data = NULL);
        void    setHandlerFunc(const char *name, void (*handler_func)(LLMessageSystem *msgsystem, void **user_data), void **user_data = NULL)
        {
-                setHandlerFuncFast(gMessageStringTable.getString(name), handler_func, user_data);
+                setHandlerFuncFast(LLMessageStringTable::getInstance()->getString(name), handler_func, user_data);
        }
        // Set a callback function for a message system exception.
@@ -339,7 +338,7 @@ public:
        BOOL    isMessageFast(const char *msg);
        BOOL    isMessage(const char *msg)
        {
-                return isMessageFast(gMessageStringTable.getString(msg));
+                return isMessageFast(LLMessageStringTable::getInstance()->getString(msg));
        }
        void dumpPacketToLog();
@@ -372,7 +371,7 @@ public:
        void nextBlockFast(const char *blockname);
        void    nextBlock(const char *blockname)
        {
-                nextBlockFast(gMessageStringTable.getString(blockname));
+                nextBlockFast(LLMessageStringTable::getInstance()->getString(blockname));
        }
 public:
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index 39a4f33..745271f 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -39,2672 +39,1336 @@
 F32 gPrehashVersionNumber = 2.000f;
-char * _PREHASH_X;
+char* _PREHASH_X = LLMessageStringTable::getInstance()->getString("X");
-char * _PREHASH_Y;
+char* _PREHASH_Y = LLMessageStringTable::getInstance()->getString("Y");
-char * _PREHASH_Z;
+char* _PREHASH_Z = LLMessageStringTable::getInstance()->getString("Z");
-char * _PREHASH_AddFlags;
+char* _PREHASH_AddFlags = LLMessageStringTable::getInstance()->getString("AddFlags");
-char * _PREHASH_FailureInfo;
+char* _PREHASH_FailureInfo = LLMessageStringTable::getInstance()->getString("FailureInfo");
-char * _PREHASH_MapData;
+char* _PREHASH_MapData = LLMessageStringTable::getInstance()->getString("MapData");
-char * _PREHASH_AddItem;
+char* _PREHASH_AddItem = LLMessageStringTable::getInstance()->getString("AddItem");
-char * _PREHASH_MeanCollision;
+char* _PREHASH_MeanCollision = LLMessageStringTable::getInstance()->getString("MeanCollision");
-char * _PREHASH_RezScript;
+char* _PREHASH_RezScript = LLMessageStringTable::getInstance()->getString("RezScript");
-char * _PREHASH_AvatarSitResponse;
+char* _PREHASH_AvatarSitResponse = LLMessageStringTable::getInstance()->getString("AvatarSitResponse");
-char * _PREHASH_InventoryAssetResponse;
+char* _PREHASH_InventoryAssetResponse = LLMessageStringTable::getInstance()->getString("InventoryAssetResponse");
-char * _PREHASH_KillObject;
+char* _PREHASH_KillObject = LLMessageStringTable::getInstance()->getString("KillObject");
-char * _PREHASH_ProposalID;
+char* _PREHASH_ProposalID = LLMessageStringTable::getInstance()->getString("ProposalID");
-char * _PREHASH_SerialNum;
+char* _PREHASH_SerialNum = LLMessageStringTable::getInstance()->getString("SerialNum");
-char * _PREHASH_Duration;
+char* _PREHASH_Duration = LLMessageStringTable::getInstance()->getString("Duration");
-char * _PREHASH_ScriptQuestion;
+char* _PREHASH_ScriptQuestion = LLMessageStringTable::getInstance()->getString("ScriptQuestion");
-char * _PREHASH_AddCircuitCode;
+char* _PREHASH_AddCircuitCode = LLMessageStringTable::getInstance()->getString("AddCircuitCode");
-char * _PREHASH_UseCircuitCode;
+char* _PREHASH_UseCircuitCode = LLMessageStringTable::getInstance()->getString("UseCircuitCode");
-char * _PREHASH_ViewerCircuitCode;
+char* _PREHASH_ViewerCircuitCode = LLMessageStringTable::getInstance()->getString("ViewerCircuitCode");
-char * _PREHASH_ScriptAnswerYes;
+char* _PREHASH_ScriptAnswerYes = LLMessageStringTable::getInstance()->getString("ScriptAnswerYes");
-char * _PREHASH_PartnerID;
+char* _PREHASH_PartnerID = LLMessageStringTable::getInstance()->getString("PartnerID");
-char * _PREHASH_DirLandQuery;
+char* _PREHASH_DirLandQuery = LLMessageStringTable::getInstance()->getString("DirLandQuery");
-char * _PREHASH_TeleportStart;
+char* _PREHASH_TeleportStart = LLMessageStringTable::getInstance()->getString("TeleportStart");
-char * _PREHASH_AboutText;
+char* _PREHASH_AboutText = LLMessageStringTable::getInstance()->getString("AboutText");
-char * _PREHASH_VisualParam;
+char* _PREHASH_VisualParam = LLMessageStringTable::getInstance()->getString("VisualParam");
-char * _PREHASH_GroupPrims;
+char* _PREHASH_GroupPrims = LLMessageStringTable::getInstance()->getString("GroupPrims");
-char * _PREHASH_SelectedPrims;
+char* _PREHASH_SelectedPrims = LLMessageStringTable::getInstance()->getString("SelectedPrims");
-char * _PREHASH_ID;
+char* _PREHASH_ID = LLMessageStringTable::getInstance()->getString("ID");
-char * _PREHASH_UUIDNameRequest;
+char* _PREHASH_UUIDNameRequest = LLMessageStringTable::getInstance()->getString("UUIDNameRequest");
-char * _PREHASH_UUIDGroupNameRequest;
+char* _PREHASH_UUIDGroupNameRequest = LLMessageStringTable::getInstance()->getString("UUIDGroupNameRequest");
-char * _PREHASH_GroupAccountTransactionsRequest;
+char* _PREHASH_GroupAccountTransactionsRequest = LLMessageStringTable::getInstance()->getString("GroupAccountTransactionsRequest");
-char * _PREHASH_MapNameRequest;
+char* _PREHASH_MapNameRequest = LLMessageStringTable::getInstance()->getString("MapNameRequest");
-char * _PREHASH_UpdateSimulator;
+char* _PREHASH_UpdateSimulator = LLMessageStringTable::getInstance()->getString("UpdateSimulator");
-char * _PREHASH_BillableFactor;
+char* _PREHASH_BillableFactor = LLMessageStringTable::getInstance()->getString("BillableFactor");
-char * _PREHASH_ObjectBonusFactor;
+char* _PREHASH_ObjectBonusFactor = LLMessageStringTable::getInstance()->getString("ObjectBonusFactor");
-char * _PREHASH_EnableSimulator;
+char* _PREHASH_EnableSimulator = LLMessageStringTable::getInstance()->getString("EnableSimulator");
-char * _PREHASH_DisableSimulator;
+char* _PREHASH_DisableSimulator = LLMessageStringTable::getInstance()->getString("DisableSimulator");
-char * _PREHASH_ConfirmEnableSimulator;
+char* _PREHASH_ConfirmEnableSimulator = LLMessageStringTable::getInstance()->getString("ConfirmEnableSimulator");
-char * _PREHASH_LayerType;
+char* _PREHASH_LayerType = LLMessageStringTable::getInstance()->getString("LayerType");
-char * _PREHASH_OwnerRole;
+char* _PREHASH_OwnerRole = LLMessageStringTable::getInstance()->getString("OwnerRole");
-char * _PREHASH_ParcelOverlay;
+char* _PREHASH_ParcelOverlay = LLMessageStringTable::getInstance()->getString("ParcelOverlay");
-char * _PREHASH_GroupOwned;
+char* _PREHASH_GroupOwned = LLMessageStringTable::getInstance()->getString("GroupOwned");
-char * _PREHASH_IP;
+char* _PREHASH_IP = LLMessageStringTable::getInstance()->getString("IP");
-char * _PREHASH_ChatFromViewer;
+char* _PREHASH_ChatFromViewer = LLMessageStringTable::getInstance()->getString("ChatFromViewer");
-char * _PREHASH_AvgAgentsInView;
+char* _PREHASH_AvgAgentsInView = LLMessageStringTable::getInstance()->getString("AvgAgentsInView");
-char * _PREHASH_AgentsInView;
+char* _PREHASH_AgentsInView = LLMessageStringTable::getInstance()->getString("AgentsInView");
-char * _PREHASH_GroupTitle;
+char* _PREHASH_GroupTitle = LLMessageStringTable::getInstance()->getString("GroupTitle");
-char * _PREHASH_MapLayerReply;
+char* _PREHASH_MapLayerReply = LLMessageStringTable::getInstance()->getString("MapLayerReply");
-char * _PREHASH_CompoundMsgID;
+char* _PREHASH_CompoundMsgID = LLMessageStringTable::getInstance()->getString("CompoundMsgID");
-char * _PREHASH_CameraConstraint;
+char* _PREHASH_CameraConstraint = LLMessageStringTable::getInstance()->getString("CameraConstraint");
-char * _PREHASH_DownloadTotals;
+char* _PREHASH_DownloadTotals = LLMessageStringTable::getInstance()->getString("DownloadTotals");
-char * _PREHASH_GenCounter;
+char* _PREHASH_GenCounter = LLMessageStringTable::getInstance()->getString("GenCounter");
-char * _PREHASH_FrozenData;
+char* _PREHASH_FrozenData = LLMessageStringTable::getInstance()->getString("FrozenData");
-char * _PREHASH_ChildAgentDying;
+char* _PREHASH_ChildAgentDying = LLMessageStringTable::getInstance()->getString("ChildAgentDying");
-char * _PREHASH_To;
+char* _PREHASH_To = LLMessageStringTable::getInstance()->getString("To");
-char * _PREHASH_CopyInventoryFromNotecard;
+char* _PREHASH_CopyInventoryFromNotecard = LLMessageStringTable::getInstance()->getString("CopyInventoryFromNotecard");
-char * _PREHASH_RezObjectFromNotecard;
+char* _PREHASH_RezObjectFromNotecard = LLMessageStringTable::getInstance()->getString("RezObjectFromNotecard");
-char * _PREHASH_ParcelDirFeeCurrent;
+char* _PREHASH_ParcelDirFeeCurrent = LLMessageStringTable::getInstance()->getString("ParcelDirFeeCurrent");
-char * _PREHASH_SeedCapability;
+char* _PREHASH_SeedCapability = LLMessageStringTable::getInstance()->getString("SeedCapability");
-char * _PREHASH_ObjectDuplicate;
+char* _PREHASH_ObjectDuplicate = LLMessageStringTable::getInstance()->getString("ObjectDuplicate");
-char * _PREHASH_InventoryData;
+char* _PREHASH_InventoryData = LLMessageStringTable::getInstance()->getString("InventoryData");
-char * _PREHASH_ReplyData;
+char* _PREHASH_ReplyData = LLMessageStringTable::getInstance()->getString("ReplyData");
-char * _PREHASH_ResetList;
+char* _PREHASH_ResetList = LLMessageStringTable::getInstance()->getString("ResetList");
-char * _PREHASH_MediaID;
+char* _PREHASH_MediaID = LLMessageStringTable::getInstance()->getString("MediaID");
-char * _PREHASH_RelatedRights;
+char* _PREHASH_RelatedRights = LLMessageStringTable::getInstance()->getString("RelatedRights");
-char * _PREHASH_RedirectGridX;
+char* _PREHASH_RedirectGridX = LLMessageStringTable::getInstance()->getString("RedirectGridX");
-char * _PREHASH_RedirectGridY;
+char* _PREHASH_RedirectGridY = LLMessageStringTable::getInstance()->getString("RedirectGridY");
-char * _PREHASH_TransferID;
+char* _PREHASH_TransferID = LLMessageStringTable::getInstance()->getString("TransferID");
-char * _PREHASH_TexturesChanged;
+char* _PREHASH_TexturesChanged = LLMessageStringTable::getInstance()->getString("TexturesChanged");
-char * _PREHASH_UserLookAt;
+char* _PREHASH_UserLookAt = LLMessageStringTable::getInstance()->getString("UserLookAt");
-char * _PREHASH_TestBlock1;
+char* _PREHASH_TestBlock1 = LLMessageStringTable::getInstance()->getString("TestBlock1");
-char * _PREHASH_SensedData;
+char* _PREHASH_SensedData = LLMessageStringTable::getInstance()->getString("SensedData");
-char * _PREHASH_UpdateBlock;
+char* _PREHASH_UpdateBlock = LLMessageStringTable::getInstance()->getString("UpdateBlock");
-char * _PREHASH_ClassifiedGodDelete;
+char* _PREHASH_ClassifiedGodDelete = LLMessageStringTable::getInstance()->getString("ClassifiedGodDelete");
-char * _PREHASH_ObjectGrabUpdate;
+char* _PREHASH_ObjectGrabUpdate = LLMessageStringTable::getInstance()->getString("ObjectGrabUpdate");
-char * _PREHASH_LocationPos;
+char* _PREHASH_LocationPos = LLMessageStringTable::getInstance()->getString("LocationPos");
-char * _PREHASH_TaxDate;
+char* _PREHASH_TaxDate = LLMessageStringTable::getInstance()->getString("TaxDate");
-char * _PREHASH_StartDateTime;
+char* _PREHASH_StartDateTime = LLMessageStringTable::getInstance()->getString("StartDateTime");
-char * _PREHASH_ObjectUpdateCached;
+char* _PREHASH_ObjectUpdateCached = LLMessageStringTable::getInstance()->getString("ObjectUpdateCached");
-char * _PREHASH_Packets;
+char* _PREHASH_Packets = LLMessageStringTable::getInstance()->getString("Packets");
-char * _PREHASH_FailureType;
+char* _PREHASH_FailureType = LLMessageStringTable::getInstance()->getString("FailureType");
-char * _PREHASH_UpdateGroupInfo;
+char* _PREHASH_UpdateGroupInfo = LLMessageStringTable::getInstance()->getString("UpdateGroupInfo");
-char * _PREHASH_ObjectPermissions;
+char* _PREHASH_ObjectPermissions = LLMessageStringTable::getInstance()->getString("ObjectPermissions");
-char * _PREHASH_RevokePermissions;
+char* _PREHASH_RevokePermissions = LLMessageStringTable::getInstance()->getString("RevokePermissions");
-char * _PREHASH_UpdateFlags;
+char* _PREHASH_UpdateFlags = LLMessageStringTable::getInstance()->getString("UpdateFlags");
-char * _PREHASH_ObjectExportSelected;
+char* _PREHASH_ObjectExportSelected = LLMessageStringTable::getInstance()->getString("ObjectExportSelected");
-char * _PREHASH_RezSelected;
+char* _PREHASH_RezSelected = LLMessageStringTable::getInstance()->getString("RezSelected");
-char * _PREHASH_AutoPilot;
+char* _PREHASH_AutoPilot = LLMessageStringTable::getInstance()->getString("AutoPilot");
-char * _PREHASH_UpdateMuteListEntry;
+char* _PREHASH_UpdateMuteListEntry = LLMessageStringTable::getInstance()->getString("UpdateMuteListEntry");
-char * _PREHASH_RemoveMuteListEntry;
+char* _PREHASH_RemoveMuteListEntry = LLMessageStringTable::getInstance()->getString("RemoveMuteListEntry");
-char * _PREHASH_SetSimStatusInDatabase;
+char* _PREHASH_SetSimStatusInDatabase = LLMessageStringTable::getInstance()->getString("SetSimStatusInDatabase");
-char * _PREHASH_SetSimPresenceInDatabase;
+char* _PREHASH_SetSimPresenceInDatabase = LLMessageStringTable::getInstance()->getString("SetSimPresenceInDatabase");
-char * _PREHASH_CameraProperty;
+char* _PREHASH_CameraProperty = LLMessageStringTable::getInstance()->getString("CameraProperty");
-char * _PREHASH_BrushSize;
+char* _PREHASH_BrushSize = LLMessageStringTable::getInstance()->getString("BrushSize");
-char * _PREHASH_SimulatorSetMap;
+char* _PREHASH_SimulatorSetMap = LLMessageStringTable::getInstance()->getString("SimulatorSetMap");
-char * _PREHASH_RegionPresenceRequestByRegionID;
+char* _PREHASH_RegionPresenceRequestByRegionID = LLMessageStringTable::getInstance()->getString("RegionPresenceRequestByRegionID");
-char * _PREHASH_ParcelObjectOwnersReply;
+char* _PREHASH_ParcelObjectOwnersReply = LLMessageStringTable::getInstance()->getString("ParcelObjectOwnersReply");
-char * _PREHASH_GroupMembersReply;
+char* _PREHASH_GroupMembersReply = LLMessageStringTable::getInstance()->getString("GroupMembersReply");
-char * _PREHASH_GroupRoleMembersReply;
+char* _PREHASH_GroupRoleMembersReply = LLMessageStringTable::getInstance()->getString("GroupRoleMembersReply");
-char * _PREHASH_RequestRegionInfo;
+char* _PREHASH_RequestRegionInfo = LLMessageStringTable::getInstance()->getString("RequestRegionInfo");
-char * _PREHASH_AABBMax;
+char* _PREHASH_AABBMax = LLMessageStringTable::getInstance()->getString("AABBMax");
-char * _PREHASH_RequestPayPrice;
+char* _PREHASH_RequestPayPrice = LLMessageStringTable::getInstance()->getString("RequestPayPrice");
-char * _PREHASH_SimulatorPresentAtLocation;
+char* _PREHASH_SimulatorPresentAtLocation = LLMessageStringTable::getInstance()->getString("SimulatorPresentAtLocation");
-char * _PREHASH_AgentRequestSit;
+char* _PREHASH_AgentRequestSit = LLMessageStringTable::getInstance()->getString("AgentRequestSit");
-char * _PREHASH_AABBMin;
+char* _PREHASH_AABBMin = LLMessageStringTable::getInstance()->getString("AABBMin");
-char * _PREHASH_ClassifiedFlags;
+char* _PREHASH_ClassifiedFlags = LLMessageStringTable::getInstance()->getString("ClassifiedFlags");
-char * _PREHASH_ControlFlags;
+char* _PREHASH_ControlFlags = LLMessageStringTable::getInstance()->getString("ControlFlags");
-char * _PREHASH_TeleportRequest;
+char* _PREHASH_TeleportRequest = LLMessageStringTable::getInstance()->getString("TeleportRequest");
-char * _PREHASH_ScriptTeleportRequest;
+char* _PREHASH_ScriptTeleportRequest = LLMessageStringTable::getInstance()->getString("ScriptTeleportRequest");
-char * _PREHASH_EstateCovenantRequest;
+char* _PREHASH_EstateCovenantRequest = LLMessageStringTable::getInstance()->getString("EstateCovenantRequest");
-char * _PREHASH_DateUTC;
+char* _PREHASH_DateUTC = LLMessageStringTable::getInstance()->getString("DateUTC");
-char * _PREHASH_TaskIDs;
+char* _PREHASH_TaskIDs = LLMessageStringTable::getInstance()->getString("TaskIDs");
-char * _PREHASH_RequestResult;
+char* _PREHASH_RequestResult = LLMessageStringTable::getInstance()->getString("RequestResult");
-char * _PREHASH_CanAcceptAgents;
+char* _PREHASH_CanAcceptAgents = LLMessageStringTable::getInstance()->getString("CanAcceptAgents");
-char * _PREHASH_ObjectSaleInfo;
+char* _PREHASH_ObjectSaleInfo = LLMessageStringTable::getInstance()->getString("ObjectSaleInfo");
-char * _PREHASH_KillChildAgents;
+char* _PREHASH_KillChildAgents = LLMessageStringTable::getInstance()->getString("KillChildAgents");
-char * _PREHASH_Balance;
+char* _PREHASH_Balance = LLMessageStringTable::getInstance()->getString("Balance");
-char * _PREHASH_DerezContainer;
+char* _PREHASH_DerezContainer = LLMessageStringTable::getInstance()->getString("DerezContainer");
-char * _PREHASH_ObjectData;
+char* _PREHASH_ObjectData = LLMessageStringTable::getInstance()->getString("ObjectData");
-char * _PREHASH_CameraAtAxis;
+char* _PREHASH_CameraAtAxis = LLMessageStringTable::getInstance()->getString("CameraAtAxis");
-char * _PREHASH_InfoBlock;
+char* _PREHASH_InfoBlock = LLMessageStringTable::getInstance()->getString("InfoBlock");
-char * _PREHASH_OwnershipCost;
+char* _PREHASH_OwnershipCost = LLMessageStringTable::getInstance()->getString("OwnershipCost");
-char * _PREHASH_AvatarNotesUpdate;
+char* _PREHASH_AvatarNotesUpdate = LLMessageStringTable::getInstance()->getString("AvatarNotesUpdate");
-char * _PREHASH_PID;
+char* _PREHASH_PID = LLMessageStringTable::getInstance()->getString("PID");
-char * _PREHASH_DirPopularReply;
+char* _PREHASH_DirPopularReply = LLMessageStringTable::getInstance()->getString("DirPopularReply");
-char * _PREHASH_TerrainHeightRange00;
+char* _PREHASH_TerrainHeightRange00 = LLMessageStringTable::getInstance()->getString("TerrainHeightRange00");
-char * _PREHASH_SimData;
+char* _PREHASH_SimData = LLMessageStringTable::getInstance()->getString("SimData");
-char * _PREHASH_TerrainHeightRange01;
+char* _PREHASH_TerrainHeightRange01 = LLMessageStringTable::getInstance()->getString("TerrainHeightRange01");
-char * _PREHASH_TerrainHeightRange10;
+char* _PREHASH_TerrainHeightRange10 = LLMessageStringTable::getInstance()->getString("TerrainHeightRange10");
-char * _PREHASH_TerrainHeightRange11;
+char* _PREHASH_TerrainHeightRange11 = LLMessageStringTable::getInstance()->getString("TerrainHeightRange11");
-char * _PREHASH_UpdateInventoryItem;
+char* _PREHASH_UpdateInventoryItem = LLMessageStringTable::getInstance()->getString("UpdateInventoryItem");
-char * _PREHASH_UpdateCreateInventoryItem;
+char* _PREHASH_UpdateCreateInventoryItem = LLMessageStringTable::getInstance()->getString("UpdateCreateInventoryItem");
-char * _PREHASH_MoveInventoryItem;
+char* _PREHASH_MoveInventoryItem = LLMessageStringTable::getInstance()->getString("MoveInventoryItem");
-char * _PREHASH_CopyInventoryItem;
+char* _PREHASH_CopyInventoryItem = LLMessageStringTable::getInstance()->getString("CopyInventoryItem");
-char * _PREHASH_RemoveInventoryItem;
+char* _PREHASH_RemoveInventoryItem = LLMessageStringTable::getInstance()->getString("RemoveInventoryItem");
-char * _PREHASH_CreateInventoryItem;
+char* _PREHASH_CreateInventoryItem = LLMessageStringTable::getInstance()->getString("CreateInventoryItem");
-char * _PREHASH_PathTwistBegin;
+char* _PREHASH_PathTwistBegin = LLMessageStringTable::getInstance()->getString("PathTwistBegin");
-char * _PREHASH_CRC;
+char* _PREHASH_CRC = LLMessageStringTable::getInstance()->getString("CRC");
-char * _PREHASH_AttachmentPoint;
+char* _PREHASH_AttachmentPoint = LLMessageStringTable::getInstance()->getString("AttachmentPoint");
-char * _PREHASH_TelehubBlock;
+char* _PREHASH_TelehubBlock = LLMessageStringTable::getInstance()->getString("TelehubBlock");
-char * _PREHASH_FOVBlock;
+char* _PREHASH_FOVBlock = LLMessageStringTable::getInstance()->getString("FOVBlock");
-char * _PREHASH_StartLocationData;
+char* _PREHASH_StartLocationData = LLMessageStringTable::getInstance()->getString("StartLocationData");
-char * _PREHASH_PositionData;
+char* _PREHASH_PositionData = LLMessageStringTable::getInstance()->getString("PositionData");
-char * _PREHASH_TimeSinceLast;
+char* _PREHASH_TimeSinceLast = LLMessageStringTable::getInstance()->getString("TimeSinceLast");
-char * _PREHASH_MapImage;
+char* _PREHASH_MapImage = LLMessageStringTable::getInstance()->getString("MapImage");
-char * _PREHASH_Objects;
+char* _PREHASH_Objects = LLMessageStringTable::getInstance()->getString("Objects");
-char * _PREHASH_URL;
+char* _PREHASH_URL = LLMessageStringTable::getInstance()->getString("URL");
-char * _PREHASH_CreationDate;
+char* _PREHASH_CreationDate = LLMessageStringTable::getInstance()->getString("CreationDate");
-char * _PREHASH_JointPivot;
+char* _PREHASH_JointPivot = LLMessageStringTable::getInstance()->getString("JointPivot");
-char * _PREHASH_FPS;
+char* _PREHASH_FPS = LLMessageStringTable::getInstance()->getString("FPS");
-char * _PREHASH_HasTelehub;
+char* _PREHASH_HasTelehub = LLMessageStringTable::getInstance()->getString("HasTelehub");
-char * _PREHASH_PathEnd;
+char* _PREHASH_PathEnd = LLMessageStringTable::getInstance()->getString("PathEnd");
-char * _PREHASH_ScriptDataReply;
+char* _PREHASH_ScriptDataReply = LLMessageStringTable::getInstance()->getString("ScriptDataReply");
-char * _PREHASH_MapBlockReply;
+char* _PREHASH_MapBlockReply = LLMessageStringTable::getInstance()->getString("MapBlockReply");
-char * _PREHASH_PropertiesData;
+char* _PREHASH_PropertiesData = LLMessageStringTable::getInstance()->getString("PropertiesData");
-char * _PREHASH_ViewerEffect;
+char* _PREHASH_ViewerEffect = LLMessageStringTable::getInstance()->getString("ViewerEffect");
-char * _PREHASH_FreezeUser;
+char* _PREHASH_FreezeUser = LLMessageStringTable::getInstance()->getString("FreezeUser");
-char * _PREHASH_OwnerPrims;
+char* _PREHASH_OwnerPrims = LLMessageStringTable::getInstance()->getString("OwnerPrims");
-char * _PREHASH_ObjectGrab;
+char* _PREHASH_ObjectGrab = LLMessageStringTable::getInstance()->getString("ObjectGrab");
-char * _PREHASH_ToAgentID;
+char* _PREHASH_ToAgentID = LLMessageStringTable::getInstance()->getString("ToAgentID");
-char * _PREHASH_SimulatorMapUpdate;
+char* _PREHASH_SimulatorMapUpdate = LLMessageStringTable::getInstance()->getString("SimulatorMapUpdate");
-char * _PREHASH_TransferPacket;
+char* _PREHASH_TransferPacket = LLMessageStringTable::getInstance()->getString("TransferPacket");
-char * _PREHASH_ObjectName;
+char* _PREHASH_ObjectName = LLMessageStringTable::getInstance()->getString("ObjectName");
-char * _PREHASH_GroupPowers;
+char* _PREHASH_GroupPowers = LLMessageStringTable::getInstance()->getString("GroupPowers");
-char * _PREHASH_OriginalName;
+char* _PREHASH_OriginalName = LLMessageStringTable::getInstance()->getString("OriginalName");
-char * _PREHASH_CompletePingCheck;
+char* _PREHASH_CompletePingCheck = LLMessageStringTable::getInstance()->getString("CompletePingCheck");
-char * _PREHASH_OnlineStatus;
+char* _PREHASH_OnlineStatus = LLMessageStringTable::getInstance()->getString("OnlineStatus");
-char * _PREHASH_ObjectDrop;
+char* _PREHASH_ObjectDrop = LLMessageStringTable::getInstance()->getString("ObjectDrop");
-char * _PREHASH_UseBigPackets;
+char* _PREHASH_UseBigPackets = LLMessageStringTable::getInstance()->getString("UseBigPackets");
-char * _PREHASH_GroupNoticesListReply;
+char* _PREHASH_GroupNoticesListReply = LLMessageStringTable::getInstance()->getString("GroupNoticesListReply");
-char * _PREHASH_ParcelAccessListReply;
+char* _PREHASH_ParcelAccessListReply = LLMessageStringTable::getInstance()->getString("ParcelAccessListReply");
-char * _PREHASH_RpcChannelReply;
+char* _PREHASH_RpcChannelReply = LLMessageStringTable::getInstance()->getString("RpcChannelReply");
-char * _PREHASH_RegionPresenceResponse;
+char* _PREHASH_RegionPresenceResponse = LLMessageStringTable::getInstance()->getString("RegionPresenceResponse");
-char * _PREHASH_CharterMember;
+char* _PREHASH_CharterMember = LLMessageStringTable::getInstance()->getString("CharterMember");
-char * _PREHASH_EdgeData;
+char* _PREHASH_EdgeData = LLMessageStringTable::getInstance()->getString("EdgeData");
-char * _PREHASH_NameData;
+char* _PREHASH_NameData = LLMessageStringTable::getInstance()->getString("NameData");
-char * _PREHASH_RegionPushOverride;
+char* _PREHASH_RegionPushOverride = LLMessageStringTable::getInstance()->getString("RegionPushOverride");
-char * _PREHASH_SimName;
+char* _PREHASH_SimName = LLMessageStringTable::getInstance()->getString("SimName");
-char * _PREHASH_UserReport;
+char* _PREHASH_UserReport = LLMessageStringTable::getInstance()->getString("UserReport");
-char * _PREHASH_DownloadPriority;
+char* _PREHASH_DownloadPriority = LLMessageStringTable::getInstance()->getString("DownloadPriority");
-char * _PREHASH_ToAgentId;
+char* _PREHASH_ToAgentId = LLMessageStringTable::getInstance()->getString("ToAgentId");
-char * _PREHASH_DirPopularQuery;
+char* _PREHASH_DirPopularQuery = LLMessageStringTable::getInstance()->getString("DirPopularQuery");
-char * _PREHASH_Mag;
+char* _PREHASH_Mag = LLMessageStringTable::getInstance()->getString("Mag");
-char * _PREHASH_ParcelPropertiesRequestByID;
+char* _PREHASH_ParcelPropertiesRequestByID = LLMessageStringTable::getInstance()->getString("ParcelPropertiesRequestByID");
-char * _PREHASH_ObjectLink;
+char* _PREHASH_ObjectLink = LLMessageStringTable::getInstance()->getString("ObjectLink");
-char * _PREHASH_RpcScriptReplyInbound;
+char* _PREHASH_RpcScriptReplyInbound = LLMessageStringTable::getInstance()->getString("RpcScriptReplyInbound");
-char * _PREHASH_RezData;
+char* _PREHASH_RezData = LLMessageStringTable::getInstance()->getString("RezData");
-char * _PREHASH_RemoveInventoryObjects;
+char* _PREHASH_RemoveInventoryObjects = LLMessageStringTable::getInstance()->getString("RemoveInventoryObjects");
-char * _PREHASH_GroupProposalBallot;
+char* _PREHASH_GroupProposalBallot = LLMessageStringTable::getInstance()->getString("GroupProposalBallot");
-char * _PREHASH_RPCServerIP;
+char* _PREHASH_RPCServerIP = LLMessageStringTable::getInstance()->getString("RPCServerIP");
-char * _PREHASH_Far;
+char* _PREHASH_Far = LLMessageStringTable::getInstance()->getString("Far");
-char * _PREHASH_GodSessionID;
+char* _PREHASH_GodSessionID = LLMessageStringTable::getInstance()->getString("GodSessionID");
-char * _PREHASH_FLAboutText;
+char* _PREHASH_FLAboutText = LLMessageStringTable::getInstance()->getString("FLAboutText");
-char * _PREHASH_RegionHandshakeReply;
+char* _PREHASH_RegionHandshakeReply = LLMessageStringTable::getInstance()->getString("RegionHandshakeReply");
-char * _PREHASH_GroupActiveProposalItemReply;
+char* _PREHASH_GroupActiveProposalItemReply = LLMessageStringTable::getInstance()->getString("GroupActiveProposalItemReply");
-char * _PREHASH_MapItemReply;
+char* _PREHASH_MapItemReply = LLMessageStringTable::getInstance()->getString("MapItemReply");
-char * _PREHASH_Seconds;
+char* _PREHASH_Seconds = LLMessageStringTable::getInstance()->getString("Seconds");
-char * _PREHASH_UpdateUserInfo;
+char* _PREHASH_UpdateUserInfo = LLMessageStringTable::getInstance()->getString("UpdateUserInfo");
-char * _PREHASH_AggregatePermTexturesOwner;
+char* _PREHASH_AggregatePermTexturesOwner = LLMessageStringTable::getInstance()->getString("AggregatePermTexturesOwner");
-char * _PREHASH_Set;
+char* _PREHASH_Set = LLMessageStringTable::getInstance()->getString("Set");
-char * _PREHASH_NewName;
+char* _PREHASH_NewName = LLMessageStringTable::getInstance()->getString("NewName");
-char * _PREHASH_Key;
+char* _PREHASH_Key = LLMessageStringTable::getInstance()->getString("Key");
-char * _PREHASH_AgentID;
+char* _PREHASH_AgentID = LLMessageStringTable::getInstance()->getString("AgentID");
-char * _PREHASH_EventNotificationRemoveRequest;
+char* _PREHASH_EventNotificationRemoveRequest = LLMessageStringTable::getInstance()->getString("EventNotificationRemoveRequest");
-char * _PREHASH_NewFolderID;
+char* _PREHASH_NewFolderID = LLMessageStringTable::getInstance()->getString("NewFolderID");
-char * _PREHASH_Arc;
+char* _PREHASH_Arc = LLMessageStringTable::getInstance()->getString("Arc");
-char * _PREHASH_RegionX;
+char* _PREHASH_RegionX = LLMessageStringTable::getInstance()->getString("RegionX");
-char * _PREHASH_RegionY;
+char* _PREHASH_RegionY = LLMessageStringTable::getInstance()->getString("RegionY");
-char * _PREHASH_RequestData;
+char* _PREHASH_RequestData = LLMessageStringTable::getInstance()->getString("RequestData");
-char * _PREHASH_Msg;
+char* _PREHASH_Msg = LLMessageStringTable::getInstance()->getString("Msg");
-char * _PREHASH_Top;
+char* _PREHASH_Top = LLMessageStringTable::getInstance()->getString("Top");
-char * _PREHASH_MiscStats;
+char* _PREHASH_MiscStats = LLMessageStringTable::getInstance()->getString("MiscStats");
-char * _PREHASH_ImageID;
+char* _PREHASH_ImageID = LLMessageStringTable::getInstance()->getString("ImageID");
-char * _PREHASH_DataPacket;
+char* _PREHASH_DataPacket = LLMessageStringTable::getInstance()->getString("DataPacket");
-char * _PREHASH_You;
+char* _PREHASH_You = LLMessageStringTable::getInstance()->getString("You");
-char * _PREHASH_ScriptControlChange;
+char* _PREHASH_ScriptControlChange = LLMessageStringTable::getInstance()->getString("ScriptControlChange");
-char * _PREHASH_LoadURL;
+char* _PREHASH_LoadURL = LLMessageStringTable::getInstance()->getString("LoadURL");
-char * _PREHASH_SetCPURatio;
+char* _PREHASH_SetCPURatio = LLMessageStringTable::getInstance()->getString("SetCPURatio");
-char * _PREHASH_NameValueData;
+char* _PREHASH_NameValueData = LLMessageStringTable::getInstance()->getString("NameValueData");
-char * _PREHASH_AtomicPassObject;
+char* _PREHASH_AtomicPassObject = LLMessageStringTable::getInstance()->getString("AtomicPassObject");
-char * _PREHASH_ErrorMessage;
+char* _PREHASH_ErrorMessage = LLMessageStringTable::getInstance()->getString("ErrorMessage");
-char * _PREHASH_ViewerFrozenMessage;
+char* _PREHASH_ViewerFrozenMessage = LLMessageStringTable::getInstance()->getString("ViewerFrozenMessage");
-char * _PREHASH_HealthMessage;
+char* _PREHASH_HealthMessage = LLMessageStringTable::getInstance()->getString("HealthMessage");
-char * _PREHASH_LogTextMessage;
+char* _PREHASH_LogTextMessage = LLMessageStringTable::getInstance()->getString("LogTextMessage");
-char * _PREHASH_TimeDilation;
+char* _PREHASH_TimeDilation = LLMessageStringTable::getInstance()->getString("TimeDilation");
-char * _PREHASH_RemoveContribution;
+char* _PREHASH_RemoveContribution = LLMessageStringTable::getInstance()->getString("RemoveContribution");
-char * _PREHASH_Contribution;
+char* _PREHASH_Contribution = LLMessageStringTable::getInstance()->getString("Contribution");
-char * _PREHASH_SetGroupContribution;
+char* _PREHASH_SetGroupContribution = LLMessageStringTable::getInstance()->getString("SetGroupContribution");
-char * _PREHASH_Offline;
+char* _PREHASH_Offline = LLMessageStringTable::getInstance()->getString("Offline");
-char * _PREHASH_AgentIsNowWearing;
+char* _PREHASH_AgentIsNowWearing = LLMessageStringTable::getInstance()->getString("AgentIsNowWearing");
-char * _PREHASH_Members;
+char* _PREHASH_Members = LLMessageStringTable::getInstance()->getString("Members");
-char * _PREHASH_FailedResends;
+char* _PREHASH_FailedResends = LLMessageStringTable::getInstance()->getString("FailedResends");
-char * _PREHASH_SecPerDay;
+char* _PREHASH_SecPerDay = LLMessageStringTable::getInstance()->getString("SecPerDay");
-char * _PREHASH_CameraCenter;
+char* _PREHASH_CameraCenter = LLMessageStringTable::getInstance()->getString("CameraCenter");
-char * _PREHASH_CameraLeftAxis;
+char* _PREHASH_CameraLeftAxis = LLMessageStringTable::getInstance()->getString("CameraLeftAxis");
-char * _PREHASH_ExBlock;
+char* _PREHASH_ExBlock = LLMessageStringTable::getInstance()->getString("ExBlock");
-char * _PREHASH_Channel;
+char* _PREHASH_Channel = LLMessageStringTable::getInstance()->getString("Channel");
-char * _PREHASH_NetTest;
+char* _PREHASH_NetTest = LLMessageStringTable::getInstance()->getString("NetTest");
-char * _PREHASH_DiscardLevel;
+char* _PREHASH_DiscardLevel = LLMessageStringTable::getInstance()->getString("DiscardLevel");
-char * _PREHASH_LayerID;
+char* _PREHASH_LayerID = LLMessageStringTable::getInstance()->getString("LayerID");
-char * _PREHASH_GrabOffset;
+char* _PREHASH_GrabOffset = LLMessageStringTable::getInstance()->getString("GrabOffset");
-char * _PREHASH_SimPort;
+char* _PREHASH_SimPort = LLMessageStringTable::getInstance()->getString("SimPort");
-char * _PREHASH_PricePerMeter;
+char* _PREHASH_PricePerMeter = LLMessageStringTable::getInstance()->getString("PricePerMeter");
-char * _PREHASH_RegionFlags;
+char* _PREHASH_RegionFlags = LLMessageStringTable::getInstance()->getString("RegionFlags");
-char * _PREHASH_VoteResult;
+char* _PREHASH_VoteResult = LLMessageStringTable::getInstance()->getString("VoteResult");
-char * _PREHASH_ParcelDirFeeEstimate;
+char* _PREHASH_ParcelDirFeeEstimate = LLMessageStringTable::getInstance()->getString("ParcelDirFeeEstimate");
-char * _PREHASH_ModifyBlock;
+char* _PREHASH_ModifyBlock = LLMessageStringTable::getInstance()->getString("ModifyBlock");
-char * _PREHASH_InventoryBlock;
+char* _PREHASH_InventoryBlock = LLMessageStringTable::getInstance()->getString("InventoryBlock");
-char * _PREHASH_ReplyBlock;
+char* _PREHASH_ReplyBlock = LLMessageStringTable::getInstance()->getString("ReplyBlock");
-char * _PREHASH_ValidUntil;
+char* _PREHASH_ValidUntil = LLMessageStringTable::getInstance()->getString("ValidUntil");
-char * _PREHASH_VelocityInterpolateOn;
+char* _PREHASH_VelocityInterpolateOn = LLMessageStringTable::getInstance()->getString("VelocityInterpolateOn");
-char * _PREHASH_ClassifiedDelete;
+char* _PREHASH_ClassifiedDelete = LLMessageStringTable::getInstance()->getString("ClassifiedDelete");
-char * _PREHASH_RegionDenyAnonymous;
+char* _PREHASH_RegionDenyAnonymous = LLMessageStringTable::getInstance()->getString("RegionDenyAnonymous");
-char * _PREHASH_FLImageID;
+char* _PREHASH_FLImageID = LLMessageStringTable::getInstance()->getString("FLImageID");
-char * _PREHASH_AllowPublish;
+char* _PREHASH_AllowPublish = LLMessageStringTable::getInstance()->getString("AllowPublish");
-char * _PREHASH_SitName;
+char* _PREHASH_SitName = LLMessageStringTable::getInstance()->getString("SitName");
-char * _PREHASH_RegionsVisited;
+char* _PREHASH_RegionsVisited = LLMessageStringTable::getInstance()->getString("RegionsVisited");
-char * _PREHASH_DirClassifiedReply;
+char* _PREHASH_DirClassifiedReply = LLMessageStringTable::getInstance()->getString("DirClassifiedReply");
-char * _PREHASH_AvatarClassifiedReply;
+char* _PREHASH_AvatarClassifiedReply = LLMessageStringTable::getInstance()->getString("AvatarClassifiedReply");
-char * _PREHASH_MediaURL;
+char* _PREHASH_MediaURL = LLMessageStringTable::getInstance()->getString("MediaURL");
-char * _PREHASH_CompleteAgentMovement;
+char* _PREHASH_CompleteAgentMovement = LLMessageStringTable::getInstance()->getString("CompleteAgentMovement");
-char * _PREHASH_ClassifiedID;
+char* _PREHASH_ClassifiedID = LLMessageStringTable::getInstance()->getString("ClassifiedID");
-char * _PREHASH_LocalID;
+char* _PREHASH_LocalID = LLMessageStringTable::getInstance()->getString("LocalID");
-char * _PREHASH_SpaceIP;
+char* _PREHASH_SpaceIP = LLMessageStringTable::getInstance()->getString("SpaceIP");
-char * _PREHASH_RemoveItem;
+char* _PREHASH_RemoveItem = LLMessageStringTable::getInstance()->getString("RemoveItem");
-char * _PREHASH_LogFailedMoneyTransaction;
+char* _PREHASH_LogFailedMoneyTransaction = LLMessageStringTable::getInstance()->getString("LogFailedMoneyTransaction");
-char * _PREHASH_ViewerStartAuction;
+char* _PREHASH_ViewerStartAuction = LLMessageStringTable::getInstance()->getString("ViewerStartAuction");
-char * _PREHASH_StartAuction;
+char* _PREHASH_StartAuction = LLMessageStringTable::getInstance()->getString("StartAuction");
-char * _PREHASH_DuplicateFlags;
+char* _PREHASH_DuplicateFlags = LLMessageStringTable::getInstance()->getString("DuplicateFlags");
-char * _PREHASH_RegionInfo2;
+char* _PREHASH_RegionInfo2 = LLMessageStringTable::getInstance()->getString("RegionInfo2");
-char * _PREHASH_TextColor;
+char* _PREHASH_TextColor = LLMessageStringTable::getInstance()->getString("TextColor");
-char * _PREHASH_SlaveID;
+char* _PREHASH_SlaveID = LLMessageStringTable::getInstance()->getString("SlaveID");
-char * _PREHASH_Charter;
+char* _PREHASH_Charter = LLMessageStringTable::getInstance()->getString("Charter");
-char * _PREHASH_AlertData;
+char* _PREHASH_AlertData = LLMessageStringTable::getInstance()->getString("AlertData");
-char * _PREHASH_TargetBlock;
+char* _PREHASH_TargetBlock = LLMessageStringTable::getInstance()->getString("TargetBlock");
-char * _PREHASH_CheckParcelAuctions;
+char* _PREHASH_CheckParcelAuctions = LLMessageStringTable::getInstance()->getString("CheckParcelAuctions");
-char * _PREHASH_ParcelAuctions;
+char* _PREHASH_ParcelAuctions = LLMessageStringTable::getInstance()->getString("ParcelAuctions");
-char * _PREHASH_OwnerIsGroup;
+char* _PREHASH_OwnerIsGroup = LLMessageStringTable::getInstance()->getString("OwnerIsGroup");
-char * _PREHASH_NameValuePair;
+char* _PREHASH_NameValuePair = LLMessageStringTable::getInstance()->getString("NameValuePair");
-char * _PREHASH_RemoveNameValuePair;
+char* _PREHASH_RemoveNameValuePair = LLMessageStringTable::getInstance()->getString("RemoveNameValuePair");
-char * _PREHASH_BulkUpdateInventory;
+char* _PREHASH_BulkUpdateInventory = LLMessageStringTable::getInstance()->getString("BulkUpdateInventory");
-char * _PREHASH_UpdateTaskInventory;
+char* _PREHASH_UpdateTaskInventory = LLMessageStringTable::getInstance()->getString("UpdateTaskInventory");
-char * _PREHASH_RemoveTaskInventory;
+char* _PREHASH_RemoveTaskInventory = LLMessageStringTable::getInstance()->getString("RemoveTaskInventory");
-char * _PREHASH_MoveTaskInventory;
+char* _PREHASH_MoveTaskInventory = LLMessageStringTable::getInstance()->getString("MoveTaskInventory");
-char * _PREHASH_RequestTaskInventory;
+char* _PREHASH_RequestTaskInventory = LLMessageStringTable::getInstance()->getString("RequestTaskInventory");
-char * _PREHASH_ReplyTaskInventory;
+char* _PREHASH_ReplyTaskInventory = LLMessageStringTable::getInstance()->getString("ReplyTaskInventory");
-char * _PREHASH_AggregatePermInventory;
+char* _PREHASH_AggregatePermInventory = LLMessageStringTable::getInstance()->getString("AggregatePermInventory");
-char * _PREHASH_GroupAccountTransactionsReply;
+char* _PREHASH_GroupAccountTransactionsReply = LLMessageStringTable::getInstance()->getString("GroupAccountTransactionsReply");
-char * _PREHASH_SimulatorInfo;
+char* _PREHASH_SimulatorInfo = LLMessageStringTable::getInstance()->getString("SimulatorInfo");
-char * _PREHASH_WearableData;
+char* _PREHASH_WearableData = LLMessageStringTable::getInstance()->getString("WearableData");
-char * _PREHASH_Enabled;
+char* _PREHASH_Enabled = LLMessageStringTable::getInstance()->getString("Enabled");
-char * _PREHASH_Savings;
+char* _PREHASH_Savings = LLMessageStringTable::getInstance()->getString("Savings");
-char * _PREHASH_SimulatorLoad;
+char* _PREHASH_SimulatorLoad = LLMessageStringTable::getInstance()->getString("SimulatorLoad");
-char * _PREHASH_InternalRegionIP;
+char* _PREHASH_InternalRegionIP = LLMessageStringTable::getInstance()->getString("InternalRegionIP");
-char * _PREHASH_ExternalRegionIP;
+char* _PREHASH_ExternalRegionIP = LLMessageStringTable::getInstance()->getString("ExternalRegionIP");
-char * _PREHASH_TotalPairs;
+char* _PREHASH_TotalPairs = LLMessageStringTable::getInstance()->getString("TotalPairs");
-char * _PREHASH_CreateGroupRequest;
+char* _PREHASH_CreateGroupRequest = LLMessageStringTable::getInstance()->getString("CreateGroupRequest");
-char * _PREHASH_JoinGroupRequest;
+char* _PREHASH_JoinGroupRequest = LLMessageStringTable::getInstance()->getString("JoinGroupRequest");
-char * _PREHASH_LeaveGroupRequest;
+char* _PREHASH_LeaveGroupRequest = LLMessageStringTable::getInstance()->getString("LeaveGroupRequest");
-char * _PREHASH_InviteGroupRequest;
+char* _PREHASH_InviteGroupRequest = LLMessageStringTable::getInstance()->getString("InviteGroupRequest");
-char * _PREHASH_LiveHelpGroupRequest;
+char* _PREHASH_LiveHelpGroupRequest = LLMessageStringTable::getInstance()->getString("LiveHelpGroupRequest");
-char * _PREHASH_PriceParcelClaimFactor;
+char* _PREHASH_PriceParcelClaimFactor = LLMessageStringTable::getInstance()->getString("PriceParcelClaimFactor");
-char * _PREHASH_BillableArea;
+char* _PREHASH_BillableArea = LLMessageStringTable::getInstance()->getString("BillableArea");
-char * _PREHASH_ObjectID;
+char* _PREHASH_ObjectID = LLMessageStringTable::getInstance()->getString("ObjectID");
-char * _PREHASH_ObjectFlagUpdate;
+char* _PREHASH_ObjectFlagUpdate = LLMessageStringTable::getInstance()->getString("ObjectFlagUpdate");
-char * _PREHASH_GroupRoleUpdate;
+char* _PREHASH_GroupRoleUpdate = LLMessageStringTable::getInstance()->getString("GroupRoleUpdate");
-char * _PREHASH_RequestInventoryAsset;
+char* _PREHASH_RequestInventoryAsset = LLMessageStringTable::getInstance()->getString("RequestInventoryAsset");
-char * _PREHASH_ChangedGrid;
+char* _PREHASH_ChangedGrid = LLMessageStringTable::getInstance()->getString("ChangedGrid");
-char * _PREHASH_AgentDropGroup;
+char* _PREHASH_AgentDropGroup = LLMessageStringTable::getInstance()->getString("AgentDropGroup");
-char * _PREHASH_Details;
+char* _PREHASH_Details = LLMessageStringTable::getInstance()->getString("Details");
-char * _PREHASH_LocationX;
+char* _PREHASH_LocationX = LLMessageStringTable::getInstance()->getString("LocationX");
-char * _PREHASH_SaleType;
+char* _PREHASH_SaleType = LLMessageStringTable::getInstance()->getString("SaleType");
-char * _PREHASH_LocationY;
+char* _PREHASH_LocationY = LLMessageStringTable::getInstance()->getString("LocationY");
-char * _PREHASH_LocationZ;
+char* _PREHASH_LocationZ = LLMessageStringTable::getInstance()->getString("LocationZ");
-char * _PREHASH_EconomyData;
+char* _PREHASH_EconomyData = LLMessageStringTable::getInstance()->getString("EconomyData");
-char * _PREHASH_HeadRotation;
+char* _PREHASH_HeadRotation = LLMessageStringTable::getInstance()->getString("HeadRotation");
-char * _PREHASH_DeleteOnCompletion;
+char* _PREHASH_DeleteOnCompletion = LLMessageStringTable::getInstance()->getString("DeleteOnCompletion");
-char * _PREHASH_PublicPort;
+char* _PREHASH_PublicPort = LLMessageStringTable::getInstance()->getString("PublicPort");
-char * _PREHASH_DirClassifiedQuery;
+char* _PREHASH_DirClassifiedQuery = LLMessageStringTable::getInstance()->getString("DirClassifiedQuery");
-char * _PREHASH_CallbackID;
+char* _PREHASH_CallbackID = LLMessageStringTable::getInstance()->getString("CallbackID");
-char * _PREHASH_RequestParcelTransfer;
+char* _PREHASH_RequestParcelTransfer = LLMessageStringTable::getInstance()->getString("RequestParcelTransfer");
-char * _PREHASH_RoleCount;
+char* _PREHASH_RoleCount = LLMessageStringTable::getInstance()->getString("RoleCount");
-char * _PREHASH_ObjectCapacity;
+char* _PREHASH_ObjectCapacity = LLMessageStringTable::getInstance()->getString("ObjectCapacity");
-char * _PREHASH_RequestID;
+char* _PREHASH_RequestID = LLMessageStringTable::getInstance()->getString("RequestID");
-char * _PREHASH_RequestXfer;
+char* _PREHASH_RequestXfer = LLMessageStringTable::getInstance()->getString("RequestXfer");
-char * _PREHASH_ObjectTaxCurrent;
+char* _PREHASH_ObjectTaxCurrent = LLMessageStringTable::getInstance()->getString("ObjectTaxCurrent");
-char * _PREHASH_LightTaxCurrent;
+char* _PREHASH_LightTaxCurrent = LLMessageStringTable::getInstance()->getString("LightTaxCurrent");
-char * _PREHASH_LandTaxCurrent;
+char* _PREHASH_LandTaxCurrent = LLMessageStringTable::getInstance()->getString("LandTaxCurrent");
-char * _PREHASH_GroupTaxCurrent;
+char* _PREHASH_GroupTaxCurrent = LLMessageStringTable::getInstance()->getString("GroupTaxCurrent");
-char * _PREHASH_FetchInventoryDescendents;
+char* _PREHASH_FetchInventoryDescendents = LLMessageStringTable::getInstance()->getString("FetchInventoryDescendents");
-char * _PREHASH_InventoryDescendents;
+char* _PREHASH_InventoryDescendents = LLMessageStringTable::getInstance()->getString("InventoryDescendents");
-char * _PREHASH_Descendents;
+char* _PREHASH_Descendents = LLMessageStringTable::getInstance()->getString("Descendents");
-char * _PREHASH_PurgeInventoryDescendents;
+char* _PREHASH_PurgeInventoryDescendents = LLMessageStringTable::getInstance()->getString("PurgeInventoryDescendents");
-char * _PREHASH_ShowDir;
+char* _PREHASH_ShowDir = LLMessageStringTable::getInstance()->getString("ShowDir");
-char * _PREHASH_IsOwner;
+char* _PREHASH_IsOwner = LLMessageStringTable::getInstance()->getString("IsOwner");
-char * _PREHASH_Timestamp;
+char* _PREHASH_Timestamp = LLMessageStringTable::getInstance()->getString("Timestamp");
-char * _PREHASH_GlobalPos;
+char* _PREHASH_GlobalPos = LLMessageStringTable::getInstance()->getString("GlobalPos");
-char * _PREHASH_GrabOffsetInitial;
+char* _PREHASH_GrabOffsetInitial = LLMessageStringTable::getInstance()->getString("GrabOffsetInitial");
-char * _PREHASH_IsTrial;
+char* _PREHASH_IsTrial = LLMessageStringTable::getInstance()->getString("IsTrial");
-char * _PREHASH_ObjectDuplicateOnRay;
+char* _PREHASH_ObjectDuplicateOnRay = LLMessageStringTable::getInstance()->getString("ObjectDuplicateOnRay");
-char * _PREHASH_GroupMembershipCount;
+char* _PREHASH_GroupMembershipCount = LLMessageStringTable::getInstance()->getString("GroupMembershipCount");
-char * _PREHASH_MethodData;
+char* _PREHASH_MethodData = LLMessageStringTable::getInstance()->getString("MethodData");
-char * _PREHASH_ActivateGestures;
+char* _PREHASH_ActivateGestures = LLMessageStringTable::getInstance()->getString("ActivateGestures");
-char * _PREHASH_DeactivateGestures;
+char* _PREHASH_DeactivateGestures = LLMessageStringTable::getInstance()->getString("DeactivateGestures");
-char * _PREHASH_ProposalData;
+char* _PREHASH_ProposalData = LLMessageStringTable::getInstance()->getString("ProposalData");
-char * _PREHASH_PosGlobal;
+char* _PREHASH_PosGlobal = LLMessageStringTable::getInstance()->getString("PosGlobal");
-char * _PREHASH_SearchID;
+char* _PREHASH_SearchID = LLMessageStringTable::getInstance()->getString("SearchID");
-char * _PREHASH_RezMultipleAttachmentsFromInv;
+char* _PREHASH_RezMultipleAttachmentsFromInv = LLMessageStringTable::getInstance()->getString("RezMultipleAttachmentsFromInv");
-char * _PREHASH_SearchName;
+char* _PREHASH_SearchName = LLMessageStringTable::getInstance()->getString("SearchName");
-char * _PREHASH_VersionString;
+char* _PREHASH_VersionString = LLMessageStringTable::getInstance()->getString("VersionString");
-char * _PREHASH_CreateGroupReply;
+char* _PREHASH_CreateGroupReply = LLMessageStringTable::getInstance()->getString("CreateGroupReply");
-char * _PREHASH_LeaveGroupReply;
+char* _PREHASH_LeaveGroupReply = LLMessageStringTable::getInstance()->getString("LeaveGroupReply");
-char * _PREHASH_ActualArea;
+char* _PREHASH_ActualArea = LLMessageStringTable::getInstance()->getString("ActualArea");
-char * _PREHASH_Message;
+char* _PREHASH_Message = LLMessageStringTable::getInstance()->getString("Message");
-char * _PREHASH_ClickAction;
+char* _PREHASH_ClickAction = LLMessageStringTable::getInstance()->getString("ClickAction");
-char * _PREHASH_AssetUploadComplete;
+char* _PREHASH_AssetUploadComplete = LLMessageStringTable::getInstance()->getString("AssetUploadComplete");
-char * _PREHASH_RequestType;
+char* _PREHASH_RequestType = LLMessageStringTable::getInstance()->getString("RequestType");
-char * _PREHASH_UUID;
+char* _PREHASH_UUID = LLMessageStringTable::getInstance()->getString("UUID");
-char * _PREHASH_BaseMask;
+char* _PREHASH_BaseMask = LLMessageStringTable::getInstance()->getString("BaseMask");
-char * _PREHASH_NetBlock;
+char* _PREHASH_NetBlock = LLMessageStringTable::getInstance()->getString("NetBlock");
-char * _PREHASH_GlobalX;
+char* _PREHASH_GlobalX = LLMessageStringTable::getInstance()->getString("GlobalX");
-char * _PREHASH_GlobalY;
+char* _PREHASH_GlobalY = LLMessageStringTable::getInstance()->getString("GlobalY");
-char * _PREHASH_CopyRotates;
+char* _PREHASH_CopyRotates = LLMessageStringTable::getInstance()->getString("CopyRotates");
-char * _PREHASH_KickUserAck;
+char* _PREHASH_KickUserAck = LLMessageStringTable::getInstance()->getString("KickUserAck");
-char * _PREHASH_TopPick;
+char* _PREHASH_TopPick = LLMessageStringTable::getInstance()->getString("TopPick");
-char * _PREHASH_SessionID;
+char* _PREHASH_SessionID = LLMessageStringTable::getInstance()->getString("SessionID");
-char * _PREHASH_GlobalZ;
+char* _PREHASH_GlobalZ = LLMessageStringTable::getInstance()->getString("GlobalZ");
-char * _PREHASH_DeclineFriendship;
+char* _PREHASH_DeclineFriendship = LLMessageStringTable::getInstance()->getString("DeclineFriendship");
-char * _PREHASH_FormFriendship;
+char* _PREHASH_FormFriendship = LLMessageStringTable::getInstance()->getString("FormFriendship");
-char * _PREHASH_TerminateFriendship;
+char* _PREHASH_TerminateFriendship = LLMessageStringTable::getInstance()->getString("TerminateFriendship");
-char * _PREHASH_TaskData;
+char* _PREHASH_TaskData = LLMessageStringTable::getInstance()->getString("TaskData");
-char * _PREHASH_SimWideMaxPrims;
+char* _PREHASH_SimWideMaxPrims = LLMessageStringTable::getInstance()->getString("SimWideMaxPrims");
-char * _PREHASH_TotalPrims;
+char* _PREHASH_TotalPrims = LLMessageStringTable::getInstance()->getString("TotalPrims");
-char * _PREHASH_ProfileBegin;
+char* _PREHASH_ProfileBegin = LLMessageStringTable::getInstance()->getString("ProfileBegin");
-char * _PREHASH_Request;
+char* _PREHASH_Request = LLMessageStringTable::getInstance()->getString("Request");
-char * _PREHASH_GroupAccountDetailsRequest;
+char* _PREHASH_GroupAccountDetailsRequest = LLMessageStringTable::getInstance()->getString("GroupAccountDetailsRequest");
-char * _PREHASH_GroupActiveProposalsRequest;
+char* _PREHASH_GroupActiveProposalsRequest = LLMessageStringTable::getInstance()->getString("GroupActiveProposalsRequest");
-char * _PREHASH_StringValue;
+char* _PREHASH_StringValue = LLMessageStringTable::getInstance()->getString("StringValue");
-char * _PREHASH_Version;
+char* _PREHASH_Version = LLMessageStringTable::getInstance()->getString("Version");
-char * _PREHASH_OtherCount;
+char* _PREHASH_OtherCount = LLMessageStringTable::getInstance()->getString("OtherCount");
-char * _PREHASH_MemberCount;
+char* _PREHASH_MemberCount = LLMessageStringTable::getInstance()->getString("MemberCount");
-char * _PREHASH_ChatData;
+char* _PREHASH_ChatData = LLMessageStringTable::getInstance()->getString("ChatData");
-char * _PREHASH_IsGroupOwned;
+char* _PREHASH_IsGroupOwned = LLMessageStringTable::getInstance()->getString("IsGroupOwned");
-char * _PREHASH_EnergyEfficiency;
+char* _PREHASH_EnergyEfficiency = LLMessageStringTable::getInstance()->getString("EnergyEfficiency");
-char * _PREHASH_PickInfoUpdate;
+char* _PREHASH_PickInfoUpdate = LLMessageStringTable::getInstance()->getString("PickInfoUpdate");
-char * _PREHASH_PickDelete;
+char* _PREHASH_PickDelete = LLMessageStringTable::getInstance()->getString("PickDelete");
-char * _PREHASH_ScriptReset;
+char* _PREHASH_ScriptReset = LLMessageStringTable::getInstance()->getString("ScriptReset");
-char * _PREHASH_Requester;
+char* _PREHASH_Requester = LLMessageStringTable::getInstance()->getString("Requester");
-char * _PREHASH_ForSale;
+char* _PREHASH_ForSale = LLMessageStringTable::getInstance()->getString("ForSale");
-char * _PREHASH_NearestLandingRegionReply;
+char* _PREHASH_NearestLandingRegionReply = LLMessageStringTable::getInstance()->getString("NearestLandingRegionReply");
-char * _PREHASH_ParcelID;
+char* _PREHASH_ParcelID = LLMessageStringTable::getInstance()->getString("ParcelID");
-char * _PREHASH_Godlike;
+char* _PREHASH_Godlike = LLMessageStringTable::getInstance()->getString("Godlike");
-char * _PREHASH_TotalDebits;
+char* _PREHASH_TotalDebits = LLMessageStringTable::getInstance()->getString("TotalDebits");
-char * _PREHASH_Direction;
+char* _PREHASH_Direction = LLMessageStringTable::getInstance()->getString("Direction");
-char * _PREHASH_HealthData;
+char* _PREHASH_HealthData = LLMessageStringTable::getInstance()->getString("HealthData");
-char * _PREHASH_LeftAxis;
+char* _PREHASH_LeftAxis = LLMessageStringTable::getInstance()->getString("LeftAxis");
-char * _PREHASH_LocationBlock;
+char* _PREHASH_LocationBlock = LLMessageStringTable::getInstance()->getString("LocationBlock");
-char * _PREHASH_ObjectImage;
+char* _PREHASH_ObjectImage = LLMessageStringTable::getInstance()->getString("ObjectImage");
-char * _PREHASH_TerrainStartHeight00;
+char* _PREHASH_TerrainStartHeight00 = LLMessageStringTable::getInstance()->getString("TerrainStartHeight00");
-char * _PREHASH_TerrainStartHeight01;
+char* _PREHASH_TerrainStartHeight01 = LLMessageStringTable::getInstance()->getString("TerrainStartHeight01");
-char * _PREHASH_TerrainStartHeight10;
+char* _PREHASH_TerrainStartHeight10 = LLMessageStringTable::getInstance()->getString("TerrainStartHeight10");
-char * _PREHASH_TerrainStartHeight11;
+char* _PREHASH_TerrainStartHeight11 = LLMessageStringTable::getInstance()->getString("TerrainStartHeight11");
-char * _PREHASH_WaterHeight;
+char* _PREHASH_WaterHeight = LLMessageStringTable::getInstance()->getString("WaterHeight");
-char * _PREHASH_FetchInventoryReply;
+char* _PREHASH_FetchInventoryReply = LLMessageStringTable::getInstance()->getString("FetchInventoryReply");
-char * _PREHASH_GroupAccountSummaryReply;
+char* _PREHASH_GroupAccountSummaryReply = LLMessageStringTable::getInstance()->getString("GroupAccountSummaryReply");
-char * _PREHASH_AttachedSound;
+char* _PREHASH_AttachedSound = LLMessageStringTable::getInstance()->getString("AttachedSound");
-char * _PREHASH_ParamInUse;
+char* _PREHASH_ParamInUse = LLMessageStringTable::getInstance()->getString("ParamInUse");
-char * _PREHASH_GodKickUser;
+char* _PREHASH_GodKickUser = LLMessageStringTable::getInstance()->getString("GodKickUser");
-char * _PREHASH_PickName;
+char* _PREHASH_PickName = LLMessageStringTable::getInstance()->getString("PickName");
-char * _PREHASH_TaskName;
+char* _PREHASH_TaskName = LLMessageStringTable::getInstance()->getString("TaskName");
-char * _PREHASH_ObjectCount;
+char* _PREHASH_ObjectCount = LLMessageStringTable::getInstance()->getString("ObjectCount");
-char * _PREHASH_RegionPresenceRequestByHandle;
+char* _PREHASH_RegionPresenceRequestByHandle = LLMessageStringTable::getInstance()->getString("RegionPresenceRequestByHandle");
-char * _PREHASH_RezSingleAttachmentFromInv;
+char* _PREHASH_RezSingleAttachmentFromInv = LLMessageStringTable::getInstance()->getString("RezSingleAttachmentFromInv");
-char * _PREHASH_ChildAgentUpdate;
+char* _PREHASH_ChildAgentUpdate = LLMessageStringTable::getInstance()->getString("ChildAgentUpdate");
-char * _PREHASH_IsOwnerGroup;
+char* _PREHASH_IsOwnerGroup = LLMessageStringTable::getInstance()->getString("IsOwnerGroup");
-char * _PREHASH_AgentHeightWidth;
+char* _PREHASH_AgentHeightWidth = LLMessageStringTable::getInstance()->getString("AgentHeightWidth");
-char * _PREHASH_VerticalAngle;
+char* _PREHASH_VerticalAngle = LLMessageStringTable::getInstance()->getString("VerticalAngle");
-char * _PREHASH_WearableType;
+char* _PREHASH_WearableType = LLMessageStringTable::getInstance()->getString("WearableType");
-char * _PREHASH_AggregatePermNextOwner;
+char* _PREHASH_AggregatePermNextOwner = LLMessageStringTable::getInstance()->getString("AggregatePermNextOwner");
-char * _PREHASH_ShowInList;
+char* _PREHASH_ShowInList = LLMessageStringTable::getInstance()->getString("ShowInList");
-char * _PREHASH_UpdateParcel;
+char* _PREHASH_UpdateParcel = LLMessageStringTable::getInstance()->getString("UpdateParcel");
-char * _PREHASH_SetAlwaysRun;
+char* _PREHASH_SetAlwaysRun = LLMessageStringTable::getInstance()->getString("SetAlwaysRun");
-char * _PREHASH_NVPair;
+char* _PREHASH_NVPair = LLMessageStringTable::getInstance()->getString("NVPair");
-char * _PREHASH_SearchType;
+char* _PREHASH_SearchType = LLMessageStringTable::getInstance()->getString("SearchType");
-char * _PREHASH_ObjectSpinStart;
+char* _PREHASH_ObjectSpinStart = LLMessageStringTable::getInstance()->getString("ObjectSpinStart");
-char * _PREHASH_UseEstateSun;
+char* _PREHASH_UseEstateSun = LLMessageStringTable::getInstance()->getString("UseEstateSun");
-char * _PREHASH_RegionID;
+char* _PREHASH_RegionID = LLMessageStringTable::getInstance()->getString("RegionID");
-char * _PREHASH_AbuseRegionID;
+char* _PREHASH_AbuseRegionID = LLMessageStringTable::getInstance()->getString("AbuseRegionID");
-char * _PREHASH_Creator;
+char* _PREHASH_Creator = LLMessageStringTable::getInstance()->getString("Creator");
-char * _PREHASH_ProposalText;
+char* _PREHASH_ProposalText = LLMessageStringTable::getInstance()->getString("ProposalText");
-char * _PREHASH_DirEventsReply;
+char* _PREHASH_DirEventsReply = LLMessageStringTable::getInstance()->getString("DirEventsReply");
-char * _PREHASH_EventInfoReply;
+char* _PREHASH_EventInfoReply = LLMessageStringTable::getInstance()->getString("EventInfoReply");
-char * _PREHASH_UserInfoReply;
+char* _PREHASH_UserInfoReply = LLMessageStringTable::getInstance()->getString("UserInfoReply");
-char * _PREHASH_PathRadiusOffset;
+char* _PREHASH_PathRadiusOffset = LLMessageStringTable::getInstance()->getString("PathRadiusOffset");
-char * _PREHASH_TextureData;
+char* _PREHASH_TextureData = LLMessageStringTable::getInstance()->getString("TextureData");
-char * _PREHASH_ChatPass;
+char* _PREHASH_ChatPass = LLMessageStringTable::getInstance()->getString("ChatPass");
-char * _PREHASH_TargetID;
+char* _PREHASH_TargetID = LLMessageStringTable::getInstance()->getString("TargetID");
-char * _PREHASH_DefaultPayPrice;
+char* _PREHASH_DefaultPayPrice = LLMessageStringTable::getInstance()->getString("DefaultPayPrice");
-char * _PREHASH_UserLocation;
+char* _PREHASH_UserLocation = LLMessageStringTable::getInstance()->getString("UserLocation");
-char * _PREHASH_MaxPrims;
+char* _PREHASH_MaxPrims = LLMessageStringTable::getInstance()->getString("MaxPrims");
-char * _PREHASH_LandmarkID;
+char* _PREHASH_LandmarkID = LLMessageStringTable::getInstance()->getString("LandmarkID");
-char * _PREHASH_InitiateDownload;
+char* _PREHASH_InitiateDownload = LLMessageStringTable::getInstance()->getString("InitiateDownload");
-char * _PREHASH_Name;
+char* _PREHASH_Name = LLMessageStringTable::getInstance()->getString("Name");
-char * _PREHASH_OtherCleanTime;
+char* _PREHASH_OtherCleanTime = LLMessageStringTable::getInstance()->getString("OtherCleanTime");
-char * _PREHASH_ParcelSetOtherCleanTime;
+char* _PREHASH_ParcelSetOtherCleanTime = LLMessageStringTable::getInstance()->getString("ParcelSetOtherCleanTime");
-char * _PREHASH_TeleportPriceExponent;
+char* _PREHASH_TeleportPriceExponent = LLMessageStringTable::getInstance()->getString("TeleportPriceExponent");
-char * _PREHASH_Gain;
+char* _PREHASH_Gain = LLMessageStringTable::getInstance()->getString("Gain");
-char * _PREHASH_PacketAck;
+char* _PREHASH_PacketAck = LLMessageStringTable::getInstance()->getString("PacketAck");
-char * _PREHASH_PathSkew;
+char* _PREHASH_PathSkew = LLMessageStringTable::getInstance()->getString("PathSkew");
-char * _PREHASH_SimulatorShutdownRequest;
+char* _PREHASH_SimulatorShutdownRequest = LLMessageStringTable::getInstance()->getString("SimulatorShutdownRequest");
-char * _PREHASH_NearestLandingRegionRequest;
+char* _PREHASH_NearestLandingRegionRequest = LLMessageStringTable::getInstance()->getString("NearestLandingRegionRequest");
-char * _PREHASH_OtherID;
+char* _PREHASH_OtherID = LLMessageStringTable::getInstance()->getString("OtherID");
-char * _PREHASH_MemberID;
+char* _PREHASH_MemberID = LLMessageStringTable::getInstance()->getString("MemberID");
-char * _PREHASH_MapLayerRequest;
+char* _PREHASH_MapLayerRequest = LLMessageStringTable::getInstance()->getString("MapLayerRequest");
-char * _PREHASH_ObjectScale;
+char* _PREHASH_ObjectScale = LLMessageStringTable::getInstance()->getString("ObjectScale");
-char * _PREHASH_TargetIP;
+char* _PREHASH_TargetIP = LLMessageStringTable::getInstance()->getString("TargetIP");
-char * _PREHASH_Redo;
+char* _PREHASH_Redo = LLMessageStringTable::getInstance()->getString("Redo");
-char * _PREHASH_MoneyBalance;
+char* _PREHASH_MoneyBalance = LLMessageStringTable::getInstance()->getString("MoneyBalance");
-char * _PREHASH_TrackAgent;
+char* _PREHASH_TrackAgent = LLMessageStringTable::getInstance()->getString("TrackAgent");
-char * _PREHASH_MaxX;
+char* _PREHASH_MaxX = LLMessageStringTable::getInstance()->getString("MaxX");
-char * _PREHASH_Data;
+char* _PREHASH_Data = LLMessageStringTable::getInstance()->getString("Data");
-char * _PREHASH_MaxY;
+char* _PREHASH_MaxY = LLMessageStringTable::getInstance()->getString("MaxY");
-char * _PREHASH_TextureAnim;
+char* _PREHASH_TextureAnim = LLMessageStringTable::getInstance()->getString("TextureAnim");
-char * _PREHASH_ReturnIDs;
+char* _PREHASH_ReturnIDs = LLMessageStringTable::getInstance()->getString("ReturnIDs");
-char * _PREHASH_Date;
+char* _PREHASH_Date = LLMessageStringTable::getInstance()->getString("Date");
-char * _PREHASH_AgentWearablesUpdate;
+char* _PREHASH_AgentWearablesUpdate = LLMessageStringTable::getInstance()->getString("AgentWearablesUpdate");
-char * _PREHASH_AgentDataUpdate;
+char* _PREHASH_AgentDataUpdate = LLMessageStringTable::getInstance()->getString("AgentDataUpdate");
-char * _PREHASH_GroupDataUpdate;
+char* _PREHASH_GroupDataUpdate = LLMessageStringTable::getInstance()->getString("GroupDataUpdate");
-char * _PREHASH_Hash;
+char* _PREHASH_Hash = LLMessageStringTable::getInstance()->getString("Hash");
-char * _PREHASH_AgentGroupDataUpdate;
+char* _PREHASH_AgentGroupDataUpdate = LLMessageStringTable::getInstance()->getString("AgentGroupDataUpdate");
-char * _PREHASH_Left;
+char* _PREHASH_Left = LLMessageStringTable::getInstance()->getString("Left");
-char * _PREHASH_Mask;
+char* _PREHASH_Mask = LLMessageStringTable::getInstance()->getString("Mask");
-char * _PREHASH_ForceMouselook;
+char* _PREHASH_ForceMouselook = LLMessageStringTable::getInstance()->getString("ForceMouselook");
-char * _PREHASH_Success;
+char* _PREHASH_Success = LLMessageStringTable::getInstance()->getString("Success");
-char * _PREHASH_ObjectGroup;
+char* _PREHASH_ObjectGroup = LLMessageStringTable::getInstance()->getString("ObjectGroup");
-char * _PREHASH_SunHour;
+char* _PREHASH_SunHour = LLMessageStringTable::getInstance()->getString("SunHour");
-char * _PREHASH_MinX;
+char* _PREHASH_MinX = LLMessageStringTable::getInstance()->getString("MinX");
-char * _PREHASH_ScriptSensorReply;
+char* _PREHASH_ScriptSensorReply = LLMessageStringTable::getInstance()->getString("ScriptSensorReply");
-char * _PREHASH_MinY;
+char* _PREHASH_MinY = LLMessageStringTable::getInstance()->getString("MinY");
-char * _PREHASH_Command;
+char* _PREHASH_Command = LLMessageStringTable::getInstance()->getString("Command");
-char * _PREHASH_Desc;
+char* _PREHASH_Desc = LLMessageStringTable::getInstance()->getString("Desc");
-char * _PREHASH_AttachmentNeedsSave;
+char* _PREHASH_AttachmentNeedsSave = LLMessageStringTable::getInstance()->getString("AttachmentNeedsSave");
-char * _PREHASH_HistoryItemData;
+char* _PREHASH_HistoryItemData = LLMessageStringTable::getInstance()->getString("HistoryItemData");
-char * _PREHASH_AgentCachedTexture;
+char* _PREHASH_AgentCachedTexture = LLMessageStringTable::getInstance()->getString("AgentCachedTexture");
-char * _PREHASH_Subject;
+char* _PREHASH_Subject = LLMessageStringTable::getInstance()->getString("Subject");
-char * _PREHASH_East;
+char* _PREHASH_East = LLMessageStringTable::getInstance()->getString("East");
-char * _PREHASH_QueryReplies;
+char* _PREHASH_QueryReplies = LLMessageStringTable::getInstance()->getString("QueryReplies");
-char * _PREHASH_ObjectCategory;
+char* _PREHASH_ObjectCategory = LLMessageStringTable::getInstance()->getString("ObjectCategory");
-char * _PREHASH_Time;
+char* _PREHASH_Time = LLMessageStringTable::getInstance()->getString("Time");
-char * _PREHASH_CreateLandmarkForEvent;
+char* _PREHASH_CreateLandmarkForEvent = LLMessageStringTable::getInstance()->getString("CreateLandmarkForEvent");
-char * _PREHASH_ParentID;
+char* _PREHASH_ParentID = LLMessageStringTable::getInstance()->getString("ParentID");
-char * _PREHASH_Ping;
+char* _PREHASH_Ping = LLMessageStringTable::getInstance()->getString("Ping");
-char * _PREHASH_Perp;
+char* _PREHASH_Perp = LLMessageStringTable::getInstance()->getString("Perp");
-char * _PREHASH_Code;
+char* _PREHASH_Code = LLMessageStringTable::getInstance()->getString("Code");
-char * _PREHASH_InvType;
+char* _PREHASH_InvType = LLMessageStringTable::getInstance()->getString("InvType");
-char * _PREHASH_AgentFOV;
+char* _PREHASH_AgentFOV = LLMessageStringTable::getInstance()->getString("AgentFOV");
-char * _PREHASH_Audible;
+char* _PREHASH_Audible = LLMessageStringTable::getInstance()->getString("Audible");
-char * _PREHASH_AuctionData;
+char* _PREHASH_AuctionData = LLMessageStringTable::getInstance()->getString("AuctionData");
-char * _PREHASH_IDBlock;
+char* _PREHASH_IDBlock = LLMessageStringTable::getInstance()->getString("IDBlock");
-char * _PREHASH_West;
+char* _PREHASH_West = LLMessageStringTable::getInstance()->getString("West");
-char * _PREHASH_Undo;
+char* _PREHASH_Undo = LLMessageStringTable::getInstance()->getString("Undo");
-char * _PREHASH_TotalNumItems;
+char* _PREHASH_TotalNumItems = LLMessageStringTable::getInstance()->getString("TotalNumItems");
-char * _PREHASH_Info;
+char* _PREHASH_Info = LLMessageStringTable::getInstance()->getString("Info");
-char * _PREHASH_Area;
+char* _PREHASH_Area = LLMessageStringTable::getInstance()->getString("Area");
-char * _PREHASH_SimCrashed;
+char* _PREHASH_SimCrashed = LLMessageStringTable::getInstance()->getString("SimCrashed");
-char * _PREHASH_Text;
+char* _PREHASH_Text = LLMessageStringTable::getInstance()->getString("Text");
-char * _PREHASH_PriceGroupCreate;
+char* _PREHASH_PriceGroupCreate = LLMessageStringTable::getInstance()->getString("PriceGroupCreate");
-char * _PREHASH_ObjectShape;
+char* _PREHASH_ObjectShape = LLMessageStringTable::getInstance()->getString("ObjectShape");
-char * _PREHASH_GroupRoleDataReply;
+char* _PREHASH_GroupRoleDataReply = LLMessageStringTable::getInstance()->getString("GroupRoleDataReply");
-char * _PREHASH_MuteCRC;
+char* _PREHASH_MuteCRC = LLMessageStringTable::getInstance()->getString("MuteCRC");
-char * _PREHASH_Size;
+char* _PREHASH_Size = LLMessageStringTable::getInstance()->getString("Size");
-char * _PREHASH_FromAddress;
+char* _PREHASH_FromAddress = LLMessageStringTable::getInstance()->getString("FromAddress");
-char * _PREHASH_Body;
+char* _PREHASH_Body = LLMessageStringTable::getInstance()->getString("Body");
-char * _PREHASH_FileData;
+char* _PREHASH_FileData = LLMessageStringTable::getInstance()->getString("FileData");
-char * _PREHASH_List;
+char* _PREHASH_List = LLMessageStringTable::getInstance()->getString("List");
-char * _PREHASH_KickUser;
+char* _PREHASH_KickUser = LLMessageStringTable::getInstance()->getString("KickUser");
-char * _PREHASH_OtherPrims;
+char* _PREHASH_OtherPrims = LLMessageStringTable::getInstance()->getString("OtherPrims");
-char * _PREHASH_RunTime;
+char* _PREHASH_RunTime = LLMessageStringTable::getInstance()->getString("RunTime");
-char * _PREHASH_GrantUserRights;
+char* _PREHASH_GrantUserRights = LLMessageStringTable::getInstance()->getString("GrantUserRights");
-char * _PREHASH_RpcScriptRequestInboundForward;
+char* _PREHASH_RpcScriptRequestInboundForward = LLMessageStringTable::getInstance()->getString("RpcScriptRequestInboundForward");
-char * _PREHASH_More;
+char* _PREHASH_More = LLMessageStringTable::getInstance()->getString("More");
-char * _PREHASH_Majority;
+char* _PREHASH_Majority = LLMessageStringTable::getInstance()->getString("Majority");
-char * _PREHASH_MetersTraveled;
+char* _PREHASH_MetersTraveled = LLMessageStringTable::getInstance()->getString("MetersTraveled");
-char * _PREHASH_Stat;
+char* _PREHASH_Stat = LLMessageStringTable::getInstance()->getString("Stat");
-char * _PREHASH_SoundID;
+char* _PREHASH_SoundID = LLMessageStringTable::getInstance()->getString("SoundID");
-char * _PREHASH_Item;
+char* _PREHASH_Item = LLMessageStringTable::getInstance()->getString("Item");
-char * _PREHASH_User;
+char* _PREHASH_User = LLMessageStringTable::getInstance()->getString("User");
-char * _PREHASH_Prey;
+char* _PREHASH_Prey = LLMessageStringTable::getInstance()->getString("Prey");
-char * _PREHASH_RayStart;
+char* _PREHASH_RayStart = LLMessageStringTable::getInstance()->getString("RayStart");
-char * _PREHASH_UsecSinceStart;
+char* _PREHASH_UsecSinceStart = LLMessageStringTable::getInstance()->getString("UsecSinceStart");
-char * _PREHASH_ParcelData;
+char* _PREHASH_ParcelData = LLMessageStringTable::getInstance()->getString("ParcelData");
-char * _PREHASH_CameraUpAxis;
+char* _PREHASH_CameraUpAxis = LLMessageStringTable::getInstance()->getString("CameraUpAxis");
-char * _PREHASH_ScriptDialog;
+char* _PREHASH_ScriptDialog = LLMessageStringTable::getInstance()->getString("ScriptDialog");
-char * _PREHASH_MasterParcelData;
+char* _PREHASH_MasterParcelData = LLMessageStringTable::getInstance()->getString("MasterParcelData");
-char * _PREHASH_Invalid;
+char* _PREHASH_Invalid = LLMessageStringTable::getInstance()->getString("Invalid");
-char * _PREHASH_ProfileCurve;
+char* _PREHASH_ProfileCurve = LLMessageStringTable::getInstance()->getString("ProfileCurve");
-char * _PREHASH_ParcelAccessListUpdate;
+char* _PREHASH_ParcelAccessListUpdate = LLMessageStringTable::getInstance()->getString("ParcelAccessListUpdate");
-char * _PREHASH_MuteListUpdate;
+char* _PREHASH_MuteListUpdate = LLMessageStringTable::getInstance()->getString("MuteListUpdate");
-char * _PREHASH_SendPacket;
+char* _PREHASH_SendPacket = LLMessageStringTable::getInstance()->getString("SendPacket");
-char * _PREHASH_SendXferPacket;
+char* _PREHASH_SendXferPacket = LLMessageStringTable::getInstance()->getString("SendXferPacket");
-char * _PREHASH_RegionDenyIdentified;
+char* _PREHASH_RegionDenyIdentified = LLMessageStringTable::getInstance()->getString("RegionDenyIdentified");
-char * _PREHASH_NotecardItemID;
+char* _PREHASH_NotecardItemID = LLMessageStringTable::getInstance()->getString("NotecardItemID");
-char * _PREHASH_LastName;
+char* _PREHASH_LastName = LLMessageStringTable::getInstance()->getString("LastName");
-char * _PREHASH_From;
+char* _PREHASH_From = LLMessageStringTable::getInstance()->getString("From");
-char * _PREHASH_RoleChange;
+char* _PREHASH_RoleChange = LLMessageStringTable::getInstance()->getString("RoleChange");
-char * _PREHASH_Port;
+char* _PREHASH_Port = LLMessageStringTable::getInstance()->getString("Port");
-char * _PREHASH_MemberTitle;
+char* _PREHASH_MemberTitle = LLMessageStringTable::getInstance()->getString("MemberTitle");
-char * _PREHASH_LogParcelChanges;
+char* _PREHASH_LogParcelChanges = LLMessageStringTable::getInstance()->getString("LogParcelChanges");
-char * _PREHASH_AgentCachedTextureResponse;
+char* _PREHASH_AgentCachedTextureResponse = LLMessageStringTable::getInstance()->getString("AgentCachedTextureResponse");
-char * _PREHASH_DeRezObject;
+char* _PREHASH_DeRezObject = LLMessageStringTable::getInstance()->getString("DeRezObject");
-char * _PREHASH_IsTemporary;
+char* _PREHASH_IsTemporary = LLMessageStringTable::getInstance()->getString("IsTemporary");
-char * _PREHASH_InsigniaID;
+char* _PREHASH_InsigniaID = LLMessageStringTable::getInstance()->getString("InsigniaID");
-char * _PREHASH_CheckFlags;
+char* _PREHASH_CheckFlags = LLMessageStringTable::getInstance()->getString("CheckFlags");
-char * _PREHASH_EventID;
+char* _PREHASH_EventID = LLMessageStringTable::getInstance()->getString("EventID");
-char * _PREHASH_Selected;
+char* _PREHASH_Selected = LLMessageStringTable::getInstance()->getString("Selected");
-char * _PREHASH_FromAgentId;
+char* _PREHASH_FromAgentId = LLMessageStringTable::getInstance()->getString("FromAgentId");
-char * _PREHASH_Type;
+char* _PREHASH_Type = LLMessageStringTable::getInstance()->getString("Type");
-char * _PREHASH_ChatType;
+char* _PREHASH_ChatType = LLMessageStringTable::getInstance()->getString("ChatType");
-char * _PREHASH_ReportData;
+char* _PREHASH_ReportData = LLMessageStringTable::getInstance()->getString("ReportData");
-char * _PREHASH_RequestBlock;
+char* _PREHASH_RequestBlock = LLMessageStringTable::getInstance()->getString("RequestBlock");
-char * _PREHASH_GrantData;
+char* _PREHASH_GrantData = LLMessageStringTable::getInstance()->getString("GrantData");
-char * _PREHASH_DetachAttachmentIntoInv;
+char* _PREHASH_DetachAttachmentIntoInv = LLMessageStringTable::getInstance()->getString("DetachAttachmentIntoInv");
-char * _PREHASH_ParcelDisableObjects;
+char* _PREHASH_ParcelDisableObjects = LLMessageStringTable::getInstance()->getString("ParcelDisableObjects");
-char * _PREHASH_Sections;
+char* _PREHASH_Sections = LLMessageStringTable::getInstance()->getString("Sections");
-char * _PREHASH_GodLevel;
+char* _PREHASH_GodLevel = LLMessageStringTable::getInstance()->getString("GodLevel");
-char * _PREHASH_PayPriceReply;
+char* _PREHASH_PayPriceReply = LLMessageStringTable::getInstance()->getString("PayPriceReply");
-char * _PREHASH_QueryID;
+char* _PREHASH_QueryID = LLMessageStringTable::getInstance()->getString("QueryID");
-char * _PREHASH_CameraEyeOffset;
+char* _PREHASH_CameraEyeOffset = LLMessageStringTable::getInstance()->getString("CameraEyeOffset");
-char * _PREHASH_AgentPosition;
+char* _PREHASH_AgentPosition = LLMessageStringTable::getInstance()->getString("AgentPosition");
-char * _PREHASH_GrabPosition;
+char* _PREHASH_GrabPosition = LLMessageStringTable::getInstance()->getString("GrabPosition");
-char * _PREHASH_OnlineNotification;
+char* _PREHASH_OnlineNotification = LLMessageStringTable::getInstance()->getString("OnlineNotification");
-char * _PREHASH_OfflineNotification;
+char* _PREHASH_OfflineNotification = LLMessageStringTable::getInstance()->getString("OfflineNotification");
-char * _PREHASH_SendPostcard;
+char* _PREHASH_SendPostcard = LLMessageStringTable::getInstance()->getString("SendPostcard");
-char * _PREHASH_RequestFlags;
+char* _PREHASH_RequestFlags = LLMessageStringTable::getInstance()->getString("RequestFlags");
-char * _PREHASH_GroupAccountSummaryRequest;
+char* _PREHASH_GroupAccountSummaryRequest = LLMessageStringTable::getInstance()->getString("GroupAccountSummaryRequest");
-char * _PREHASH_GroupVoteHistoryRequest;
+char* _PREHASH_GroupVoteHistoryRequest = LLMessageStringTable::getInstance()->getString("GroupVoteHistoryRequest");
-char * _PREHASH_ParamValue;
+char* _PREHASH_ParamValue = LLMessageStringTable::getInstance()->getString("ParamValue");
-char * _PREHASH_MaxAgents;
+char* _PREHASH_MaxAgents = LLMessageStringTable::getInstance()->getString("MaxAgents");
-char * _PREHASH_CreateNewOutfitAttachments;
+char* _PREHASH_CreateNewOutfitAttachments = LLMessageStringTable::getInstance()->getString("CreateNewOutfitAttachments");
-char * _PREHASH_RegionHandle;
+char* _PREHASH_RegionHandle = LLMessageStringTable::getInstance()->getString("RegionHandle");
-char * _PREHASH_TeleportProgress;
+char* _PREHASH_TeleportProgress = LLMessageStringTable::getInstance()->getString("TeleportProgress");
-char * _PREHASH_AgentQuitCopy;
+char* _PREHASH_AgentQuitCopy = LLMessageStringTable::getInstance()->getString("AgentQuitCopy");
-char * _PREHASH_AvatarInterestsUpdate;
+char* _PREHASH_AvatarInterestsUpdate = LLMessageStringTable::getInstance()->getString("AvatarInterestsUpdate");
-char * _PREHASH_GroupNoticeID;
+char* _PREHASH_GroupNoticeID = LLMessageStringTable::getInstance()->getString("GroupNoticeID");
-char * _PREHASH_ParcelName;
+char* _PREHASH_ParcelName = LLMessageStringTable::getInstance()->getString("ParcelName");
-char * _PREHASH_PriceObjectRent;
+char* _PREHASH_PriceObjectRent = LLMessageStringTable::getInstance()->getString("PriceObjectRent");
-char * _PREHASH_OfferCallingCard;
+char* _PREHASH_OfferCallingCard = LLMessageStringTable::getInstance()->getString("OfferCallingCard");
-char * _PREHASH_AcceptCallingCard;
+char* _PREHASH_AcceptCallingCard = LLMessageStringTable::getInstance()->getString("AcceptCallingCard");
-char * _PREHASH_DeclineCallingCard;
+char* _PREHASH_DeclineCallingCard = LLMessageStringTable::getInstance()->getString("DeclineCallingCard");
-char * _PREHASH_AgentAccess;
+char* _PREHASH_AgentAccess = LLMessageStringTable::getInstance()->getString("AgentAccess");
-char * _PREHASH_DataHomeLocationReply;
+char* _PREHASH_DataHomeLocationReply = LLMessageStringTable::getInstance()->getString("DataHomeLocationReply");
-char * _PREHASH_EventLocationReply;
+char* _PREHASH_EventLocationReply = LLMessageStringTable::getInstance()->getString("EventLocationReply");
-char * _PREHASH_TerseDateID;
+char* _PREHASH_TerseDateID = LLMessageStringTable::getInstance()->getString("TerseDateID");
-char * _PREHASH_ObjectOwner;
+char* _PREHASH_ObjectOwner = LLMessageStringTable::getInstance()->getString("ObjectOwner");
-char * _PREHASH_AssetID;
+char* _PREHASH_AssetID = LLMessageStringTable::getInstance()->getString("AssetID");
-char * _PREHASH_AlertMessage;
+char* _PREHASH_AlertMessage = LLMessageStringTable::getInstance()->getString("AlertMessage");
-char * _PREHASH_AgentAlertMessage;
+char* _PREHASH_AgentAlertMessage = LLMessageStringTable::getInstance()->getString("AgentAlertMessage");
-char * _PREHASH_EstateOwnerMessage;
+char* _PREHASH_EstateOwnerMessage = LLMessageStringTable::getInstance()->getString("EstateOwnerMessage");
-char * _PREHASH_ParcelMediaCommandMessage;
+char* _PREHASH_ParcelMediaCommandMessage = LLMessageStringTable::getInstance()->getString("ParcelMediaCommandMessage");
-char * _PREHASH_Auction;
+char* _PREHASH_Auction = LLMessageStringTable::getInstance()->getString("Auction");
-char * _PREHASH_Category;
+char* _PREHASH_Category = LLMessageStringTable::getInstance()->getString("Category");
-char * _PREHASH_FilePath;
+char* _PREHASH_FilePath = LLMessageStringTable::getInstance()->getString("FilePath");
-char * _PREHASH_ItemFlags;
+char* _PREHASH_ItemFlags = LLMessageStringTable::getInstance()->getString("ItemFlags");
-char * _PREHASH_Invoice;
+char* _PREHASH_Invoice = LLMessageStringTable::getInstance()->getString("Invoice");
-char * _PREHASH_IntervalDays;
+char* _PREHASH_IntervalDays = LLMessageStringTable::getInstance()->getString("IntervalDays");
-char * _PREHASH_PathScaleX;
+char* _PREHASH_PathScaleX = LLMessageStringTable::getInstance()->getString("PathScaleX");
-char * _PREHASH_FromTaskID;
+char* _PREHASH_FromTaskID = LLMessageStringTable::getInstance()->getString("FromTaskID");
-char * _PREHASH_PathScaleY;
+char* _PREHASH_PathScaleY = LLMessageStringTable::getInstance()->getString("PathScaleY");
-char * _PREHASH_TimeInfo;
+char* _PREHASH_TimeInfo = LLMessageStringTable::getInstance()->getString("TimeInfo");
-char * _PREHASH_PublicCount;
+char* _PREHASH_PublicCount = LLMessageStringTable::getInstance()->getString("PublicCount");
-char * _PREHASH_ParcelJoin;
+char* _PREHASH_ParcelJoin = LLMessageStringTable::getInstance()->getString("ParcelJoin");
-char * _PREHASH_GroupRolesCount;
+char* _PREHASH_GroupRolesCount = LLMessageStringTable::getInstance()->getString("GroupRolesCount");
-char * _PREHASH_SimulatorBlock;
+char* _PREHASH_SimulatorBlock = LLMessageStringTable::getInstance()->getString("SimulatorBlock");
-char * _PREHASH_GroupID;
+char* _PREHASH_GroupID = LLMessageStringTable::getInstance()->getString("GroupID");
-char * _PREHASH_AgentVel;
+char* _PREHASH_AgentVel = LLMessageStringTable::getInstance()->getString("AgentVel");
-char * _PREHASH_RequestImage;
+char* _PREHASH_RequestImage = LLMessageStringTable::getInstance()->getString("RequestImage");
-char * _PREHASH_NetStats;
+char* _PREHASH_NetStats = LLMessageStringTable::getInstance()->getString("NetStats");
-char * _PREHASH_AgentPos;
+char* _PREHASH_AgentPos = LLMessageStringTable::getInstance()->getString("AgentPos");
-char * _PREHASH_AgentSit;
+char* _PREHASH_AgentSit = LLMessageStringTable::getInstance()->getString("AgentSit");
-char * _PREHASH_Material;
+char* _PREHASH_Material = LLMessageStringTable::getInstance()->getString("Material");
-char * _PREHASH_ObjectDeGrab;
+char* _PREHASH_ObjectDeGrab = LLMessageStringTable::getInstance()->getString("ObjectDeGrab");
-char * _PREHASH_VelocityInterpolateOff;
+char* _PREHASH_VelocityInterpolateOff = LLMessageStringTable::getInstance()->getString("VelocityInterpolateOff");
-char * _PREHASH_AuthorizedBuyerID;
+char* _PREHASH_AuthorizedBuyerID = LLMessageStringTable::getInstance()->getString("AuthorizedBuyerID");
-char * _PREHASH_AvatarPropertiesReply;
+char* _PREHASH_AvatarPropertiesReply = LLMessageStringTable::getInstance()->getString("AvatarPropertiesReply");
-char * _PREHASH_GroupProfileReply;
+char* _PREHASH_GroupProfileReply = LLMessageStringTable::getInstance()->getString("GroupProfileReply");
-char * _PREHASH_SimOwner;
+char* _PREHASH_SimOwner = LLMessageStringTable::getInstance()->getString("SimOwner");
-char * _PREHASH_SalePrice;
+char* _PREHASH_SalePrice = LLMessageStringTable::getInstance()->getString("SalePrice");
-char * _PREHASH_Animation;
+char* _PREHASH_Animation = LLMessageStringTable::getInstance()->getString("Animation");
-char * _PREHASH_OwnerID;
+char* _PREHASH_OwnerID = LLMessageStringTable::getInstance()->getString("OwnerID");
-char * _PREHASH_NearestLandingRegionUpdated;
+char* _PREHASH_NearestLandingRegionUpdated = LLMessageStringTable::getInstance()->getString("NearestLandingRegionUpdated");
-char * _PREHASH_PassToAgent;
+char* _PREHASH_PassToAgent = LLMessageStringTable::getInstance()->getString("PassToAgent");
-char * _PREHASH_PreyAgent;
+char* _PREHASH_PreyAgent = LLMessageStringTable::getInstance()->getString("PreyAgent");
-char * _PREHASH_SimStats;
+char* _PREHASH_SimStats = LLMessageStringTable::getInstance()->getString("SimStats");
-char * _PREHASH_LogoutReply;
+char* _PREHASH_LogoutReply = LLMessageStringTable::getInstance()->getString("LogoutReply");
-char * _PREHASH_FeatureDisabled;
+char* _PREHASH_FeatureDisabled = LLMessageStringTable::getInstance()->getString("FeatureDisabled");
-char * _PREHASH_PhysicalAvatarEventList;
+char* _PREHASH_PhysicalAvatarEventList = LLMessageStringTable::getInstance()->getString("PhysicalAvatarEventList");
-char * _PREHASH_ObjectLocalID;
+char* _PREHASH_ObjectLocalID = LLMessageStringTable::getInstance()->getString("ObjectLocalID");
-char * _PREHASH_Dropped;
+char* _PREHASH_Dropped = LLMessageStringTable::getInstance()->getString("Dropped");
-char * _PREHASH_WebProfilesDisabled;
+char* _PREHASH_WebProfilesDisabled = LLMessageStringTable::getInstance()->getString("WebProfilesDisabled");
-char * _PREHASH_Destination;
+char* _PREHASH_Destination = LLMessageStringTable::getInstance()->getString("Destination");
-char * _PREHASH_MasterID;
+char* _PREHASH_MasterID = LLMessageStringTable::getInstance()->getString("MasterID");
-char * _PREHASH_TransferData;
+char* _PREHASH_TransferData = LLMessageStringTable::getInstance()->getString("TransferData");
-char * _PREHASH_WantToMask;
+char* _PREHASH_WantToMask = LLMessageStringTable::getInstance()->getString("WantToMask");
-char * _PREHASH_ParcelSelectObjects;
+char* _PREHASH_ParcelSelectObjects = LLMessageStringTable::getInstance()->getString("ParcelSelectObjects");
-char * _PREHASH_ExtraParams;
+char* _PREHASH_ExtraParams = LLMessageStringTable::getInstance()->getString("ExtraParams");
-char * _PREHASH_CreatorID;
+char* _PREHASH_CreatorID = LLMessageStringTable::getInstance()->getString("CreatorID");
-char * _PREHASH_Summary;
+char* _PREHASH_Summary = LLMessageStringTable::getInstance()->getString("Summary");
-char * _PREHASH_BuyObjectInventory;
+char* _PREHASH_BuyObjectInventory = LLMessageStringTable::getInstance()->getString("BuyObjectInventory");
-char * _PREHASH_FetchInventory;
+char* _PREHASH_FetchInventory = LLMessageStringTable::getInstance()->getString("FetchInventory");
-char * _PREHASH_InventoryID;
+char* _PREHASH_InventoryID = LLMessageStringTable::getInstance()->getString("InventoryID");
-char * _PREHASH_PacketNumber;
+char* _PREHASH_PacketNumber = LLMessageStringTable::getInstance()->getString("PacketNumber");
-char * _PREHASH_SetFollowCamProperties;
+char* _PREHASH_SetFollowCamProperties = LLMessageStringTable::getInstance()->getString("SetFollowCamProperties");
-char * _PREHASH_ClearFollowCamProperties;
+char* _PREHASH_ClearFollowCamProperties = LLMessageStringTable::getInstance()->getString("ClearFollowCamProperties");
-char * _PREHASH_SequenceID;
+char* _PREHASH_SequenceID = LLMessageStringTable::getInstance()->getString("SequenceID");
-char * _PREHASH_DataServerLogout;
+char* _PREHASH_DataServerLogout = LLMessageStringTable::getInstance()->getString("DataServerLogout");
-char * _PREHASH_NameValue;
+char* _PREHASH_NameValue = LLMessageStringTable::getInstance()->getString("NameValue");
-char * _PREHASH_PathShearX;
+char* _PREHASH_PathShearX = LLMessageStringTable::getInstance()->getString("PathShearX");
-char * _PREHASH_PathShearY;
+char* _PREHASH_PathShearY = LLMessageStringTable::getInstance()->getString("PathShearY");
-char * _PREHASH_Velocity;
+char* _PREHASH_Velocity = LLMessageStringTable::getInstance()->getString("Velocity");
-char * _PREHASH_SecPerYear;
+char* _PREHASH_SecPerYear = LLMessageStringTable::getInstance()->getString("SecPerYear");
-char * _PREHASH_FirstName;
+char* _PREHASH_FirstName = LLMessageStringTable::getInstance()->getString("FirstName");
-char * _PREHASH_AttachedSoundGainChange;
+char* _PREHASH_AttachedSoundGainChange = LLMessageStringTable::getInstance()->getString("AttachedSoundGainChange");
-char * _PREHASH_LocationID;
+char* _PREHASH_LocationID = LLMessageStringTable::getInstance()->getString("LocationID");
-char * _PREHASH_Running;
+char* _PREHASH_Running = LLMessageStringTable::getInstance()->getString("Running");
-char * _PREHASH_AgentThrottle;
+char* _PREHASH_AgentThrottle = LLMessageStringTable::getInstance()->getString("AgentThrottle");
-char * _PREHASH_NeighborList;
+char* _PREHASH_NeighborList = LLMessageStringTable::getInstance()->getString("NeighborList");
-char * _PREHASH_PathTaperX;
+char* _PREHASH_PathTaperX = LLMessageStringTable::getInstance()->getString("PathTaperX");
-char * _PREHASH_PathTaperY;
+char* _PREHASH_PathTaperY = LLMessageStringTable::getInstance()->getString("PathTaperY");
-char * _PREHASH_AgentRelated;
+char* _PREHASH_AgentRelated = LLMessageStringTable::getInstance()->getString("AgentRelated");
-char * _PREHASH_GranterBlock;
+char* _PREHASH_GranterBlock = LLMessageStringTable::getInstance()->getString("GranterBlock");
-char * _PREHASH_UseCachedMuteList;
+char* _PREHASH_UseCachedMuteList = LLMessageStringTable::getInstance()->getString("UseCachedMuteList");
-char * _PREHASH_FailStats;
+char* _PREHASH_FailStats = LLMessageStringTable::getInstance()->getString("FailStats");
-char * _PREHASH_Tempfile;
+char* _PREHASH_Tempfile = LLMessageStringTable::getInstance()->getString("Tempfile");
-char * _PREHASH_BuyerID;
+char* _PREHASH_BuyerID = LLMessageStringTable::getInstance()->getString("BuyerID");
-char * _PREHASH_DirPeopleReply;
+char* _PREHASH_DirPeopleReply = LLMessageStringTable::getInstance()->getString("DirPeopleReply");
-char * _PREHASH_TransferInfo;
+char* _PREHASH_TransferInfo = LLMessageStringTable::getInstance()->getString("TransferInfo");
-char * _PREHASH_AvatarPickerRequestBackend;
+char* _PREHASH_AvatarPickerRequestBackend = LLMessageStringTable::getInstance()->getString("AvatarPickerRequestBackend");
-char * _PREHASH_AvatarPropertiesRequestBackend;
+char* _PREHASH_AvatarPropertiesRequestBackend = LLMessageStringTable::getInstance()->getString("AvatarPropertiesRequestBackend");
-char * _PREHASH_UpdateData;
+char* _PREHASH_UpdateData = LLMessageStringTable::getInstance()->getString("UpdateData");
-char * _PREHASH_SimFPS;
+char* _PREHASH_SimFPS = LLMessageStringTable::getInstance()->getString("SimFPS");
-char * _PREHASH_ReporterID;
+char* _PREHASH_ReporterID = LLMessageStringTable::getInstance()->getString("ReporterID");
-char * _PREHASH_ButtonLabel;
+char* _PREHASH_ButtonLabel = LLMessageStringTable::getInstance()->getString("ButtonLabel");
-char * _PREHASH_GranterID;
+char* _PREHASH_GranterID = LLMessageStringTable::getInstance()->getString("GranterID");
-char * _PREHASH_WantToText;
+char* _PREHASH_WantToText = LLMessageStringTable::getInstance()->getString("WantToText");
-char * _PREHASH_ReportType;
+char* _PREHASH_ReportType = LLMessageStringTable::getInstance()->getString("ReportType");
-char * _PREHASH_SimulatorReady;
+char* _PREHASH_SimulatorReady = LLMessageStringTable::getInstance()->getString("SimulatorReady");
-char * _PREHASH_DataBlock;
+char* _PREHASH_DataBlock = LLMessageStringTable::getInstance()->getString("DataBlock");
-char * _PREHASH_AnimationSourceList;
+char* _PREHASH_AnimationSourceList = LLMessageStringTable::getInstance()->getString("AnimationSourceList");
-char * _PREHASH_SubscribeLoad;
+char* _PREHASH_SubscribeLoad = LLMessageStringTable::getInstance()->getString("SubscribeLoad");
-char * _PREHASH_UnsubscribeLoad;
+char* _PREHASH_UnsubscribeLoad = LLMessageStringTable::getInstance()->getString("UnsubscribeLoad");
-char * _PREHASH_Packet;
+char* _PREHASH_Packet = LLMessageStringTable::getInstance()->getString("Packet");
-char * _PREHASH_UndoLand;
+char* _PREHASH_UndoLand = LLMessageStringTable::getInstance()->getString("UndoLand");
-char * _PREHASH_SimAccess;
+char* _PREHASH_SimAccess = LLMessageStringTable::getInstance()->getString("SimAccess");
-char * _PREHASH_AbuserID;
+char* _PREHASH_AbuserID = LLMessageStringTable::getInstance()->getString("AbuserID");
-char * _PREHASH_MembershipFee;
+char* _PREHASH_MembershipFee = LLMessageStringTable::getInstance()->getString("MembershipFee");
-char * _PREHASH_InviteGroupResponse;
+char* _PREHASH_InviteGroupResponse = LLMessageStringTable::getInstance()->getString("InviteGroupResponse");
-char * _PREHASH_CreateInventoryFolder;
+char* _PREHASH_CreateInventoryFolder = LLMessageStringTable::getInstance()->getString("CreateInventoryFolder");
-char * _PREHASH_UpdateInventoryFolder;
+char* _PREHASH_UpdateInventoryFolder = LLMessageStringTable::getInstance()->getString("UpdateInventoryFolder");
-char * _PREHASH_MoveInventoryFolder;
+char* _PREHASH_MoveInventoryFolder = LLMessageStringTable::getInstance()->getString("MoveInventoryFolder");
-char * _PREHASH_RemoveInventoryFolder;
+char* _PREHASH_RemoveInventoryFolder = LLMessageStringTable::getInstance()->getString("RemoveInventoryFolder");
-char * _PREHASH_MoneyData;
+char* _PREHASH_MoneyData = LLMessageStringTable::getInstance()->getString("MoneyData");
-char * _PREHASH_ObjectDeselect;
+char* _PREHASH_ObjectDeselect = LLMessageStringTable::getInstance()->getString("ObjectDeselect");
-char * _PREHASH_NewAssetID;
+char* _PREHASH_NewAssetID = LLMessageStringTable::getInstance()->getString("NewAssetID");
-char * _PREHASH_ObjectAdd;
+char* _PREHASH_ObjectAdd = LLMessageStringTable::getInstance()->getString("ObjectAdd");
-char * _PREHASH_RayEndIsIntersection;
+char* _PREHASH_RayEndIsIntersection = LLMessageStringTable::getInstance()->getString("RayEndIsIntersection");
-char * _PREHASH_CompleteAuction;
+char* _PREHASH_CompleteAuction = LLMessageStringTable::getInstance()->getString("CompleteAuction");
-char * _PREHASH_CircuitCode;
+char* _PREHASH_CircuitCode = LLMessageStringTable::getInstance()->getString("CircuitCode");
-char * _PREHASH_AgentMovementComplete;
+char* _PREHASH_AgentMovementComplete = LLMessageStringTable::getInstance()->getString("AgentMovementComplete");
-char * _PREHASH_ViewerIP;
+char* _PREHASH_ViewerIP = LLMessageStringTable::getInstance()->getString("ViewerIP");
-char * _PREHASH_Header;
+char* _PREHASH_Header = LLMessageStringTable::getInstance()->getString("Header");
-char * _PREHASH_GestureFlags;
+char* _PREHASH_GestureFlags = LLMessageStringTable::getInstance()->getString("GestureFlags");
-char * _PREHASH_XferID;
+char* _PREHASH_XferID = LLMessageStringTable::getInstance()->getString("XferID");
-char * _PREHASH_StatValue;
+char* _PREHASH_StatValue = LLMessageStringTable::getInstance()->getString("StatValue");
-char * _PREHASH_TaskID;
+char* _PREHASH_TaskID = LLMessageStringTable::getInstance()->getString("TaskID");
-char * _PREHASH_PickID;
+char* _PREHASH_PickID = LLMessageStringTable::getInstance()->getString("PickID");
-char * _PREHASH_RayEnd;
+char* _PREHASH_RayEnd = LLMessageStringTable::getInstance()->getString("RayEnd");
-char * _PREHASH_Throttles;
+char* _PREHASH_Throttles = LLMessageStringTable::getInstance()->getString("Throttles");
-char * _PREHASH_RebakeAvatarTextures;
+char* _PREHASH_RebakeAvatarTextures = LLMessageStringTable::getInstance()->getString("RebakeAvatarTextures");
-char * _PREHASH_UpAxis;
+char* _PREHASH_UpAxis = LLMessageStringTable::getInstance()->getString("UpAxis");
-char * _PREHASH_AgentTextures;
+char* _PREHASH_AgentTextures = LLMessageStringTable::getInstance()->getString("AgentTextures");
-char * _PREHASH_NotecardData;
+char* _PREHASH_NotecardData = LLMessageStringTable::getInstance()->getString("NotecardData");
-char * _PREHASH_Radius;
+char* _PREHASH_Radius = LLMessageStringTable::getInstance()->getString("Radius");
-char * _PREHASH_OffCircuit;
+char* _PREHASH_OffCircuit = LLMessageStringTable::getInstance()->getString("OffCircuit");
-char * _PREHASH_Access;
+char* _PREHASH_Access = LLMessageStringTable::getInstance()->getString("Access");
-char * _PREHASH_TitleRoleID;
+char* _PREHASH_TitleRoleID = LLMessageStringTable::getInstance()->getString("TitleRoleID");
-char * _PREHASH_SquareMetersCredit;
+char* _PREHASH_SquareMetersCredit = LLMessageStringTable::getInstance()->getString("SquareMetersCredit");
-char * _PREHASH_Filename;
+char* _PREHASH_Filename = LLMessageStringTable::getInstance()->getString("Filename");
-char * _PREHASH_ClassifiedInfoRequest;
+char* _PREHASH_ClassifiedInfoRequest = LLMessageStringTable::getInstance()->getString("ClassifiedInfoRequest");
-char * _PREHASH_ParcelInfoRequest;
+char* _PREHASH_ParcelInfoRequest = LLMessageStringTable::getInstance()->getString("ParcelInfoRequest");
-char * _PREHASH_ParcelObjectOwnersRequest;
+char* _PREHASH_ParcelObjectOwnersRequest = LLMessageStringTable::getInstance()->getString("ParcelObjectOwnersRequest");
-char * _PREHASH_TeleportLandmarkRequest;
+char* _PREHASH_TeleportLandmarkRequest = LLMessageStringTable::getInstance()->getString("TeleportLandmarkRequest");
-char * _PREHASH_EventInfoRequest;
+char* _PREHASH_EventInfoRequest = LLMessageStringTable::getInstance()->getString("EventInfoRequest");
-char * _PREHASH_MoneyBalanceRequest;
+char* _PREHASH_MoneyBalanceRequest = LLMessageStringTable::getInstance()->getString("MoneyBalanceRequest");
-char * _PREHASH_GroupMembersRequest;
+char* _PREHASH_GroupMembersRequest = LLMessageStringTable::getInstance()->getString("GroupMembersRequest");
-char * _PREHASH_GroupRoleMembersRequest;
+char* _PREHASH_GroupRoleMembersRequest = LLMessageStringTable::getInstance()->getString("GroupRoleMembersRequest");
-char * _PREHASH_ChatFromSimulator;
+char* _PREHASH_ChatFromSimulator = LLMessageStringTable::getInstance()->getString("ChatFromSimulator");
-char * _PREHASH_OldFolderID;
+char* _PREHASH_OldFolderID = LLMessageStringTable::getInstance()->getString("OldFolderID");
-char * _PREHASH_UserInfoRequest;
+char* _PREHASH_UserInfoRequest = LLMessageStringTable::getInstance()->getString("UserInfoRequest");
-char * _PREHASH_TextureID;
+char* _PREHASH_TextureID = LLMessageStringTable::getInstance()->getString("TextureID");
-char * _PREHASH_ProfileURL;
+char* _PREHASH_ProfileURL = LLMessageStringTable::getInstance()->getString("ProfileURL");
-char * _PREHASH_Handle;
+char* _PREHASH_Handle = LLMessageStringTable::getInstance()->getString("Handle");
-char * _PREHASH_ButtonIndex;
+char* _PREHASH_ButtonIndex = LLMessageStringTable::getInstance()->getString("ButtonIndex");
-char * _PREHASH_GetScriptRunning;
+char* _PREHASH_GetScriptRunning = LLMessageStringTable::getInstance()->getString("GetScriptRunning");
-char * _PREHASH_SetScriptRunning;
+char* _PREHASH_SetScriptRunning = LLMessageStringTable::getInstance()->getString("SetScriptRunning");
-char * _PREHASH_Health;
+char* _PREHASH_Health = LLMessageStringTable::getInstance()->getString("Health");
-char * _PREHASH_CircuitInfo;
+char* _PREHASH_CircuitInfo = LLMessageStringTable::getInstance()->getString("CircuitInfo");
-char * _PREHASH_ObjectBuy;
+char* _PREHASH_ObjectBuy = LLMessageStringTable::getInstance()->getString("ObjectBuy");
-char * _PREHASH_ProfileEnd;
+char* _PREHASH_ProfileEnd = LLMessageStringTable::getInstance()->getString("ProfileEnd");
-char * _PREHASH_Effect;
+char* _PREHASH_Effect = LLMessageStringTable::getInstance()->getString("Effect");
-char * _PREHASH_TestMessage;
+char* _PREHASH_TestMessage = LLMessageStringTable::getInstance()->getString("TestMessage");
-char * _PREHASH_ScriptMailRegistration;
+char* _PREHASH_ScriptMailRegistration = LLMessageStringTable::getInstance()->getString("ScriptMailRegistration");
-char * _PREHASH_AgentSetAppearance;
+char* _PREHASH_AgentSetAppearance = LLMessageStringTable::getInstance()->getString("AgentSetAppearance");
-char * _PREHASH_AvatarAppearance;
+char* _PREHASH_AvatarAppearance = LLMessageStringTable::getInstance()->getString("AvatarAppearance");
-char * _PREHASH_RegionData;
+char* _PREHASH_RegionData = LLMessageStringTable::getInstance()->getString("RegionData");
-char * _PREHASH_RequestingRegionData;
+char* _PREHASH_RequestingRegionData = LLMessageStringTable::getInstance()->getString("RequestingRegionData");
-char * _PREHASH_LandingRegionData;
+char* _PREHASH_LandingRegionData = LLMessageStringTable::getInstance()->getString("LandingRegionData");
-char * _PREHASH_SitTransform;
+char* _PREHASH_SitTransform = LLMessageStringTable::getInstance()->getString("SitTransform");
-char * _PREHASH_TerrainBase0;
+char* _PREHASH_TerrainBase0 = LLMessageStringTable::getInstance()->getString("TerrainBase0");
-char * _PREHASH_SkillsMask;
+char* _PREHASH_SkillsMask = LLMessageStringTable::getInstance()->getString("SkillsMask");
-char * _PREHASH_AtAxis;
+char* _PREHASH_AtAxis = LLMessageStringTable::getInstance()->getString("AtAxis");
-char * _PREHASH_TerrainBase1;
+char* _PREHASH_TerrainBase1 = LLMessageStringTable::getInstance()->getString("TerrainBase1");
-char * _PREHASH_Reason;
+char* _PREHASH_Reason = LLMessageStringTable::getInstance()->getString("Reason");
-char * _PREHASH_TerrainBase2;
+char* _PREHASH_TerrainBase2 = LLMessageStringTable::getInstance()->getString("TerrainBase2");
-char * _PREHASH_TerrainBase3;
+char* _PREHASH_TerrainBase3 = LLMessageStringTable::getInstance()->getString("TerrainBase3");
-char * _PREHASH_Params;
+char* _PREHASH_Params = LLMessageStringTable::getInstance()->getString("Params");
-char * _PREHASH_PingID;
+char* _PREHASH_PingID = LLMessageStringTable::getInstance()->getString("PingID");
-char * _PREHASH_Change;
+char* _PREHASH_Change = LLMessageStringTable::getInstance()->getString("Change");
-char * _PREHASH_Height;
+char* _PREHASH_Height = LLMessageStringTable::getInstance()->getString("Height");
-char * _PREHASH_Region;
+char* _PREHASH_Region = LLMessageStringTable::getInstance()->getString("Region");
-char * _PREHASH_TelehubInfo;
+char* _PREHASH_TelehubInfo = LLMessageStringTable::getInstance()->getString("TelehubInfo");
-char * _PREHASH_StateSave;
+char* _PREHASH_StateSave = LLMessageStringTable::getInstance()->getString("StateSave");
-char * _PREHASH_RoleData;
+char* _PREHASH_RoleData = LLMessageStringTable::getInstance()->getString("RoleData");
-char * _PREHASH_AgentAnimation;
+char* _PREHASH_AgentAnimation = LLMessageStringTable::getInstance()->getString("AgentAnimation");
-char * _PREHASH_AvatarAnimation;
+char* _PREHASH_AvatarAnimation = LLMessageStringTable::getInstance()->getString("AvatarAnimation");
-char * _PREHASH_LogDwellTime;
+char* _PREHASH_LogDwellTime = LLMessageStringTable::getInstance()->getString("LogDwellTime");
-char * _PREHASH_ParcelGodMarkAsContent;
+char* _PREHASH_ParcelGodMarkAsContent = LLMessageStringTable::getInstance()->getString("ParcelGodMarkAsContent");
-char * _PREHASH_UsePhysics;
+char* _PREHASH_UsePhysics = LLMessageStringTable::getInstance()->getString("UsePhysics");
-char * _PREHASH_RegionDenyTransacted;
+char* _PREHASH_RegionDenyTransacted = LLMessageStringTable::getInstance()->getString("RegionDenyTransacted");
-char * _PREHASH_JointType;
+char* _PREHASH_JointType = LLMessageStringTable::getInstance()->getString("JointType");
-char * _PREHASH_ObjectTaxEstimate;
+char* _PREHASH_ObjectTaxEstimate = LLMessageStringTable::getInstance()->getString("ObjectTaxEstimate");
-char * _PREHASH_LightTaxEstimate;
+char* _PREHASH_LightTaxEstimate = LLMessageStringTable::getInstance()->getString("LightTaxEstimate");
-char * _PREHASH_LandTaxEstimate;
+char* _PREHASH_LandTaxEstimate = LLMessageStringTable::getInstance()->getString("LandTaxEstimate");
-char * _PREHASH_TeleportLandingStatusChanged;
+char* _PREHASH_TeleportLandingStatusChanged = LLMessageStringTable::getInstance()->getString("TeleportLandingStatusChanged");
-char * _PREHASH_GroupTaxEstimate;
+char* _PREHASH_GroupTaxEstimate = LLMessageStringTable::getInstance()->getString("GroupTaxEstimate");
-char * _PREHASH_AvgViewerFPS;
+char* _PREHASH_AvgViewerFPS = LLMessageStringTable::getInstance()->getString("AvgViewerFPS");
-char * _PREHASH_Buttons;
+char* _PREHASH_Buttons = LLMessageStringTable::getInstance()->getString("Buttons");
-char * _PREHASH_Sender;
+char* _PREHASH_Sender = LLMessageStringTable::getInstance()->getString("Sender");
-char * _PREHASH_Dialog;
+char* _PREHASH_Dialog = LLMessageStringTable::getInstance()->getString("Dialog");
-char * _PREHASH_TargetData;
+char* _PREHASH_TargetData = LLMessageStringTable::getInstance()->getString("TargetData");
-char * _PREHASH_DestID;
+char* _PREHASH_DestID = LLMessageStringTable::getInstance()->getString("DestID");
-char * _PREHASH_PricePublicObjectDelete;
+char* _PREHASH_PricePublicObjectDelete = LLMessageStringTable::getInstance()->getString("PricePublicObjectDelete");
-char * _PREHASH_ObjectDelete;
+char* _PREHASH_ObjectDelete = LLMessageStringTable::getInstance()->getString("ObjectDelete");
-char * _PREHASH_Delete;
+char* _PREHASH_Delete = LLMessageStringTable::getInstance()->getString("Delete");
-char * _PREHASH_EventGodDelete;
+char* _PREHASH_EventGodDelete = LLMessageStringTable::getInstance()->getString("EventGodDelete");
-char * _PREHASH_LastTaxDate;
+char* _PREHASH_LastTaxDate = LLMessageStringTable::getInstance()->getString("LastTaxDate");
-char * _PREHASH_MapImageID;
+char* _PREHASH_MapImageID = LLMessageStringTable::getInstance()->getString("MapImageID");
-char * _PREHASH_EndDateTime;
+char* _PREHASH_EndDateTime = LLMessageStringTable::getInstance()->getString("EndDateTime");
-char * _PREHASH_TerrainDetail0;
+char* _PREHASH_TerrainDetail0 = LLMessageStringTable::getInstance()->getString("TerrainDetail0");
-char * _PREHASH_TerrainDetail1;
+char* _PREHASH_TerrainDetail1 = LLMessageStringTable::getInstance()->getString("TerrainDetail1");
-char * _PREHASH_TerrainDetail2;
+char* _PREHASH_TerrainDetail2 = LLMessageStringTable::getInstance()->getString("TerrainDetail2");
-char * _PREHASH_TerrainDetail3;
+char* _PREHASH_TerrainDetail3 = LLMessageStringTable::getInstance()->getString("TerrainDetail3");
-char * _PREHASH_Offset;
+char* _PREHASH_Offset = LLMessageStringTable::getInstance()->getString("Offset");
-char * _PREHASH_ObjectDelink;
+char* _PREHASH_ObjectDelink = LLMessageStringTable::getInstance()->getString("ObjectDelink");
-char * _PREHASH_TargetObject;
+char* _PREHASH_TargetObject = LLMessageStringTable::getInstance()->getString("TargetObject");
-char * _PREHASH_IsEstateManager;
+char* _PREHASH_IsEstateManager = LLMessageStringTable::getInstance()->getString("IsEstateManager");
-char * _PREHASH_CancelAuction;
+char* _PREHASH_CancelAuction = LLMessageStringTable::getInstance()->getString("CancelAuction");
-char * _PREHASH_ObjectDetach;
+char* _PREHASH_ObjectDetach = LLMessageStringTable::getInstance()->getString("ObjectDetach");
-char * _PREHASH_Compressed;
+char* _PREHASH_Compressed = LLMessageStringTable::getInstance()->getString("Compressed");
-char * _PREHASH_PathBegin;
+char* _PREHASH_PathBegin = LLMessageStringTable::getInstance()->getString("PathBegin");
-char * _PREHASH_BypassRaycast;
+char* _PREHASH_BypassRaycast = LLMessageStringTable::getInstance()->getString("BypassRaycast");
-char * _PREHASH_WinnerID;
+char* _PREHASH_WinnerID = LLMessageStringTable::getInstance()->getString("WinnerID");
-char * _PREHASH_ChannelType;
+char* _PREHASH_ChannelType = LLMessageStringTable::getInstance()->getString("ChannelType");
-char * _PREHASH_NonExemptMembers;
+char* _PREHASH_NonExemptMembers = LLMessageStringTable::getInstance()->getString("NonExemptMembers");
-char * _PREHASH_Agents;
+char* _PREHASH_Agents = LLMessageStringTable::getInstance()->getString("Agents");
-char * _PREHASH_MemberData;
+char* _PREHASH_MemberData = LLMessageStringTable::getInstance()->getString("MemberData");
-char * _PREHASH_ToGroupID;
+char* _PREHASH_ToGroupID = LLMessageStringTable::getInstance()->getString("ToGroupID");
-char * _PREHASH_ImageNotInDatabase;
+char* _PREHASH_ImageNotInDatabase = LLMessageStringTable::getInstance()->getString("ImageNotInDatabase");
-char * _PREHASH_StartDate;
+char* _PREHASH_StartDate = LLMessageStringTable::getInstance()->getString("StartDate");
-char * _PREHASH_AnimID;
+char* _PREHASH_AnimID = LLMessageStringTable::getInstance()->getString("AnimID");
-char * _PREHASH_Serial;
+char* _PREHASH_Serial = LLMessageStringTable::getInstance()->getString("Serial");
-char * _PREHASH_AbuseRegionName;
+char* _PREHASH_AbuseRegionName = LLMessageStringTable::getInstance()->getString("AbuseRegionName");
-char * _PREHASH_ModifyLand;
+char* _PREHASH_ModifyLand = LLMessageStringTable::getInstance()->getString("ModifyLand");
-char * _PREHASH_Digest;
+char* _PREHASH_Digest = LLMessageStringTable::getInstance()->getString("Digest");
-char * _PREHASH_Victim;
+char* _PREHASH_Victim = LLMessageStringTable::getInstance()->getString("Victim");
-char * _PREHASH_Script;
+char* _PREHASH_Script = LLMessageStringTable::getInstance()->getString("Script");
-char * _PREHASH_PickInfoReply;
+char* _PREHASH_PickInfoReply = LLMessageStringTable::getInstance()->getString("PickInfoReply");
-char * _PREHASH_MoneyBalanceReply;
+char* _PREHASH_MoneyBalanceReply = LLMessageStringTable::getInstance()->getString("MoneyBalanceReply");
-char * _PREHASH_RoutedMoneyBalanceReply;
+char* _PREHASH_RoutedMoneyBalanceReply = LLMessageStringTable::getInstance()->getString("RoutedMoneyBalanceReply");
-char * _PREHASH_RoleID;
+char* _PREHASH_RoleID = LLMessageStringTable::getInstance()->getString("RoleID");
-char * _PREHASH_RegionInfo;
+char* _PREHASH_RegionInfo = LLMessageStringTable::getInstance()->getString("RegionInfo");
-char * _PREHASH_GodUpdateRegionInfo;
+char* _PREHASH_GodUpdateRegionInfo = LLMessageStringTable::getInstance()->getString("GodUpdateRegionInfo");
-char * _PREHASH_StartAnim;
+char* _PREHASH_StartAnim = LLMessageStringTable::getInstance()->getString("StartAnim");
-char * _PREHASH_Action;
+char* _PREHASH_Action = LLMessageStringTable::getInstance()->getString("Action");
-char * _PREHASH_Location;
+char* _PREHASH_Location = LLMessageStringTable::getInstance()->getString("Location");
-char * _PREHASH_Rights;
+char* _PREHASH_Rights = LLMessageStringTable::getInstance()->getString("Rights");
-char * _PREHASH_SearchDir;
+char* _PREHASH_SearchDir = LLMessageStringTable::getInstance()->getString("SearchDir");
-char * _PREHASH_TransferRequest;
+char* _PREHASH_TransferRequest = LLMessageStringTable::getInstance()->getString("TransferRequest");
-char * _PREHASH_ScriptSensorRequest;
+char* _PREHASH_ScriptSensorRequest = LLMessageStringTable::getInstance()->getString("ScriptSensorRequest");
-char * _PREHASH_MoneyTransferRequest;
+char* _PREHASH_MoneyTransferRequest = LLMessageStringTable::getInstance()->getString("MoneyTransferRequest");
-char * _PREHASH_EjectGroupMemberRequest;
+char* _PREHASH_EjectGroupMemberRequest = LLMessageStringTable::getInstance()->getString("EjectGroupMemberRequest");
-char * _PREHASH_SkillsText;
+char* _PREHASH_SkillsText = LLMessageStringTable::getInstance()->getString("SkillsText");
-char * _PREHASH_Resent;
+char* _PREHASH_Resent = LLMessageStringTable::getInstance()->getString("Resent");
-char * _PREHASH_Center;
+char* _PREHASH_Center = LLMessageStringTable::getInstance()->getString("Center");
-char * _PREHASH_SharedData;
+char* _PREHASH_SharedData = LLMessageStringTable::getInstance()->getString("SharedData");
-char * _PREHASH_PSBlock;
+char* _PREHASH_PSBlock = LLMessageStringTable::getInstance()->getString("PSBlock");
-char * _PREHASH_UUIDNameBlock;
+char* _PREHASH_UUIDNameBlock = LLMessageStringTable::getInstance()->getString("UUIDNameBlock");
-char * _PREHASH_GroupTitleUpdate;
+char* _PREHASH_GroupTitleUpdate = LLMessageStringTable::getInstance()->getString("GroupTitleUpdate");
-char * _PREHASH_Method;
+char* _PREHASH_Method = LLMessageStringTable::getInstance()->getString("Method");
-char * _PREHASH_TouchName;
+char* _PREHASH_TouchName = LLMessageStringTable::getInstance()->getString("TouchName");
-char * _PREHASH_UpdateType;
+char* _PREHASH_UpdateType = LLMessageStringTable::getInstance()->getString("UpdateType");
-char * _PREHASH_KickedFromEstateID;
+char* _PREHASH_KickedFromEstateID = LLMessageStringTable::getInstance()->getString("KickedFromEstateID");
-char * _PREHASH_CandidateID;
+char* _PREHASH_CandidateID = LLMessageStringTable::getInstance()->getString("CandidateID");
-char * _PREHASH_ParamData;
+char* _PREHASH_ParamData = LLMessageStringTable::getInstance()->getString("ParamData");
-char * _PREHASH_GodlikeMessage;
+char* _PREHASH_GodlikeMessage = LLMessageStringTable::getInstance()->getString("GodlikeMessage");
-char * _PREHASH_SystemMessage;
+char* _PREHASH_SystemMessage = LLMessageStringTable::getInstance()->getString("SystemMessage");
-char * _PREHASH_BodyRotation;
+char* _PREHASH_BodyRotation = LLMessageStringTable::getInstance()->getString("BodyRotation");
-char * _PREHASH_SearchRegions;
+char* _PREHASH_SearchRegions = LLMessageStringTable::getInstance()->getString("SearchRegions");
-char * _PREHASH_AnimationData;
+char* _PREHASH_AnimationData = LLMessageStringTable::getInstance()->getString("AnimationData");
-char * _PREHASH_StatID;
+char* _PREHASH_StatID = LLMessageStringTable::getInstance()->getString("StatID");
-char * _PREHASH_ItemID;
+char* _PREHASH_ItemID = LLMessageStringTable::getInstance()->getString("ItemID");
-char * _PREHASH_ScriptDialogReply;
+char* _PREHASH_ScriptDialogReply = LLMessageStringTable::getInstance()->getString("ScriptDialogReply");
-char * _PREHASH_RegionIDAndHandleReply;
+char* _PREHASH_RegionIDAndHandleReply = LLMessageStringTable::getInstance()->getString("RegionIDAndHandleReply");
-char * _PREHASH_CameraAtOffset;
+char* _PREHASH_CameraAtOffset = LLMessageStringTable::getInstance()->getString("CameraAtOffset");
-char * _PREHASH_VoteID;
+char* _PREHASH_VoteID = LLMessageStringTable::getInstance()->getString("VoteID");
-char * _PREHASH_ParcelGodForceOwner;
+char* _PREHASH_ParcelGodForceOwner = LLMessageStringTable::getInstance()->getString("ParcelGodForceOwner");
-char * _PREHASH_Filter;
+char* _PREHASH_Filter = LLMessageStringTable::getInstance()->getString("Filter");
-char * _PREHASH_InviteData;
+char* _PREHASH_InviteData = LLMessageStringTable::getInstance()->getString("InviteData");
-char * _PREHASH_PCode;
+char* _PREHASH_PCode = LLMessageStringTable::getInstance()->getString("PCode");
-char * _PREHASH_SearchPos;
+char* _PREHASH_SearchPos = LLMessageStringTable::getInstance()->getString("SearchPos");
-char * _PREHASH_PreyID;
+char* _PREHASH_PreyID = LLMessageStringTable::getInstance()->getString("PreyID");
-char * _PREHASH_TerrainLowerLimit;
+char* _PREHASH_TerrainLowerLimit = LLMessageStringTable::getInstance()->getString("TerrainLowerLimit");
-char * _PREHASH_EventFlags;
+char* _PREHASH_EventFlags = LLMessageStringTable::getInstance()->getString("EventFlags");
-char * _PREHASH_TallyVotes;
+char* _PREHASH_TallyVotes = LLMessageStringTable::getInstance()->getString("TallyVotes");
-char * _PREHASH_Result;
+char* _PREHASH_Result = LLMessageStringTable::getInstance()->getString("Result");
-char * _PREHASH_LookAt;
+char* _PREHASH_LookAt = LLMessageStringTable::getInstance()->getString("LookAt");
-char * _PREHASH_SearchOrder;
+char* _PREHASH_SearchOrder = LLMessageStringTable::getInstance()->getString("SearchOrder");
-char * _PREHASH_PayButton;
+char* _PREHASH_PayButton = LLMessageStringTable::getInstance()->getString("PayButton");
-char * _PREHASH_SelfCount;
+char* _PREHASH_SelfCount = LLMessageStringTable::getInstance()->getString("SelfCount");
-char * _PREHASH_PacketCount;
+char* _PREHASH_PacketCount = LLMessageStringTable::getInstance()->getString("PacketCount");
-char * _PREHASH_ParcelBuyPass;
+char* _PREHASH_ParcelBuyPass = LLMessageStringTable::getInstance()->getString("ParcelBuyPass");
-char * _PREHASH_OldItemID;
+char* _PREHASH_OldItemID = LLMessageStringTable::getInstance()->getString("OldItemID");
-char * _PREHASH_RegionPort;
+char* _PREHASH_RegionPort = LLMessageStringTable::getInstance()->getString("RegionPort");
-char * _PREHASH_PriceEnergyUnit;
+char* _PREHASH_PriceEnergyUnit = LLMessageStringTable::getInstance()->getString("PriceEnergyUnit");
-char * _PREHASH_Bitmap;
+char* _PREHASH_Bitmap = LLMessageStringTable::getInstance()->getString("Bitmap");
-char * _PREHASH_CacheMissType;
+char* _PREHASH_CacheMissType = LLMessageStringTable::getInstance()->getString("CacheMissType");
-char * _PREHASH_VFileID;
+char* _PREHASH_VFileID = LLMessageStringTable::getInstance()->getString("VFileID");
-char * _PREHASH_GroupInsigniaID;
+char* _PREHASH_GroupInsigniaID = LLMessageStringTable::getInstance()->getString("GroupInsigniaID");
-char * _PREHASH_Online;
+char* _PREHASH_Online = LLMessageStringTable::getInstance()->getString("Online");
-char * _PREHASH_KickFlags;
+char* _PREHASH_KickFlags = LLMessageStringTable::getInstance()->getString("KickFlags");
-char * _PREHASH_CovenantID;
+char* _PREHASH_CovenantID = LLMessageStringTable::getInstance()->getString("CovenantID");
-char * _PREHASH_SysCPU;
+char* _PREHASH_SysCPU = LLMessageStringTable::getInstance()->getString("SysCPU");
-char * _PREHASH_EMail;
+char* _PREHASH_EMail = LLMessageStringTable::getInstance()->getString("EMail");
-char * _PREHASH_AggregatePermTextures;
+char* _PREHASH_AggregatePermTextures = LLMessageStringTable::getInstance()->getString("AggregatePermTextures");
-char * _PREHASH_ChatChannel;
+char* _PREHASH_ChatChannel = LLMessageStringTable::getInstance()->getString("ChatChannel");
-char * _PREHASH_ReturnID;
+char* _PREHASH_ReturnID = LLMessageStringTable::getInstance()->getString("ReturnID");
-char * _PREHASH_ObjectAttach;
+char* _PREHASH_ObjectAttach = LLMessageStringTable::getInstance()->getString("ObjectAttach");
-char * _PREHASH_TargetPort;
+char* _PREHASH_TargetPort = LLMessageStringTable::getInstance()->getString("TargetPort");
-char * _PREHASH_ObjectSpinStop;
+char* _PREHASH_ObjectSpinStop = LLMessageStringTable::getInstance()->getString("ObjectSpinStop");
-char * _PREHASH_FullID;
+char* _PREHASH_FullID = LLMessageStringTable::getInstance()->getString("FullID");
-char * _PREHASH_ActivateGroup;
+char* _PREHASH_ActivateGroup = LLMessageStringTable::getInstance()->getString("ActivateGroup");
-char * _PREHASH_SysGPU;
+char* _PREHASH_SysGPU = LLMessageStringTable::getInstance()->getString("SysGPU");
-char * _PREHASH_AvatarInterestsReply;
+char* _PREHASH_AvatarInterestsReply = LLMessageStringTable::getInstance()->getString("AvatarInterestsReply");
-char * _PREHASH_StartLure;
+char* _PREHASH_StartLure = LLMessageStringTable::getInstance()->getString("StartLure");
-char * _PREHASH_SysRAM;
+char* _PREHASH_SysRAM = LLMessageStringTable::getInstance()->getString("SysRAM");
-char * _PREHASH_ObjectPosition;
+char* _PREHASH_ObjectPosition = LLMessageStringTable::getInstance()->getString("ObjectPosition");
-char * _PREHASH_SitPosition;
+char* _PREHASH_SitPosition = LLMessageStringTable::getInstance()->getString("SitPosition");
-char * _PREHASH_StartTime;
+char* _PREHASH_StartTime = LLMessageStringTable::getInstance()->getString("StartTime");
-char * _PREHASH_BornOn;
+char* _PREHASH_BornOn = LLMessageStringTable::getInstance()->getString("BornOn");
-char * _PREHASH_CameraCollidePlane;
+char* _PREHASH_CameraCollidePlane = LLMessageStringTable::getInstance()->getString("CameraCollidePlane");
-char * _PREHASH_EconomyDataRequest;
+char* _PREHASH_EconomyDataRequest = LLMessageStringTable::getInstance()->getString("EconomyDataRequest");
-char * _PREHASH_TeleportLureRequest;
+char* _PREHASH_TeleportLureRequest = LLMessageStringTable::getInstance()->getString("TeleportLureRequest");
-char * _PREHASH_FolderID;
+char* _PREHASH_FolderID = LLMessageStringTable::getInstance()->getString("FolderID");
-char * _PREHASH_RegionHandleRequest;
+char* _PREHASH_RegionHandleRequest = LLMessageStringTable::getInstance()->getString("RegionHandleRequest");
-char * _PREHASH_ScriptDataRequest;
+char* _PREHASH_ScriptDataRequest = LLMessageStringTable::getInstance()->getString("ScriptDataRequest");
-char * _PREHASH_GroupRoleDataRequest;
+char* _PREHASH_GroupRoleDataRequest = LLMessageStringTable::getInstance()->getString("GroupRoleDataRequest");
-char * _PREHASH_GroupTitlesRequest;
+char* _PREHASH_GroupTitlesRequest = LLMessageStringTable::getInstance()->getString("GroupTitlesRequest");
-char * _PREHASH_AgentWearablesRequest;
+char* _PREHASH_AgentWearablesRequest = LLMessageStringTable::getInstance()->getString("AgentWearablesRequest");
-char * _PREHASH_MapBlockRequest;
+char* _PREHASH_MapBlockRequest = LLMessageStringTable::getInstance()->getString("MapBlockRequest");
-char * _PREHASH_LureID;
+char* _PREHASH_LureID = LLMessageStringTable::getInstance()->getString("LureID");
-char * _PREHASH_CopyCenters;
+char* _PREHASH_CopyCenters = LLMessageStringTable::getInstance()->getString("CopyCenters");
-char * _PREHASH_ParamList;
+char* _PREHASH_ParamList = LLMessageStringTable::getInstance()->getString("ParamList");
-char * _PREHASH_InventorySerial;
+char* _PREHASH_InventorySerial = LLMessageStringTable::getInstance()->getString("InventorySerial");
-char * _PREHASH_EdgeDataPacket;
+char* _PREHASH_EdgeDataPacket = LLMessageStringTable::getInstance()->getString("EdgeDataPacket");
-char * _PREHASH_AvatarPickerReply;
+char* _PREHASH_AvatarPickerReply = LLMessageStringTable::getInstance()->getString("AvatarPickerReply");
-char * _PREHASH_ParcelDwellReply;
+char* _PREHASH_ParcelDwellReply = LLMessageStringTable::getInstance()->getString("ParcelDwellReply");
-char * _PREHASH_IsForSale;
+char* _PREHASH_IsForSale = LLMessageStringTable::getInstance()->getString("IsForSale");
-char * _PREHASH_MuteID;
+char* _PREHASH_MuteID = LLMessageStringTable::getInstance()->getString("MuteID");
-char * _PREHASH_MeanCollisionAlert;
+char* _PREHASH_MeanCollisionAlert = LLMessageStringTable::getInstance()->getString("MeanCollisionAlert");
-char * _PREHASH_CanAcceptTasks;
+char* _PREHASH_CanAcceptTasks = LLMessageStringTable::getInstance()->getString("CanAcceptTasks");
-char * _PREHASH_ItemData;
+char* _PREHASH_ItemData = LLMessageStringTable::getInstance()->getString("ItemData");
-char * _PREHASH_AnimationList;
+char* _PREHASH_AnimationList = LLMessageStringTable::getInstance()->getString("AnimationList");
-char * _PREHASH_Reputation;
+char* _PREHASH_Reputation = LLMessageStringTable::getInstance()->getString("Reputation");
-char * _PREHASH_IntValue;
+char* _PREHASH_IntValue = LLMessageStringTable::getInstance()->getString("IntValue");
-char * _PREHASH_TargetType;
+char* _PREHASH_TargetType = LLMessageStringTable::getInstance()->getString("TargetType");
-char * _PREHASH_Amount;
+char* _PREHASH_Amount = LLMessageStringTable::getInstance()->getString("Amount");
-char * _PREHASH_HasAttachment;
+char* _PREHASH_HasAttachment = LLMessageStringTable::getInstance()->getString("HasAttachment");
-char * _PREHASH_UpdateAttachment;
+char* _PREHASH_UpdateAttachment = LLMessageStringTable::getInstance()->getString("UpdateAttachment");
-char * _PREHASH_RemoveAttachment;
+char* _PREHASH_RemoveAttachment = LLMessageStringTable::getInstance()->getString("RemoveAttachment");
-char * _PREHASH_HeightWidthBlock;
+char* _PREHASH_HeightWidthBlock = LLMessageStringTable::getInstance()->getString("HeightWidthBlock");
-char * _PREHASH_RequestObjectPropertiesFamily;
+char* _PREHASH_RequestObjectPropertiesFamily = LLMessageStringTable::getInstance()->getString("RequestObjectPropertiesFamily");
-char * _PREHASH_ObjectPropertiesFamily;
+char* _PREHASH_ObjectPropertiesFamily = LLMessageStringTable::getInstance()->getString("ObjectPropertiesFamily");
-char * _PREHASH_UserData;
+char* _PREHASH_UserData = LLMessageStringTable::getInstance()->getString("UserData");
-char * _PREHASH_IsReadable;
+char* _PREHASH_IsReadable = LLMessageStringTable::getInstance()->getString("IsReadable");
-char * _PREHASH_PathCurve;
+char* _PREHASH_PathCurve = LLMessageStringTable::getInstance()->getString("PathCurve");
-char * _PREHASH_Status;
+char* _PREHASH_Status = LLMessageStringTable::getInstance()->getString("Status");
-char * _PREHASH_FromGroup;
+char* _PREHASH_FromGroup = LLMessageStringTable::getInstance()->getString("FromGroup");
-char * _PREHASH_AlreadyVoted;
+char* _PREHASH_AlreadyVoted = LLMessageStringTable::getInstance()->getString("AlreadyVoted");
-char * _PREHASH_PlacesReply;
+char* _PREHASH_PlacesReply = LLMessageStringTable::getInstance()->getString("PlacesReply");
-char * _PREHASH_DirPlacesReply;
+char* _PREHASH_DirPlacesReply = LLMessageStringTable::getInstance()->getString("DirPlacesReply");
-char * _PREHASH_ParcelBuy;
+char* _PREHASH_ParcelBuy = LLMessageStringTable::getInstance()->getString("ParcelBuy");
-char * _PREHASH_DirFindQueryBackend;
+char* _PREHASH_DirFindQueryBackend = LLMessageStringTable::getInstance()->getString("DirFindQueryBackend");
-char * _PREHASH_DirPlacesQueryBackend;
+char* _PREHASH_DirPlacesQueryBackend = LLMessageStringTable::getInstance()->getString("DirPlacesQueryBackend");
-char * _PREHASH_DirClassifiedQueryBackend;
+char* _PREHASH_DirClassifiedQueryBackend = LLMessageStringTable::getInstance()->getString("DirClassifiedQueryBackend");
-char * _PREHASH_DirLandQueryBackend;
+char* _PREHASH_DirLandQueryBackend = LLMessageStringTable::getInstance()->getString("DirLandQueryBackend");
-char * _PREHASH_DirPopularQueryBackend;
+char* _PREHASH_DirPopularQueryBackend = LLMessageStringTable::getInstance()->getString("DirPopularQueryBackend");
-char * _PREHASH_HistoryData;
+char* _PREHASH_HistoryData = LLMessageStringTable::getInstance()->getString("HistoryData");
-char * _PREHASH_SnapshotID;
+char* _PREHASH_SnapshotID = LLMessageStringTable::getInstance()->getString("SnapshotID");
-char * _PREHASH_Aspect;
+char* _PREHASH_Aspect = LLMessageStringTable::getInstance()->getString("Aspect");
-char * _PREHASH_ParamSize;
+char* _PREHASH_ParamSize = LLMessageStringTable::getInstance()->getString("ParamSize");
-char * _PREHASH_VoteCast;
+char* _PREHASH_VoteCast = LLMessageStringTable::getInstance()->getString("VoteCast");
-char * _PREHASH_CastsShadows;
+char* _PREHASH_CastsShadows = LLMessageStringTable::getInstance()->getString("CastsShadows");
-char * _PREHASH_EveryoneMask;
+char* _PREHASH_EveryoneMask = LLMessageStringTable::getInstance()->getString("EveryoneMask");
-char * _PREHASH_ObjectSpinUpdate;
+char* _PREHASH_ObjectSpinUpdate = LLMessageStringTable::getInstance()->getString("ObjectSpinUpdate");
-char * _PREHASH_MaturePublish;
+char* _PREHASH_MaturePublish = LLMessageStringTable::getInstance()->getString("MaturePublish");
-char * _PREHASH_UseExistingAsset;
+char* _PREHASH_UseExistingAsset = LLMessageStringTable::getInstance()->getString("UseExistingAsset");
-char * _PREHASH_Powers;
+char* _PREHASH_Powers = LLMessageStringTable::getInstance()->getString("Powers");
-char * _PREHASH_ParcelLocalID;
+char* _PREHASH_ParcelLocalID = LLMessageStringTable::getInstance()->getString("ParcelLocalID");
-char * _PREHASH_TeleportCancel;
+char* _PREHASH_TeleportCancel = LLMessageStringTable::getInstance()->getString("TeleportCancel");
-char * _PREHASH_UnixTime;
+char* _PREHASH_UnixTime = LLMessageStringTable::getInstance()->getString("UnixTime");
-char * _PREHASH_QueryFlags;
+char* _PREHASH_QueryFlags = LLMessageStringTable::getInstance()->getString("QueryFlags");
-char * _PREHASH_AlwaysRun;
+char* _PREHASH_AlwaysRun = LLMessageStringTable::getInstance()->getString("AlwaysRun");
-char * _PREHASH_Bottom;
+char* _PREHASH_Bottom = LLMessageStringTable::getInstance()->getString("Bottom");
-char * _PREHASH_ButtonData;
+char* _PREHASH_ButtonData = LLMessageStringTable::getInstance()->getString("ButtonData");
-char * _PREHASH_SoundData;
+char* _PREHASH_SoundData = LLMessageStringTable::getInstance()->getString("SoundData");
-char * _PREHASH_ViewerStats;
+char* _PREHASH_ViewerStats = LLMessageStringTable::getInstance()->getString("ViewerStats");
-char * _PREHASH_RegionHandshake;
+char* _PREHASH_RegionHandshake = LLMessageStringTable::getInstance()->getString("RegionHandshake");
-char * _PREHASH_ObjectDescription;
+char* _PREHASH_ObjectDescription = LLMessageStringTable::getInstance()->getString("ObjectDescription");
-char * _PREHASH_Description;
+char* _PREHASH_Description = LLMessageStringTable::getInstance()->getString("Description");
-char * _PREHASH_ParamType;
+char* _PREHASH_ParamType = LLMessageStringTable::getInstance()->getString("ParamType");
-char * _PREHASH_UUIDNameReply;
+char* _PREHASH_UUIDNameReply = LLMessageStringTable::getInstance()->getString("UUIDNameReply");
-char * _PREHASH_UUIDGroupNameReply;
+char* _PREHASH_UUIDGroupNameReply = LLMessageStringTable::getInstance()->getString("UUIDGroupNameReply");
-char * _PREHASH_SaveAssetIntoInventory;
+char* _PREHASH_SaveAssetIntoInventory = LLMessageStringTable::getInstance()->getString("SaveAssetIntoInventory");
-char * _PREHASH_UserInfo;
+char* _PREHASH_UserInfo = LLMessageStringTable::getInstance()->getString("UserInfo");
-char * _PREHASH_AnimSequenceID;
+char* _PREHASH_AnimSequenceID = LLMessageStringTable::getInstance()->getString("AnimSequenceID");
-char * _PREHASH_NVPairs;
+char* _PREHASH_NVPairs = LLMessageStringTable::getInstance()->getString("NVPairs");
-char * _PREHASH_GroupNoticesListRequest;
+char* _PREHASH_GroupNoticesListRequest = LLMessageStringTable::getInstance()->getString("GroupNoticesListRequest");
-char * _PREHASH_ParcelAccessListRequest;
+char* _PREHASH_ParcelAccessListRequest = LLMessageStringTable::getInstance()->getString("ParcelAccessListRequest");
-char * _PREHASH_MuteListRequest;
+char* _PREHASH_MuteListRequest = LLMessageStringTable::getInstance()->getString("MuteListRequest");
-char * _PREHASH_RpcChannelRequest;
+char* _PREHASH_RpcChannelRequest = LLMessageStringTable::getInstance()->getString("RpcChannelRequest");
-char * _PREHASH_LandStatRequest;
+char* _PREHASH_LandStatRequest = LLMessageStringTable::getInstance()->getString("LandStatRequest");
-char * _PREHASH_PlacesQuery;
+char* _PREHASH_PlacesQuery = LLMessageStringTable::getInstance()->getString("PlacesQuery");
-char * _PREHASH_DirPlacesQuery;
+char* _PREHASH_DirPlacesQuery = LLMessageStringTable::getInstance()->getString("DirPlacesQuery");
-char * _PREHASH_SortOrder;
+char* _PREHASH_SortOrder = LLMessageStringTable::getInstance()->getString("SortOrder");
-char * _PREHASH_Hunter;
+char* _PREHASH_Hunter = LLMessageStringTable::getInstance()->getString("Hunter");
-char * _PREHASH_SunAngVelocity;
+char* _PREHASH_SunAngVelocity = LLMessageStringTable::getInstance()->getString("SunAngVelocity");
-char * _PREHASH_BinaryBucket;
+char* _PREHASH_BinaryBucket = LLMessageStringTable::getInstance()->getString("BinaryBucket");
-char * _PREHASH_ImagePacket;
+char* _PREHASH_ImagePacket = LLMessageStringTable::getInstance()->getString("ImagePacket");
-char * _PREHASH_StartGroupProposal;
+char* _PREHASH_StartGroupProposal = LLMessageStringTable::getInstance()->getString("StartGroupProposal");
-char * _PREHASH_EnergyLevel;
+char* _PREHASH_EnergyLevel = LLMessageStringTable::getInstance()->getString("EnergyLevel");
-char * _PREHASH_PriceForListing;
+char* _PREHASH_PriceForListing = LLMessageStringTable::getInstance()->getString("PriceForListing");
-char * _PREHASH_Scale;
+char* _PREHASH_Scale = LLMessageStringTable::getInstance()->getString("Scale");
-char * _PREHASH_EstateCovenantReply;
+char* _PREHASH_EstateCovenantReply = LLMessageStringTable::getInstance()->getString("EstateCovenantReply");
-char * _PREHASH_ParentEstateID;
+char* _PREHASH_ParentEstateID = LLMessageStringTable::getInstance()->getString("ParentEstateID");
-char * _PREHASH_Extra2;
+char* _PREHASH_Extra2 = LLMessageStringTable::getInstance()->getString("Extra2");
-char * _PREHASH_Throttle;
+char* _PREHASH_Throttle = LLMessageStringTable::getInstance()->getString("Throttle");
-char * _PREHASH_SimIP;
+char* _PREHASH_SimIP = LLMessageStringTable::getInstance()->getString("SimIP");
-char * _PREHASH_GodID;
+char* _PREHASH_GodID = LLMessageStringTable::getInstance()->getString("GodID");
-char * _PREHASH_TeleportMinPrice;
+char* _PREHASH_TeleportMinPrice = LLMessageStringTable::getInstance()->getString("TeleportMinPrice");
-char * _PREHASH_VoteItem;
+char* _PREHASH_VoteItem = LLMessageStringTable::getInstance()->getString("VoteItem");
-char * _PREHASH_ObjectRotation;
+char* _PREHASH_ObjectRotation = LLMessageStringTable::getInstance()->getString("ObjectRotation");
-char * _PREHASH_SitRotation;
+char* _PREHASH_SitRotation = LLMessageStringTable::getInstance()->getString("SitRotation");
-char * _PREHASH_SnapSelection;
+char* _PREHASH_SnapSelection = LLMessageStringTable::getInstance()->getString("SnapSelection");
-char * _PREHASH_SoundTrigger;
+char* _PREHASH_SoundTrigger = LLMessageStringTable::getInstance()->getString("SoundTrigger");
-char * _PREHASH_TerrainRaiseLimit;
+char* _PREHASH_TerrainRaiseLimit = LLMessageStringTable::getInstance()->getString("TerrainRaiseLimit");
-char * _PREHASH_Quorum;
+char* _PREHASH_Quorum = LLMessageStringTable::getInstance()->getString("Quorum");
-char * _PREHASH_AgentBlock;
+char* _PREHASH_AgentBlock = LLMessageStringTable::getInstance()->getString("AgentBlock");
-char * _PREHASH_CommandBlock;
+char* _PREHASH_CommandBlock = LLMessageStringTable::getInstance()->getString("CommandBlock");
-char * _PREHASH_PricePublicObjectDecay;
+char* _PREHASH_PricePublicObjectDecay = LLMessageStringTable::getInstance()->getString("PricePublicObjectDecay");
-char * _PREHASH_SpawnPointPos;
+char* _PREHASH_SpawnPointPos = LLMessageStringTable::getInstance()->getString("SpawnPointPos");
-char * _PREHASH_VolumeDetail;
+char* _PREHASH_VolumeDetail = LLMessageStringTable::getInstance()->getString("VolumeDetail");
-char * _PREHASH_FromAgentName;
+char* _PREHASH_FromAgentName = LLMessageStringTable::getInstance()->getString("FromAgentName");
-char * _PREHASH_Range;
+char* _PREHASH_Range = LLMessageStringTable::getInstance()->getString("Range");
-char * _PREHASH_DirectoryVisibility;
+char* _PREHASH_DirectoryVisibility = LLMessageStringTable::getInstance()->getString("DirectoryVisibility");
-char * _PREHASH_PublicIP;
+char* _PREHASH_PublicIP = LLMessageStringTable::getInstance()->getString("PublicIP");
-char * _PREHASH_TeleportFailed;
+char* _PREHASH_TeleportFailed = LLMessageStringTable::getInstance()->getString("TeleportFailed");
-char * _PREHASH_PreloadSound;
+char* _PREHASH_PreloadSound = LLMessageStringTable::getInstance()->getString("PreloadSound");
-char * _PREHASH_ScreenshotID;
+char* _PREHASH_ScreenshotID = LLMessageStringTable::getInstance()->getString("ScreenshotID");
-char * _PREHASH_CovenantTimestamp;
+char* _PREHASH_CovenantTimestamp = LLMessageStringTable::getInstance()->getString("CovenantTimestamp");
-char * _PREHASH_OldestUnacked;
+char* _PREHASH_OldestUnacked = LLMessageStringTable::getInstance()->getString("OldestUnacked");
-char * _PREHASH_SimulatorIP;
+char* _PREHASH_SimulatorIP = LLMessageStringTable::getInstance()->getString("SimulatorIP");
-char * _PREHASH_Value;
+char* _PREHASH_Value = LLMessageStringTable::getInstance()->getString("Value");
-char * _PREHASH_JointAxisOrAnchor;
+char* _PREHASH_JointAxisOrAnchor = LLMessageStringTable::getInstance()->getString("JointAxisOrAnchor");
-char * _PREHASH_Test0;
+char* _PREHASH_Test0 = LLMessageStringTable::getInstance()->getString("Test0");
-char * _PREHASH_Test1;
+char* _PREHASH_Test1 = LLMessageStringTable::getInstance()->getString("Test1");
-char * _PREHASH_Test2;
+char* _PREHASH_Test2 = LLMessageStringTable::getInstance()->getString("Test2");
-char * _PREHASH_SunPhase;
+char* _PREHASH_SunPhase = LLMessageStringTable::getInstance()->getString("SunPhase");
-char * _PREHASH_ParcelDivide;
+char* _PREHASH_ParcelDivide = LLMessageStringTable::getInstance()->getString("ParcelDivide");
-char * _PREHASH_PriceObjectClaim;
+char* _PREHASH_PriceObjectClaim = LLMessageStringTable::getInstance()->getString("PriceObjectClaim");
-char * _PREHASH_Field;
+char* _PREHASH_Field = LLMessageStringTable::getInstance()->getString("Field");
-char * _PREHASH_Ratio;
+char* _PREHASH_Ratio = LLMessageStringTable::getInstance()->getString("Ratio");
-char * _PREHASH_JoinGroupReply;
+char* _PREHASH_JoinGroupReply = LLMessageStringTable::getInstance()->getString("JoinGroupReply");
-char * _PREHASH_LiveHelpGroupReply;
+char* _PREHASH_LiveHelpGroupReply = LLMessageStringTable::getInstance()->getString("LiveHelpGroupReply");
-char * _PREHASH_Score;
+char* _PREHASH_Score = LLMessageStringTable::getInstance()->getString("Score");
-char * _PREHASH_Image;
+char* _PREHASH_Image = LLMessageStringTable::getInstance()->getString("Image");
-char * _PREHASH_ObjectClickAction;
+char* _PREHASH_ObjectClickAction = LLMessageStringTable::getInstance()->getString("ObjectClickAction");
-char * _PREHASH_Parameter;
+char* _PREHASH_Parameter = LLMessageStringTable::getInstance()->getString("Parameter");
-char * _PREHASH_Flags;
+char* _PREHASH_Flags = LLMessageStringTable::getInstance()->getString("Flags");
-char * _PREHASH_Plane;
+char* _PREHASH_Plane = LLMessageStringTable::getInstance()->getString("Plane");
-char * _PREHASH_Width;
+char* _PREHASH_Width = LLMessageStringTable::getInstance()->getString("Width");
-char * _PREHASH_Right;
+char* _PREHASH_Right = LLMessageStringTable::getInstance()->getString("Right");
-char * _PREHASH_DirFindQuery;
+char* _PREHASH_DirFindQuery = LLMessageStringTable::getInstance()->getString("DirFindQuery");
-char * _PREHASH_Textures;
+char* _PREHASH_Textures = LLMessageStringTable::getInstance()->getString("Textures");
-char * _PREHASH_EventData;
+char* _PREHASH_EventData = LLMessageStringTable::getInstance()->getString("EventData");
-char * _PREHASH_Final;
+char* _PREHASH_Final = LLMessageStringTable::getInstance()->getString("Final");
-char * _PREHASH_System;
+char* _PREHASH_System = LLMessageStringTable::getInstance()->getString("System");
-char * _PREHASH_TelehubPos;
+char* _PREHASH_TelehubPos = LLMessageStringTable::getInstance()->getString("TelehubPos");
-char * _PREHASH_ReportAutosaveCrash;
+char* _PREHASH_ReportAutosaveCrash = LLMessageStringTable::getInstance()->getString("ReportAutosaveCrash");
-char * _PREHASH_CreateTrustedCircuit;
+char* _PREHASH_CreateTrustedCircuit = LLMessageStringTable::getInstance()->getString("CreateTrustedCircuit");
-char * _PREHASH_DenyTrustedCircuit;
+char* _PREHASH_DenyTrustedCircuit = LLMessageStringTable::getInstance()->getString("DenyTrustedCircuit");
-char * _PREHASH_RequestTrustedCircuit;
+char* _PREHASH_RequestTrustedCircuit = LLMessageStringTable::getInstance()->getString("RequestTrustedCircuit");
-char * _PREHASH_Codec;
+char* _PREHASH_Codec = LLMessageStringTable::getInstance()->getString("Codec");
-char * _PREHASH_Modal;
+char* _PREHASH_Modal = LLMessageStringTable::getInstance()->getString("Modal");
-char * _PREHASH_ChildAgentUnknown;
+char* _PREHASH_ChildAgentUnknown = LLMessageStringTable::getInstance()->getString("ChildAgentUnknown");
-char * _PREHASH_LandingType;
+char* _PREHASH_LandingType = LLMessageStringTable::getInstance()->getString("LandingType");
-char * _PREHASH_ScriptRunningReply;
+char* _PREHASH_ScriptRunningReply = LLMessageStringTable::getInstance()->getString("ScriptRunningReply");
-char * _PREHASH_Reply;
+char* _PREHASH_Reply = LLMessageStringTable::getInstance()->getString("Reply");
-char * _PREHASH_GroupAccountDetailsReply;
+char* _PREHASH_GroupAccountDetailsReply = LLMessageStringTable::getInstance()->getString("GroupAccountDetailsReply");
-char * _PREHASH_TelehubRot;
+char* _PREHASH_TelehubRot = LLMessageStringTable::getInstance()->getString("TelehubRot");
-char * _PREHASH_AcceptFriendship;
+char* _PREHASH_AcceptFriendship = LLMessageStringTable::getInstance()->getString("AcceptFriendship");
-char * _PREHASH_ItemType;
+char* _PREHASH_ItemType = LLMessageStringTable::getInstance()->getString("ItemType");
-char * _PREHASH_DwellInfo;
+char* _PREHASH_DwellInfo = LLMessageStringTable::getInstance()->getString("DwellInfo");
-char * _PREHASH_AgentResume;
+char* _PREHASH_AgentResume = LLMessageStringTable::getInstance()->getString("AgentResume");
-char * _PREHASH_MailFilter;
+char* _PREHASH_MailFilter = LLMessageStringTable::getInstance()->getString("MailFilter");
-char * _PREHASH_Disconnect;
+char* _PREHASH_Disconnect = LLMessageStringTable::getInstance()->getString("Disconnect");
-char * _PREHASH_SimPosition;
+char* _PREHASH_SimPosition = LLMessageStringTable::getInstance()->getString("SimPosition");
-char * _PREHASH_SimWideTotalPrims;
+char* _PREHASH_SimWideTotalPrims = LLMessageStringTable::getInstance()->getString("SimWideTotalPrims");
-char * _PREHASH_Index;
+char* _PREHASH_Index = LLMessageStringTable::getInstance()->getString("Index");
-char * _PREHASH_SimFilename;
+char* _PREHASH_SimFilename = LLMessageStringTable::getInstance()->getString("SimFilename");
-char * _PREHASH_LastOwnerID;
+char* _PREHASH_LastOwnerID = LLMessageStringTable::getInstance()->getString("LastOwnerID");
-char * _PREHASH_GroupNoticeRequest;
+char* _PREHASH_GroupNoticeRequest = LLMessageStringTable::getInstance()->getString("GroupNoticeRequest");
-char * _PREHASH_EmailMessageRequest;
+char* _PREHASH_EmailMessageRequest = LLMessageStringTable::getInstance()->getString("EmailMessageRequest");
-char * _PREHASH_MapItemRequest;
+char* _PREHASH_MapItemRequest = LLMessageStringTable::getInstance()->getString("MapItemRequest");
-char * _PREHASH_AgentCount;
+char* _PREHASH_AgentCount = LLMessageStringTable::getInstance()->getString("AgentCount");
-char * _PREHASH_MessageBlock;
+char* _PREHASH_MessageBlock = LLMessageStringTable::getInstance()->getString("MessageBlock");
-char * _PREHASH_FuseBlock;
+char* _PREHASH_FuseBlock = LLMessageStringTable::getInstance()->getString("FuseBlock");
-char * _PREHASH_AgentGroupData;
+char* _PREHASH_AgentGroupData = LLMessageStringTable::getInstance()->getString("AgentGroupData");
-char * _PREHASH_ClassifiedInfoUpdate;
+char* _PREHASH_ClassifiedInfoUpdate = LLMessageStringTable::getInstance()->getString("ClassifiedInfoUpdate");
-char * _PREHASH_RegionPos;
+char* _PREHASH_RegionPos = LLMessageStringTable::getInstance()->getString("RegionPos");
-char * _PREHASH_ParcelMediaUpdate;
+char* _PREHASH_ParcelMediaUpdate = LLMessageStringTable::getInstance()->getString("ParcelMediaUpdate");
-char * _PREHASH_NoticeID;
+char* _PREHASH_NoticeID = LLMessageStringTable::getInstance()->getString("NoticeID");
-char * _PREHASH_GridX;
+char* _PREHASH_GridX = LLMessageStringTable::getInstance()->getString("GridX");
-char * _PREHASH_GridY;
+char* _PREHASH_GridY = LLMessageStringTable::getInstance()->getString("GridY");
-char * _PREHASH_Title;
+char* _PREHASH_Title = LLMessageStringTable::getInstance()->getString("Title");
-char * _PREHASH_AuctionID;
+char* _PREHASH_AuctionID = LLMessageStringTable::getInstance()->getString("AuctionID");
-char * _PREHASH_VoteType;
+char* _PREHASH_VoteType = LLMessageStringTable::getInstance()->getString("VoteType");
-char * _PREHASH_CategoryID;
+char* _PREHASH_CategoryID = LLMessageStringTable::getInstance()->getString("CategoryID");
-char * _PREHASH_Token;
+char* _PREHASH_Token = LLMessageStringTable::getInstance()->getString("Token");
-char * _PREHASH_AggregatePerms;
+char* _PREHASH_AggregatePerms = LLMessageStringTable::getInstance()->getString("AggregatePerms");
-char * _PREHASH_ObjectSelect;
+char* _PREHASH_ObjectSelect = LLMessageStringTable::getInstance()->getString("ObjectSelect");
-char * _PREHASH_ForceObjectSelect;
+char* _PREHASH_ForceObjectSelect = LLMessageStringTable::getInstance()->getString("ForceObjectSelect");
-char * _PREHASH_Price;
+char* _PREHASH_Price = LLMessageStringTable::getInstance()->getString("Price");
-char * _PREHASH_SunDirection;
+char* _PREHASH_SunDirection = LLMessageStringTable::getInstance()->getString("SunDirection");
-char * _PREHASH_FromName;
+char* _PREHASH_FromName = LLMessageStringTable::getInstance()->getString("FromName");
-char * _PREHASH_ChangeInventoryItemFlags;
+char* _PREHASH_ChangeInventoryItemFlags = LLMessageStringTable::getInstance()->getString("ChangeInventoryItemFlags");
-char * _PREHASH_Force;
+char* _PREHASH_Force = LLMessageStringTable::getInstance()->getString("Force");
-char * _PREHASH_TransactionBlock;
+char* _PREHASH_TransactionBlock = LLMessageStringTable::getInstance()->getString("TransactionBlock");
-char * _PREHASH_PowersMask;
+char* _PREHASH_PowersMask = LLMessageStringTable::getInstance()->getString("PowersMask");
-char * _PREHASH_Stamp;
+char* _PREHASH_Stamp = LLMessageStringTable::getInstance()->getString("Stamp");
-char * _PREHASH_TotalCredits;
+char* _PREHASH_TotalCredits = LLMessageStringTable::getInstance()->getString("TotalCredits");
-char * _PREHASH_State;
+char* _PREHASH_State = LLMessageStringTable::getInstance()->getString("State");
-char * _PREHASH_TextureIndex;
+char* _PREHASH_TextureIndex = LLMessageStringTable::getInstance()->getString("TextureIndex");
-char * _PREHASH_InviteeID;
+char* _PREHASH_InviteeID = LLMessageStringTable::getInstance()->getString("InviteeID");
-char * _PREHASH_ParcelReclaim;
+char* _PREHASH_ParcelReclaim = LLMessageStringTable::getInstance()->getString("ParcelReclaim");
-char * _PREHASH_Money;
+char* _PREHASH_Money = LLMessageStringTable::getInstance()->getString("Money");
-char * _PREHASH_PathTwist;
+char* _PREHASH_PathTwist = LLMessageStringTable::getInstance()->getString("PathTwist");
-char * _PREHASH_AuthBuyerID;
+char* _PREHASH_AuthBuyerID = LLMessageStringTable::getInstance()->getString("AuthBuyerID");
-char * _PREHASH_Color;
+char* _PREHASH_Color = LLMessageStringTable::getInstance()->getString("Color");
-char * _PREHASH_SourceType;
+char* _PREHASH_SourceType = LLMessageStringTable::getInstance()->getString("SourceType");
-char * _PREHASH_World;
+char* _PREHASH_World = LLMessageStringTable::getInstance()->getString("World");
-char * _PREHASH_QueryData;
+char* _PREHASH_QueryData = LLMessageStringTable::getInstance()->getString("QueryData");
-char * _PREHASH_Users;
+char* _PREHASH_Users = LLMessageStringTable::getInstance()->getString("Users");
-char * _PREHASH_SysOS;
+char* _PREHASH_SysOS = LLMessageStringTable::getInstance()->getString("SysOS");
-char * _PREHASH_Notes;
+char* _PREHASH_Notes = LLMessageStringTable::getInstance()->getString("Notes");
-char * _PREHASH_AvatarID;
+char* _PREHASH_AvatarID = LLMessageStringTable::getInstance()->getString("AvatarID");
-char * _PREHASH_FounderID;
+char* _PREHASH_FounderID = LLMessageStringTable::getInstance()->getString("FounderID");
-char * _PREHASH_EndPointID;
+char* _PREHASH_EndPointID = LLMessageStringTable::getInstance()->getString("EndPointID");
-char * _PREHASH_LocationLookAt;
+char* _PREHASH_LocationLookAt = LLMessageStringTable::getInstance()->getString("LocationLookAt");
-char * _PREHASH_Sound;
+char* _PREHASH_Sound = LLMessageStringTable::getInstance()->getString("Sound");
-char * _PREHASH_Cover;
+char* _PREHASH_Cover = LLMessageStringTable::getInstance()->getString("Cover");
-char * _PREHASH_TotalObjectCount;
+char* _PREHASH_TotalObjectCount = LLMessageStringTable::getInstance()->getString("TotalObjectCount");
-char * _PREHASH_TextureEntry;
+char* _PREHASH_TextureEntry = LLMessageStringTable::getInstance()->getString("TextureEntry");
-char * _PREHASH_SquareMetersCommitted;
+char* _PREHASH_SquareMetersCommitted = LLMessageStringTable::getInstance()->getString("SquareMetersCommitted");
-char * _PREHASH_ChannelID;
+char* _PREHASH_ChannelID = LLMessageStringTable::getInstance()->getString("ChannelID");
-char * _PREHASH_Dwell;
+char* _PREHASH_Dwell = LLMessageStringTable::getInstance()->getString("Dwell");
-char * _PREHASH_North;
+char* _PREHASH_North = LLMessageStringTable::getInstance()->getString("North");
-char * _PREHASH_AgentUpdate;
+char* _PREHASH_AgentUpdate = LLMessageStringTable::getInstance()->getString("AgentUpdate");
-char * _PREHASH_PickGodDelete;
+char* _PREHASH_PickGodDelete = LLMessageStringTable::getInstance()->getString("PickGodDelete");
-char * _PREHASH_HostName;
+char* _PREHASH_HostName = LLMessageStringTable::getInstance()->getString("HostName");
-char * _PREHASH_PriceParcelClaim;
+char* _PREHASH_PriceParcelClaim = LLMessageStringTable::getInstance()->getString("PriceParcelClaim");
-char * _PREHASH_ParcelClaim;
+char* _PREHASH_ParcelClaim = LLMessageStringTable::getInstance()->getString("ParcelClaim");
-char * _PREHASH_AgentPowers;
+char* _PREHASH_AgentPowers = LLMessageStringTable::getInstance()->getString("AgentPowers");
-char * _PREHASH_ProfileHollow;
+char* _PREHASH_ProfileHollow = LLMessageStringTable::getInstance()->getString("ProfileHollow");
-char * _PREHASH_GroupRoleChanges;
+char* _PREHASH_GroupRoleChanges = LLMessageStringTable::getInstance()->getString("GroupRoleChanges");
-char * _PREHASH_Count;
+char* _PREHASH_Count = LLMessageStringTable::getInstance()->getString("Count");
-char * _PREHASH_South;
+char* _PREHASH_South = LLMessageStringTable::getInstance()->getString("South");
-char * _PREHASH_ObjectUpdateCompressed;
+char* _PREHASH_ObjectUpdateCompressed = LLMessageStringTable::getInstance()->getString("ObjectUpdateCompressed");
-char * _PREHASH_MuteFlags;
+char* _PREHASH_MuteFlags = LLMessageStringTable::getInstance()->getString("MuteFlags");
-char * _PREHASH_Group;
+char* _PREHASH_Group = LLMessageStringTable::getInstance()->getString("Group");
-char * _PREHASH_AgentPause;
+char* _PREHASH_AgentPause = LLMessageStringTable::getInstance()->getString("AgentPause");
-char * _PREHASH_LanguagesText;
+char* _PREHASH_LanguagesText = LLMessageStringTable::getInstance()->getString("LanguagesText");
-char * _PREHASH_Error;
+char* _PREHASH_Error = LLMessageStringTable::getInstance()->getString("Error");
-char * _PREHASH_InternalScriptMail;
+char* _PREHASH_InternalScriptMail = LLMessageStringTable::getInstance()->getString("InternalScriptMail");
-char * _PREHASH_FindAgent;
+char* _PREHASH_FindAgent = LLMessageStringTable::getInstance()->getString("FindAgent");
-char * _PREHASH_AgentData;
+char* _PREHASH_AgentData = LLMessageStringTable::getInstance()->getString("AgentData");
-char * _PREHASH_FolderData;
+char* _PREHASH_FolderData = LLMessageStringTable::getInstance()->getString("FolderData");
-char * _PREHASH_AssetBlock;
+char* _PREHASH_AssetBlock = LLMessageStringTable::getInstance()->getString("AssetBlock");
-char * _PREHASH_AcceptNotices;
+char* _PREHASH_AcceptNotices = LLMessageStringTable::getInstance()->getString("AcceptNotices");
-char * _PREHASH_SetGroupAcceptNotices;
+char* _PREHASH_SetGroupAcceptNotices = LLMessageStringTable::getInstance()->getString("SetGroupAcceptNotices");
-char * _PREHASH_CloseCircuit;
+char* _PREHASH_CloseCircuit = LLMessageStringTable::getInstance()->getString("CloseCircuit");
-char * _PREHASH_TeleportFinish;
+char* _PREHASH_TeleportFinish = LLMessageStringTable::getInstance()->getString("TeleportFinish");
-char * _PREHASH_PathRevolutions;
+char* _PREHASH_PathRevolutions = LLMessageStringTable::getInstance()->getString("PathRevolutions");
-char * _PREHASH_ClassifiedInfoReply;
+char* _PREHASH_ClassifiedInfoReply = LLMessageStringTable::getInstance()->getString("ClassifiedInfoReply");
-char * _PREHASH_ParcelInfoReply;
+char* _PREHASH_ParcelInfoReply = LLMessageStringTable::getInstance()->getString("ParcelInfoReply");
-char * _PREHASH_AutosaveData;
+char* _PREHASH_AutosaveData = LLMessageStringTable::getInstance()->getString("AutosaveData");
-char * _PREHASH_SetStartLocation;
+char* _PREHASH_SetStartLocation = LLMessageStringTable::getInstance()->getString("SetStartLocation");
-char * _PREHASH_PassHours;
+char* _PREHASH_PassHours = LLMessageStringTable::getInstance()->getString("PassHours");
-char * _PREHASH_AttachmentPt;
+char* _PREHASH_AttachmentPt = LLMessageStringTable::getInstance()->getString("AttachmentPt");
-char * _PREHASH_ParcelFlags;
+char* _PREHASH_ParcelFlags = LLMessageStringTable::getInstance()->getString("ParcelFlags");
-char * _PREHASH_NumVotes;
+char* _PREHASH_NumVotes = LLMessageStringTable::getInstance()->getString("NumVotes");
-char * _PREHASH_AvatarPickerRequest;
+char* _PREHASH_AvatarPickerRequest = LLMessageStringTable::getInstance()->getString("AvatarPickerRequest");
-char * _PREHASH_TeleportLocationRequest;
+char* _PREHASH_TeleportLocationRequest = LLMessageStringTable::getInstance()->getString("TeleportLocationRequest");
-char * _PREHASH_DataHomeLocationRequest;
+char* _PREHASH_DataHomeLocationRequest = LLMessageStringTable::getInstance()->getString("DataHomeLocationRequest");
-char * _PREHASH_EventNotificationAddRequest;
+char* _PREHASH_EventNotificationAddRequest = LLMessageStringTable::getInstance()->getString("EventNotificationAddRequest");
-char * _PREHASH_ParcelDwellRequest;
+char* _PREHASH_ParcelDwellRequest = LLMessageStringTable::getInstance()->getString("ParcelDwellRequest");
-char * _PREHASH_EventLocationRequest;
+char* _PREHASH_EventLocationRequest = LLMessageStringTable::getInstance()->getString("EventLocationRequest");
-char * _PREHASH_SetStartLocationRequest;
+char* _PREHASH_SetStartLocationRequest = LLMessageStringTable::getInstance()->getString("SetStartLocationRequest");
-char * _PREHASH_QueryStart;
+char* _PREHASH_QueryStart = LLMessageStringTable::getInstance()->getString("QueryStart");
-char * _PREHASH_EjectData;
+char* _PREHASH_EjectData = LLMessageStringTable::getInstance()->getString("EjectData");
-char * _PREHASH_AvatarTextureUpdate;
+char* _PREHASH_AvatarTextureUpdate = LLMessageStringTable::getInstance()->getString("AvatarTextureUpdate");
-char * _PREHASH_RPCServerPort;
+char* _PREHASH_RPCServerPort = LLMessageStringTable::getInstance()->getString("RPCServerPort");
-char * _PREHASH_Bytes;
+char* _PREHASH_Bytes = LLMessageStringTable::getInstance()->getString("Bytes");
-char * _PREHASH_Extra;
+char* _PREHASH_Extra = LLMessageStringTable::getInstance()->getString("Extra");
-char * _PREHASH_ForceScriptControlRelease;
+char* _PREHASH_ForceScriptControlRelease = LLMessageStringTable::getInstance()->getString("ForceScriptControlRelease");
-char * _PREHASH_ParcelRelease;
+char* _PREHASH_ParcelRelease = LLMessageStringTable::getInstance()->getString("ParcelRelease");
-char * _PREHASH_VFileType;
+char* _PREHASH_VFileType = LLMessageStringTable::getInstance()->getString("VFileType");
-char * _PREHASH_EjectGroupMemberReply;
+char* _PREHASH_EjectGroupMemberReply = LLMessageStringTable::getInstance()->getString("EjectGroupMemberReply");
-char * _PREHASH_ImageData;
+char* _PREHASH_ImageData = LLMessageStringTable::getInstance()->getString("ImageData");
-char * _PREHASH_SimulatorViewerTimeMessage;
+char* _PREHASH_SimulatorViewerTimeMessage = LLMessageStringTable::getInstance()->getString("SimulatorViewerTimeMessage");
-char * _PREHASH_Rotation;
+char* _PREHASH_Rotation = LLMessageStringTable::getInstance()->getString("Rotation");
-char * _PREHASH_Selection;
+char* _PREHASH_Selection = LLMessageStringTable::getInstance()->getString("Selection");
-char * _PREHASH_TransactionData;
+char* _PREHASH_TransactionData = LLMessageStringTable::getInstance()->getString("TransactionData");
-char * _PREHASH_OperationData;
+char* _PREHASH_OperationData = LLMessageStringTable::getInstance()->getString("OperationData");
-char * _PREHASH_ExpirationDate;
+char* _PREHASH_ExpirationDate = LLMessageStringTable::getInstance()->getString("ExpirationDate");
-char * _PREHASH_ParcelDeedToGroup;
+char* _PREHASH_ParcelDeedToGroup = LLMessageStringTable::getInstance()->getString("ParcelDeedToGroup");
-char * _PREHASH_AvatarPicksReply;
+char* _PREHASH_AvatarPicksReply = LLMessageStringTable::getInstance()->getString("AvatarPicksReply");
-char * _PREHASH_GroupTitlesReply;
+char* _PREHASH_GroupTitlesReply = LLMessageStringTable::getInstance()->getString("GroupTitlesReply");
-char * _PREHASH_AgentInfo;
+char* _PREHASH_AgentInfo = LLMessageStringTable::getInstance()->getString("AgentInfo");
-char * _PREHASH_MoneyTransferBackend;
+char* _PREHASH_MoneyTransferBackend = LLMessageStringTable::getInstance()->getString("MoneyTransferBackend");
-char * _PREHASH_NextOwnerMask;
+char* _PREHASH_NextOwnerMask = LLMessageStringTable::getInstance()->getString("NextOwnerMask");
-char * _PREHASH_MuteData;
+char* _PREHASH_MuteData = LLMessageStringTable::getInstance()->getString("MuteData");
-char * _PREHASH_PassPrice;
+char* _PREHASH_PassPrice = LLMessageStringTable::getInstance()->getString("PassPrice");
-char * _PREHASH_SourceID;
+char* _PREHASH_SourceID = LLMessageStringTable::getInstance()->getString("SourceID");
-char * _PREHASH_ChangeUserRights;
+char* _PREHASH_ChangeUserRights = LLMessageStringTable::getInstance()->getString("ChangeUserRights");
-char * _PREHASH_TeleportFlags;
+char* _PREHASH_TeleportFlags = LLMessageStringTable::getInstance()->getString("TeleportFlags");
-char * _PREHASH_SlaveParcelData;
+char* _PREHASH_SlaveParcelData = LLMessageStringTable::getInstance()->getString("SlaveParcelData");
-char * _PREHASH_AssetData;
+char* _PREHASH_AssetData = LLMessageStringTable::getInstance()->getString("AssetData");
-char * _PREHASH_MultipleObjectUpdate;
+char* _PREHASH_MultipleObjectUpdate = LLMessageStringTable::getInstance()->getString("MultipleObjectUpdate");
-char * _PREHASH_ObjectUpdate;
+char* _PREHASH_ObjectUpdate = LLMessageStringTable::getInstance()->getString("ObjectUpdate");
-char * _PREHASH_ImprovedTerseObjectUpdate;
+char* _PREHASH_ImprovedTerseObjectUpdate = LLMessageStringTable::getInstance()->getString("ImprovedTerseObjectUpdate");
-char * _PREHASH_ConfirmXferPacket;
+char* _PREHASH_ConfirmXferPacket = LLMessageStringTable::getInstance()->getString("ConfirmXferPacket");
-char * _PREHASH_StartPingCheck;
+char* _PREHASH_StartPingCheck = LLMessageStringTable::getInstance()->getString("StartPingCheck");
-char * _PREHASH_SimWideDeletes;
+char* _PREHASH_SimWideDeletes = LLMessageStringTable::getInstance()->getString("SimWideDeletes");
-char * _PREHASH_LandStatReply;
+char* _PREHASH_LandStatReply = LLMessageStringTable::getInstance()->getString("LandStatReply");
-char * _PREHASH_IsPhantom;
+char* _PREHASH_IsPhantom = LLMessageStringTable::getInstance()->getString("IsPhantom");
-char * _PREHASH_AgentList;
+char* _PREHASH_AgentList = LLMessageStringTable::getInstance()->getString("AgentList");
-char * _PREHASH_SimApproved;
+char* _PREHASH_SimApproved = LLMessageStringTable::getInstance()->getString("SimApproved");
-char * _PREHASH_RezObject;
+char* _PREHASH_RezObject = LLMessageStringTable::getInstance()->getString("RezObject");
-char * _PREHASH_TaskLocalID;
+char* _PREHASH_TaskLocalID = LLMessageStringTable::getInstance()->getString("TaskLocalID");
-char * _PREHASH_ClaimDate;
+char* _PREHASH_ClaimDate = LLMessageStringTable::getInstance()->getString("ClaimDate");
-char * _PREHASH_MergeParcel;
+char* _PREHASH_MergeParcel = LLMessageStringTable::getInstance()->getString("MergeParcel");
-char * _PREHASH_Priority;
+char* _PREHASH_Priority = LLMessageStringTable::getInstance()->getString("Priority");
-char * _PREHASH_QueryText;
+char* _PREHASH_QueryText = LLMessageStringTable::getInstance()->getString("QueryText");
-char * _PREHASH_GroupNoticeAdd;
+char* _PREHASH_GroupNoticeAdd = LLMessageStringTable::getInstance()->getString("GroupNoticeAdd");
-char * _PREHASH_ReturnType;
+char* _PREHASH_ReturnType = LLMessageStringTable::getInstance()->getString("ReturnType");
-char * _PREHASH_FetchFolders;
+char* _PREHASH_FetchFolders = LLMessageStringTable::getInstance()->getString("FetchFolders");
-char * _PREHASH_SimulatorPublicHostBlock;
+char* _PREHASH_SimulatorPublicHostBlock = LLMessageStringTable::getInstance()->getString("SimulatorPublicHostBlock");
-char * _PREHASH_HeaderData;
+char* _PREHASH_HeaderData = LLMessageStringTable::getInstance()->getString("HeaderData");
-char * _PREHASH_RequestMultipleObjects;
+char* _PREHASH_RequestMultipleObjects = LLMessageStringTable::getInstance()->getString("RequestMultipleObjects");
-char * _PREHASH_RetrieveInstantMessages;
+char* _PREHASH_RetrieveInstantMessages = LLMessageStringTable::getInstance()->getString("RetrieveInstantMessages");
-char * _PREHASH_OpenCircuit;
+char* _PREHASH_OpenCircuit = LLMessageStringTable::getInstance()->getString("OpenCircuit");
-char * _PREHASH_CrossedRegion;
+char* _PREHASH_CrossedRegion = LLMessageStringTable::getInstance()->getString("CrossedRegion");
-char * _PREHASH_DirGroupsReply;
+char* _PREHASH_DirGroupsReply = LLMessageStringTable::getInstance()->getString("DirGroupsReply");
-char * _PREHASH_AvatarGroupsReply;
+char* _PREHASH_AvatarGroupsReply = LLMessageStringTable::getInstance()->getString("AvatarGroupsReply");
-char * _PREHASH_EmailMessageReply;
+char* _PREHASH_EmailMessageReply = LLMessageStringTable::getInstance()->getString("EmailMessageReply");
-char * _PREHASH_GroupVoteHistoryItemReply;
+char* _PREHASH_GroupVoteHistoryItemReply = LLMessageStringTable::getInstance()->getString("GroupVoteHistoryItemReply");
-char * _PREHASH_ViewerPosition;
+char* _PREHASH_ViewerPosition = LLMessageStringTable::getInstance()->getString("ViewerPosition");
-char * _PREHASH_Position;
+char* _PREHASH_Position = LLMessageStringTable::getInstance()->getString("Position");
-char * _PREHASH_ParentEstate;
+char* _PREHASH_ParentEstate = LLMessageStringTable::getInstance()->getString("ParentEstate");
-char * _PREHASH_EstateName;
+char* _PREHASH_EstateName = LLMessageStringTable::getInstance()->getString("EstateName");
-char * _PREHASH_MuteName;
+char* _PREHASH_MuteName = LLMessageStringTable::getInstance()->getString("MuteName");
-char * _PREHASH_ParcelRename;
+char* _PREHASH_ParcelRename = LLMessageStringTable::getInstance()->getString("ParcelRename");
-char * _PREHASH_ViewerFilename;
+char* _PREHASH_ViewerFilename = LLMessageStringTable::getInstance()->getString("ViewerFilename");
-char * _PREHASH_UserReportInternal;
+char* _PREHASH_UserReportInternal = LLMessageStringTable::getInstance()->getString("UserReportInternal");
-char * _PREHASH_AvatarPropertiesRequest;
+char* _PREHASH_AvatarPropertiesRequest = LLMessageStringTable::getInstance()->getString("AvatarPropertiesRequest");
-char * _PREHASH_ParcelPropertiesRequest;
+char* _PREHASH_ParcelPropertiesRequest = LLMessageStringTable::getInstance()->getString("ParcelPropertiesRequest");
-char * _PREHASH_GroupProfileRequest;
+char* _PREHASH_GroupProfileRequest = LLMessageStringTable::getInstance()->getString("GroupProfileRequest");
-char * _PREHASH_AgentDataUpdateRequest;
+char* _PREHASH_AgentDataUpdateRequest = LLMessageStringTable::getInstance()->getString("AgentDataUpdateRequest");
-char * _PREHASH_PriceObjectScaleFactor;
+char* _PREHASH_PriceObjectScaleFactor = LLMessageStringTable::getInstance()->getString("PriceObjectScaleFactor");
-char * _PREHASH_OpenEnrollment;
+char* _PREHASH_OpenEnrollment = LLMessageStringTable::getInstance()->getString("OpenEnrollment");
-char * _PREHASH_GroupData;
+char* _PREHASH_GroupData = LLMessageStringTable::getInstance()->getString("GroupData");
-char * _PREHASH_RequestGodlikePowers;
+char* _PREHASH_RequestGodlikePowers = LLMessageStringTable::getInstance()->getString("RequestGodlikePowers");
-char * _PREHASH_GrantGodlikePowers;
+char* _PREHASH_GrantGodlikePowers = LLMessageStringTable::getInstance()->getString("GrantGodlikePowers");
-char * _PREHASH_TransactionID;
+char* _PREHASH_TransactionID = LLMessageStringTable::getInstance()->getString("TransactionID");
-char * _PREHASH_DestinationID;
+char* _PREHASH_DestinationID = LLMessageStringTable::getInstance()->getString("DestinationID");
-char * _PREHASH_Controls;
+char* _PREHASH_Controls = LLMessageStringTable::getInstance()->getString("Controls");
-char * _PREHASH_FirstDetachAll;
+char* _PREHASH_FirstDetachAll = LLMessageStringTable::getInstance()->getString("FirstDetachAll");
-char * _PREHASH_EstateID;
+char* _PREHASH_EstateID = LLMessageStringTable::getInstance()->getString("EstateID");
-char * _PREHASH_ImprovedInstantMessage;
+char* _PREHASH_ImprovedInstantMessage = LLMessageStringTable::getInstance()->getString("ImprovedInstantMessage");
-char * _PREHASH_CheckParcelSales;
+char* _PREHASH_CheckParcelSales = LLMessageStringTable::getInstance()->getString("CheckParcelSales");
-char * _PREHASH_ParcelSales;
+char* _PREHASH_ParcelSales = LLMessageStringTable::getInstance()->getString("ParcelSales");
-char * _PREHASH_CurrentInterval;
+char* _PREHASH_CurrentInterval = LLMessageStringTable::getInstance()->getString("CurrentInterval");
-char * _PREHASH_PriceRentLight;
+char* _PREHASH_PriceRentLight = LLMessageStringTable::getInstance()->getString("PriceRentLight");
-char * _PREHASH_MediaAutoScale;
+char* _PREHASH_MediaAutoScale = LLMessageStringTable::getInstance()->getString("MediaAutoScale");
-char * _PREHASH_NeighborBlock;
+char* _PREHASH_NeighborBlock = LLMessageStringTable::getInstance()->getString("NeighborBlock");
-char * _PREHASH_LayerData;
+char* _PREHASH_LayerData = LLMessageStringTable::getInstance()->getString("LayerData");
-char * _PREHASH_NVPairData;
+char* _PREHASH_NVPairData = LLMessageStringTable::getInstance()->getString("NVPairData");
-char * _PREHASH_TeleportLocal;
+char* _PREHASH_TeleportLocal = LLMessageStringTable::getInstance()->getString("TeleportLocal");
-char * _PREHASH_EjecteeID;
+char* _PREHASH_EjecteeID = LLMessageStringTable::getInstance()->getString("EjecteeID");
-char * _PREHASH_VoteInitiator;
+char* _PREHASH_VoteInitiator = LLMessageStringTable::getInstance()->getString("VoteInitiator");
-char * _PREHASH_TypeData;
+char* _PREHASH_TypeData = LLMessageStringTable::getInstance()->getString("TypeData");
-char * _PREHASH_OwnerIDs;
+char* _PREHASH_OwnerIDs = LLMessageStringTable::getInstance()->getString("OwnerIDs");
-char * _PREHASH_SystemKickUser;
+char* _PREHASH_SystemKickUser = LLMessageStringTable::getInstance()->getString("SystemKickUser");
-char * _PREHASH_TransactionTime;
+char* _PREHASH_TransactionTime = LLMessageStringTable::getInstance()->getString("TransactionTime");
-char * _PREHASH_TimeToLive;
+char* _PREHASH_TimeToLive = LLMessageStringTable::getInstance()->getString("TimeToLive");
-char * _PREHASH_OldAgentID;
+char* _PREHASH_OldAgentID = LLMessageStringTable::getInstance()->getString("OldAgentID");
-char * _PREHASH_MusicURL;
+char* _PREHASH_MusicURL = LLMessageStringTable::getInstance()->getString("MusicURL");
-char * _PREHASH_ParcelPrimBonus;
+char* _PREHASH_ParcelPrimBonus = LLMessageStringTable::getInstance()->getString("ParcelPrimBonus");
-char * _PREHASH_EjectUser;
+char* _PREHASH_EjectUser = LLMessageStringTable::getInstance()->getString("EjectUser");
-char * _PREHASH_CoarseLocationUpdate;
+char* _PREHASH_CoarseLocationUpdate = LLMessageStringTable::getInstance()->getString("CoarseLocationUpdate");
-char * _PREHASH_ChildAgentPositionUpdate;
+char* _PREHASH_ChildAgentPositionUpdate = LLMessageStringTable::getInstance()->getString("ChildAgentPositionUpdate");
-char * _PREHASH_StoreLocal;
+char* _PREHASH_StoreLocal = LLMessageStringTable::getInstance()->getString("StoreLocal");
-char * _PREHASH_GroupName;
+char* _PREHASH_GroupName = LLMessageStringTable::getInstance()->getString("GroupName");
-char * _PREHASH_PriceParcelRent;
+char* _PREHASH_PriceParcelRent = LLMessageStringTable::getInstance()->getString("PriceParcelRent");
-char * _PREHASH_SimStatus;
+char* _PREHASH_SimStatus = LLMessageStringTable::getInstance()->getString("SimStatus");
-char * _PREHASH_TransactionSuccess;
+char* _PREHASH_TransactionSuccess = LLMessageStringTable::getInstance()->getString("TransactionSuccess");
-char * _PREHASH_LureType;
+char* _PREHASH_LureType = LLMessageStringTable::getInstance()->getString("LureType");
-char * _PREHASH_GroupMask;
+char* _PREHASH_GroupMask = LLMessageStringTable::getInstance()->getString("GroupMask");
-char * _PREHASH_SitObject;
+char* _PREHASH_SitObject = LLMessageStringTable::getInstance()->getString("SitObject");
-char * _PREHASH_Override;
+char* _PREHASH_Override = LLMessageStringTable::getInstance()->getString("Override");
-char * _PREHASH_LocomotionState;
+char* _PREHASH_LocomotionState = LLMessageStringTable::getInstance()->getString("LocomotionState");
-char * _PREHASH_PriceUpload;
+char* _PREHASH_PriceUpload = LLMessageStringTable::getInstance()->getString("PriceUpload");
-char * _PREHASH_RemoveParcel;
+char* _PREHASH_RemoveParcel = LLMessageStringTable::getInstance()->getString("RemoveParcel");
-char * _PREHASH_ConfirmAuctionStart;
+char* _PREHASH_ConfirmAuctionStart = LLMessageStringTable::getInstance()->getString("ConfirmAuctionStart");
-char * _PREHASH_RpcScriptRequestInbound;
+char* _PREHASH_RpcScriptRequestInbound = LLMessageStringTable::getInstance()->getString("RpcScriptRequestInbound");
-char * _PREHASH_ActiveGroupID;
+char* _PREHASH_ActiveGroupID = LLMessageStringTable::getInstance()->getString("ActiveGroupID");
-char * _PREHASH_ParcelReturnObjects;
+char* _PREHASH_ParcelReturnObjects = LLMessageStringTable::getInstance()->getString("ParcelReturnObjects");
-char * _PREHASH_TotalObjects;
+char* _PREHASH_TotalObjects = LLMessageStringTable::getInstance()->getString("TotalObjects");
-char * _PREHASH_ObjectExtraParams;
+char* _PREHASH_ObjectExtraParams = LLMessageStringTable::getInstance()->getString("ObjectExtraParams");
-char * _PREHASH_Questions;
+char* _PREHASH_Questions = LLMessageStringTable::getInstance()->getString("Questions");
-char * _PREHASH_TransferAbort;
+char* _PREHASH_TransferAbort = LLMessageStringTable::getInstance()->getString("TransferAbort");
-char * _PREHASH_TransferInventory;
+char* _PREHASH_TransferInventory = LLMessageStringTable::getInstance()->getString("TransferInventory");
-char * _PREHASH_RayTargetID;
+char* _PREHASH_RayTargetID = LLMessageStringTable::getInstance()->getString("RayTargetID");
-char * _PREHASH_ClaimPrice;
+char* _PREHASH_ClaimPrice = LLMessageStringTable::getInstance()->getString("ClaimPrice");
-char * _PREHASH_ObjectProperties;
+char* _PREHASH_ObjectProperties = LLMessageStringTable::getInstance()->getString("ObjectProperties");
-char * _PREHASH_ParcelProperties;
+char* _PREHASH_ParcelProperties = LLMessageStringTable::getInstance()->getString("ParcelProperties");
-char * _PREHASH_EstateOwnerID;
+char* _PREHASH_EstateOwnerID = LLMessageStringTable::getInstance()->getString("EstateOwnerID");
-char * _PREHASH_LogoutRequest;
+char* _PREHASH_LogoutRequest = LLMessageStringTable::getInstance()->getString("LogoutRequest");
-char * _PREHASH_AssetUploadRequest;
+char* _PREHASH_AssetUploadRequest = LLMessageStringTable::getInstance()->getString("AssetUploadRequest");
-char * _PREHASH_TransactionType;
+char* _PREHASH_TransactionType = LLMessageStringTable::getInstance()->getString("TransactionType");
-char * _PREHASH_AvatarPropertiesUpdate;
+char* _PREHASH_AvatarPropertiesUpdate = LLMessageStringTable::getInstance()->getString("AvatarPropertiesUpdate");
-char * _PREHASH_ParcelPropertiesUpdate;
+char* _PREHASH_ParcelPropertiesUpdate = LLMessageStringTable::getInstance()->getString("ParcelPropertiesUpdate");
-char * _PREHASH_FetchItems;
+char* _PREHASH_FetchItems = LLMessageStringTable::getInstance()->getString("FetchItems");
-char * _PREHASH_AbortXfer;
+char* _PREHASH_AbortXfer = LLMessageStringTable::getInstance()->getString("AbortXfer");
-char * _PREHASH_DeRezAck;
+char* _PREHASH_DeRezAck = LLMessageStringTable::getInstance()->getString("DeRezAck");
-char * _PREHASH_TakeControls;
+char* _PREHASH_TakeControls = LLMessageStringTable::getInstance()->getString("TakeControls");
-char * _PREHASH_DirLandReply;
+char* _PREHASH_DirLandReply = LLMessageStringTable::getInstance()->getString("DirLandReply");
-char * _PREHASH_MuteType;
+char* _PREHASH_MuteType = LLMessageStringTable::getInstance()->getString("MuteType");
-char * _PREHASH_IMViaEMail;
+char* _PREHASH_IMViaEMail = LLMessageStringTable::getInstance()->getString("IMViaEMail");
-char * _PREHASH_RentPrice;
+char* _PREHASH_RentPrice = LLMessageStringTable::getInstance()->getString("RentPrice");
-char * _PREHASH_GenericMessage;
+char* _PREHASH_GenericMessage = LLMessageStringTable::getInstance()->getString("GenericMessage");
-char * _PREHASH_ChildAgentAlive;
+char* _PREHASH_ChildAgentAlive = LLMessageStringTable::getInstance()->getString("ChildAgentAlive");
-char * _PREHASH_AssetType;
+char* _PREHASH_AssetType = LLMessageStringTable::getInstance()->getString("AssetType");
-char * _PREHASH_SpawnPointBlock;
+char* _PREHASH_SpawnPointBlock = LLMessageStringTable::getInstance()->getString("SpawnPointBlock");
-char * _PREHASH_AttachmentBlock;
+char* _PREHASH_AttachmentBlock = LLMessageStringTable::getInstance()->getString("AttachmentBlock");
-char * _PREHASH_ObjectMaterial;
+char* _PREHASH_ObjectMaterial = LLMessageStringTable::getInstance()->getString("ObjectMaterial");
-char * _PREHASH_OwnerName;
+char* _PREHASH_OwnerName = LLMessageStringTable::getInstance()->getString("OwnerName");
-char * _PREHASH_AvatarNotesReply;
+char* _PREHASH_AvatarNotesReply = LLMessageStringTable::getInstance()->getString("AvatarNotesReply");
-char * _PREHASH_CacheID;
+char* _PREHASH_CacheID = LLMessageStringTable::getInstance()->getString("CacheID");
-char * _PREHASH_OwnerMask;
+char* _PREHASH_OwnerMask = LLMessageStringTable::getInstance()->getString("OwnerMask");
-char * _PREHASH_TransferInventoryAck;
+char* _PREHASH_TransferInventoryAck = LLMessageStringTable::getInstance()->getString("TransferInventoryAck");
-char * _PREHASH_RegionDenyAgeUnverified;
+char* _PREHASH_RegionDenyAgeUnverified = LLMessageStringTable::getInstance()->getString("RegionDenyAgeUnverified");
-char * _PREHASH_AgeVerificationBlock;
+char* _PREHASH_AgeVerificationBlock = LLMessageStringTable::getInstance()->getString("AgeVerificationBlock");
-void init_prehash_data()
-{
-        _PREHASH_X = gMessageStringTable.getString("X");
-        _PREHASH_Y = gMessageStringTable.getString("Y");
-        _PREHASH_Z = gMessageStringTable.getString("Z");
-        _PREHASH_AddFlags = gMessageStringTable.getString("AddFlags");
-        _PREHASH_FailureInfo = gMessageStringTable.getString("FailureInfo");
-        _PREHASH_MapData = gMessageStringTable.getString("MapData");
-        _PREHASH_AddItem = gMessageStringTable.getString("AddItem");
-        _PREHASH_MeanCollision = gMessageStringTable.getString("MeanCollision");
-        _PREHASH_RezScript = gMessageStringTable.getString("RezScript");
-        _PREHASH_AvatarSitResponse = gMessageStringTable.getString("AvatarSitResponse");
-        _PREHASH_InventoryAssetResponse = gMessageStringTable.getString("InventoryAssetResponse");
-        _PREHASH_KillObject = gMessageStringTable.getString("KillObject");
-        _PREHASH_ProposalID = gMessageStringTable.getString("ProposalID");
-        _PREHASH_SerialNum = gMessageStringTable.getString("SerialNum");
-        _PREHASH_Duration = gMessageStringTable.getString("Duration");
-        _PREHASH_ScriptQuestion = gMessageStringTable.getString("ScriptQuestion");
-        _PREHASH_AddCircuitCode = gMessageStringTable.getString("AddCircuitCode");
-        _PREHASH_UseCircuitCode = gMessageStringTable.getString("UseCircuitCode");
-        _PREHASH_ViewerCircuitCode = gMessageStringTable.getString("ViewerCircuitCode");
-        _PREHASH_ScriptAnswerYes = gMessageStringTable.getString("ScriptAnswerYes");
-        _PREHASH_PartnerID = gMessageStringTable.getString("PartnerID");
-        _PREHASH_DirLandQuery = gMessageStringTable.getString("DirLandQuery");
-        _PREHASH_TeleportStart = gMessageStringTable.getString("TeleportStart");
-        _PREHASH_AboutText = gMessageStringTable.getString("AboutText");
-        _PREHASH_VisualParam = gMessageStringTable.getString("VisualParam");
-        _PREHASH_GroupPrims = gMessageStringTable.getString("GroupPrims");
-        _PREHASH_SelectedPrims = gMessageStringTable.getString("SelectedPrims");
-        _PREHASH_ID = gMessageStringTable.getString("ID");
-        _PREHASH_UUIDNameRequest = gMessageStringTable.getString("UUIDNameRequest");
-        _PREHASH_UUIDGroupNameRequest = gMessageStringTable.getString("UUIDGroupNameRequest");
-        _PREHASH_GroupAccountTransactionsRequest = gMessageStringTable.getString("GroupAccountTransactionsRequest");
-        _PREHASH_MapNameRequest = gMessageStringTable.getString("MapNameRequest");
-        _PREHASH_UpdateSimulator = gMessageStringTable.getString("UpdateSimulator");
-        _PREHASH_BillableFactor = gMessageStringTable.getString("BillableFactor");
-        _PREHASH_ObjectBonusFactor = gMessageStringTable.getString("ObjectBonusFactor");
-        _PREHASH_EnableSimulator = gMessageStringTable.getString("EnableSimulator");
-        _PREHASH_DisableSimulator = gMessageStringTable.getString("DisableSimulator");
-        _PREHASH_ConfirmEnableSimulator = gMessageStringTable.getString("ConfirmEnableSimulator");
-        _PREHASH_LayerType = gMessageStringTable.getString("LayerType");
-        _PREHASH_OwnerRole = gMessageStringTable.getString("OwnerRole");
-        _PREHASH_ParcelOverlay = gMessageStringTable.getString("ParcelOverlay");
-        _PREHASH_GroupOwned = gMessageStringTable.getString("GroupOwned");
-        _PREHASH_IP = gMessageStringTable.getString("IP");
-        _PREHASH_ChatFromViewer = gMessageStringTable.getString("ChatFromViewer");
-        _PREHASH_AvgAgentsInView = gMessageStringTable.getString("AvgAgentsInView");
-        _PREHASH_AgentsInView = gMessageStringTable.getString("AgentsInView");
-        _PREHASH_GroupTitle = gMessageStringTable.getString("GroupTitle");
-        _PREHASH_MapLayerReply = gMessageStringTable.getString("MapLayerReply");
-        _PREHASH_CompoundMsgID = gMessageStringTable.getString("CompoundMsgID");
-        _PREHASH_CameraConstraint = gMessageStringTable.getString("CameraConstraint");
-        _PREHASH_DownloadTotals = gMessageStringTable.getString("DownloadTotals");
-        _PREHASH_GenCounter = gMessageStringTable.getString("GenCounter");
-        _PREHASH_FrozenData = gMessageStringTable.getString("FrozenData");
-        _PREHASH_ChildAgentDying = gMessageStringTable.getString("ChildAgentDying");
-        _PREHASH_To = gMessageStringTable.getString("To");
-        _PREHASH_CopyInventoryFromNotecard = gMessageStringTable.getString("CopyInventoryFromNotecard");
-        _PREHASH_RezObjectFromNotecard = gMessageStringTable.getString("RezObjectFromNotecard");
-        _PREHASH_ParcelDirFeeCurrent = gMessageStringTable.getString("ParcelDirFeeCurrent");
-        _PREHASH_SeedCapability = gMessageStringTable.getString("SeedCapability");
-        _PREHASH_ObjectDuplicate = gMessageStringTable.getString("ObjectDuplicate");
-        _PREHASH_InventoryData = gMessageStringTable.getString("InventoryData");
-        _PREHASH_ReplyData = gMessageStringTable.getString("ReplyData");
-        _PREHASH_ResetList = gMessageStringTable.getString("ResetList");
-        _PREHASH_MediaID = gMessageStringTable.getString("MediaID");
-        _PREHASH_RelatedRights = gMessageStringTable.getString("RelatedRights");
-        _PREHASH_RedirectGridX = gMessageStringTable.getString("RedirectGridX");
-        _PREHASH_RedirectGridY = gMessageStringTable.getString("RedirectGridY");
-        _PREHASH_TransferID = gMessageStringTable.getString("TransferID");
-        _PREHASH_TexturesChanged = gMessageStringTable.getString("TexturesChanged");
-        _PREHASH_UserLookAt = gMessageStringTable.getString("UserLookAt");
-        _PREHASH_TestBlock1 = gMessageStringTable.getString("TestBlock1");
-        _PREHASH_SensedData = gMessageStringTable.getString("SensedData");
-        _PREHASH_UpdateBlock = gMessageStringTable.getString("UpdateBlock");
-        _PREHASH_ClassifiedGodDelete = gMessageStringTable.getString("ClassifiedGodDelete");
-        _PREHASH_ObjectGrabUpdate = gMessageStringTable.getString("ObjectGrabUpdate");
-        _PREHASH_LocationPos = gMessageStringTable.getString("LocationPos");
-        _PREHASH_TaxDate = gMessageStringTable.getString("TaxDate");
-        _PREHASH_StartDateTime = gMessageStringTable.getString("StartDateTime");
-        _PREHASH_ObjectUpdateCached = gMessageStringTable.getString("ObjectUpdateCached");
-        _PREHASH_Packets = gMessageStringTable.getString("Packets");
-        _PREHASH_FailureType = gMessageStringTable.getString("FailureType");
-        _PREHASH_UpdateGroupInfo = gMessageStringTable.getString("UpdateGroupInfo");
-        _PREHASH_ObjectPermissions = gMessageStringTable.getString("ObjectPermissions");
-        _PREHASH_RevokePermissions = gMessageStringTable.getString("RevokePermissions");
-        _PREHASH_UpdateFlags = gMessageStringTable.getString("UpdateFlags");
-        _PREHASH_ObjectExportSelected = gMessageStringTable.getString("ObjectExportSelected");
-        _PREHASH_RezSelected = gMessageStringTable.getString("RezSelected");
-        _PREHASH_AutoPilot = gMessageStringTable.getString("AutoPilot");
-        _PREHASH_UpdateMuteListEntry = gMessageStringTable.getString("UpdateMuteListEntry");
-        _PREHASH_RemoveMuteListEntry = gMessageStringTable.getString("RemoveMuteListEntry");
-        _PREHASH_SetSimStatusInDatabase = gMessageStringTable.getString("SetSimStatusInDatabase");
-        _PREHASH_SetSimPresenceInDatabase = gMessageStringTable.getString("SetSimPresenceInDatabase");
-        _PREHASH_CameraProperty = gMessageStringTable.getString("CameraProperty");
-        _PREHASH_BrushSize = gMessageStringTable.getString("BrushSize");
-        _PREHASH_SimulatorSetMap = gMessageStringTable.getString("SimulatorSetMap");
-        _PREHASH_RegionPresenceRequestByRegionID = gMessageStringTable.getString("RegionPresenceRequestByRegionID");
-        _PREHASH_ParcelObjectOwnersReply = gMessageStringTable.getString("ParcelObjectOwnersReply");
-        _PREHASH_GroupMembersReply = gMessageStringTable.getString("GroupMembersReply");
-        _PREHASH_GroupRoleMembersReply = gMessageStringTable.getString("GroupRoleMembersReply");
-        _PREHASH_RequestRegionInfo = gMessageStringTable.getString("RequestRegionInfo");
-        _PREHASH_AABBMax = gMessageStringTable.getString("AABBMax");
-        _PREHASH_RequestPayPrice = gMessageStringTable.getString("RequestPayPrice");
-        _PREHASH_SimulatorPresentAtLocation = gMessageStringTable.getString("SimulatorPresentAtLocation");
-        _PREHASH_AgentRequestSit = gMessageStringTable.getString("AgentRequestSit");
-        _PREHASH_AABBMin = gMessageStringTable.getString("AABBMin");
-        _PREHASH_ClassifiedFlags = gMessageStringTable.getString("ClassifiedFlags");
-        _PREHASH_ControlFlags = gMessageStringTable.getString("ControlFlags");
-        _PREHASH_TeleportRequest = gMessageStringTable.getString("TeleportRequest");
-        _PREHASH_ScriptTeleportRequest = gMessageStringTable.getString("ScriptTeleportRequest");
-        _PREHASH_EstateCovenantRequest = gMessageStringTable.getString("EstateCovenantRequest");
-        _PREHASH_DateUTC = gMessageStringTable.getString("DateUTC");
-        _PREHASH_TaskIDs = gMessageStringTable.getString("TaskIDs");
-        _PREHASH_RequestResult = gMessageStringTable.getString("RequestResult");
-        _PREHASH_CanAcceptAgents = gMessageStringTable.getString("CanAcceptAgents");
-        _PREHASH_ObjectSaleInfo = gMessageStringTable.getString("ObjectSaleInfo");
-        _PREHASH_KillChildAgents = gMessageStringTable.getString("KillChildAgents");
-        _PREHASH_Balance = gMessageStringTable.getString("Balance");
-        _PREHASH_DerezContainer = gMessageStringTable.getString("DerezContainer");
-        _PREHASH_ObjectData = gMessageStringTable.getString("ObjectData");
-        _PREHASH_CameraAtAxis = gMessageStringTable.getString("CameraAtAxis");
-        _PREHASH_InfoBlock = gMessageStringTable.getString("InfoBlock");
-        _PREHASH_OwnershipCost = gMessageStringTable.getString("OwnershipCost");
-        _PREHASH_AvatarNotesUpdate = gMessageStringTable.getString("AvatarNotesUpdate");
-        _PREHASH_PID = gMessageStringTable.getString("PID");
-        _PREHASH_DirPopularReply = gMessageStringTable.getString("DirPopularReply");
-        _PREHASH_TerrainHeightRange00 = gMessageStringTable.getString("TerrainHeightRange00");
-        _PREHASH_SimData = gMessageStringTable.getString("SimData");
-        _PREHASH_TerrainHeightRange01 = gMessageStringTable.getString("TerrainHeightRange01");
-        _PREHASH_TerrainHeightRange10 = gMessageStringTable.getString("TerrainHeightRange10");
-        _PREHASH_TerrainHeightRange11 = gMessageStringTable.getString("TerrainHeightRange11");
-        _PREHASH_UpdateInventoryItem = gMessageStringTable.getString("UpdateInventoryItem");
-        _PREHASH_UpdateCreateInventoryItem = gMessageStringTable.getString("UpdateCreateInventoryItem");
-        _PREHASH_MoveInventoryItem = gMessageStringTable.getString("MoveInventoryItem");
-        _PREHASH_CopyInventoryItem = gMessageStringTable.getString("CopyInventoryItem");
-        _PREHASH_RemoveInventoryItem = gMessageStringTable.getString("RemoveInventoryItem");
-        _PREHASH_CreateInventoryItem = gMessageStringTable.getString("CreateInventoryItem");
-        _PREHASH_PathTwistBegin = gMessageStringTable.getString("PathTwistBegin");
-        _PREHASH_CRC = gMessageStringTable.getString("CRC");
-        _PREHASH_AttachmentPoint = gMessageStringTable.getString("AttachmentPoint");
-        _PREHASH_TelehubBlock = gMessageStringTable.getString("TelehubBlock");
-        _PREHASH_FOVBlock = gMessageStringTable.getString("FOVBlock");
-        _PREHASH_StartLocationData = gMessageStringTable.getString("StartLocationData");
-        _PREHASH_PositionData = gMessageStringTable.getString("PositionData");
-        _PREHASH_TimeSinceLast = gMessageStringTable.getString("TimeSinceLast");
-        _PREHASH_MapImage = gMessageStringTable.getString("MapImage");
-        _PREHASH_Objects = gMessageStringTable.getString("Objects");
-        _PREHASH_URL = gMessageStringTable.getString("URL");
-        _PREHASH_CreationDate = gMessageStringTable.getString("CreationDate");
-        _PREHASH_JointPivot = gMessageStringTable.getString("JointPivot");
-        _PREHASH_FPS = gMessageStringTable.getString("FPS");
-        _PREHASH_HasTelehub = gMessageStringTable.getString("HasTelehub");
-        _PREHASH_PathEnd = gMessageStringTable.getString("PathEnd");
-        _PREHASH_ScriptDataReply = gMessageStringTable.getString("ScriptDataReply");
-        _PREHASH_MapBlockReply = gMessageStringTable.getString("MapBlockReply");
-        _PREHASH_PropertiesData = gMessageStringTable.getString("PropertiesData");
-        _PREHASH_ViewerEffect = gMessageStringTable.getString("ViewerEffect");
-        _PREHASH_FreezeUser = gMessageStringTable.getString("FreezeUser");
-        _PREHASH_OwnerPrims = gMessageStringTable.getString("OwnerPrims");
-        _PREHASH_ObjectGrab = gMessageStringTable.getString("ObjectGrab");
-        _PREHASH_ToAgentID = gMessageStringTable.getString("ToAgentID");
-        _PREHASH_SimulatorMapUpdate = gMessageStringTable.getString("SimulatorMapUpdate");
-        _PREHASH_TransferPacket = gMessageStringTable.getString("TransferPacket");
-        _PREHASH_ObjectName = gMessageStringTable.getString("ObjectName");
-        _PREHASH_GroupPowers = gMessageStringTable.getString("GroupPowers");
-        _PREHASH_OriginalName = gMessageStringTable.getString("OriginalName");
-        _PREHASH_CompletePingCheck = gMessageStringTable.getString("CompletePingCheck");
-        _PREHASH_OnlineStatus = gMessageStringTable.getString("OnlineStatus");
-        _PREHASH_ObjectDrop = gMessageStringTable.getString("ObjectDrop");
-        _PREHASH_UseBigPackets = gMessageStringTable.getString("UseBigPackets");
-        _PREHASH_GroupNoticesListReply = gMessageStringTable.getString("GroupNoticesListReply");
-        _PREHASH_ParcelAccessListReply = gMessageStringTable.getString("ParcelAccessListReply");
-        _PREHASH_RpcChannelReply = gMessageStringTable.getString("RpcChannelReply");
-        _PREHASH_RegionPresenceResponse = gMessageStringTable.getString("RegionPresenceResponse");
-        _PREHASH_CharterMember = gMessageStringTable.getString("CharterMember");
-        _PREHASH_EdgeData = gMessageStringTable.getString("EdgeData");
-        _PREHASH_NameData = gMessageStringTable.getString("NameData");
-        _PREHASH_RegionPushOverride = gMessageStringTable.getString("RegionPushOverride");
-        _PREHASH_SimName = gMessageStringTable.getString("SimName");
-        _PREHASH_UserReport = gMessageStringTable.getString("UserReport");
-        _PREHASH_DownloadPriority = gMessageStringTable.getString("DownloadPriority");
-        _PREHASH_ToAgentId = gMessageStringTable.getString("ToAgentId");
-        _PREHASH_DirPopularQuery = gMessageStringTable.getString("DirPopularQuery");
-        _PREHASH_Mag = gMessageStringTable.getString("Mag");
-        _PREHASH_ParcelPropertiesRequestByID = gMessageStringTable.getString("ParcelPropertiesRequestByID");
-        _PREHASH_ObjectLink = gMessageStringTable.getString("ObjectLink");
-        _PREHASH_RpcScriptReplyInbound = gMessageStringTable.getString("RpcScriptReplyInbound");
-        _PREHASH_RezData = gMessageStringTable.getString("RezData");
-        _PREHASH_RemoveInventoryObjects = gMessageStringTable.getString("RemoveInventoryObjects");
-        _PREHASH_GroupProposalBallot = gMessageStringTable.getString("GroupProposalBallot");
-        _PREHASH_RPCServerIP = gMessageStringTable.getString("RPCServerIP");
-        _PREHASH_Far = gMessageStringTable.getString("Far");
-        _PREHASH_GodSessionID = gMessageStringTable.getString("GodSessionID");
-        _PREHASH_FLAboutText = gMessageStringTable.getString("FLAboutText");
-        _PREHASH_RegionHandshakeReply = gMessageStringTable.getString("RegionHandshakeReply");
-        _PREHASH_GroupActiveProposalItemReply = gMessageStringTable.getString("GroupActiveProposalItemReply");
-        _PREHASH_MapItemReply = gMessageStringTable.getString("MapItemReply");
-        _PREHASH_Seconds = gMessageStringTable.getString("Seconds");
-        _PREHASH_UpdateUserInfo = gMessageStringTable.getString("UpdateUserInfo");
-        _PREHASH_AggregatePermTexturesOwner = gMessageStringTable.getString("AggregatePermTexturesOwner");
-        _PREHASH_Set = gMessageStringTable.getString("Set");
-        _PREHASH_NewName = gMessageStringTable.getString("NewName");
-        _PREHASH_Key = gMessageStringTable.getString("Key");
-        _PREHASH_AgentID = gMessageStringTable.getString("AgentID");
-        _PREHASH_EventNotificationRemoveRequest = gMessageStringTable.getString("EventNotificationRemoveRequest");
-        _PREHASH_NewFolderID = gMessageStringTable.getString("NewFolderID");
-        _PREHASH_Arc = gMessageStringTable.getString("Arc");
-        _PREHASH_RegionX = gMessageStringTable.getString("RegionX");
-        _PREHASH_RegionY = gMessageStringTable.getString("RegionY");
-        _PREHASH_RequestData = gMessageStringTable.getString("RequestData");
-        _PREHASH_Msg = gMessageStringTable.getString("Msg");
-        _PREHASH_Top = gMessageStringTable.getString("Top");
-        _PREHASH_MiscStats = gMessageStringTable.getString("MiscStats");
-        _PREHASH_ImageID = gMessageStringTable.getString("ImageID");
-        _PREHASH_DataPacket = gMessageStringTable.getString("DataPacket");
-        _PREHASH_You = gMessageStringTable.getString("You");
-        _PREHASH_ScriptControlChange = gMessageStringTable.getString("ScriptControlChange");
-        _PREHASH_LoadURL = gMessageStringTable.getString("LoadURL");
-        _PREHASH_SetCPURatio = gMessageStringTable.getString("SetCPURatio");
-        _PREHASH_NameValueData = gMessageStringTable.getString("NameValueData");
-        _PREHASH_AtomicPassObject = gMessageStringTable.getString("AtomicPassObject");
-        _PREHASH_ErrorMessage = gMessageStringTable.getString("ErrorMessage");
-        _PREHASH_ViewerFrozenMessage = gMessageStringTable.getString("ViewerFrozenMessage");
-        _PREHASH_HealthMessage = gMessageStringTable.getString("HealthMessage");
-        _PREHASH_LogTextMessage = gMessageStringTable.getString("LogTextMessage");
-        _PREHASH_TimeDilation = gMessageStringTable.getString("TimeDilation");
-        _PREHASH_RemoveContribution = gMessageStringTable.getString("RemoveContribution");
-        _PREHASH_Contribution = gMessageStringTable.getString("Contribution");
-        _PREHASH_SetGroupContribution = gMessageStringTable.getString("SetGroupContribution");
-        _PREHASH_Offline = gMessageStringTable.getString("Offline");
-        _PREHASH_AgentIsNowWearing = gMessageStringTable.getString("AgentIsNowWearing");
-        _PREHASH_Members = gMessageStringTable.getString("Members");
-        _PREHASH_FailedResends = gMessageStringTable.getString("FailedResends");
-        _PREHASH_SecPerDay = gMessageStringTable.getString("SecPerDay");
-        _PREHASH_CameraCenter = gMessageStringTable.getString("CameraCenter");
-        _PREHASH_CameraLeftAxis = gMessageStringTable.getString("CameraLeftAxis");
-        _PREHASH_ExBlock = gMessageStringTable.getString("ExBlock");
-        _PREHASH_Channel = gMessageStringTable.getString("Channel");
-        _PREHASH_NetTest = gMessageStringTable.getString("NetTest");
-        _PREHASH_DiscardLevel = gMessageStringTable.getString("DiscardLevel");
-        _PREHASH_LayerID = gMessageStringTable.getString("LayerID");
-        _PREHASH_GrabOffset = gMessageStringTable.getString("GrabOffset");
-        _PREHASH_SimPort = gMessageStringTable.getString("SimPort");
-        _PREHASH_PricePerMeter = gMessageStringTable.getString("PricePerMeter");
-        _PREHASH_RegionFlags = gMessageStringTable.getString("RegionFlags");
-        _PREHASH_VoteResult = gMessageStringTable.getString("VoteResult");
-        _PREHASH_ParcelDirFeeEstimate = gMessageStringTable.getString("ParcelDirFeeEstimate");
-        _PREHASH_ModifyBlock = gMessageStringTable.getString("ModifyBlock");
-        _PREHASH_InventoryBlock = gMessageStringTable.getString("InventoryBlock");
-        _PREHASH_ReplyBlock = gMessageStringTable.getString("ReplyBlock");
-        _PREHASH_ValidUntil = gMessageStringTable.getString("ValidUntil");
-        _PREHASH_VelocityInterpolateOn = gMessageStringTable.getString("VelocityInterpolateOn");
-        _PREHASH_ClassifiedDelete = gMessageStringTable.getString("ClassifiedDelete");
-        _PREHASH_RegionDenyAnonymous = gMessageStringTable.getString("RegionDenyAnonymous");
-        _PREHASH_FLImageID = gMessageStringTable.getString("FLImageID");
-        _PREHASH_AllowPublish = gMessageStringTable.getString("AllowPublish");
-        _PREHASH_SitName = gMessageStringTable.getString("SitName");
-        _PREHASH_RegionsVisited = gMessageStringTable.getString("RegionsVisited");
-        _PREHASH_DirClassifiedReply = gMessageStringTable.getString("DirClassifiedReply");
-        _PREHASH_AvatarClassifiedReply = gMessageStringTable.getString("AvatarClassifiedReply");
-        _PREHASH_MediaURL = gMessageStringTable.getString("MediaURL");
-        _PREHASH_CompleteAgentMovement = gMessageStringTable.getString("CompleteAgentMovement");
-        _PREHASH_ClassifiedID = gMessageStringTable.getString("ClassifiedID");
-        _PREHASH_LocalID = gMessageStringTable.getString("LocalID");
-        _PREHASH_SpaceIP = gMessageStringTable.getString("SpaceIP");
-        _PREHASH_RemoveItem = gMessageStringTable.getString("RemoveItem");
-        _PREHASH_LogFailedMoneyTransaction = gMessageStringTable.getString("LogFailedMoneyTransaction");
-        _PREHASH_ViewerStartAuction = gMessageStringTable.getString("ViewerStartAuction");
-        _PREHASH_StartAuction = gMessageStringTable.getString("StartAuction");
-        _PREHASH_DuplicateFlags = gMessageStringTable.getString("DuplicateFlags");
-        _PREHASH_RegionInfo2 = gMessageStringTable.getString("RegionInfo2");
-        _PREHASH_TextColor = gMessageStringTable.getString("TextColor");
-        _PREHASH_SlaveID = gMessageStringTable.getString("SlaveID");
-        _PREHASH_Charter = gMessageStringTable.getString("Charter");
-        _PREHASH_AlertData = gMessageStringTable.getString("AlertData");
-        _PREHASH_TargetBlock = gMessageStringTable.getString("TargetBlock");
-        _PREHASH_CheckParcelAuctions = gMessageStringTable.getString("CheckParcelAuctions");
-        _PREHASH_ParcelAuctions = gMessageStringTable.getString("ParcelAuctions");
-        _PREHASH_OwnerIsGroup = gMessageStringTable.getString("OwnerIsGroup");
-        _PREHASH_NameValuePair = gMessageStringTable.getString("NameValuePair");
-        _PREHASH_RemoveNameValuePair = gMessageStringTable.getString("RemoveNameValuePair");
-        _PREHASH_BulkUpdateInventory = gMessageStringTable.getString("BulkUpdateInventory");
-        _PREHASH_UpdateTaskInventory = gMessageStringTable.getString("UpdateTaskInventory");
-        _PREHASH_RemoveTaskInventory = gMessageStringTable.getString("RemoveTaskInventory");
-        _PREHASH_MoveTaskInventory = gMessageStringTable.getString("MoveTaskInventory");
-        _PREHASH_RequestTaskInventory = gMessageStringTable.getString("RequestTaskInventory");
-        _PREHASH_ReplyTaskInventory = gMessageStringTable.getString("ReplyTaskInventory");
-        _PREHASH_AggregatePermInventory = gMessageStringTable.getString("AggregatePermInventory");
-        _PREHASH_GroupAccountTransactionsReply = gMessageStringTable.getString("GroupAccountTransactionsReply");
-        _PREHASH_SimulatorInfo = gMessageStringTable.getString("SimulatorInfo");
-        _PREHASH_WearableData = gMessageStringTable.getString("WearableData");
-        _PREHASH_Enabled = gMessageStringTable.getString("Enabled");
-        _PREHASH_Savings = gMessageStringTable.getString("Savings");
-        _PREHASH_SimulatorLoad = gMessageStringTable.getString("SimulatorLoad");
-        _PREHASH_InternalRegionIP = gMessageStringTable.getString("InternalRegionIP");
-        _PREHASH_ExternalRegionIP = gMessageStringTable.getString("ExternalRegionIP");
-        _PREHASH_TotalPairs = gMessageStringTable.getString("TotalPairs");
-        _PREHASH_CreateGroupRequest = gMessageStringTable.getString("CreateGroupRequest");
-        _PREHASH_JoinGroupRequest = gMessageStringTable.getString("JoinGroupRequest");
-        _PREHASH_LeaveGroupRequest = gMessageStringTable.getString("LeaveGroupRequest");
-        _PREHASH_InviteGroupRequest = gMessageStringTable.getString("InviteGroupRequest");
-        _PREHASH_LiveHelpGroupRequest = gMessageStringTable.getString("LiveHelpGroupRequest");
-        _PREHASH_PriceParcelClaimFactor = gMessageStringTable.getString("PriceParcelClaimFactor");
-        _PREHASH_BillableArea = gMessageStringTable.getString("BillableArea");
-        _PREHASH_ObjectID = gMessageStringTable.getString("ObjectID");
-        _PREHASH_ObjectFlagUpdate = gMessageStringTable.getString("ObjectFlagUpdate");
-        _PREHASH_GroupRoleUpdate = gMessageStringTable.getString("GroupRoleUpdate");
-        _PREHASH_RequestInventoryAsset = gMessageStringTable.getString("RequestInventoryAsset");
-        _PREHASH_ChangedGrid = gMessageStringTable.getString("ChangedGrid");
-        _PREHASH_AgentDropGroup = gMessageStringTable.getString("AgentDropGroup");
-        _PREHASH_Details = gMessageStringTable.getString("Details");
-        _PREHASH_LocationX = gMessageStringTable.getString("LocationX");
-        _PREHASH_SaleType = gMessageStringTable.getString("SaleType");
-        _PREHASH_LocationY = gMessageStringTable.getString("LocationY");
-        _PREHASH_LocationZ = gMessageStringTable.getString("LocationZ");
-        _PREHASH_EconomyData = gMessageStringTable.getString("EconomyData");
-        _PREHASH_HeadRotation = gMessageStringTable.getString("HeadRotation");
-        _PREHASH_DeleteOnCompletion = gMessageStringTable.getString("DeleteOnCompletion");
-        _PREHASH_PublicPort = gMessageStringTable.getString("PublicPort");
-        _PREHASH_DirClassifiedQuery = gMessageStringTable.getString("DirClassifiedQuery");
-        _PREHASH_CallbackID = gMessageStringTable.getString("CallbackID");
-        _PREHASH_RequestParcelTransfer = gMessageStringTable.getString("RequestParcelTransfer");
-        _PREHASH_RoleCount = gMessageStringTable.getString("RoleCount");
-        _PREHASH_ObjectCapacity = gMessageStringTable.getString("ObjectCapacity");
-        _PREHASH_RequestID = gMessageStringTable.getString("RequestID");
-        _PREHASH_RequestXfer = gMessageStringTable.getString("RequestXfer");
-        _PREHASH_ObjectTaxCurrent = gMessageStringTable.getString("ObjectTaxCurrent");
-        _PREHASH_LightTaxCurrent = gMessageStringTable.getString("LightTaxCurrent");
-        _PREHASH_LandTaxCurrent = gMessageStringTable.getString("LandTaxCurrent");
-        _PREHASH_GroupTaxCurrent = gMessageStringTable.getString("GroupTaxCurrent");
-        _PREHASH_FetchInventoryDescendents = gMessageStringTable.getString("FetchInventoryDescendents");
-        _PREHASH_InventoryDescendents = gMessageStringTable.getString("InventoryDescendents");
-        _PREHASH_Descendents = gMessageStringTable.getString("Descendents");
-        _PREHASH_PurgeInventoryDescendents = gMessageStringTable.getString("PurgeInventoryDescendents");
-        _PREHASH_ShowDir = gMessageStringTable.getString("ShowDir");
-        _PREHASH_IsOwner = gMessageStringTable.getString("IsOwner");
-        _PREHASH_Timestamp = gMessageStringTable.getString("Timestamp");
-        _PREHASH_GlobalPos = gMessageStringTable.getString("GlobalPos");
-        _PREHASH_GrabOffsetInitial = gMessageStringTable.getString("GrabOffsetInitial");
-        _PREHASH_IsTrial = gMessageStringTable.getString("IsTrial");
-        _PREHASH_ObjectDuplicateOnRay = gMessageStringTable.getString("ObjectDuplicateOnRay");
-        _PREHASH_GroupMembershipCount = gMessageStringTable.getString("GroupMembershipCount");
-        _PREHASH_MethodData = gMessageStringTable.getString("MethodData");
-        _PREHASH_ActivateGestures = gMessageStringTable.getString("ActivateGestures");
-        _PREHASH_DeactivateGestures = gMessageStringTable.getString("DeactivateGestures");
-        _PREHASH_ProposalData = gMessageStringTable.getString("ProposalData");
-        _PREHASH_PosGlobal = gMessageStringTable.getString("PosGlobal");
-        _PREHASH_SearchID = gMessageStringTable.getString("SearchID");
-        _PREHASH_RezMultipleAttachmentsFromInv = gMessageStringTable.getString("RezMultipleAttachmentsFromInv");
-        _PREHASH_SearchName = gMessageStringTable.getString("SearchName");
-        _PREHASH_VersionString = gMessageStringTable.getString("VersionString");
-        _PREHASH_CreateGroupReply = gMessageStringTable.getString("CreateGroupReply");
-        _PREHASH_LeaveGroupReply = gMessageStringTable.getString("LeaveGroupReply");
-        _PREHASH_ActualArea = gMessageStringTable.getString("ActualArea");
-        _PREHASH_Message = gMessageStringTable.getString("Message");
-        _PREHASH_ClickAction = gMessageStringTable.getString("ClickAction");
-        _PREHASH_AssetUploadComplete = gMessageStringTable.getString("AssetUploadComplete");
-        _PREHASH_RequestType = gMessageStringTable.getString("RequestType");
-        _PREHASH_UUID = gMessageStringTable.getString("UUID");
-        _PREHASH_BaseMask = gMessageStringTable.getString("BaseMask");
-        _PREHASH_NetBlock = gMessageStringTable.getString("NetBlock");
-        _PREHASH_GlobalX = gMessageStringTable.getString("GlobalX");
-        _PREHASH_GlobalY = gMessageStringTable.getString("GlobalY");
-        _PREHASH_CopyRotates = gMessageStringTable.getString("CopyRotates");
-        _PREHASH_KickUserAck = gMessageStringTable.getString("KickUserAck");
-        _PREHASH_TopPick = gMessageStringTable.getString("TopPick");
-        _PREHASH_SessionID = gMessageStringTable.getString("SessionID");
-        _PREHASH_GlobalZ = gMessageStringTable.getString("GlobalZ");
-        _PREHASH_DeclineFriendship = gMessageStringTable.getString("DeclineFriendship");
-        _PREHASH_FormFriendship = gMessageStringTable.getString("FormFriendship");
-        _PREHASH_TerminateFriendship = gMessageStringTable.getString("TerminateFriendship");
-        _PREHASH_TaskData = gMessageStringTable.getString("TaskData");
-        _PREHASH_SimWideMaxPrims = gMessageStringTable.getString("SimWideMaxPrims");
-        _PREHASH_TotalPrims = gMessageStringTable.getString("TotalPrims");
-        _PREHASH_ProfileBegin = gMessageStringTable.getString("ProfileBegin");
-        _PREHASH_Request = gMessageStringTable.getString("Request");
-        _PREHASH_GroupAccountDetailsRequest = gMessageStringTable.getString("GroupAccountDetailsRequest");
-        _PREHASH_GroupActiveProposalsRequest = gMessageStringTable.getString("GroupActiveProposalsRequest");
-        _PREHASH_StringValue = gMessageStringTable.getString("StringValue");
-        _PREHASH_Version = gMessageStringTable.getString("Version");
-        _PREHASH_OtherCount = gMessageStringTable.getString("OtherCount");
-        _PREHASH_MemberCount = gMessageStringTable.getString("MemberCount");
-        _PREHASH_ChatData = gMessageStringTable.getString("ChatData");
-        _PREHASH_IsGroupOwned = gMessageStringTable.getString("IsGroupOwned");
-        _PREHASH_EnergyEfficiency = gMessageStringTable.getString("EnergyEfficiency");
-        _PREHASH_PickInfoUpdate = gMessageStringTable.getString("PickInfoUpdate");
-        _PREHASH_PickDelete = gMessageStringTable.getString("PickDelete");
-        _PREHASH_ScriptReset = gMessageStringTable.getString("ScriptReset");
-        _PREHASH_Requester = gMessageStringTable.getString("Requester");
-        _PREHASH_ForSale = gMessageStringTable.getString("ForSale");
-        _PREHASH_NearestLandingRegionReply = gMessageStringTable.getString("NearestLandingRegionReply");
-        _PREHASH_ParcelID = gMessageStringTable.getString("ParcelID");
-        _PREHASH_Godlike = gMessageStringTable.getString("Godlike");
-        _PREHASH_TotalDebits = gMessageStringTable.getString("TotalDebits");
-        _PREHASH_Direction = gMessageStringTable.getString("Direction");
-        _PREHASH_HealthData = gMessageStringTable.getString("HealthData");
-        _PREHASH_LeftAxis = gMessageStringTable.getString("LeftAxis");
-        _PREHASH_LocationBlock = gMessageStringTable.getString("LocationBlock");
-        _PREHASH_ObjectImage = gMessageStringTable.getString("ObjectImage");
-        _PREHASH_TerrainStartHeight00 = gMessageStringTable.getString("TerrainStartHeight00");
-        _PREHASH_TerrainStartHeight01 = gMessageStringTable.getString("TerrainStartHeight01");
-        _PREHASH_TerrainStartHeight10 = gMessageStringTable.getString("TerrainStartHeight10");
-        _PREHASH_TerrainStartHeight11 = gMessageStringTable.getString("TerrainStartHeight11");
-        _PREHASH_WaterHeight = gMessageStringTable.getString("WaterHeight");
-        _PREHASH_FetchInventoryReply = gMessageStringTable.getString("FetchInventoryReply");
-        _PREHASH_GroupAccountSummaryReply = gMessageStringTable.getString("GroupAccountSummaryReply");
-        _PREHASH_AttachedSound = gMessageStringTable.getString("AttachedSound");
-        _PREHASH_ParamInUse = gMessageStringTable.getString("ParamInUse");
-        _PREHASH_GodKickUser = gMessageStringTable.getString("GodKickUser");
-        _PREHASH_PickName = gMessageStringTable.getString("PickName");
-        _PREHASH_TaskName = gMessageStringTable.getString("TaskName");
-        _PREHASH_ObjectCount = gMessageStringTable.getString("ObjectCount");
-        _PREHASH_RegionPresenceRequestByHandle = gMessageStringTable.getString("RegionPresenceRequestByHandle");
-        _PREHASH_RezSingleAttachmentFromInv = gMessageStringTable.getString("RezSingleAttachmentFromInv");
-        _PREHASH_ChildAgentUpdate = gMessageStringTable.getString("ChildAgentUpdate");
-        _PREHASH_IsOwnerGroup = gMessageStringTable.getString("IsOwnerGroup");
-        _PREHASH_AgentHeightWidth = gMessageStringTable.getString("AgentHeightWidth");
-        _PREHASH_VerticalAngle = gMessageStringTable.getString("VerticalAngle");
-        _PREHASH_WearableType = gMessageStringTable.getString("WearableType");
-        _PREHASH_AggregatePermNextOwner = gMessageStringTable.getString("AggregatePermNextOwner");
-        _PREHASH_ShowInList = gMessageStringTable.getString("ShowInList");
-        _PREHASH_UpdateParcel = gMessageStringTable.getString("UpdateParcel");
-        _PREHASH_SetAlwaysRun = gMessageStringTable.getString("SetAlwaysRun");
-        _PREHASH_NVPair = gMessageStringTable.getString("NVPair");
-        _PREHASH_SearchType = gMessageStringTable.getString("SearchType");
-        _PREHASH_ObjectSpinStart = gMessageStringTable.getString("ObjectSpinStart");
-        _PREHASH_UseEstateSun = gMessageStringTable.getString("UseEstateSun");
-        _PREHASH_RegionID = gMessageStringTable.getString("RegionID");
-        _PREHASH_AbuseRegionID = gMessageStringTable.getString("AbuseRegionID");
-        _PREHASH_Creator = gMessageStringTable.getString("Creator");
-        _PREHASH_ProposalText = gMessageStringTable.getString("ProposalText");
-        _PREHASH_DirEventsReply = gMessageStringTable.getString("DirEventsReply");
-        _PREHASH_EventInfoReply = gMessageStringTable.getString("EventInfoReply");
-        _PREHASH_UserInfoReply = gMessageStringTable.getString("UserInfoReply");
-        _PREHASH_PathRadiusOffset = gMessageStringTable.getString("PathRadiusOffset");
-        _PREHASH_TextureData = gMessageStringTable.getString("TextureData");
-        _PREHASH_ChatPass = gMessageStringTable.getString("ChatPass");
-        _PREHASH_TargetID = gMessageStringTable.getString("TargetID");
-        _PREHASH_DefaultPayPrice = gMessageStringTable.getString("DefaultPayPrice");
-        _PREHASH_UserLocation = gMessageStringTable.getString("UserLocation");
-        _PREHASH_MaxPrims = gMessageStringTable.getString("MaxPrims");
-        _PREHASH_LandmarkID = gMessageStringTable.getString("LandmarkID");
-        _PREHASH_InitiateDownload = gMessageStringTable.getString("InitiateDownload");
-        _PREHASH_Name = gMessageStringTable.getString("Name");
-        _PREHASH_OtherCleanTime = gMessageStringTable.getString("OtherCleanTime");
-        _PREHASH_ParcelSetOtherCleanTime = gMessageStringTable.getString("ParcelSetOtherCleanTime");
-        _PREHASH_TeleportPriceExponent = gMessageStringTable.getString("TeleportPriceExponent");
-        _PREHASH_Gain = gMessageStringTable.getString("Gain");
-        _PREHASH_PacketAck = gMessageStringTable.getString("PacketAck");
-        _PREHASH_PathSkew = gMessageStringTable.getString("PathSkew");
-        _PREHASH_SimulatorShutdownRequest = gMessageStringTable.getString("SimulatorShutdownRequest");
-        _PREHASH_NearestLandingRegionRequest = gMessageStringTable.getString("NearestLandingRegionRequest");
-        _PREHASH_OtherID = gMessageStringTable.getString("OtherID");
-        _PREHASH_MemberID = gMessageStringTable.getString("MemberID");
-        _PREHASH_MapLayerRequest = gMessageStringTable.getString("MapLayerRequest");
-        _PREHASH_ObjectScale = gMessageStringTable.getString("ObjectScale");
-        _PREHASH_TargetIP = gMessageStringTable.getString("TargetIP");
-        _PREHASH_Redo = gMessageStringTable.getString("Redo");
-        _PREHASH_MoneyBalance = gMessageStringTable.getString("MoneyBalance");
-        _PREHASH_TrackAgent = gMessageStringTable.getString("TrackAgent");
-        _PREHASH_MaxX = gMessageStringTable.getString("MaxX");
-        _PREHASH_Data = gMessageStringTable.getString("Data");
-        _PREHASH_MaxY = gMessageStringTable.getString("MaxY");
-        _PREHASH_TextureAnim = gMessageStringTable.getString("TextureAnim");
-        _PREHASH_ReturnIDs = gMessageStringTable.getString("ReturnIDs");
-        _PREHASH_Date = gMessageStringTable.getString("Date");
-        _PREHASH_AgentWearablesUpdate = gMessageStringTable.getString("AgentWearablesUpdate");
-        _PREHASH_AgentDataUpdate = gMessageStringTable.getString("AgentDataUpdate");
-        _PREHASH_GroupDataUpdate = gMessageStringTable.getString("GroupDataUpdate");
-        _PREHASH_Hash = gMessageStringTable.getString("Hash");
-        _PREHASH_AgentGroupDataUpdate = gMessageStringTable.getString("AgentGroupDataUpdate");
-        _PREHASH_Left = gMessageStringTable.getString("Left");
-        _PREHASH_Mask = gMessageStringTable.getString("Mask");
-        _PREHASH_ForceMouselook = gMessageStringTable.getString("ForceMouselook");
-        _PREHASH_Success = gMessageStringTable.getString("Success");
-        _PREHASH_ObjectGroup = gMessageStringTable.getString("ObjectGroup");
-        _PREHASH_SunHour = gMessageStringTable.getString("SunHour");
-        _PREHASH_MinX = gMessageStringTable.getString("MinX");
-        _PREHASH_ScriptSensorReply = gMessageStringTable.getString("ScriptSensorReply");
-        _PREHASH_MinY = gMessageStringTable.getString("MinY");
-        _PREHASH_Command = gMessageStringTable.getString("Command");
-        _PREHASH_Desc = gMessageStringTable.getString("Desc");
-        _PREHASH_AttachmentNeedsSave = gMessageStringTable.getString("AttachmentNeedsSave");
-        _PREHASH_HistoryItemData = gMessageStringTable.getString("HistoryItemData");
-        _PREHASH_AgentCachedTexture = gMessageStringTable.getString("AgentCachedTexture");
-        _PREHASH_Subject = gMessageStringTable.getString("Subject");
-        _PREHASH_East = gMessageStringTable.getString("East");
-        _PREHASH_QueryReplies = gMessageStringTable.getString("QueryReplies");
-        _PREHASH_ObjectCategory = gMessageStringTable.getString("ObjectCategory");
-        _PREHASH_Time = gMessageStringTable.getString("Time");
-        _PREHASH_CreateLandmarkForEvent = gMessageStringTable.getString("CreateLandmarkForEvent");
-        _PREHASH_ParentID = gMessageStringTable.getString("ParentID");
-        _PREHASH_Ping = gMessageStringTable.getString("Ping");
-        _PREHASH_Perp = gMessageStringTable.getString("Perp");
-        _PREHASH_Code = gMessageStringTable.getString("Code");
-        _PREHASH_InvType = gMessageStringTable.getString("InvType");
-        _PREHASH_AgentFOV = gMessageStringTable.getString("AgentFOV");
-        _PREHASH_Audible = gMessageStringTable.getString("Audible");
-        _PREHASH_AuctionData = gMessageStringTable.getString("AuctionData");
-        _PREHASH_IDBlock = gMessageStringTable.getString("IDBlock");
-        _PREHASH_West = gMessageStringTable.getString("West");
-        _PREHASH_Undo = gMessageStringTable.getString("Undo");
-        _PREHASH_TotalNumItems = gMessageStringTable.getString("TotalNumItems");
-        _PREHASH_Info = gMessageStringTable.getString("Info");
-        _PREHASH_Area = gMessageStringTable.getString("Area");
-        _PREHASH_SimCrashed = gMessageStringTable.getString("SimCrashed");
-        _PREHASH_Text = gMessageStringTable.getString("Text");
-        _PREHASH_PriceGroupCreate = gMessageStringTable.getString("PriceGroupCreate");
-        _PREHASH_ObjectShape = gMessageStringTable.getString("ObjectShape");
-        _PREHASH_GroupRoleDataReply = gMessageStringTable.getString("GroupRoleDataReply");
-        _PREHASH_MuteCRC = gMessageStringTable.getString("MuteCRC");
-        _PREHASH_Size = gMessageStringTable.getString("Size");
-        _PREHASH_FromAddress = gMessageStringTable.getString("FromAddress");
-        _PREHASH_Body = gMessageStringTable.getString("Body");
-        _PREHASH_FileData = gMessageStringTable.getString("FileData");
-        _PREHASH_List = gMessageStringTable.getString("List");
-        _PREHASH_KickUser = gMessageStringTable.getString("KickUser");
-        _PREHASH_OtherPrims = gMessageStringTable.getString("OtherPrims");
-        _PREHASH_RunTime = gMessageStringTable.getString("RunTime");
-        _PREHASH_GrantUserRights = gMessageStringTable.getString("GrantUserRights");
-        _PREHASH_RpcScriptRequestInboundForward = gMessageStringTable.getString("RpcScriptRequestInboundForward");
-        _PREHASH_More = gMessageStringTable.getString("More");
-        _PREHASH_Majority = gMessageStringTable.getString("Majority");
-        _PREHASH_MetersTraveled = gMessageStringTable.getString("MetersTraveled");
-        _PREHASH_Stat = gMessageStringTable.getString("Stat");
-        _PREHASH_SoundID = gMessageStringTable.getString("SoundID");
-        _PREHASH_Item = gMessageStringTable.getString("Item");
-        _PREHASH_User = gMessageStringTable.getString("User");
-        _PREHASH_Prey = gMessageStringTable.getString("Prey");
-        _PREHASH_RayStart = gMessageStringTable.getString("RayStart");
-        _PREHASH_UsecSinceStart = gMessageStringTable.getString("UsecSinceStart");
-        _PREHASH_ParcelData = gMessageStringTable.getString("ParcelData");
-        _PREHASH_CameraUpAxis = gMessageStringTable.getString("CameraUpAxis");
-        _PREHASH_ScriptDialog = gMessageStringTable.getString("ScriptDialog");
-        _PREHASH_MasterParcelData = gMessageStringTable.getString("MasterParcelData");
-        _PREHASH_Invalid = gMessageStringTable.getString("Invalid");
-        _PREHASH_ProfileCurve = gMessageStringTable.getString("ProfileCurve");
-        _PREHASH_ParcelAccessListUpdate = gMessageStringTable.getString("ParcelAccessListUpdate");
-        _PREHASH_MuteListUpdate = gMessageStringTable.getString("MuteListUpdate");
-        _PREHASH_SendPacket = gMessageStringTable.getString("SendPacket");
-        _PREHASH_SendXferPacket = gMessageStringTable.getString("SendXferPacket");
-        _PREHASH_RegionDenyIdentified = gMessageStringTable.getString("RegionDenyIdentified");
-        _PREHASH_NotecardItemID = gMessageStringTable.getString("NotecardItemID");
-        _PREHASH_LastName = gMessageStringTable.getString("LastName");
-        _PREHASH_From = gMessageStringTable.getString("From");
-        _PREHASH_RoleChange = gMessageStringTable.getString("RoleChange");
-        _PREHASH_Port = gMessageStringTable.getString("Port");
-        _PREHASH_MemberTitle = gMessageStringTable.getString("MemberTitle");
-        _PREHASH_LogParcelChanges = gMessageStringTable.getString("LogParcelChanges");
-        _PREHASH_AgentCachedTextureResponse = gMessageStringTable.getString("AgentCachedTextureResponse");
-        _PREHASH_DeRezObject = gMessageStringTable.getString("DeRezObject");
-        _PREHASH_IsTemporary = gMessageStringTable.getString("IsTemporary");
-        _PREHASH_InsigniaID = gMessageStringTable.getString("InsigniaID");
-        _PREHASH_CheckFlags = gMessageStringTable.getString("CheckFlags");
-        _PREHASH_EventID = gMessageStringTable.getString("EventID");
-        _PREHASH_Selected = gMessageStringTable.getString("Selected");
-        _PREHASH_FromAgentId = gMessageStringTable.getString("FromAgentId");
-        _PREHASH_Type = gMessageStringTable.getString("Type");
-        _PREHASH_ChatType = gMessageStringTable.getString("ChatType");
-        _PREHASH_ReportData = gMessageStringTable.getString("ReportData");
-        _PREHASH_RequestBlock = gMessageStringTable.getString("RequestBlock");
-        _PREHASH_GrantData = gMessageStringTable.getString("GrantData");
-        _PREHASH_DetachAttachmentIntoInv = gMessageStringTable.getString("DetachAttachmentIntoInv");
-        _PREHASH_ParcelDisableObjects = gMessageStringTable.getString("ParcelDisableObjects");
-        _PREHASH_Sections = gMessageStringTable.getString("Sections");
-        _PREHASH_GodLevel = gMessageStringTable.getString("GodLevel");
-        _PREHASH_PayPriceReply = gMessageStringTable.getString("PayPriceReply");
-        _PREHASH_QueryID = gMessageStringTable.getString("QueryID");
-        _PREHASH_CameraEyeOffset = gMessageStringTable.getString("CameraEyeOffset");
-        _PREHASH_AgentPosition = gMessageStringTable.getString("AgentPosition");
-        _PREHASH_GrabPosition = gMessageStringTable.getString("GrabPosition");
-        _PREHASH_OnlineNotification = gMessageStringTable.getString("OnlineNotification");
-        _PREHASH_OfflineNotification = gMessageStringTable.getString("OfflineNotification");
-        _PREHASH_SendPostcard = gMessageStringTable.getString("SendPostcard");
-        _PREHASH_RequestFlags = gMessageStringTable.getString("RequestFlags");
-        _PREHASH_GroupAccountSummaryRequest = gMessageStringTable.getString("GroupAccountSummaryRequest");
-        _PREHASH_GroupVoteHistoryRequest = gMessageStringTable.getString("GroupVoteHistoryRequest");
-        _PREHASH_ParamValue = gMessageStringTable.getString("ParamValue");
-        _PREHASH_MaxAgents = gMessageStringTable.getString("MaxAgents");
-        _PREHASH_CreateNewOutfitAttachments = gMessageStringTable.getString("CreateNewOutfitAttachments");
-        _PREHASH_RegionHandle = gMessageStringTable.getString("RegionHandle");
-        _PREHASH_TeleportProgress = gMessageStringTable.getString("TeleportProgress");
-        _PREHASH_AgentQuitCopy = gMessageStringTable.getString("AgentQuitCopy");
-        _PREHASH_AvatarInterestsUpdate = gMessageStringTable.getString("AvatarInterestsUpdate");
-        _PREHASH_GroupNoticeID = gMessageStringTable.getString("GroupNoticeID");
-        _PREHASH_ParcelName = gMessageStringTable.getString("ParcelName");
-        _PREHASH_PriceObjectRent = gMessageStringTable.getString("PriceObjectRent");
-        _PREHASH_OfferCallingCard = gMessageStringTable.getString("OfferCallingCard");
-        _PREHASH_AcceptCallingCard = gMessageStringTable.getString("AcceptCallingCard");
-        _PREHASH_DeclineCallingCard = gMessageStringTable.getString("DeclineCallingCard");
-        _PREHASH_AgentAccess = gMessageStringTable.getString("AgentAccess");
-        _PREHASH_DataHomeLocationReply = gMessageStringTable.getString("DataHomeLocationReply");
-        _PREHASH_EventLocationReply = gMessageStringTable.getString("EventLocationReply");
-        _PREHASH_TerseDateID = gMessageStringTable.getString("TerseDateID");
-        _PREHASH_ObjectOwner = gMessageStringTable.getString("ObjectOwner");
-        _PREHASH_AssetID = gMessageStringTable.getString("AssetID");
-        _PREHASH_AlertMessage = gMessageStringTable.getString("AlertMessage");
-        _PREHASH_AgentAlertMessage = gMessageStringTable.getString("AgentAlertMessage");
-        _PREHASH_EstateOwnerMessage = gMessageStringTable.getString("EstateOwnerMessage");
-        _PREHASH_ParcelMediaCommandMessage = gMessageStringTable.getString("ParcelMediaCommandMessage");
-        _PREHASH_Auction = gMessageStringTable.getString("Auction");
-        _PREHASH_Category = gMessageStringTable.getString("Category");
-        _PREHASH_FilePath = gMessageStringTable.getString("FilePath");
-        _PREHASH_ItemFlags = gMessageStringTable.getString("ItemFlags");
-        _PREHASH_Invoice = gMessageStringTable.getString("Invoice");
-        _PREHASH_IntervalDays = gMessageStringTable.getString("IntervalDays");
-        _PREHASH_PathScaleX = gMessageStringTable.getString("PathScaleX");
-        _PREHASH_FromTaskID = gMessageStringTable.getString("FromTaskID");
-        _PREHASH_PathScaleY = gMessageStringTable.getString("PathScaleY");
-        _PREHASH_TimeInfo = gMessageStringTable.getString("TimeInfo");
-        _PREHASH_PublicCount = gMessageStringTable.getString("PublicCount");
-        _PREHASH_ParcelJoin = gMessageStringTable.getString("ParcelJoin");
-        _PREHASH_GroupRolesCount = gMessageStringTable.getString("GroupRolesCount");
-        _PREHASH_SimulatorBlock = gMessageStringTable.getString("SimulatorBlock");
-        _PREHASH_GroupID = gMessageStringTable.getString("GroupID");
-        _PREHASH_AgentVel = gMessageStringTable.getString("AgentVel");
-        _PREHASH_RequestImage = gMessageStringTable.getString("RequestImage");
-        _PREHASH_NetStats = gMessageStringTable.getString("NetStats");
-        _PREHASH_AgentPos = gMessageStringTable.getString("AgentPos");
-        _PREHASH_AgentSit = gMessageStringTable.getString("AgentSit");
-        _PREHASH_Material = gMessageStringTable.getString("Material");
-        _PREHASH_ObjectDeGrab = gMessageStringTable.getString("ObjectDeGrab");
-        _PREHASH_VelocityInterpolateOff = gMessageStringTable.getString("VelocityInterpolateOff");
-        _PREHASH_AuthorizedBuyerID = gMessageStringTable.getString("AuthorizedBuyerID");
-        _PREHASH_AvatarPropertiesReply = gMessageStringTable.getString("AvatarPropertiesReply");
-        _PREHASH_GroupProfileReply = gMessageStringTable.getString("GroupProfileReply");
-        _PREHASH_SimOwner = gMessageStringTable.getString("SimOwner");
-        _PREHASH_SalePrice = gMessageStringTable.getString("SalePrice");
-        _PREHASH_Animation = gMessageStringTable.getString("Animation");
-        _PREHASH_OwnerID = gMessageStringTable.getString("OwnerID");
-        _PREHASH_NearestLandingRegionUpdated = gMessageStringTable.getString("NearestLandingRegionUpdated");
-        _PREHASH_PassToAgent = gMessageStringTable.getString("PassToAgent");
-        _PREHASH_PreyAgent = gMessageStringTable.getString("PreyAgent");
-        _PREHASH_SimStats = gMessageStringTable.getString("SimStats");
-        _PREHASH_LogoutReply = gMessageStringTable.getString("LogoutReply");
-        _PREHASH_FeatureDisabled = gMessageStringTable.getString("FeatureDisabled");
-        _PREHASH_PhysicalAvatarEventList = gMessageStringTable.getString("PhysicalAvatarEventList");
-        _PREHASH_ObjectLocalID = gMessageStringTable.getString("ObjectLocalID");
-        _PREHASH_Dropped = gMessageStringTable.getString("Dropped");
-        _PREHASH_WebProfilesDisabled = gMessageStringTable.getString("WebProfilesDisabled");
-        _PREHASH_Destination = gMessageStringTable.getString("Destination");
-        _PREHASH_MasterID = gMessageStringTable.getString("MasterID");
-        _PREHASH_TransferData = gMessageStringTable.getString("TransferData");
-        _PREHASH_WantToMask = gMessageStringTable.getString("WantToMask");
-        _PREHASH_ParcelSelectObjects = gMessageStringTable.getString("ParcelSelectObjects");
-        _PREHASH_ExtraParams = gMessageStringTable.getString("ExtraParams");
-        _PREHASH_CreatorID = gMessageStringTable.getString("CreatorID");
-        _PREHASH_Summary = gMessageStringTable.getString("Summary");
-        _PREHASH_BuyObjectInventory = gMessageStringTable.getString("BuyObjectInventory");
-        _PREHASH_FetchInventory = gMessageStringTable.getString("FetchInventory");
-        _PREHASH_InventoryID = gMessageStringTable.getString("InventoryID");
-        _PREHASH_PacketNumber = gMessageStringTable.getString("PacketNumber");
-        _PREHASH_SetFollowCamProperties = gMessageStringTable.getString("SetFollowCamProperties");
-        _PREHASH_ClearFollowCamProperties = gMessageStringTable.getString("ClearFollowCamProperties");
-        _PREHASH_SequenceID = gMessageStringTable.getString("SequenceID");
-        _PREHASH_DataServerLogout = gMessageStringTable.getString("DataServerLogout");
-        _PREHASH_NameValue = gMessageStringTable.getString("NameValue");
-        _PREHASH_PathShearX = gMessageStringTable.getString("PathShearX");
-        _PREHASH_PathShearY = gMessageStringTable.getString("PathShearY");
-        _PREHASH_Velocity = gMessageStringTable.getString("Velocity");
-        _PREHASH_SecPerYear = gMessageStringTable.getString("SecPerYear");
-        _PREHASH_FirstName = gMessageStringTable.getString("FirstName");
-        _PREHASH_AttachedSoundGainChange = gMessageStringTable.getString("AttachedSoundGainChange");
-        _PREHASH_LocationID = gMessageStringTable.getString("LocationID");
-        _PREHASH_Running = gMessageStringTable.getString("Running");
-        _PREHASH_AgentThrottle = gMessageStringTable.getString("AgentThrottle");
-        _PREHASH_NeighborList = gMessageStringTable.getString("NeighborList");
-        _PREHASH_PathTaperX = gMessageStringTable.getString("PathTaperX");
-        _PREHASH_PathTaperY = gMessageStringTable.getString("PathTaperY");
-        _PREHASH_AgentRelated = gMessageStringTable.getString("AgentRelated");
-        _PREHASH_GranterBlock = gMessageStringTable.getString("GranterBlock");
-        _PREHASH_UseCachedMuteList = gMessageStringTable.getString("UseCachedMuteList");
-        _PREHASH_FailStats = gMessageStringTable.getString("FailStats");
-        _PREHASH_Tempfile = gMessageStringTable.getString("Tempfile");
-        _PREHASH_BuyerID = gMessageStringTable.getString("BuyerID");
-        _PREHASH_DirPeopleReply = gMessageStringTable.getString("DirPeopleReply");
-        _PREHASH_TransferInfo = gMessageStringTable.getString("TransferInfo");
-        _PREHASH_AvatarPickerRequestBackend = gMessageStringTable.getString("AvatarPickerRequestBackend");
-        _PREHASH_AvatarPropertiesRequestBackend = gMessageStringTable.getString("AvatarPropertiesRequestBackend");
-        _PREHASH_UpdateData = gMessageStringTable.getString("UpdateData");
-        _PREHASH_SimFPS = gMessageStringTable.getString("SimFPS");
-        _PREHASH_ReporterID = gMessageStringTable.getString("ReporterID");
-        _PREHASH_ButtonLabel = gMessageStringTable.getString("ButtonLabel");
-        _PREHASH_GranterID = gMessageStringTable.getString("GranterID");
-        _PREHASH_WantToText = gMessageStringTable.getString("WantToText");
-        _PREHASH_ReportType = gMessageStringTable.getString("ReportType");
-        _PREHASH_SimulatorReady = gMessageStringTable.getString("SimulatorReady");
-        _PREHASH_DataBlock = gMessageStringTable.getString("DataBlock");
-        _PREHASH_AnimationSourceList = gMessageStringTable.getString("AnimationSourceList");
-        _PREHASH_SubscribeLoad = gMessageStringTable.getString("SubscribeLoad");
-        _PREHASH_UnsubscribeLoad = gMessageStringTable.getString("UnsubscribeLoad");
-        _PREHASH_Packet = gMessageStringTable.getString("Packet");
-        _PREHASH_UndoLand = gMessageStringTable.getString("UndoLand");
-        _PREHASH_SimAccess = gMessageStringTable.getString("SimAccess");
-        _PREHASH_AbuserID = gMessageStringTable.getString("AbuserID");
-        _PREHASH_MembershipFee = gMessageStringTable.getString("MembershipFee");
-        _PREHASH_InviteGroupResponse = gMessageStringTable.getString("InviteGroupResponse");
-        _PREHASH_CreateInventoryFolder = gMessageStringTable.getString("CreateInventoryFolder");
-        _PREHASH_UpdateInventoryFolder = gMessageStringTable.getString("UpdateInventoryFolder");
-        _PREHASH_MoveInventoryFolder = gMessageStringTable.getString("MoveInventoryFolder");
-        _PREHASH_RemoveInventoryFolder = gMessageStringTable.getString("RemoveInventoryFolder");
-        _PREHASH_MoneyData = gMessageStringTable.getString("MoneyData");
-        _PREHASH_ObjectDeselect = gMessageStringTable.getString("ObjectDeselect");
-        _PREHASH_NewAssetID = gMessageStringTable.getString("NewAssetID");
-        _PREHASH_ObjectAdd = gMessageStringTable.getString("ObjectAdd");
-        _PREHASH_RayEndIsIntersection = gMessageStringTable.getString("RayEndIsIntersection");
-        _PREHASH_CompleteAuction = gMessageStringTable.getString("CompleteAuction");
-        _PREHASH_CircuitCode = gMessageStringTable.getString("CircuitCode");
-        _PREHASH_AgentMovementComplete = gMessageStringTable.getString("AgentMovementComplete");
-        _PREHASH_ViewerIP = gMessageStringTable.getString("ViewerIP");
-        _PREHASH_Header = gMessageStringTable.getString("Header");
-        _PREHASH_GestureFlags = gMessageStringTable.getString("GestureFlags");
-        _PREHASH_XferID = gMessageStringTable.getString("XferID");
-        _PREHASH_StatValue = gMessageStringTable.getString("StatValue");
-        _PREHASH_TaskID = gMessageStringTable.getString("TaskID");
-        _PREHASH_PickID = gMessageStringTable.getString("PickID");
-        _PREHASH_RayEnd = gMessageStringTable.getString("RayEnd");
-        _PREHASH_Throttles = gMessageStringTable.getString("Throttles");
-        _PREHASH_RebakeAvatarTextures = gMessageStringTable.getString("RebakeAvatarTextures");
-        _PREHASH_UpAxis = gMessageStringTable.getString("UpAxis");
-        _PREHASH_AgentTextures = gMessageStringTable.getString("AgentTextures");
-        _PREHASH_NotecardData = gMessageStringTable.getString("NotecardData");
-        _PREHASH_Radius = gMessageStringTable.getString("Radius");
-        _PREHASH_OffCircuit = gMessageStringTable.getString("OffCircuit");
-        _PREHASH_Access = gMessageStringTable.getString("Access");
-        _PREHASH_TitleRoleID = gMessageStringTable.getString("TitleRoleID");
-        _PREHASH_SquareMetersCredit = gMessageStringTable.getString("SquareMetersCredit");
-        _PREHASH_Filename = gMessageStringTable.getString("Filename");
-        _PREHASH_ClassifiedInfoRequest = gMessageStringTable.getString("ClassifiedInfoRequest");
-        _PREHASH_ParcelInfoRequest = gMessageStringTable.getString("ParcelInfoRequest");
-        _PREHASH_ParcelObjectOwnersRequest = gMessageStringTable.getString("ParcelObjectOwnersRequest");
-        _PREHASH_TeleportLandmarkRequest = gMessageStringTable.getString("TeleportLandmarkRequest");
-        _PREHASH_EventInfoRequest = gMessageStringTable.getString("EventInfoRequest");
-        _PREHASH_MoneyBalanceRequest = gMessageStringTable.getString("MoneyBalanceRequest");
-        _PREHASH_GroupMembersRequest = gMessageStringTable.getString("GroupMembersRequest");
-        _PREHASH_GroupRoleMembersRequest = gMessageStringTable.getString("GroupRoleMembersRequest");
-        _PREHASH_ChatFromSimulator = gMessageStringTable.getString("ChatFromSimulator");
-        _PREHASH_OldFolderID = gMessageStringTable.getString("OldFolderID");
-        _PREHASH_UserInfoRequest = gMessageStringTable.getString("UserInfoRequest");
-        _PREHASH_TextureID = gMessageStringTable.getString("TextureID");
-        _PREHASH_ProfileURL = gMessageStringTable.getString("ProfileURL");
-        _PREHASH_Handle = gMessageStringTable.getString("Handle");
-        _PREHASH_ButtonIndex = gMessageStringTable.getString("ButtonIndex");
-        _PREHASH_GetScriptRunning = gMessageStringTable.getString("GetScriptRunning");
-        _PREHASH_SetScriptRunning = gMessageStringTable.getString("SetScriptRunning");
-        _PREHASH_Health = gMessageStringTable.getString("Health");
-        _PREHASH_CircuitInfo = gMessageStringTable.getString("CircuitInfo");
-        _PREHASH_ObjectBuy = gMessageStringTable.getString("ObjectBuy");
-        _PREHASH_ProfileEnd = gMessageStringTable.getString("ProfileEnd");
-        _PREHASH_Effect = gMessageStringTable.getString("Effect");
-        _PREHASH_TestMessage = gMessageStringTable.getString("TestMessage");
-        _PREHASH_ScriptMailRegistration = gMessageStringTable.getString("ScriptMailRegistration");
-        _PREHASH_AgentSetAppearance = gMessageStringTable.getString("AgentSetAppearance");
-        _PREHASH_AvatarAppearance = gMessageStringTable.getString("AvatarAppearance");
-        _PREHASH_RegionData = gMessageStringTable.getString("RegionData");
-        _PREHASH_RequestingRegionData = gMessageStringTable.getString("RequestingRegionData");
-        _PREHASH_LandingRegionData = gMessageStringTable.getString("LandingRegionData");
-        _PREHASH_SitTransform = gMessageStringTable.getString("SitTransform");
-        _PREHASH_TerrainBase0 = gMessageStringTable.getString("TerrainBase0");
-        _PREHASH_SkillsMask = gMessageStringTable.getString("SkillsMask");
-        _PREHASH_AtAxis = gMessageStringTable.getString("AtAxis");
-        _PREHASH_TerrainBase1 = gMessageStringTable.getString("TerrainBase1");
-        _PREHASH_Reason = gMessageStringTable.getString("Reason");
-        _PREHASH_TerrainBase2 = gMessageStringTable.getString("TerrainBase2");
-        _PREHASH_TerrainBase3 = gMessageStringTable.getString("TerrainBase3");
-        _PREHASH_Params = gMessageStringTable.getString("Params");
-        _PREHASH_PingID = gMessageStringTable.getString("PingID");
-        _PREHASH_Change = gMessageStringTable.getString("Change");
-        _PREHASH_Height = gMessageStringTable.getString("Height");
-        _PREHASH_Region = gMessageStringTable.getString("Region");
-        _PREHASH_TelehubInfo = gMessageStringTable.getString("TelehubInfo");
-        _PREHASH_StateSave = gMessageStringTable.getString("StateSave");
-        _PREHASH_RoleData = gMessageStringTable.getString("RoleData");
-        _PREHASH_AgentAnimation = gMessageStringTable.getString("AgentAnimation");
-        _PREHASH_AvatarAnimation = gMessageStringTable.getString("AvatarAnimation");
-        _PREHASH_LogDwellTime = gMessageStringTable.getString("LogDwellTime");
-        _PREHASH_ParcelGodMarkAsContent = gMessageStringTable.getString("ParcelGodMarkAsContent");
-        _PREHASH_UsePhysics = gMessageStringTable.getString("UsePhysics");
-        _PREHASH_RegionDenyTransacted = gMessageStringTable.getString("RegionDenyTransacted");
-        _PREHASH_JointType = gMessageStringTable.getString("JointType");
-        _PREHASH_ObjectTaxEstimate = gMessageStringTable.getString("ObjectTaxEstimate");
-        _PREHASH_LightTaxEstimate = gMessageStringTable.getString("LightTaxEstimate");
-        _PREHASH_LandTaxEstimate = gMessageStringTable.getString("LandTaxEstimate");
-        _PREHASH_TeleportLandingStatusChanged = gMessageStringTable.getString("TeleportLandingStatusChanged");
-        _PREHASH_GroupTaxEstimate = gMessageStringTable.getString("GroupTaxEstimate");
-        _PREHASH_AvgViewerFPS = gMessageStringTable.getString("AvgViewerFPS");
-        _PREHASH_Buttons = gMessageStringTable.getString("Buttons");
-        _PREHASH_Sender = gMessageStringTable.getString("Sender");
-        _PREHASH_Dialog = gMessageStringTable.getString("Dialog");
-        _PREHASH_TargetData = gMessageStringTable.getString("TargetData");
-        _PREHASH_DestID = gMessageStringTable.getString("DestID");
-        _PREHASH_PricePublicObjectDelete = gMessageStringTable.getString("PricePublicObjectDelete");
-        _PREHASH_ObjectDelete = gMessageStringTable.getString("ObjectDelete");
-        _PREHASH_Delete = gMessageStringTable.getString("Delete");
-        _PREHASH_EventGodDelete = gMessageStringTable.getString("EventGodDelete");
-        _PREHASH_LastTaxDate = gMessageStringTable.getString("LastTaxDate");
-        _PREHASH_MapImageID = gMessageStringTable.getString("MapImageID");
-        _PREHASH_EndDateTime = gMessageStringTable.getString("EndDateTime");
-        _PREHASH_TerrainDetail0 = gMessageStringTable.getString("TerrainDetail0");
-        _PREHASH_TerrainDetail1 = gMessageStringTable.getString("TerrainDetail1");
-        _PREHASH_TerrainDetail2 = gMessageStringTable.getString("TerrainDetail2");
-        _PREHASH_TerrainDetail3 = gMessageStringTable.getString("TerrainDetail3");
-        _PREHASH_Offset = gMessageStringTable.getString("Offset");
-        _PREHASH_ObjectDelink = gMessageStringTable.getString("ObjectDelink");
-        _PREHASH_TargetObject = gMessageStringTable.getString("TargetObject");
-        _PREHASH_IsEstateManager = gMessageStringTable.getString("IsEstateManager");
-        _PREHASH_CancelAuction = gMessageStringTable.getString("CancelAuction");
-        _PREHASH_ObjectDetach = gMessageStringTable.getString("ObjectDetach");
-        _PREHASH_Compressed = gMessageStringTable.getString("Compressed");
-        _PREHASH_PathBegin = gMessageStringTable.getString("PathBegin");
-        _PREHASH_BypassRaycast = gMessageStringTable.getString("BypassRaycast");
-        _PREHASH_WinnerID = gMessageStringTable.getString("WinnerID");
-        _PREHASH_ChannelType = gMessageStringTable.getString("ChannelType");
-        _PREHASH_NonExemptMembers = gMessageStringTable.getString("NonExemptMembers");
-        _PREHASH_Agents = gMessageStringTable.getString("Agents");
-        _PREHASH_MemberData = gMessageStringTable.getString("MemberData");
-        _PREHASH_ToGroupID = gMessageStringTable.getString("ToGroupID");
-        _PREHASH_ImageNotInDatabase = gMessageStringTable.getString("ImageNotInDatabase");
-        _PREHASH_StartDate = gMessageStringTable.getString("StartDate");
-        _PREHASH_AnimID = gMessageStringTable.getString("AnimID");
-        _PREHASH_Serial = gMessageStringTable.getString("Serial");
-        _PREHASH_AbuseRegionName = gMessageStringTable.getString("AbuseRegionName");
-        _PREHASH_ModifyLand = gMessageStringTable.getString("ModifyLand");
-        _PREHASH_Digest = gMessageStringTable.getString("Digest");
-        _PREHASH_Victim = gMessageStringTable.getString("Victim");
-        _PREHASH_Script = gMessageStringTable.getString("Script");
-        _PREHASH_PickInfoReply = gMessageStringTable.getString("PickInfoReply");
-        _PREHASH_MoneyBalanceReply = gMessageStringTable.getString("MoneyBalanceReply");
-        _PREHASH_RoutedMoneyBalanceReply = gMessageStringTable.getString("RoutedMoneyBalanceReply");
-        _PREHASH_RoleID = gMessageStringTable.getString("RoleID");
-        _PREHASH_RegionInfo = gMessageStringTable.getString("RegionInfo");
-        _PREHASH_GodUpdateRegionInfo = gMessageStringTable.getString("GodUpdateRegionInfo");
-        _PREHASH_StartAnim = gMessageStringTable.getString("StartAnim");
-        _PREHASH_Action = gMessageStringTable.getString("Action");
-        _PREHASH_Location = gMessageStringTable.getString("Location");
-        _PREHASH_Rights = gMessageStringTable.getString("Rights");
-        _PREHASH_SearchDir = gMessageStringTable.getString("SearchDir");
-        _PREHASH_TransferRequest = gMessageStringTable.getString("TransferRequest");
-        _PREHASH_ScriptSensorRequest = gMessageStringTable.getString("ScriptSensorRequest");
-        _PREHASH_MoneyTransferRequest = gMessageStringTable.getString("MoneyTransferRequest");
-        _PREHASH_EjectGroupMemberRequest = gMessageStringTable.getString("EjectGroupMemberRequest");
-        _PREHASH_SkillsText = gMessageStringTable.getString("SkillsText");
-        _PREHASH_Resent = gMessageStringTable.getString("Resent");
-        _PREHASH_Center = gMessageStringTable.getString("Center");
-        _PREHASH_SharedData = gMessageStringTable.getString("SharedData");
-        _PREHASH_PSBlock = gMessageStringTable.getString("PSBlock");
-        _PREHASH_UUIDNameBlock = gMessageStringTable.getString("UUIDNameBlock");
-        _PREHASH_GroupTitleUpdate = gMessageStringTable.getString("GroupTitleUpdate");
-        _PREHASH_Method = gMessageStringTable.getString("Method");
-        _PREHASH_TouchName = gMessageStringTable.getString("TouchName");
-        _PREHASH_UpdateType = gMessageStringTable.getString("UpdateType");
-        _PREHASH_KickedFromEstateID = gMessageStringTable.getString("KickedFromEstateID");
-        _PREHASH_CandidateID = gMessageStringTable.getString("CandidateID");
-        _PREHASH_ParamData = gMessageStringTable.getString("ParamData");
-        _PREHASH_GodlikeMessage = gMessageStringTable.getString("GodlikeMessage");
-        _PREHASH_SystemMessage = gMessageStringTable.getString("SystemMessage");
-        _PREHASH_BodyRotation = gMessageStringTable.getString("BodyRotation");
-        _PREHASH_SearchRegions = gMessageStringTable.getString("SearchRegions");
-        _PREHASH_AnimationData = gMessageStringTable.getString("AnimationData");
-        _PREHASH_StatID = gMessageStringTable.getString("StatID");
-        _PREHASH_ItemID = gMessageStringTable.getString("ItemID");
-        _PREHASH_ScriptDialogReply = gMessageStringTable.getString("ScriptDialogReply");
-        _PREHASH_RegionIDAndHandleReply = gMessageStringTable.getString("RegionIDAndHandleReply");
-        _PREHASH_CameraAtOffset = gMessageStringTable.getString("CameraAtOffset");
-        _PREHASH_VoteID = gMessageStringTable.getString("VoteID");
-        _PREHASH_ParcelGodForceOwner = gMessageStringTable.getString("ParcelGodForceOwner");
-        _PREHASH_Filter = gMessageStringTable.getString("Filter");
-        _PREHASH_InviteData = gMessageStringTable.getString("InviteData");
-        _PREHASH_PCode = gMessageStringTable.getString("PCode");
-        _PREHASH_SearchPos = gMessageStringTable.getString("SearchPos");
-        _PREHASH_PreyID = gMessageStringTable.getString("PreyID");
-        _PREHASH_TerrainLowerLimit = gMessageStringTable.getString("TerrainLowerLimit");
-        _PREHASH_EventFlags = gMessageStringTable.getString("EventFlags");
-        _PREHASH_TallyVotes = gMessageStringTable.getString("TallyVotes");
-        _PREHASH_Result = gMessageStringTable.getString("Result");
-        _PREHASH_LookAt = gMessageStringTable.getString("LookAt");
-        _PREHASH_SearchOrder = gMessageStringTable.getString("SearchOrder");
-        _PREHASH_PayButton = gMessageStringTable.getString("PayButton");
-        _PREHASH_SelfCount = gMessageStringTable.getString("SelfCount");
-        _PREHASH_PacketCount = gMessageStringTable.getString("PacketCount");
-        _PREHASH_ParcelBuyPass = gMessageStringTable.getString("ParcelBuyPass");
-        _PREHASH_OldItemID = gMessageStringTable.getString("OldItemID");
-        _PREHASH_RegionPort = gMessageStringTable.getString("RegionPort");
-        _PREHASH_PriceEnergyUnit = gMessageStringTable.getString("PriceEnergyUnit");
-        _PREHASH_Bitmap = gMessageStringTable.getString("Bitmap");
-        _PREHASH_CacheMissType = gMessageStringTable.getString("CacheMissType");
-        _PREHASH_VFileID = gMessageStringTable.getString("VFileID");
-        _PREHASH_GroupInsigniaID = gMessageStringTable.getString("GroupInsigniaID");
-        _PREHASH_Online = gMessageStringTable.getString("Online");
-        _PREHASH_KickFlags = gMessageStringTable.getString("KickFlags");
-        _PREHASH_CovenantID = gMessageStringTable.getString("CovenantID");
-        _PREHASH_SysCPU = gMessageStringTable.getString("SysCPU");
-        _PREHASH_EMail = gMessageStringTable.getString("EMail");
-        _PREHASH_AggregatePermTextures = gMessageStringTable.getString("AggregatePermTextures");
-        _PREHASH_ChatChannel = gMessageStringTable.getString("ChatChannel");
-        _PREHASH_ReturnID = gMessageStringTable.getString("ReturnID");
-        _PREHASH_ObjectAttach = gMessageStringTable.getString("ObjectAttach");
-        _PREHASH_TargetPort = gMessageStringTable.getString("TargetPort");
-        _PREHASH_ObjectSpinStop = gMessageStringTable.getString("ObjectSpinStop");
-        _PREHASH_FullID = gMessageStringTable.getString("FullID");
-        _PREHASH_ActivateGroup = gMessageStringTable.getString("ActivateGroup");
-        _PREHASH_SysGPU = gMessageStringTable.getString("SysGPU");
-        _PREHASH_AvatarInterestsReply = gMessageStringTable.getString("AvatarInterestsReply");
-        _PREHASH_StartLure = gMessageStringTable.getString("StartLure");
-        _PREHASH_SysRAM = gMessageStringTable.getString("SysRAM");
-        _PREHASH_ObjectPosition = gMessageStringTable.getString("ObjectPosition");
-        _PREHASH_SitPosition = gMessageStringTable.getString("SitPosition");
-        _PREHASH_StartTime = gMessageStringTable.getString("StartTime");
-        _PREHASH_BornOn = gMessageStringTable.getString("BornOn");
-        _PREHASH_CameraCollidePlane = gMessageStringTable.getString("CameraCollidePlane");
-        _PREHASH_EconomyDataRequest = gMessageStringTable.getString("EconomyDataRequest");
-        _PREHASH_TeleportLureRequest = gMessageStringTable.getString("TeleportLureRequest");
-        _PREHASH_FolderID = gMessageStringTable.getString("FolderID");
-        _PREHASH_RegionHandleRequest = gMessageStringTable.getString("RegionHandleRequest");
-        _PREHASH_ScriptDataRequest = gMessageStringTable.getString("ScriptDataRequest");
-        _PREHASH_GroupRoleDataRequest = gMessageStringTable.getString("GroupRoleDataRequest");
-        _PREHASH_GroupTitlesRequest = gMessageStringTable.getString("GroupTitlesRequest");
-        _PREHASH_AgentWearablesRequest = gMessageStringTable.getString("AgentWearablesRequest");
-        _PREHASH_MapBlockRequest = gMessageStringTable.getString("MapBlockRequest");
-        _PREHASH_LureID = gMessageStringTable.getString("LureID");
-        _PREHASH_CopyCenters = gMessageStringTable.getString("CopyCenters");
-        _PREHASH_ParamList = gMessageStringTable.getString("ParamList");
-        _PREHASH_InventorySerial = gMessageStringTable.getString("InventorySerial");
-        _PREHASH_EdgeDataPacket = gMessageStringTable.getString("EdgeDataPacket");
-        _PREHASH_AvatarPickerReply = gMessageStringTable.getString("AvatarPickerReply");
-        _PREHASH_ParcelDwellReply = gMessageStringTable.getString("ParcelDwellReply");
-        _PREHASH_IsForSale = gMessageStringTable.getString("IsForSale");
-        _PREHASH_MuteID = gMessageStringTable.getString("MuteID");
-        _PREHASH_MeanCollisionAlert = gMessageStringTable.getString("MeanCollisionAlert");
-        _PREHASH_CanAcceptTasks = gMessageStringTable.getString("CanAcceptTasks");
-        _PREHASH_ItemData = gMessageStringTable.getString("ItemData");
-        _PREHASH_AnimationList = gMessageStringTable.getString("AnimationList");
-        _PREHASH_Reputation = gMessageStringTable.getString("Reputation");
-        _PREHASH_IntValue = gMessageStringTable.getString("IntValue");
-        _PREHASH_TargetType = gMessageStringTable.getString("TargetType");
-        _PREHASH_Amount = gMessageStringTable.getString("Amount");
-        _PREHASH_HasAttachment = gMessageStringTable.getString("HasAttachment");
-        _PREHASH_UpdateAttachment = gMessageStringTable.getString("UpdateAttachment");
-        _PREHASH_RemoveAttachment = gMessageStringTable.getString("RemoveAttachment");
-        _PREHASH_HeightWidthBlock = gMessageStringTable.getString("HeightWidthBlock");
-        _PREHASH_RequestObjectPropertiesFamily = gMessageStringTable.getString("RequestObjectPropertiesFamily");
-        _PREHASH_ObjectPropertiesFamily = gMessageStringTable.getString("ObjectPropertiesFamily");
-        _PREHASH_UserData = gMessageStringTable.getString("UserData");
-        _PREHASH_IsReadable = gMessageStringTable.getString("IsReadable");
-        _PREHASH_PathCurve = gMessageStringTable.getString("PathCurve");
-        _PREHASH_Status = gMessageStringTable.getString("Status");
-        _PREHASH_FromGroup = gMessageStringTable.getString("FromGroup");
-        _PREHASH_AlreadyVoted = gMessageStringTable.getString("AlreadyVoted");
-        _PREHASH_PlacesReply = gMessageStringTable.getString("PlacesReply");
-        _PREHASH_DirPlacesReply = gMessageStringTable.getString("DirPlacesReply");
-        _PREHASH_ParcelBuy = gMessageStringTable.getString("ParcelBuy");
-        _PREHASH_DirFindQueryBackend = gMessageStringTable.getString("DirFindQueryBackend");
-        _PREHASH_DirPlacesQueryBackend = gMessageStringTable.getString("DirPlacesQueryBackend");
-        _PREHASH_DirClassifiedQueryBackend = gMessageStringTable.getString("DirClassifiedQueryBackend");
-        _PREHASH_DirLandQueryBackend = gMessageStringTable.getString("DirLandQueryBackend");
-        _PREHASH_DirPopularQueryBackend = gMessageStringTable.getString("DirPopularQueryBackend");
-        _PREHASH_HistoryData = gMessageStringTable.getString("HistoryData");
-        _PREHASH_SnapshotID = gMessageStringTable.getString("SnapshotID");
-        _PREHASH_Aspect = gMessageStringTable.getString("Aspect");
-        _PREHASH_ParamSize = gMessageStringTable.getString("ParamSize");
-        _PREHASH_VoteCast = gMessageStringTable.getString("VoteCast");
-        _PREHASH_CastsShadows = gMessageStringTable.getString("CastsShadows");
-        _PREHASH_EveryoneMask = gMessageStringTable.getString("EveryoneMask");
-        _PREHASH_ObjectSpinUpdate = gMessageStringTable.getString("ObjectSpinUpdate");
-        _PREHASH_MaturePublish = gMessageStringTable.getString("MaturePublish");
-        _PREHASH_UseExistingAsset = gMessageStringTable.getString("UseExistingAsset");
-        _PREHASH_Powers = gMessageStringTable.getString("Powers");
-        _PREHASH_ParcelLocalID = gMessageStringTable.getString("ParcelLocalID");
-        _PREHASH_TeleportCancel = gMessageStringTable.getString("TeleportCancel");
-        _PREHASH_UnixTime = gMessageStringTable.getString("UnixTime");
-        _PREHASH_QueryFlags = gMessageStringTable.getString("QueryFlags");
-        _PREHASH_AlwaysRun = gMessageStringTable.getString("AlwaysRun");
-        _PREHASH_Bottom = gMessageStringTable.getString("Bottom");
-        _PREHASH_ButtonData = gMessageStringTable.getString("ButtonData");
-        _PREHASH_SoundData = gMessageStringTable.getString("SoundData");
-        _PREHASH_ViewerStats = gMessageStringTable.getString("ViewerStats");
-        _PREHASH_RegionHandshake = gMessageStringTable.getString("RegionHandshake");
-        _PREHASH_ObjectDescription = gMessageStringTable.getString("ObjectDescription");
-        _PREHASH_Description = gMessageStringTable.getString("Description");
-        _PREHASH_ParamType = gMessageStringTable.getString("ParamType");
-        _PREHASH_UUIDNameReply = gMessageStringTable.getString("UUIDNameReply");
-        _PREHASH_UUIDGroupNameReply = gMessageStringTable.getString("UUIDGroupNameReply");
-        _PREHASH_SaveAssetIntoInventory = gMessageStringTable.getString("SaveAssetIntoInventory");
-        _PREHASH_UserInfo = gMessageStringTable.getString("UserInfo");
-        _PREHASH_AnimSequenceID = gMessageStringTable.getString("AnimSequenceID");
-        _PREHASH_NVPairs = gMessageStringTable.getString("NVPairs");
-        _PREHASH_GroupNoticesListRequest = gMessageStringTable.getString("GroupNoticesListRequest");
-        _PREHASH_ParcelAccessListRequest = gMessageStringTable.getString("ParcelAccessListRequest");
-        _PREHASH_MuteListRequest = gMessageStringTable.getString("MuteListRequest");
-        _PREHASH_RpcChannelRequest = gMessageStringTable.getString("RpcChannelRequest");
-        _PREHASH_LandStatRequest = gMessageStringTable.getString("LandStatRequest");
-        _PREHASH_PlacesQuery = gMessageStringTable.getString("PlacesQuery");
-        _PREHASH_DirPlacesQuery = gMessageStringTable.getString("DirPlacesQuery");
-        _PREHASH_SortOrder = gMessageStringTable.getString("SortOrder");
-        _PREHASH_Hunter = gMessageStringTable.getString("Hunter");
-        _PREHASH_SunAngVelocity = gMessageStringTable.getString("SunAngVelocity");
-        _PREHASH_BinaryBucket = gMessageStringTable.getString("BinaryBucket");
-        _PREHASH_ImagePacket = gMessageStringTable.getString("ImagePacket");
-        _PREHASH_StartGroupProposal = gMessageStringTable.getString("StartGroupProposal");
-        _PREHASH_EnergyLevel = gMessageStringTable.getString("EnergyLevel");
-        _PREHASH_PriceForListing = gMessageStringTable.getString("PriceForListing");
-        _PREHASH_Scale = gMessageStringTable.getString("Scale");
-        _PREHASH_EstateCovenantReply = gMessageStringTable.getString("EstateCovenantReply");
-        _PREHASH_ParentEstateID = gMessageStringTable.getString("ParentEstateID");
-        _PREHASH_Extra2 = gMessageStringTable.getString("Extra2");
-        _PREHASH_Throttle = gMessageStringTable.getString("Throttle");
-        _PREHASH_SimIP = gMessageStringTable.getString("SimIP");
-        _PREHASH_GodID = gMessageStringTable.getString("GodID");
-        _PREHASH_TeleportMinPrice = gMessageStringTable.getString("TeleportMinPrice");
-        _PREHASH_VoteItem = gMessageStringTable.getString("VoteItem");
-        _PREHASH_ObjectRotation = gMessageStringTable.getString("ObjectRotation");
-        _PREHASH_SitRotation = gMessageStringTable.getString("SitRotation");
-        _PREHASH_SnapSelection = gMessageStringTable.getString("SnapSelection");
-        _PREHASH_SoundTrigger = gMessageStringTable.getString("SoundTrigger");
-        _PREHASH_TerrainRaiseLimit = gMessageStringTable.getString("TerrainRaiseLimit");
-        _PREHASH_Quorum = gMessageStringTable.getString("Quorum");
-        _PREHASH_AgentBlock = gMessageStringTable.getString("AgentBlock");
-        _PREHASH_CommandBlock = gMessageStringTable.getString("CommandBlock");
-        _PREHASH_PricePublicObjectDecay = gMessageStringTable.getString("PricePublicObjectDecay");
-        _PREHASH_SpawnPointPos = gMessageStringTable.getString("SpawnPointPos");
-        _PREHASH_VolumeDetail = gMessageStringTable.getString("VolumeDetail");
-        _PREHASH_FromAgentName = gMessageStringTable.getString("FromAgentName");
-        _PREHASH_Range = gMessageStringTable.getString("Range");
-        _PREHASH_DirectoryVisibility = gMessageStringTable.getString("DirectoryVisibility");
-        _PREHASH_PublicIP = gMessageStringTable.getString("PublicIP");
-        _PREHASH_TeleportFailed = gMessageStringTable.getString("TeleportFailed");
-        _PREHASH_PreloadSound = gMessageStringTable.getString("PreloadSound");
-        _PREHASH_ScreenshotID = gMessageStringTable.getString("ScreenshotID");
-        _PREHASH_CovenantTimestamp = gMessageStringTable.getString("CovenantTimestamp");
-        _PREHASH_OldestUnacked = gMessageStringTable.getString("OldestUnacked");
-        _PREHASH_SimulatorIP = gMessageStringTable.getString("SimulatorIP");
-        _PREHASH_Value = gMessageStringTable.getString("Value");
-        _PREHASH_JointAxisOrAnchor = gMessageStringTable.getString("JointAxisOrAnchor");
-        _PREHASH_Test0 = gMessageStringTable.getString("Test0");
-        _PREHASH_Test1 = gMessageStringTable.getString("Test1");
-        _PREHASH_Test2 = gMessageStringTable.getString("Test2");
-        _PREHASH_SunPhase = gMessageStringTable.getString("SunPhase");
-        _PREHASH_ParcelDivide = gMessageStringTable.getString("ParcelDivide");
-        _PREHASH_PriceObjectClaim = gMessageStringTable.getString("PriceObjectClaim");
-        _PREHASH_Field = gMessageStringTable.getString("Field");
-        _PREHASH_Ratio = gMessageStringTable.getString("Ratio");
-        _PREHASH_JoinGroupReply = gMessageStringTable.getString("JoinGroupReply");
-        _PREHASH_LiveHelpGroupReply = gMessageStringTable.getString("LiveHelpGroupReply");
-        _PREHASH_Score = gMessageStringTable.getString("Score");
-        _PREHASH_Image = gMessageStringTable.getString("Image");
-        _PREHASH_ObjectClickAction = gMessageStringTable.getString("ObjectClickAction");
-        _PREHASH_Parameter = gMessageStringTable.getString("Parameter");
-        _PREHASH_Flags = gMessageStringTable.getString("Flags");
-        _PREHASH_Plane = gMessageStringTable.getString("Plane");
-        _PREHASH_Width = gMessageStringTable.getString("Width");
-        _PREHASH_Right = gMessageStringTable.getString("Right");
-        _PREHASH_DirFindQuery = gMessageStringTable.getString("DirFindQuery");
-        _PREHASH_Textures = gMessageStringTable.getString("Textures");
-        _PREHASH_EventData = gMessageStringTable.getString("EventData");
-        _PREHASH_Final = gMessageStringTable.getString("Final");
-        _PREHASH_System = gMessageStringTable.getString("System");
-        _PREHASH_TelehubPos = gMessageStringTable.getString("TelehubPos");
-        _PREHASH_ReportAutosaveCrash = gMessageStringTable.getString("ReportAutosaveCrash");
-        _PREHASH_CreateTrustedCircuit = gMessageStringTable.getString("CreateTrustedCircuit");
-        _PREHASH_DenyTrustedCircuit = gMessageStringTable.getString("DenyTrustedCircuit");
-        _PREHASH_RequestTrustedCircuit = gMessageStringTable.getString("RequestTrustedCircuit");
-        _PREHASH_Codec = gMessageStringTable.getString("Codec");
-        _PREHASH_Modal = gMessageStringTable.getString("Modal");
-        _PREHASH_ChildAgentUnknown = gMessageStringTable.getString("ChildAgentUnknown");
-        _PREHASH_LandingType = gMessageStringTable.getString("LandingType");
-        _PREHASH_ScriptRunningReply = gMessageStringTable.getString("ScriptRunningReply");
-        _PREHASH_Reply = gMessageStringTable.getString("Reply");
-        _PREHASH_GroupAccountDetailsReply = gMessageStringTable.getString("GroupAccountDetailsReply");
-        _PREHASH_TelehubRot = gMessageStringTable.getString("TelehubRot");
-        _PREHASH_AcceptFriendship = gMessageStringTable.getString("AcceptFriendship");
-        _PREHASH_ItemType = gMessageStringTable.getString("ItemType");
-        _PREHASH_DwellInfo = gMessageStringTable.getString("DwellInfo");
-        _PREHASH_AgentResume = gMessageStringTable.getString("AgentResume");
-        _PREHASH_MailFilter = gMessageStringTable.getString("MailFilter");
-        _PREHASH_Disconnect = gMessageStringTable.getString("Disconnect");
-        _PREHASH_SimPosition = gMessageStringTable.getString("SimPosition");
-        _PREHASH_SimWideTotalPrims = gMessageStringTable.getString("SimWideTotalPrims");
-        _PREHASH_Index = gMessageStringTable.getString("Index");
-        _PREHASH_SimFilename = gMessageStringTable.getString("SimFilename");
-        _PREHASH_LastOwnerID = gMessageStringTable.getString("LastOwnerID");
-        _PREHASH_GroupNoticeRequest = gMessageStringTable.getString("GroupNoticeRequest");
-        _PREHASH_EmailMessageRequest = gMessageStringTable.getString("EmailMessageRequest");
-        _PREHASH_MapItemRequest = gMessageStringTable.getString("MapItemRequest");
-        _PREHASH_AgentCount = gMessageStringTable.getString("AgentCount");
-        _PREHASH_MessageBlock = gMessageStringTable.getString("MessageBlock");
-        _PREHASH_FuseBlock = gMessageStringTable.getString("FuseBlock");
-        _PREHASH_AgentGroupData = gMessageStringTable.getString("AgentGroupData");
-        _PREHASH_ClassifiedInfoUpdate = gMessageStringTable.getString("ClassifiedInfoUpdate");
-        _PREHASH_RegionPos = gMessageStringTable.getString("RegionPos");
-        _PREHASH_ParcelMediaUpdate = gMessageStringTable.getString("ParcelMediaUpdate");
-        _PREHASH_NoticeID = gMessageStringTable.getString("NoticeID");
-        _PREHASH_GridX = gMessageStringTable.getString("GridX");
-        _PREHASH_GridY = gMessageStringTable.getString("GridY");
-        _PREHASH_Title = gMessageStringTable.getString("Title");
-        _PREHASH_AuctionID = gMessageStringTable.getString("AuctionID");
-        _PREHASH_VoteType = gMessageStringTable.getString("VoteType");
-        _PREHASH_CategoryID = gMessageStringTable.getString("CategoryID");
-        _PREHASH_Token = gMessageStringTable.getString("Token");
-        _PREHASH_AggregatePerms = gMessageStringTable.getString("AggregatePerms");
-        _PREHASH_ObjectSelect = gMessageStringTable.getString("ObjectSelect");
-        _PREHASH_ForceObjectSelect = gMessageStringTable.getString("ForceObjectSelect");
-        _PREHASH_Price = gMessageStringTable.getString("Price");
-        _PREHASH_SunDirection = gMessageStringTable.getString("SunDirection");
-        _PREHASH_FromName = gMessageStringTable.getString("FromName");
-        _PREHASH_ChangeInventoryItemFlags = gMessageStringTable.getString("ChangeInventoryItemFlags");
-        _PREHASH_Force = gMessageStringTable.getString("Force");
-        _PREHASH_TransactionBlock = gMessageStringTable.getString("TransactionBlock");
-        _PREHASH_PowersMask = gMessageStringTable.getString("PowersMask");
-        _PREHASH_Stamp = gMessageStringTable.getString("Stamp");
-        _PREHASH_TotalCredits = gMessageStringTable.getString("TotalCredits");
-        _PREHASH_State = gMessageStringTable.getString("State");
-        _PREHASH_TextureIndex = gMessageStringTable.getString("TextureIndex");
-        _PREHASH_InviteeID = gMessageStringTable.getString("InviteeID");
-        _PREHASH_ParcelReclaim = gMessageStringTable.getString("ParcelReclaim");
-        _PREHASH_Money = gMessageStringTable.getString("Money");
-        _PREHASH_PathTwist = gMessageStringTable.getString("PathTwist");
-        _PREHASH_AuthBuyerID = gMessageStringTable.getString("AuthBuyerID");
-        _PREHASH_Color = gMessageStringTable.getString("Color");
-        _PREHASH_SourceType = gMessageStringTable.getString("SourceType");
-        _PREHASH_World = gMessageStringTable.getString("World");
-        _PREHASH_QueryData = gMessageStringTable.getString("QueryData");
-        _PREHASH_Users = gMessageStringTable.getString("Users");
-        _PREHASH_SysOS = gMessageStringTable.getString("SysOS");
-        _PREHASH_Notes = gMessageStringTable.getString("Notes");
-        _PREHASH_AvatarID = gMessageStringTable.getString("AvatarID");
-        _PREHASH_FounderID = gMessageStringTable.getString("FounderID");
-        _PREHASH_EndPointID = gMessageStringTable.getString("EndPointID");
-        _PREHASH_LocationLookAt = gMessageStringTable.getString("LocationLookAt");
-        _PREHASH_Sound = gMessageStringTable.getString("Sound");
-        _PREHASH_Cover = gMessageStringTable.getString("Cover");
-        _PREHASH_TotalObjectCount = gMessageStringTable.getString("TotalObjectCount");
-        _PREHASH_TextureEntry = gMessageStringTable.getString("TextureEntry");
-        _PREHASH_SquareMetersCommitted = gMessageStringTable.getString("SquareMetersCommitted");
-        _PREHASH_ChannelID = gMessageStringTable.getString("ChannelID");
-        _PREHASH_Dwell = gMessageStringTable.getString("Dwell");
-        _PREHASH_North = gMessageStringTable.getString("North");
-        _PREHASH_AgentUpdate = gMessageStringTable.getString("AgentUpdate");
-        _PREHASH_PickGodDelete = gMessageStringTable.getString("PickGodDelete");
-        _PREHASH_HostName = gMessageStringTable.getString("HostName");
-        _PREHASH_PriceParcelClaim = gMessageStringTable.getString("PriceParcelClaim");
-        _PREHASH_ParcelClaim = gMessageStringTable.getString("ParcelClaim");
-        _PREHASH_AgentPowers = gMessageStringTable.getString("AgentPowers");
-        _PREHASH_ProfileHollow = gMessageStringTable.getString("ProfileHollow");
-        _PREHASH_GroupRoleChanges = gMessageStringTable.getString("GroupRoleChanges");
-        _PREHASH_Count = gMessageStringTable.getString("Count");
-        _PREHASH_South = gMessageStringTable.getString("South");
-        _PREHASH_ObjectUpdateCompressed = gMessageStringTable.getString("ObjectUpdateCompressed");
-        _PREHASH_MuteFlags = gMessageStringTable.getString("MuteFlags");
-        _PREHASH_Group = gMessageStringTable.getString("Group");
-        _PREHASH_AgentPause = gMessageStringTable.getString("AgentPause");
-        _PREHASH_LanguagesText = gMessageStringTable.getString("LanguagesText");
-        _PREHASH_Error = gMessageStringTable.getString("Error");
-        _PREHASH_InternalScriptMail = gMessageStringTable.getString("InternalScriptMail");
-        _PREHASH_FindAgent = gMessageStringTable.getString("FindAgent");
-        _PREHASH_AgentData = gMessageStringTable.getString("AgentData");
-        _PREHASH_FolderData = gMessageStringTable.getString("FolderData");
-        _PREHASH_AssetBlock = gMessageStringTable.getString("AssetBlock");
-        _PREHASH_AcceptNotices = gMessageStringTable.getString("AcceptNotices");
-        _PREHASH_SetGroupAcceptNotices = gMessageStringTable.getString("SetGroupAcceptNotices");
-        _PREHASH_CloseCircuit = gMessageStringTable.getString("CloseCircuit");
-        _PREHASH_TeleportFinish = gMessageStringTable.getString("TeleportFinish");
-        _PREHASH_PathRevolutions = gMessageStringTable.getString("PathRevolutions");
-        _PREHASH_ClassifiedInfoReply = gMessageStringTable.getString("ClassifiedInfoReply");
-        _PREHASH_ParcelInfoReply = gMessageStringTable.getString("ParcelInfoReply");
-        _PREHASH_AutosaveData = gMessageStringTable.getString("AutosaveData");
-        _PREHASH_SetStartLocation = gMessageStringTable.getString("SetStartLocation");
-        _PREHASH_PassHours = gMessageStringTable.getString("PassHours");
-        _PREHASH_AttachmentPt = gMessageStringTable.getString("AttachmentPt");
-        _PREHASH_ParcelFlags = gMessageStringTable.getString("ParcelFlags");
-        _PREHASH_NumVotes = gMessageStringTable.getString("NumVotes");
-        _PREHASH_AvatarPickerRequest = gMessageStringTable.getString("AvatarPickerRequest");
-        _PREHASH_TeleportLocationRequest = gMessageStringTable.getString("TeleportLocationRequest");
-        _PREHASH_DataHomeLocationRequest = gMessageStringTable.getString("DataHomeLocationRequest");
-        _PREHASH_EventNotificationAddRequest = gMessageStringTable.getString("EventNotificationAddRequest");
-        _PREHASH_ParcelDwellRequest = gMessageStringTable.getString("ParcelDwellRequest");
-        _PREHASH_EventLocationRequest = gMessageStringTable.getString("EventLocationRequest");
-        _PREHASH_SetStartLocationRequest = gMessageStringTable.getString("SetStartLocationRequest");
-        _PREHASH_QueryStart = gMessageStringTable.getString("QueryStart");
-        _PREHASH_EjectData = gMessageStringTable.getString("EjectData");
-        _PREHASH_AvatarTextureUpdate = gMessageStringTable.getString("AvatarTextureUpdate");
-        _PREHASH_RPCServerPort = gMessageStringTable.getString("RPCServerPort");
-        _PREHASH_Bytes = gMessageStringTable.getString("Bytes");
-        _PREHASH_Extra = gMessageStringTable.getString("Extra");
-        _PREHASH_ForceScriptControlRelease = gMessageStringTable.getString("ForceScriptControlRelease");
-        _PREHASH_ParcelRelease = gMessageStringTable.getString("ParcelRelease");
-        _PREHASH_VFileType = gMessageStringTable.getString("VFileType");
-        _PREHASH_EjectGroupMemberReply = gMessageStringTable.getString("EjectGroupMemberReply");
-        _PREHASH_ImageData = gMessageStringTable.getString("ImageData");
-        _PREHASH_SimulatorViewerTimeMessage = gMessageStringTable.getString("SimulatorViewerTimeMessage");
-        _PREHASH_Rotation = gMessageStringTable.getString("Rotation");
-        _PREHASH_Selection = gMessageStringTable.getString("Selection");
-        _PREHASH_TransactionData = gMessageStringTable.getString("TransactionData");
-        _PREHASH_OperationData = gMessageStringTable.getString("OperationData");
-        _PREHASH_ExpirationDate = gMessageStringTable.getString("ExpirationDate");
-        _PREHASH_ParcelDeedToGroup = gMessageStringTable.getString("ParcelDeedToGroup");
-        _PREHASH_AvatarPicksReply = gMessageStringTable.getString("AvatarPicksReply");
-        _PREHASH_GroupTitlesReply = gMessageStringTable.getString("GroupTitlesReply");
-        _PREHASH_AgentInfo = gMessageStringTable.getString("AgentInfo");
-        _PREHASH_MoneyTransferBackend = gMessageStringTable.getString("MoneyTransferBackend");
-        _PREHASH_NextOwnerMask = gMessageStringTable.getString("NextOwnerMask");
-        _PREHASH_MuteData = gMessageStringTable.getString("MuteData");
-        _PREHASH_PassPrice = gMessageStringTable.getString("PassPrice");
-        _PREHASH_SourceID = gMessageStringTable.getString("SourceID");
-        _PREHASH_ChangeUserRights = gMessageStringTable.getString("ChangeUserRights");
-        _PREHASH_TeleportFlags = gMessageStringTable.getString("TeleportFlags");
-        _PREHASH_SlaveParcelData = gMessageStringTable.getString("SlaveParcelData");
-        _PREHASH_AssetData = gMessageStringTable.getString("AssetData");
-        _PREHASH_MultipleObjectUpdate = gMessageStringTable.getString("MultipleObjectUpdate");
-        _PREHASH_ObjectUpdate = gMessageStringTable.getString("ObjectUpdate");
-        _PREHASH_ImprovedTerseObjectUpdate = gMessageStringTable.getString("ImprovedTerseObjectUpdate");
-        _PREHASH_ConfirmXferPacket = gMessageStringTable.getString("ConfirmXferPacket");
-        _PREHASH_StartPingCheck = gMessageStringTable.getString("StartPingCheck");
-        _PREHASH_SimWideDeletes = gMessageStringTable.getString("SimWideDeletes");
-        _PREHASH_LandStatReply = gMessageStringTable.getString("LandStatReply");
-        _PREHASH_IsPhantom = gMessageStringTable.getString("IsPhantom");
-        _PREHASH_AgentList = gMessageStringTable.getString("AgentList");
-        _PREHASH_SimApproved = gMessageStringTable.getString("SimApproved");
-        _PREHASH_RezObject = gMessageStringTable.getString("RezObject");
-        _PREHASH_TaskLocalID = gMessageStringTable.getString("TaskLocalID");
-        _PREHASH_ClaimDate = gMessageStringTable.getString("ClaimDate");
-        _PREHASH_MergeParcel = gMessageStringTable.getString("MergeParcel");
-        _PREHASH_Priority = gMessageStringTable.getString("Priority");
-        _PREHASH_QueryText = gMessageStringTable.getString("QueryText");
-        _PREHASH_GroupNoticeAdd = gMessageStringTable.getString("GroupNoticeAdd");
-        _PREHASH_ReturnType = gMessageStringTable.getString("ReturnType");
-        _PREHASH_FetchFolders = gMessageStringTable.getString("FetchFolders");
-        _PREHASH_SimulatorPublicHostBlock = gMessageStringTable.getString("SimulatorPublicHostBlock");
-        _PREHASH_HeaderData = gMessageStringTable.getString("HeaderData");
-        _PREHASH_RequestMultipleObjects = gMessageStringTable.getString("RequestMultipleObjects");
-        _PREHASH_RetrieveInstantMessages = gMessageStringTable.getString("RetrieveInstantMessages");
-        _PREHASH_OpenCircuit = gMessageStringTable.getString("OpenCircuit");
-        _PREHASH_CrossedRegion = gMessageStringTable.getString("CrossedRegion");
-        _PREHASH_DirGroupsReply = gMessageStringTable.getString("DirGroupsReply");
-        _PREHASH_AvatarGroupsReply = gMessageStringTable.getString("AvatarGroupsReply");
-        _PREHASH_EmailMessageReply = gMessageStringTable.getString("EmailMessageReply");
-        _PREHASH_GroupVoteHistoryItemReply = gMessageStringTable.getString("GroupVoteHistoryItemReply");
-        _PREHASH_ViewerPosition = gMessageStringTable.getString("ViewerPosition");
-        _PREHASH_Position = gMessageStringTable.getString("Position");
-        _PREHASH_ParentEstate = gMessageStringTable.getString("ParentEstate");
-        _PREHASH_EstateName = gMessageStringTable.getString("EstateName");
-        _PREHASH_MuteName = gMessageStringTable.getString("MuteName");
-        _PREHASH_ParcelRename = gMessageStringTable.getString("ParcelRename");
-        _PREHASH_ViewerFilename = gMessageStringTable.getString("ViewerFilename");
-        _PREHASH_UserReportInternal = gMessageStringTable.getString("UserReportInternal");
-        _PREHASH_AvatarPropertiesRequest = gMessageStringTable.getString("AvatarPropertiesRequest");
-        _PREHASH_ParcelPropertiesRequest = gMessageStringTable.getString("ParcelPropertiesRequest");
-        _PREHASH_GroupProfileRequest = gMessageStringTable.getString("GroupProfileRequest");
-        _PREHASH_AgentDataUpdateRequest = gMessageStringTable.getString("AgentDataUpdateRequest");
-        _PREHASH_PriceObjectScaleFactor = gMessageStringTable.getString("PriceObjectScaleFactor");
-        _PREHASH_OpenEnrollment = gMessageStringTable.getString("OpenEnrollment");
-        _PREHASH_GroupData = gMessageStringTable.getString("GroupData");
-        _PREHASH_RequestGodlikePowers = gMessageStringTable.getString("RequestGodlikePowers");
-        _PREHASH_GrantGodlikePowers = gMessageStringTable.getString("GrantGodlikePowers");
-        _PREHASH_TransactionID = gMessageStringTable.getString("TransactionID");
-        _PREHASH_DestinationID = gMessageStringTable.getString("DestinationID");
-        _PREHASH_Controls = gMessageStringTable.getString("Controls");
-        _PREHASH_FirstDetachAll = gMessageStringTable.getString("FirstDetachAll");
-        _PREHASH_EstateID = gMessageStringTable.getString("EstateID");
-        _PREHASH_ImprovedInstantMessage = gMessageStringTable.getString("ImprovedInstantMessage");
-        _PREHASH_CheckParcelSales = gMessageStringTable.getString("CheckParcelSales");
-        _PREHASH_ParcelSales = gMessageStringTable.getString("ParcelSales");
-        _PREHASH_CurrentInterval = gMessageStringTable.getString("CurrentInterval");
-        _PREHASH_PriceRentLight = gMessageStringTable.getString("PriceRentLight");
-        _PREHASH_MediaAutoScale = gMessageStringTable.getString("MediaAutoScale");
-        _PREHASH_NeighborBlock = gMessageStringTable.getString("NeighborBlock");
-        _PREHASH_LayerData = gMessageStringTable.getString("LayerData");
-        _PREHASH_NVPairData = gMessageStringTable.getString("NVPairData");
-        _PREHASH_TeleportLocal = gMessageStringTable.getString("TeleportLocal");
-        _PREHASH_EjecteeID = gMessageStringTable.getString("EjecteeID");
-        _PREHASH_VoteInitiator = gMessageStringTable.getString("VoteInitiator");
-        _PREHASH_TypeData = gMessageStringTable.getString("TypeData");
-        _PREHASH_OwnerIDs = gMessageStringTable.getString("OwnerIDs");
-        _PREHASH_SystemKickUser = gMessageStringTable.getString("SystemKickUser");
-        _PREHASH_TransactionTime = gMessageStringTable.getString("TransactionTime");
-        _PREHASH_TimeToLive = gMessageStringTable.getString("TimeToLive");
-        _PREHASH_OldAgentID = gMessageStringTable.getString("OldAgentID");
-        _PREHASH_MusicURL = gMessageStringTable.getString("MusicURL");
-        _PREHASH_ParcelPrimBonus = gMessageStringTable.getString("ParcelPrimBonus");
-        _PREHASH_EjectUser = gMessageStringTable.getString("EjectUser");
-        _PREHASH_CoarseLocationUpdate = gMessageStringTable.getString("CoarseLocationUpdate");
-        _PREHASH_ChildAgentPositionUpdate = gMessageStringTable.getString("ChildAgentPositionUpdate");
-        _PREHASH_StoreLocal = gMessageStringTable.getString("StoreLocal");
-        _PREHASH_GroupName = gMessageStringTable.getString("GroupName");
-        _PREHASH_PriceParcelRent = gMessageStringTable.getString("PriceParcelRent");
-        _PREHASH_SimStatus = gMessageStringTable.getString("SimStatus");
-        _PREHASH_TransactionSuccess = gMessageStringTable.getString("TransactionSuccess");
-        _PREHASH_LureType = gMessageStringTable.getString("LureType");
-        _PREHASH_GroupMask = gMessageStringTable.getString("GroupMask");
-        _PREHASH_SitObject = gMessageStringTable.getString("SitObject");
-        _PREHASH_Override = gMessageStringTable.getString("Override");
-        _PREHASH_LocomotionState = gMessageStringTable.getString("LocomotionState");
-        _PREHASH_PriceUpload = gMessageStringTable.getString("PriceUpload");
-        _PREHASH_RemoveParcel = gMessageStringTable.getString("RemoveParcel");
-        _PREHASH_ConfirmAuctionStart = gMessageStringTable.getString("ConfirmAuctionStart");
-        _PREHASH_RpcScriptRequestInbound = gMessageStringTable.getString("RpcScriptRequestInbound");
-        _PREHASH_ActiveGroupID = gMessageStringTable.getString("ActiveGroupID");
-        _PREHASH_ParcelReturnObjects = gMessageStringTable.getString("ParcelReturnObjects");
-        _PREHASH_TotalObjects = gMessageStringTable.getString("TotalObjects");
-        _PREHASH_ObjectExtraParams = gMessageStringTable.getString("ObjectExtraParams");
-        _PREHASH_Questions = gMessageStringTable.getString("Questions");
-        _PREHASH_TransferAbort = gMessageStringTable.getString("TransferAbort");
-        _PREHASH_TransferInventory = gMessageStringTable.getString("TransferInventory");
-        _PREHASH_RayTargetID = gMessageStringTable.getString("RayTargetID");
-        _PREHASH_ClaimPrice = gMessageStringTable.getString("ClaimPrice");
-        _PREHASH_ObjectProperties = gMessageStringTable.getString("ObjectProperties");
-        _PREHASH_ParcelProperties = gMessageStringTable.getString("ParcelProperties");
-        _PREHASH_EstateOwnerID = gMessageStringTable.getString("EstateOwnerID");
-        _PREHASH_LogoutRequest = gMessageStringTable.getString("LogoutRequest");
-        _PREHASH_AssetUploadRequest = gMessageStringTable.getString("AssetUploadRequest");
-        _PREHASH_TransactionType = gMessageStringTable.getString("TransactionType");
-        _PREHASH_AvatarPropertiesUpdate = gMessageStringTable.getString("AvatarPropertiesUpdate");
-        _PREHASH_ParcelPropertiesUpdate = gMessageStringTable.getString("ParcelPropertiesUpdate");
-        _PREHASH_FetchItems = gMessageStringTable.getString("FetchItems");
-        _PREHASH_AbortXfer = gMessageStringTable.getString("AbortXfer");
-        _PREHASH_DeRezAck = gMessageStringTable.getString("DeRezAck");
-        _PREHASH_TakeControls = gMessageStringTable.getString("TakeControls");
-        _PREHASH_DirLandReply = gMessageStringTable.getString("DirLandReply");
-        _PREHASH_MuteType = gMessageStringTable.getString("MuteType");
-        _PREHASH_IMViaEMail = gMessageStringTable.getString("IMViaEMail");
-        _PREHASH_RentPrice = gMessageStringTable.getString("RentPrice");
-        _PREHASH_GenericMessage = gMessageStringTable.getString("GenericMessage");
-        _PREHASH_ChildAgentAlive = gMessageStringTable.getString("ChildAgentAlive");
-        _PREHASH_AssetType = gMessageStringTable.getString("AssetType");
-        _PREHASH_SpawnPointBlock = gMessageStringTable.getString("SpawnPointBlock");
-        _PREHASH_AttachmentBlock = gMessageStringTable.getString("AttachmentBlock");
-        _PREHASH_ObjectMaterial = gMessageStringTable.getString("ObjectMaterial");
-        _PREHASH_OwnerName = gMessageStringTable.getString("OwnerName");
-        _PREHASH_AvatarNotesReply = gMessageStringTable.getString("AvatarNotesReply");
-        _PREHASH_CacheID = gMessageStringTable.getString("CacheID");
-        _PREHASH_OwnerMask = gMessageStringTable.getString("OwnerMask");
-        _PREHASH_TransferInventoryAck = gMessageStringTable.getString("TransferInventoryAck");
-        _PREHASH_RegionDenyAgeUnverified = gMessageStringTable.getString("RegionDenyAgeUnverified");
-        _PREHASH_AgeVerificationBlock = gMessageStringTable.getString("AgeVerificationBlock");
-}
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index 1a22fba..e65d539 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -1373,10 +1373,4 @@ extern char * _PREHASH_RegionDenyAgeUnverified;
 extern char * _PREHASH_AgeVerificationBlock;
-void init_prehash_data();
 #endif
diff --git a/linden/indra/llmessage/message_string_table.cpp b/linden/indra/llmessage/message_string_table.cpp
index 36d1de0..e4da828 100644
--- a/linden/indra/llmessage/message_string_table.cpp
+++ b/linden/indra/llmessage/message_string_table.cpp
@@ -46,8 +46,6 @@ inline U32	message_hash_my_string(const char *str)
 }
-LLMessageStringTable gMessageStringTable;
 LLMessageStringTable::LLMessageStringTable()
 :       mUsed(0)
diff --git a/linden/indra/llprimitive/llmaterialtable.cpp b/linden/indra/llprimitive/llmaterialtable.cpp
index 537c968..5e45e44 100644
--- a/linden/indra/llprimitive/llmaterialtable.cpp
+++ b/linden/indra/llprimitive/llmaterialtable.cpp
@@ -39,6 +39,54 @@
 LLMaterialTable LLMaterialTable::basic(1);
+/* 
+        Old Havok 1 constants
+// these are the approximately correct friction values for various materials
+// however Havok1's friction dynamics are not very correct, so the effective
+// friction coefficients that result from these numbers are approximately
+// 25-50% too low, more incorrect for the lower values.
+F32 const LLMaterialTable::FRICTION_MIN         = 0.2f;         
+F32 const LLMaterialTable::FRICTION_GLASS       = 0.2f;         // borosilicate glass
+F32 const LLMaterialTable::FRICTION_LIGHT       = 0.2f;         //
+F32 const LLMaterialTable::FRICTION_METAL       = 0.3f;         // steel
+F32 const LLMaterialTable::FRICTION_PLASTIC     = 0.4f;         // HDPE
+F32 const LLMaterialTable::FRICTION_WOOD        = 0.6f;         // southern pine
+F32 const LLMaterialTable::FRICTION_FLESH       = 0.60f;        // saltwater
+F32 const LLMaterialTable::FRICTION_LAND        = 0.78f;        // dirt
+F32 const LLMaterialTable::FRICTION_STONE       = 0.8f;         // concrete
+F32 const LLMaterialTable::FRICTION_RUBBER      = 0.9f;         //
+F32 const LLMaterialTable::FRICTION_MAX         = 0.95f;        //
+*/
+// #if LL_CURRENT_HAVOK_VERSION == LL_HAVOK_VERSION_460
+// Havok4 has more correct friction dynamics, however here we have to use
+// the "incorrect" equivalents for the legacy Havok1 behavior
+F32 const LLMaterialTable::FRICTION_MIN         = 0.15f;        
+F32 const LLMaterialTable::FRICTION_GLASS       = 0.13f;        // borosilicate glass
+F32 const LLMaterialTable::FRICTION_LIGHT       = 0.14f;        //
+F32 const LLMaterialTable::FRICTION_METAL       = 0.22f;        // steel
+F32 const LLMaterialTable::FRICTION_PLASTIC     = 0.3f;         // HDPE
+F32 const LLMaterialTable::FRICTION_WOOD        = 0.44f;        // southern pine
+F32 const LLMaterialTable::FRICTION_FLESH       = 0.46f;        // saltwater
+F32 const LLMaterialTable::FRICTION_LAND        = 0.58f;        // dirt
+F32 const LLMaterialTable::FRICTION_STONE       = 0.6f;         // concrete
+F32 const LLMaterialTable::FRICTION_RUBBER      = 0.67f;        //
+F32 const LLMaterialTable::FRICTION_MAX         = 0.71f;        //
+// #endif
+F32 const LLMaterialTable::RESTITUTION_MIN              = 0.02f;        
+F32 const LLMaterialTable::RESTITUTION_LAND     = LLMaterialTable::RESTITUTION_MIN;
+F32 const LLMaterialTable::RESTITUTION_FLESH    = 0.2f;         // saltwater
+F32 const LLMaterialTable::RESTITUTION_STONE    = 0.4f;         // concrete
+F32 const LLMaterialTable::RESTITUTION_METAL    = 0.4f;         // steel
+F32 const LLMaterialTable::RESTITUTION_WOOD     = 0.5f;         // southern pine
+F32 const LLMaterialTable::RESTITUTION_GLASS    = 0.7f;         // borosilicate glass
+F32 const LLMaterialTable::RESTITUTION_PLASTIC  = 0.7f;         // HDPE
+F32 const LLMaterialTable::RESTITUTION_LIGHT    = 0.7f;         //
+F32 const LLMaterialTable::RESTITUTION_RUBBER   = 0.9f;         //
+F32 const LLMaterialTable::RESTITUTION_MAX              = 0.95f;
 F32 const LLMaterialTable::DEFAULT_FRICTION = 0.5f;
 F32 const LLMaterialTable::DEFAULT_RESTITUTION = 0.4f;
diff --git a/linden/indra/llprimitive/llmaterialtable.h b/linden/indra/llprimitive/llmaterialtable.h
index b48c832..863fb25 100644
--- a/linden/indra/llprimitive/llmaterialtable.h
+++ b/linden/indra/llprimitive/llmaterialtable.h
@@ -33,11 +33,36 @@
 #define LL_LLMATERIALTABLE_H
 #include "lluuid.h"
-#include "linked_lists.h"
 #include "llstring.h"
+#include <list>
 const U32 LLMATERIAL_INFO_NAME_LENGTH = 256;
+// We've moved toward more reasonable mass values for the Havok4 engine.
+// The LEGACY_DEFAULT_OBJECT_DENSITY is used to maintain support for
+// legacy scripts code (llGetMass()) and script energy consumption.
+const F32 DEFAULT_OBJECT_DENSITY = 1000.0f;                     // per m^3
+const F32 LEGACY_DEFAULT_OBJECT_DENSITY = 10.0f;
+// Avatars density depends on the collision shape used.  The approximate
+// legacy volumes of avatars are:
+// Body_Length Body_Width Body_Fat Leg_Length  Volume(m^3)
+// -------------------------------------------------------
+//    min     |   min    |  min   |    min    |   0.123   |
+//    max     |   max    |  max   |    max    |   0.208   |
+//
+// Either the avatar shape must be tweaked to match those volumes
+// or the DEFAULT_AVATAR_DENSITY must be adjusted to achieve the 
+// legacy mass.
+//
+// The current density appears to be low because the mass and
+// inertia are computed as if the avatar were a cylinder which
+// has more volume than the actual collision shape of the avatar.
+// See the physics engine mass properties code for more info.
+const F32 DEFAULT_AVATAR_DENSITY = 445.3f;              // was 444.24f;
 class LLMaterialInfo
 {
 public:
@@ -84,9 +109,33 @@ public:
 class LLMaterialTable
 {
 public:
+        static const F32 FRICTION_MIN;
+        static const F32 FRICTION_GLASS;
+        static const F32 FRICTION_LIGHT;
+        static const F32 FRICTION_METAL;
+        static const F32 FRICTION_PLASTIC;
+        static const F32 FRICTION_WOOD;
+        static const F32 FRICTION_LAND;
+        static const F32 FRICTION_STONE;
+        static const F32 FRICTION_FLESH;
+        static const F32 FRICTION_RUBBER;
+        static const F32 FRICTION_MAX;
+        static const F32 RESTITUTION_MIN;
+        static const F32 RESTITUTION_LAND;
+        static const F32 RESTITUTION_FLESH;
+        static const F32 RESTITUTION_STONE;
+        static const F32 RESTITUTION_METAL;
+        static const F32 RESTITUTION_WOOD;
+        static const F32 RESTITUTION_GLASS;
+        static const F32 RESTITUTION_PLASTIC;
+        static const F32 RESTITUTION_LIGHT;
+        static const F32 RESTITUTION_RUBBER;
+        static const F32 RESTITUTION_MAX;
        typedef std::list<LLMaterialInfo*> info_list_t;
        info_list_t mMaterialInfoList;
-        
        LLUUID *mCollisionSoundMatrix;
        LLUUID *mSlidingSoundMatrix;
        LLUUID *mRollingSoundMatrix;
@@ -117,8 +166,8 @@ public:
        char*  getName(U8 mcode);
        F32 getDensity(U8 mcode);                                                       // kg/m^3, 0 if not found
-        F32 getFriction(U8 mcode);                                                      // havok values
+        F32 getFriction(U8 mcode);                                                      // physics values
-        F32 getRestitution(U8 mcode);                                               // havok values
+        F32 getRestitution(U8 mcode);                                               // physics values
        F32 getHPMod(U8 mcode);
        F32 getDamageMod(U8 mcode);
        F32 getEPMod(U8 mcode);
diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp
index 91d3c4e..a906926 100644
--- a/linden/indra/llprimitive/llprimitive.cpp
+++ b/linden/indra/llprimitive/llprimitive.cpp
@@ -113,9 +113,38 @@ const BOOL FLEXIBLE_OBJECT_DEFAULT_RENDERING_COLLISION_SPHERE = FALSE;
 const char *SCULPT_DEFAULT_TEXTURE = "be293869-d0d9-0a69-5989-ad27f1946fd4"; // old inverted texture: "7595d345-a24c-e7ef-f0bd-78793792133e";
+//static 
+// LEGACY: by default we use the LLVolumeMgr::gVolumeMgr global
+// TODO -- eliminate this global from the codebase!
+LLVolumeMgr* LLPrimitive::sVolumeManager = NULL;
+// static
+void LLPrimitive::setVolumeManager( LLVolumeMgr* volume_manager )
+{
+        if ( !volume_manager || sVolumeManager )
+        {
+                llerrs << "Unable to set LLPrimitive::sVolumeManager to NULL" << llendl;
+        }
+        sVolumeManager = volume_manager;
+}
+// static
+bool LLPrimitive::cleanupVolumeManager()
+{
+        BOOL res = FALSE;
+        if (sVolumeManager) 
+        {
+                res = sVolumeManager->cleanup();
+                delete sVolumeManager;
+                sVolumeManager = NULL;
+        }
+        return res;
+}
 //===============================================================
 LLPrimitive::LLPrimitive()
+:       mMiscFlags(0)
 {
        mPrimitiveCode = 0;
@@ -149,7 +178,7 @@ LLPrimitive::~LLPrimitive()
        // Cleanup handled by volume manager
        if (mVolumep)
        {
-                gVolumeMgr->cleanupVolume(mVolumep);
+                sVolumeManager->cleanupVolume(mVolumep);
        }
        mVolumep = NULL;
 }
@@ -162,7 +191,7 @@ LLPrimitive *LLPrimitive::createPrimitive(LLPCode p_code)
        
        if (retval)
        {
-                retval->init(p_code);
+                retval->init_primitive(p_code);
        }
        else
        {
@@ -173,7 +202,7 @@ LLPrimitive *LLPrimitive::createPrimitive(LLPCode p_code)
 }
 //===============================================================
-void LLPrimitive::init(LLPCode p_code)
+void LLPrimitive::init_primitive(LLPCode p_code)
 {
        if (mNumTEs)
        {
@@ -533,6 +562,8 @@ S32 LLPrimitive::setTEGlow(const U8 te, const F32 glow)
 LLPCode LLPrimitive::legacyToPCode(const U8 legacy)
 {
+        // TODO: Should this default to something valid?
+        // Maybe volume?
        LLPCode pcode = 0;
        switch (legacy)
@@ -621,7 +652,7 @@ LLPCode LLPrimitive::legacyToPCode(const U8 legacy)
                pcode = LL_PCODE_TREE_NEW;
                break;
        default:
-                llwarns << "Unknown legacy code " << legacy << "!" << llendl;
+                llwarns << "Unknown legacy code " << legacy << " [" << (S32)legacy << "]!" << llendl;
        }
        return pcode;
@@ -904,10 +935,10 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
                        }
                }
-                volumep = gVolumeMgr->getVolume(volume_params, detail);
+                volumep = sVolumeManager->getVolume(volume_params, detail);
                if (volumep == mVolumep)
                {
-                        gVolumeMgr->cleanupVolume( volumep );  // gVolumeMgr->getVolume() creates a reference, but we don't need a second one.
+                        sVolumeManager->cleanupVolume( volumep );  // LLVolumeMgr::getVolume() creates a reference, but we don't need a second one.
                        return TRUE;
                }
        }
@@ -950,7 +981,7 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
        // build the new object
-        gVolumeMgr->cleanupVolume(mVolumep);
+        sVolumeManager->cleanupVolume(mVolumep);
        mVolumep = volumep;
        
        U32 new_face_mask = mVolumep->mFaceMask;
diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h
index 3b43e8f..e698a31 100644
--- a/linden/indra/llprimitive/llprimitive.h
+++ b/linden/indra/llprimitive/llprimitive.h
@@ -48,6 +48,7 @@ class LLColor4;
 class LLColor3;
 class LLTextureEntry;
 class LLDataPacker;
+class LLVolumeMgr;
 enum LLGeomType // NOTE: same vals as GL Ids
 {
@@ -269,11 +270,32 @@ public:
 class LLPrimitive : public LLXform
 {
 public:
+        // HACK for removing LLPrimitive's dependency on gVolumeMgr global.
+        // If a different LLVolumeManager is instantiated and set early enough
+        // then the LLPrimitive class will use it instead of gVolumeMgr.
+        static LLVolumeMgr* getVolumeManager() { return sVolumeManager; }
+        static void setVolumeManager( LLVolumeMgr* volume_manager);
+        static bool cleanupVolumeManager();
+        // these flags influence how the RigidBody representation is built
+        static const U32 PRIM_FLAG_PHANTOM                              = 0x1 << 0;
+        static const U32 PRIM_FLAG_VOLUME_DETECT                = 0x1 << 1;
+        static const U32 PRIM_FLAG_DYNAMIC                              = 0x1 << 2;
+        static const U32 PRIM_FLAG_AVATAR                               = 0x1 << 3;
+        static const U32 PRIM_FLAG_SCULPT                               = 0x1 << 4;
+        // not used yet, but soon
+        static const U32 PRIM_FLAG_COLLISION_CALLBACK   = 0x1 << 5;
+        static const U32 PRIM_FLAG_CONVEX                               = 0x1 << 6;
+        static const U32 PRIM_FLAG_DEFAULT_VOLUME               = 0x1 << 7;
+        static const U32 PRIM_FLAG_SITTING                              = 0x1 << 8;
+        static const U32 PRIM_FLAG_SITTING_ON_GROUND    = 0x1 << 9;             // Set along with PRIM_FLAG_SITTING
        LLPrimitive();
        virtual ~LLPrimitive();
        static LLPrimitive *createPrimitive(LLPCode p_code);
-        void init(LLPCode p_code);
+        void init_primitive(LLPCode p_code);
        void setPCode(const LLPCode pcode);
        const LLVolume *getVolumeConst() const { return mVolumep; }             // HACK for Windoze confusion about ostream operator in LLVolume
@@ -369,8 +391,15 @@ public:
        void setTextureList(LLTextureEntry *listp);
-        inline BOOL                     isAvatar() const;
+        inline BOOL     isAvatar() const;
-        
+        inline BOOL     isSittingAvatar() const;
+        inline BOOL     isSittingAvatarOnGround() const;
+        void setFlags(U32 flags) { mMiscFlags = flags; }
+        void addFlags(U32 flags) { mMiscFlags |= flags; }
+        void removeFlags(U32 flags) { mMiscFlags &= ~flags; }
+        U32 getFlags() const { return mMiscFlags; }
        static const char *pCodeToString(const LLPCode pcode);
        static LLPCode legacyToPCode(const U8 legacy);
        static U8 pCodeToLegacy(const LLPCode pcode);
@@ -388,11 +417,28 @@ protected:
        LLTextureEntry          *mTextureList;          // list of texture GUIDs, scales, offsets
        U8                                      mMaterial;                      // Material code
        U8                                      mNumTEs;                        // # of faces on the primitve   
+        U32                             mMiscFlags;                     // home for misc bools
+        static LLVolumeMgr* sVolumeManager;
 };
 inline BOOL LLPrimitive::isAvatar() const
 {
-        return mPrimitiveCode == LL_PCODE_LEGACY_AVATAR;
+        return ( LL_PCODE_LEGACY_AVATAR == mPrimitiveCode ) ? TRUE : FALSE;
+}
+inline BOOL LLPrimitive::isSittingAvatar() const
+{
+        // this is only used server-side
+        return ( LL_PCODE_LEGACY_AVATAR == mPrimitiveCode 
+                         &&      ((getFlags() & (PRIM_FLAG_SITTING | PRIM_FLAG_SITTING_ON_GROUND)) != 0) ) ? TRUE : FALSE;
+}
+inline BOOL LLPrimitive::isSittingAvatarOnGround() const
+{
+        // this is only used server-side
+        return ( LL_PCODE_LEGACY_AVATAR == mPrimitiveCode 
+                         &&      ((getFlags() & PRIM_FLAG_SITTING_ON_GROUND) != 0) ) ? TRUE : FALSE;
 }
 // static
diff --git a/linden/indra/llprimitive/llprimitive.vcproj b/linden/indra/llprimitive/llprimitive.vcproj
index b04d938..620ace4 100644
--- a/linden/indra/llprimitive/llprimitive.vcproj
+++ b/linden/indra/llprimitive/llprimitive.vcproj
@@ -19,8 +19,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                                AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
+                                AdditionalIncludeDirectories="..\;..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG;LL_CURRENT_HAVOK_VERSION=460"
                                MinimalRebuild="TRUE"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="1"
@@ -64,8 +64,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/Oy-"
-                                AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
+                                AdditionalIncludeDirectories="..\;..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;LL_CURRENT_HAVOK_VERSION=460"
                                RuntimeLibrary="0"
                                StructMemberAlignment="0"
                                ForceConformanceInForLoopScope="TRUE"
@@ -108,8 +108,8 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="/Oy-"
                                Optimization="0"
-                                AdditionalIncludeDirectories="..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include\"
+                                AdditionalIncludeDirectories="..\;..\llxml;..\llprimitive;..\llcommon;..\llmath;..\llmessage;..\..\libraries\i686-win32\include;..\..\libraries\include"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE;LL_CURRENT_HAVOK_VERSION=460"
                                RuntimeLibrary="0"
                                StructMemberAlignment="0"
                                ForceConformanceInForLoopScope="TRUE"
@@ -186,6 +186,9 @@
                                RelativePath=".\llprimitive.h">
                        </File>
                        <File
+                                RelativePath=".\llprimlinkinfo.h">
+                        </File>
+                        <File
                                RelativePath=".\lltextureanim.h">
                        </File>
                        <File
diff --git a/linden/indra/llprimitive/llprimlinkinfo.h b/linden/indra/llprimitive/llprimlinkinfo.h
new file mode 100644
index 0000000..8de5ca0
--- /dev/null
+++ b/linden/indra/llprimitive/llprimlinkinfo.h
@@ -0,0 +1,388 @@
+/** 
+ * @file llprimlinkinfo.h
+ * @author andrew@lindenlab.com
+ * @brief A template for determining which prims in a set are linkable
+ *
+ * $LicenseInfo:firstyear=2007&license=internal$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LL_PRIM_LINK_INFO_H
+#define LL_PRIM_LINK_INFO_H
+// system includes
+#include <iostream>
+#include <map>
+#include <list>
+#include <vector>
+// common includes
+#include "stdtypes.h"
+#include "v3math.h"
+#include "llquaternion.h"
+#include "llsphere.h"
+const F32 MAX_OBJECT_SPAN = 54.f;               // max distance from outside edge of an object to the farthest edge
+const F32 OBJECT_SPAN_BONUS = 2.f;              // infinitesimally small prims can always link up to this distance
+const S32 MAX_PRIMS_PER_OBJECT = 255;
+template < typename DATA_TYPE >
+class LLPrimLinkInfo
+{
+public:
+        LLPrimLinkInfo();
+        LLPrimLinkInfo( DATA_TYPE data, const LLSphere& sphere );
+        ~LLPrimLinkInfo();
+        void set( DATA_TYPE data, const LLSphere& sphere );
+        void append( DATA_TYPE data, const LLSphere& sphere );
+        void getData( std::list< DATA_TYPE >& data_list ) const;
+        F32 getDiameter() const;
+        LLVector3 getCenter() const;
+        // returns 'true' if this info can link with other_info
+        bool canLink( const LLPrimLinkInfo< DATA_TYPE >& other_info );
+        S32 getPrimCount() const { return mDataMap.size(); }
+        void mergeLinkableSet( typename std::list< LLPrimLinkInfo < DATA_TYPE > >& unlinked );
+        void transform(const LLVector3& position, const LLQuaternion& rotation);
+private:
+        // returns number of merges made
+        S32 merge(LLPrimLinkInfo< DATA_TYPE >& other_info);
+        // returns number of collapses made
+        static S32 collapse(typename std::list< LLPrimLinkInfo < DATA_TYPE > >& unlinked );
+        void computeBoundingSphere();
+        // Internal utility to encapsulate the link rules
+        F32 get_max_linkable_span(const LLSphere& first, const LLSphere& second);
+        F32 get_span(const LLSphere& first, const LLSphere& second);
+private:
+        std::map< DATA_TYPE, LLSphere > mDataMap;
+        LLSphere mBoundingSphere;
+};
+template < typename DATA_TYPE >
+LLPrimLinkInfo< DATA_TYPE >::LLPrimLinkInfo()
+:       mBoundingSphere( LLVector3(0.f, 0.f, 0.f), 0.f )
+{
+}
+template < typename DATA_TYPE >
+LLPrimLinkInfo< DATA_TYPE >::LLPrimLinkInfo( DATA_TYPE data, const LLSphere& sphere)
+:       mBoundingSphere(sphere)
+{
+        mDataMap[data] = sphere;
+}
+template < typename DATA_TYPE >
+LLPrimLinkInfo< DATA_TYPE >::~LLPrimLinkInfo()
+{
+        mDataMap.clear();
+}
+template < typename DATA_TYPE >
+void LLPrimLinkInfo< DATA_TYPE>::set( DATA_TYPE data, const LLSphere& sphere )
+{
+        if (!mDataMap.empty())
+        {
+                mDataMap.clear();
+        }
+        mDataMap[data] = sphere;
+        mBoundingSphere = sphere;
+}
+template < typename DATA_TYPE >
+void LLPrimLinkInfo< DATA_TYPE>::append( DATA_TYPE data, const LLSphere& sphere )
+{
+        mDataMap[data] = sphere;
+        if (!mBoundingSphere.contains(sphere))
+        {
+                computeBoundingSphere();
+        }
+}
+template < typename DATA_TYPE >
+void LLPrimLinkInfo< DATA_TYPE >::getData( std::list< DATA_TYPE >& data_list) const
+{
+        typename std::map< DATA_TYPE, LLSphere >::const_iterator map_itr;
+        for (map_itr = mDataMap.begin(); map_itr != mDataMap.end(); ++map_itr)
+        {
+                data_list.push_back(map_itr->first);
+        }
+}
+template < typename DATA_TYPE >
+F32 LLPrimLinkInfo< DATA_TYPE >::getDiameter() const
+{ 
+        return 2.f * mBoundingSphere.getRadius();
+}
+template < typename DATA_TYPE >
+LLVector3 LLPrimLinkInfo< DATA_TYPE >::getCenter() const
+{ 
+        return mBoundingSphere.getCenter(); 
+}
+template < typename DATA_TYPE >
+F32 LLPrimLinkInfo< DATA_TYPE >::get_max_linkable_span(const LLSphere& first, const LLSphere& second)
+{
+        F32 max_span = 3.f * (first.getRadius() + second.getRadius()) + OBJECT_SPAN_BONUS;
+        if (max_span > MAX_OBJECT_SPAN)
+        {
+                max_span = MAX_OBJECT_SPAN;
+        }
+        return max_span;
+}
+template < typename DATA_TYPE >
+F32 LLPrimLinkInfo< DATA_TYPE >::get_span(const LLSphere& first, const LLSphere& second)
+{
+        F32 span = (first.getCenter() - second.getCenter()).length()
+                                + first.getRadius() + second.getRadius();
+        return span;
+}
+// static
+// returns 'true' if this info can link with any part of other_info
+template < typename DATA_TYPE >
+bool LLPrimLinkInfo< DATA_TYPE >::canLink(const LLPrimLinkInfo& other_info)
+{
+        F32 max_span = get_max_linkable_span(mBoundingSphere, other_info.mBoundingSphere);
+        F32 span = get_span(mBoundingSphere, other_info.mBoundingSphere);
+        
+        if (span <= max_span)
+        {
+                // The entire other_info fits inside the max span.
+                return TRUE;
+        }
+        else if (span > max_span + 2.f * other_info.mBoundingSphere.getRadius())
+        {
+                // there is no way any piece of other_info could link with this one
+                return FALSE;
+        }
+        // there may be a piece of other_info that is linkable
+        typename std::map< DATA_TYPE, LLSphere >::const_iterator map_itr;
+        for (map_itr = other_info.mDataMap.begin(); map_itr != other_info.mDataMap.end(); ++map_itr)
+        {
+                const LLSphere& other_sphere = (*map_itr).second;
+                max_span = get_max_linkable_span(mBoundingSphere, other_sphere);
+                span = get_span(mBoundingSphere, other_sphere);
+                if (span <= max_span)
+                {
+                        // found one piece that is linkable
+                        return TRUE;
+                }
+        }
+        return FALSE;
+}
+// merges elements of 'unlinked' 
+// returns number of links made (NOT final prim count, NOR linked prim count)
+// and removes any linkable infos from 'unlinked' 
+template < typename DATA_TYPE >
+void LLPrimLinkInfo< DATA_TYPE >::mergeLinkableSet(std::list< LLPrimLinkInfo< DATA_TYPE > > & unlinked)
+{
+        bool linked_something = true;
+        while (linked_something)
+        {
+                linked_something = false;
+                typename std::list< LLPrimLinkInfo< DATA_TYPE > >::iterator other_itr = unlinked.begin();
+                while ( other_itr != unlinked.end()
+                           && getPrimCount() < MAX_PRIMS_PER_OBJECT )
+                {
+                        S32 merge_count = merge(*other_itr);
+                        if (merge_count > 0)
+                        {
+                                linked_something = true;
+                        }
+                        if (0 == (*other_itr).getPrimCount())
+                        {
+                                unlinked.erase(other_itr++);
+                        }
+                        else
+                        {
+                                ++other_itr;
+                        }
+                }
+                if (!linked_something
+                        && unlinked.size() > 1)
+                {
+                        S32 collapse_count = collapse(unlinked);
+                        if (collapse_count > 0)
+                        {
+                                linked_something = true;
+                        }
+                }
+        }
+}
+// transforms all of the spheres into a new reference frame
+template < typename DATA_TYPE >
+void LLPrimLinkInfo< DATA_TYPE >::transform(const LLVector3& position, const LLQuaternion& rotation)
+{
+        typename std::map< DATA_TYPE, LLSphere >::iterator map_itr;
+        for (map_itr = mDataMap.begin(); map_itr != mDataMap.end(); ++map_itr)
+        {
+                (*map_itr).second.setCenter((*map_itr).second.getCenter() * rotation + position);
+        }
+        mBoundingSphere.setCenter(mBoundingSphere.getCenter() * rotation + position);
+}
+// private
+// returns number of links made
+template < typename DATA_TYPE >
+S32 LLPrimLinkInfo< DATA_TYPE >::merge(LLPrimLinkInfo& other_info)
+{
+        S32 link_count = 0;
+//      F32 other_radius = other_info.mBoundingSphere.getRadius();
+//      other_info.computeBoundingSphere();
+//      if ( other_radius != other_info.mBoundingSphere.getRadius() )
+//      {
+//              llinfos << "Other bounding sphere changed!!" << llendl;
+//      }
+//      F32 this_radius = mBoundingSphere.getRadius();
+//      computeBoundingSphere();
+//      if ( this_radius != mBoundingSphere.getRadius() )
+//      {
+//              llinfos << "This bounding sphere changed!!" << llendl;
+//      }
+        F32 max_span = get_max_linkable_span(mBoundingSphere, other_info.mBoundingSphere);
+        //  F32 center_dist = (mBoundingSphere.getCenter() - other_info.mBoundingSphere.getCenter()).length();
+        //      llinfos << "objects are " << center_dist << "m apart" << llendl;
+        F32 span = get_span(mBoundingSphere, other_info.mBoundingSphere);
+        F32 span_limit = max_span + (2.f * other_info.mBoundingSphere.getRadius());
+        if (span > span_limit)
+        {
+                // there is no way any piece of other_info could link with this one
+                // llinfos << "span too large:  " << span << " vs. " << span_limit << llendl;
+                return 0;
+        }
+        bool completely_linkable = (span <= max_span) ? true : false;
+        typename std::map< DATA_TYPE, LLSphere >::iterator map_itr = other_info.mDataMap.begin();
+        while (map_itr != other_info.mDataMap.end()
+                        && getPrimCount() < MAX_PRIMS_PER_OBJECT )
+        {
+                DATA_TYPE other_data = (*map_itr).first;
+                LLSphere& other_sphere = (*map_itr).second;
+                if (!completely_linkable)
+                {
+                        max_span = get_max_linkable_span(mBoundingSphere, other_sphere);
+        
+                        F32 span = get_span(mBoundingSphere, other_sphere);
+                        if (span > max_span)
+                        {
+                                ++map_itr;
+                                continue;
+                        }
+                }
+                mDataMap[other_data] = other_sphere;
+                ++link_count;
+                if (!mBoundingSphere.contains(other_sphere) )
+                {
+                        computeBoundingSphere();
+                }
+                // remove from the other info
+                other_info.mDataMap.erase(map_itr++);
+        }
+        if (link_count > 0 && other_info.getPrimCount() > 0)
+        {
+                other_info.computeBoundingSphere();
+        }
+        return link_count;
+}
+// links any linkable elements of unlinked
+template < typename DATA_TYPE >
+S32 LLPrimLinkInfo< DATA_TYPE >::collapse(std::list< LLPrimLinkInfo< DATA_TYPE > > & unlinked)
+{ 
+        S32 link_count = 0;
+        bool linked_something = true;
+        while (linked_something)
+        {
+                linked_something = false;
+                typename std::list< LLPrimLinkInfo< DATA_TYPE > >::iterator this_itr = unlinked.begin();
+                typename std::list< LLPrimLinkInfo< DATA_TYPE > >::iterator other_itr = this_itr;
+                ++other_itr;
+                while ( other_itr != unlinked.end() )
+                           
+                {
+                        S32 merge_count = (*this_itr).merge(*other_itr);
+                        if (merge_count > 0)
+                        {
+                                linked_something = true;
+                                link_count += merge_count;
+                        }
+                        if (0 == (*other_itr).getPrimCount())
+                        {
+                                unlinked.erase(other_itr++);
+                        }
+                        else
+                        {
+                                ++other_itr;
+                        }
+                }
+        }
+        return link_count;
+}
+template < typename DATA_TYPE >
+void LLPrimLinkInfo< DATA_TYPE >::computeBoundingSphere()
+{ 
+        std::vector< LLSphere > sphere_list;
+        typename std::map< DATA_TYPE, LLSphere >::const_iterator map_itr;
+        for (map_itr = mDataMap.begin(); map_itr != mDataMap.end(); ++map_itr)
+        {
+                sphere_list.push_back(map_itr->second);
+        }
+        mBoundingSphere = LLSphere::getBoundingSphere(sphere_list);
+}
+#endif
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 9298e8c..53e8c2b 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -47,6 +47,7 @@ F32 LLFontGL::sVertDPI = 96.f;
 F32 LLFontGL::sHorizDPI = 96.f;
 F32 LLFontGL::sScaleX = 1.f;
 F32 LLFontGL::sScaleY = 1.f;
+BOOL LLFontGL::sDisplayFont = TRUE ;
 LLString LLFontGL::sAppDir;
 LLFontGL* LLFontGL::sMonospace = NULL;
@@ -559,6 +560,11 @@ S32 LLFontGL::render(const LLWString &wstr,
                                         BOOL use_embedded,
                                         BOOL use_ellipses) const
 {
+        if(!sDisplayFont) //do not display texts
+        {
+                return wstr.length() ;
+        }
        LLGLEnable tex(GL_TEXTURE_2D);
        if (wstr.empty())
diff --git a/linden/indra/llrender/llfontgl.h b/linden/indra/llrender/llfontgl.h
index ce55385..4df1063 100644
--- a/linden/indra/llrender/llfontgl.h
+++ b/linden/indra/llrender/llfontgl.h
@@ -204,6 +204,8 @@ public:
        static LLString nameFromVAlign(LLFontGL::VAlign align);
        static LLFontGL::VAlign vAlignFromName(const LLString& name);
+        static void setFontDisplay(BOOL flag) { sDisplayFont = flag ; }
 protected:
        struct embedded_data_t
        {
@@ -222,6 +224,7 @@ public:
        static F32 sHorizDPI;
        static F32 sScaleX;
        static F32 sScaleY;
+        static BOOL     sDisplayFont ;
        static LLString sAppDir;                        // For loading fonts
                
        static LLFontGL*        sMonospace;             // medium
@@ -246,7 +249,7 @@ public:
 protected:
        /*virtual*/ BOOL addChar(const llwchar wch);
        static LLString getFontPathLocal();
-        static LLString getFontPathSystem();
+        static LLString getFontPathSystem();    
 protected:
        LLPointer<LLImageRaw>   mRawImageGLp;
diff --git a/linden/indra/llrender/llrendertarget.cpp b/linden/indra/llrender/llrendertarget.cpp
index 974e0a2..d95c8aa 100644
--- a/linden/indra/llrender/llrendertarget.cpp
+++ b/linden/indra/llrender/llrendertarget.cpp
@@ -49,8 +49,9 @@ LLRenderTarget::~LLRenderTarget()
        release();
 }
-void LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, BOOL depth, U32 usage, BOOL force_fbo)
+void LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, BOOL depth, U32 usage, BOOL use_fbo)
 {
+        stop_glerror();
        mResX = resx;
        mResY = resy;
@@ -79,32 +80,45 @@ void LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, BOOL depth, U32
        stop_glerror();
-        if (sUseFBO || force_fbo)
+        if ((sUseFBO || use_fbo) && gGLManager.mHasFramebufferObject)
        {
                if (depth)
                {
-                        glGenRenderbuffersEXT(1, (GLuint *) &mDepth);
+                        stop_glerror();
-                        glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, mDepth);
+                        allocateDepth();
-                        glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT,GL_DEPTH_COMPONENT,mResX,mResY);
+                        stop_glerror();
-                        glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);  
                }
                glGenFramebuffersEXT(1, (GLuint *) &mFBO);
                glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, mFBO);
                if (mDepth)
                {
-                        glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
+                        glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, mUsage, mDepth, 0);
-                                                                                        GL_RENDERBUFFER_EXT, mDepth);   
+                        glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, mUsage, mDepth, 0);
+                        stop_glerror();
                }
                glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
                                                mUsage, mTex, 0);
+                stop_glerror();
                glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+                stop_glerror();
        }
 }
+void LLRenderTarget::allocateDepth()
+{
+        glGenTextures(1, (GLuint *) &mDepth);
+        glBindTexture(mUsage, mDepth);
+        glTexParameteri(mUsage, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        glTexParameteri(mUsage, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glTexImage2D(mUsage, 0, GL_DEPTH24_STENCIL8_EXT, mResX, mResY, 0, GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, NULL);
+}
 void LLRenderTarget::release()
 {
        if (mFBO)
@@ -121,7 +135,7 @@ void LLRenderTarget::release()
        if (mDepth)
        {
-                glDeleteRenderbuffersEXT(1, (GLuint *) &mDepth);
+                glDeleteTextures(1, (GLuint *) &mDepth);
                mDepth = 0;
        }
 }
@@ -141,7 +155,7 @@ void LLRenderTarget::clear()
        U32 mask = GL_COLOR_BUFFER_BIT;
        if (mUseDepth)
        {
-                mask |= GL_DEPTH_BUFFER_BIT;
+                mask |= GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT;
        }
        if (mFBO)
        {
@@ -160,13 +174,34 @@ void LLRenderTarget::bindTexture()
        glBindTexture(mUsage, mTex);
 }
-void LLRenderTarget::flush()
+void LLRenderTarget::bindDepth()
+{
+        glBindTexture(mUsage, mDepth);
+}
+void LLRenderTarget::flush(BOOL fetch_depth)
 {
        gGL.flush();
        if (!mFBO)
        {
                bindTexture();
                glCopyTexSubImage2D(mUsage, 0, 0, 0, 0, 0, mResX, mResY);
+                if (fetch_depth)
+                {
+                        if (!mDepth)
+                        {
+                                allocateDepth();
+                        }
+                        bindDepth();
+                        glCopyTexImage2D(mUsage, 0, GL_DEPTH24_STENCIL8_EXT, 0, 0, mResX, mResY, 0);
+                }
+        }
+        else
+        {
+                glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
        }
 }
diff --git a/linden/indra/llrender/llrendertarget.h b/linden/indra/llrender/llrendertarget.h
index cc36146..918a604 100644
--- a/linden/indra/llrender/llrendertarget.h
+++ b/linden/indra/llrender/llrendertarget.h
@@ -37,7 +37,7 @@
 /*
 SAMPLE USAGE:
-        LLFBOTarget target;
+        LLRenderTarget target;
        ...
@@ -46,7 +46,7 @@
        //render to contents of offscreen buffer
        target.bindTarget();
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        target.clear();
        ... <issue drawing commands> ...
        target.flush();
@@ -71,7 +71,10 @@ public:
        //allocate resources for rendering
        //must be called before use
        //multiple calls will release previously allocated resources
-        void allocate(U32 resx, U32 resy, U32 color_fmt, BOOL depth, U32 usage = GL_TEXTURE_2D, BOOL force_fbo = FALSE);
+        void allocate(U32 resx, U32 resy, U32 color_fmt, BOOL depth, U32 usage = GL_TEXTURE_2D, BOOL use_fbo = TRUE);
+        //allocate a depth texture
+        void allocateDepth();
        //free any allocated resources
        //safe to call redundantly
@@ -80,7 +83,7 @@ public:
        //bind target for rendering
        //applies appropriate viewport
        void bindTarget();
+        
        //clear render targer, clears depth buffer if present,
        //uses scissor rect if in copy-to-texture mode
        void clear();
@@ -88,14 +91,25 @@ public:
        //get applied viewport
        void getViewport(S32* viewport);
+        //get X resolution
+        U32 getWidth() const { return mResX; }
+        //get Y resolution
+        U32 getHeight() const { return mResY; }
        //bind results of render for sampling
        void bindTexture();
+        //bind results of render for sampling depth buffer
+        void bindDepth();
        //flush rendering operations
        //must be called when rendering is complete
        //should be used 1:1 with bindTarget 
        // call bindTarget once, do all your rendering, call flush once
-        void flush();
+        // if fetch_depth is TRUE, every effort will be made to copy the depth buffer into 
+        // the current depth texture.  A depth texture will be allocated if needed.
+        void flush(BOOL fetch_depth = FALSE);
        //Returns TRUE if target is ready to be rendered into.
        //That is, if the target has been allocated with at least
@@ -108,8 +122,11 @@ private:
        U32 mTex;
        U32 mFBO;
        U32 mDepth;
+        U32 mStencil;
        BOOL mUseDepth;
+        BOOL mRenderDepth;
        U32 mUsage;
+        
 };
 #endif
diff --git a/linden/indra/llui/llalertdialog.cpp b/linden/indra/llui/llalertdialog.cpp
index e60ef42..4ca9dc8 100644
--- a/linden/indra/llui/llalertdialog.cpp
+++ b/linden/indra/llui/llalertdialog.cpp
@@ -186,7 +186,7 @@ bool LLAlertDialog::show()
                {
                        mOptionChosen = mDefaultOption;
                        llinfos << "Alert: " << mLabel << llendl;
-                        delete this;
+                        close();
                        return false;
                }
        }
@@ -208,7 +208,7 @@ bool LLAlertDialog::show()
                        case IGNORE_SHOW_AGAIN:
                                break;
                        }
-                        delete this;
+                        close();
                        return false;
                }
        }
@@ -231,7 +231,7 @@ bool LLAlertDialog::show()
                {
                        gFloaterView->bringToFront(iter->second);
                        mUnique = FALSE; // don't remove entry from map on destruction
-                        delete this;
+                        close();
                        return false;
                }
                sUniqueActiveMap[mLabel] = this;
@@ -270,7 +270,7 @@ void LLAlertDialog::createDialog(const std::vector<LLString>* optionsp, S32 defa
        setBackgroundVisible(TRUE);
        setBackgroundOpaque(TRUE);
-        const LLFontGL* font = gResMgr->getRes( font_name );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( font_name );
        const S32 LINE_HEIGHT = llfloor(font->getLineHeight() + 0.99f);
        const S32 EDITOR_HEIGHT = 20;
@@ -399,7 +399,7 @@ void LLAlertDialog::createDialog(const std::vector<LLString>* optionsp, S32 defa
 bool LLAlertDialog::setCheckBox( const LLString& check_title, const LLString& check_control )
 {
-        const LLFontGL* font = gResMgr->getRes( font_name );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( font_name );
        const S32 LINE_HEIGHT = llfloor(font->getLineHeight() + 0.99f);
        
        // Extend dialog for "check next time"
@@ -444,8 +444,23 @@ void LLAlertDialog::setVisible( BOOL visible )
        }
 }
+void LLAlertDialog::onClose(bool app_quitting)
+{
+        LLModalDialog::onClose(app_quitting);
+        handleCallbacks();
+}
 LLAlertDialog::~LLAlertDialog()
 {
+        delete[] mButtonData;
+        if (mUnique)
+        {
+                sUniqueActiveMap.erase(mLabel);
+        }
+}
+void LLAlertDialog::handleCallbacks()
+{
        if (mOptionChosen >= 0)
        {
                if (mTextCallback && mLineEditor)
@@ -465,7 +480,7 @@ LLAlertDialog::~LLAlertDialog()
                                sURLLoader->load(mURL);
                        }
                }
-                
                // Only change warn state if we actually warned.
                if (mCheck
                        && sSettings->getWarning(mIgnoreLabel))
@@ -490,13 +505,7 @@ LLAlertDialog::~LLAlertDialog()
                        }
                }
        }
-        delete[] mButtonData;
-        if (mUnique)
-        {
-                sUniqueActiveMap.erase(mLabel);
-        }
 }
 BOOL LLAlertDialog::hasTitleBar() const
 {
        return (getTitle() != "" && getTitle() != " ")  // has title
@@ -504,16 +513,11 @@ BOOL LLAlertDialog::hasTitleBar() const
                        || isCloseable();
 }
-BOOL LLAlertDialog::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLAlertDialog::handleKeyHere(KEY key, MASK mask )
 {
        if( KEY_RETURN == key && mask == MASK_NONE )
        {
-                // Warning: handleKeyHere may result in the default button
+                LLModalDialog::handleKeyHere( key, mask );
-                // being committed, which will destroy this object.
-                // Everything works, but the call stack will pass through 
-                // the very end of functions that belong to deleted objects.
-                // Should find a less fragile way to do this.
-                LLModalDialog::handleKeyHere( key, mask , called_from_parent );
                return TRUE;
        }
        else if (KEY_RIGHT == key)
@@ -538,7 +542,7 @@ BOOL LLAlertDialog::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent )
        }
        else
        {
-                return LLModalDialog::handleKeyHere( key, mask , called_from_parent );
+                return LLModalDialog::handleKeyHere( key, mask );
        }
 }
@@ -551,16 +555,14 @@ void LLAlertDialog::draw()
                mDefaultBtnTimer.stop();  // prevent this block from being run more than once
                setDefaultBtn(mButtonData[mDefaultOption].mButton);
        }
-        if (getVisible())
-        {
-                LLColor4 shadow_color = LLUI::sColorsGroup->getColor("ColorDropShadow");
-                S32 shadow_lines = LLUI::sConfigGroup->getS32("DropShadowFloater");
-                gl_drop_shadow( 0, getRect().getHeight(), getRect().getWidth(), 0,
+        LLColor4 shadow_color = LLUI::sColorsGroup->getColor("ColorDropShadow");
-                        shadow_color, shadow_lines);
+        S32 shadow_lines = LLUI::sConfigGroup->getS32("DropShadowFloater");
-                LLModalDialog::draw();
+        gl_drop_shadow( 0, getRect().getHeight(), getRect().getWidth(), 0,
-        }
+                shadow_color, shadow_lines);
+        LLModalDialog::draw();
 }
 void LLAlertDialog::setOptionEnabled( S32 option, BOOL enable )
diff --git a/linden/indra/llui/llalertdialog.h b/linden/indra/llui/llalertdialog.h
index 4978d71..8633164 100644
--- a/linden/indra/llui/llalertdialog.h
+++ b/linden/indra/llui/llalertdialog.h
@@ -68,10 +68,11 @@ public:
        LLAlertDialog( const LLAlertDialogTemplate* xml_template, const LLString::format_map_t& args,
                                   alert_callback_t callback = NULL, void *user_data = NULL);
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent );
+        virtual BOOL    handleKeyHere(KEY key, MASK mask );
        virtual void    draw();
        virtual void    setVisible( BOOL visible );
+        virtual void    onClose(bool app_quitting);
        bool                    setCheckBox( const LLString&, const LLString& );        
        void                    setOptionEnabled( S32 option, BOOL enable );
@@ -126,7 +127,9 @@ private:
                                          const LLString& msg, const LLString::format_map_t& args,
                                          const LLString& edit_text);
        
-        virtual ~LLAlertDialog();       // No you can't kill it.  It can only kill itself.
+        virtual ~LLAlertDialog();
+        void handleCallbacks();
+        // No you can't kill it.  It can only kill itself.
        // Does it have a readable title label, or minimize or close buttons?
        BOOL hasTitleBar() const;
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 4af40ff..3ada389 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -50,6 +50,8 @@
 #include "llwindow.h"
 #include "llglimmediate.h"
+static LLRegisterWidget<LLButton> r("button");
 // globals loaded from settings.xml
 S32     LLBUTTON_ORIG_H_PAD     = 6; // Pre-zoomable UI
 S32     LLBUTTON_H_PAD  = 0;
@@ -222,18 +224,6 @@ LLButton::~LLButton()
        }
 }
-// virtual
-EWidgetType LLButton::getWidgetType() const
-{
-        return WIDGET_TYPE_BUTTON;
-}
-// virtual
-LLString LLButton::getWidgetTag() const
-{
-        return LL_BUTTON_TAG;
-}
 // HACK: Committing a button is the same as instantly clicking it.
 // virtual
 void LLButton::onCommit()
@@ -277,10 +267,11 @@ void LLButton::onCommit()
-BOOL LLButton::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent)
+BOOL LLButton::handleUnicodeCharHere(llwchar uni_char)
 {
        BOOL handled = FALSE;
-        if( getVisible() && getEnabled() && !called_from_parent && ' ' == uni_char && !gKeyboard->getKeyRepeated(' '))
+        if(' ' == uni_char 
+                && !gKeyboard->getKeyRepeated(' '))
        {
                if (mIsToggle)
                {
@@ -296,24 +287,21 @@ BOOL LLButton::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent)
        return handled; 
 }
-BOOL LLButton::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLButton::handleKeyHere(KEY key, MASK mask )
 {
        BOOL handled = FALSE;
-        if( getVisible() && getEnabled() && !called_from_parent )
+        if( mCommitOnReturn && KEY_RETURN == key && mask == MASK_NONE && !gKeyboard->getKeyRepeated(key))
        {
-                if( mCommitOnReturn && KEY_RETURN == key && mask == MASK_NONE && !gKeyboard->getKeyRepeated(key))
+                if (mIsToggle)
                {
-                        if (mIsToggle)
+                        toggleState();
-                        {
+                }
-                                toggleState();
-                        }
-                        handled = TRUE;
+                handled = TRUE;
-                        if (mClickedCallback)
+                if (mClickedCallback)
-                        {
+                {
-                                (*mClickedCallback)( mCallbackUserData );
+                        (*mClickedCallback)( mCallbackUserData );
-                        }
                }
        }
        return handled;
@@ -391,8 +379,6 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask)
 BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
 {
-        BOOL    handled = FALSE;
        LLMouseHandler* other_captor = gFocusMgr.getMouseCapture();
        mNeedsHighlight = other_captor == NULL || 
                                other_captor == this ||
@@ -409,358 +395,333 @@ BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
        }
        // We only handle the click if the click both started and ended within us
-        if( hasMouseCapture() )
+        getWindow()->setCursor(UI_CURSOR_ARROW);
-        {
+        lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
-                handled = TRUE;
-        }
-        else if( getVisible() )
-        {
-                // Opaque
-                handled = TRUE;
-        }
-        if( handled )
+        return TRUE;
-        {
-                getWindow()->setCursor(UI_CURSOR_ARROW);
-                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;              
-        }
-        return handled;
 }
 // virtual
 void LLButton::draw()
 {
-        if( getVisible() ) 
+        BOOL flash = FALSE;
+        if( mFlashing )
        {
-                BOOL flash = FALSE;
+                F32 elapsed = mFlashingTimer.getElapsedTimeF32();
-                if( mFlashing )
+                S32 flash_count = S32(elapsed * LLUI::sConfigGroup->getF32("ButtonFlashRate") * 2.f);
-                {
+                // flash on or off?
-                        F32 elapsed = mFlashingTimer.getElapsedTimeF32();
+                flash = (flash_count % 2 == 0) || flash_count > S32((F32)LLUI::sConfigGroup->getS32("ButtonFlashCount") * 2.f);
-                        S32 flash_count = S32(elapsed * LLUI::sConfigGroup->getF32("ButtonFlashRate") * 2.f);
+        }
-                        // flash on or off?
-                        flash = (flash_count % 2 == 0) || flash_count > (F32)LLUI::sConfigGroup->getS32("ButtonFlashCount");
-                }
-                BOOL pressed_by_keyboard = FALSE;
+        BOOL pressed_by_keyboard = FALSE;
-                if (hasFocus())
+        if (hasFocus())
-                {
+        {
-                        pressed_by_keyboard = gKeyboard->getKeyDown(' ') || (mCommitOnReturn && gKeyboard->getKeyDown(KEY_RETURN));
+                pressed_by_keyboard = gKeyboard->getKeyDown(' ') || (mCommitOnReturn && gKeyboard->getKeyDown(KEY_RETURN));
-                }
+        }
-                // Unselected image assignments
+        // Unselected image assignments
-                S32 local_mouse_x;
+        S32 local_mouse_x;
-                S32 local_mouse_y;
+        S32 local_mouse_y;
-                LLCoordWindow cursor_pos_window;
+        LLCoordWindow cursor_pos_window;
-                getWindow()->getCursorPosition(&cursor_pos_window);
+        getWindow()->getCursorPosition(&cursor_pos_window);
-                LLCoordGL cursor_pos_gl;
+        LLCoordGL cursor_pos_gl;
-                getWindow()->convertCoords(cursor_pos_window, &cursor_pos_gl);
+        getWindow()->convertCoords(cursor_pos_window, &cursor_pos_gl);
-                cursor_pos_gl.mX = llround((F32)cursor_pos_gl.mX / LLUI::sGLScaleFactor.mV[VX]);
+        cursor_pos_gl.mX = llround((F32)cursor_pos_gl.mX / LLUI::sGLScaleFactor.mV[VX]);
-                cursor_pos_gl.mY = llround((F32)cursor_pos_gl.mY / LLUI::sGLScaleFactor.mV[VY]);
+        cursor_pos_gl.mY = llround((F32)cursor_pos_gl.mY / LLUI::sGLScaleFactor.mV[VY]);
-                screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, &local_mouse_x, &local_mouse_y);
+        screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, &local_mouse_x, &local_mouse_y);
-                BOOL pressed = pressed_by_keyboard 
+        BOOL pressed = pressed_by_keyboard 
-                                                || (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y)) 
+                                        || (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y)) 
-                                                || mToggleState;
+                                        || mToggleState;
-                
+        
-                BOOL use_glow_effect = FALSE;
+        BOOL use_glow_effect = FALSE;
-                if ( mNeedsHighlight || flash )
+        if ( mNeedsHighlight || flash )
+        {
+                if (pressed)
                {
-                        if (pressed)
+                        if (mImageHoverSelected)
                        {
-                                if (mImageHoverSelected)
+                                mImagep = mImageHoverSelected;
-                                {
-                                        mImagep = mImageHoverSelected;
-                                }
-                                else
-                                {
-                                        mImagep = mImageSelected;
-                                        use_glow_effect = TRUE;
-                                }
                        }
                        else
                        {
-                                if (mImageHoverUnselected)
+                                mImagep = mImageSelected;
-                                {
+                                use_glow_effect = TRUE;
-                                        mImagep = mImageHoverUnselected;
-                                }
-                                else
-                                {
-                                        mImagep = mImageUnselected;
-                                        use_glow_effect = TRUE;
-                                }
                        }
                }
-                else if ( pressed )
-                {
-                        mImagep = mImageSelected;
-                }
                else
                {
-                        mImagep = mImageUnselected;
+                        if (mImageHoverUnselected)
+                        {
+                                mImagep = mImageHoverUnselected;
+                        }
+                        else
+                        {
+                                mImagep = mImageUnselected;
+                                use_glow_effect = TRUE;
+                        }
                }
+        }
+        else if ( pressed )
+        {
+                mImagep = mImageSelected;
+        }
+        else
+        {
+                mImagep = mImageUnselected;
+        }
-                // Override if more data is available
+        // Override if more data is available
-                // HACK: Use gray checked state to mean either:
+        // HACK: Use gray checked state to mean either:
-                //   enabled and tentative
+        //   enabled and tentative
-                // or
+        // or
-                //   disabled but checked
+        //   disabled but checked
-                if (!mImageDisabledSelected.isNull() && ( (getEnabled() && getTentative()) || (!getEnabled() && pressed ) ) )
+        if (!mImageDisabledSelected.isNull() 
-                {
+                && 
-                        mImagep = mImageDisabledSelected;
+                        ( (getEnabled() && getTentative()) 
-                }
+                        || (!getEnabled() && pressed ) ) )
-                else if (!mImageDisabled.isNull() && !getEnabled() && !pressed)
+        {
-                {
+                mImagep = mImageDisabledSelected;
-                        mImagep = mImageDisabled;
+        }
-                }
+        else if (!mImageDisabled.isNull() 
+                && !getEnabled() 
+                && !pressed)
+        {
+                mImagep = mImageDisabled;
+        }
-                if (mNeedsHighlight && !mImagep)
+        if (mNeedsHighlight && !mImagep)
-                {
+        {
-                        use_glow_effect = TRUE;
+                use_glow_effect = TRUE;
-                }
+        }
-                // Figure out appropriate color for the text
+        // Figure out appropriate color for the text
-                LLColor4 label_color;
+        LLColor4 label_color;
-                // label changes when button state changes, not when pressed
+        // label changes when button state changes, not when pressed
-                if ( getEnabled() )
+        if ( getEnabled() )
+        {
+                if ( mToggleState )
                {
-                        if ( mToggleState )
+                        label_color = mSelectedLabelColor;
-                        {
-                                label_color = mSelectedLabelColor;
-                        }
-                        else
-                        {
-                                label_color = mUnselectedLabelColor;
-                        }
                }
                else
                {
-                        if ( mToggleState )
+                        label_color = mUnselectedLabelColor;
-                        {
-                                label_color = mDisabledSelectedLabelColor;
-                        }
-                        else
-                        {
-                                label_color = mDisabledLabelColor;
-                        }
                }
+        }
-                // Unselected label assignments
+        else
-                LLWString label;
+        {
+                if ( mToggleState )
-                if( mToggleState )
                {
-                        if( getEnabled() || mDisabledSelectedLabel.empty() )
+                        label_color = mDisabledSelectedLabelColor;
-                        {
-                                label = mSelectedLabel;
-                        }
-                        else
-                        {
-                                label = mDisabledSelectedLabel;
-                        }
                }
                else
                {
-                        if( getEnabled() || mDisabledLabel.empty() )
+                        label_color = mDisabledLabelColor;
-                        {
-                                label = mUnselectedLabel;
-                        }
-                        else
-                        {
-                                label = mDisabledLabel;
-                        }
                }
-                
+        }
-                // draw default button border
-                if (getEnabled() && mBorderEnabled && gFocusMgr.getAppHasFocus()) // because we're the default button in a panel
+        // Unselected label assignments
+        LLWString label;
+        if( mToggleState )
+        {
+                if( getEnabled() || mDisabledSelectedLabel.empty() )
                {
-                        drawBorder(LLUI::sColorsGroup->getColor( "ButtonBorderColor" ), BORDER_SIZE);
+                        label = mSelectedLabel;
                }
+                else
-                // overlay with keyboard focus border
-                if (hasFocus())
                {
-                        F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
+                        label = mDisabledSelectedLabel;
-                        drawBorder(gFocusMgr.getFocusColor(), llround(lerp(1.f, 3.f, lerp_amt)));
                }
-                
+        }
-                if (use_glow_effect)
+        else
+        {
+                if( getEnabled() || mDisabledLabel.empty() )
                {
-                        mCurGlowStrength = lerp(mCurGlowStrength, mHoverGlowStrength, LLCriticalDamp::getInterpolant(0.05f));
+                        label = mUnselectedLabel;
                }
                else
                {
-                        mCurGlowStrength = lerp(mCurGlowStrength, 0.f, LLCriticalDamp::getInterpolant(0.05f));
+                        label = mDisabledLabel;
                }
+        }
-                // Draw button image, if available.
+        // overlay with keyboard focus border
-                // Otherwise draw basic rectangular button.
+        if (hasFocus())
-                if( mImagep.notNull() && !mScaleImage)
+        {
+                F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
+                drawBorder(gFocusMgr.getFocusColor(), llround(lerp(1.f, 3.f, lerp_amt)));
+        }
+        
+        if (use_glow_effect)
+        {
+                mCurGlowStrength = lerp(mCurGlowStrength, mHoverGlowStrength, LLCriticalDamp::getInterpolant(0.05f));
+        }
+        else
+        {
+                mCurGlowStrength = lerp(mCurGlowStrength, 0.f, LLCriticalDamp::getInterpolant(0.05f));
+        }
+        // Draw button image, if available.
+        // Otherwise draw basic rectangular button.
+        if (mImagep.notNull())
+        {
+                if ( mScaleImage)
                {
-                        mImagep->draw(0, 0, getEnabled() ? mImageColor : mDisabledImageColor );
+                        mImagep->draw(getLocalRect(), getEnabled() ? mImageColor : mDisabledImageColor  );
                        if (mCurGlowStrength > 0.01f)
                        {
-                                gGL.blendFunc(GL_SRC_ALPHA, GL_ONE);
+                                glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-                                mImagep->drawSolid(0, 0, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
+                                mImagep->drawSolid(0, 0, getRect().getWidth(), getRect().getHeight(), LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
-                                gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                        }
                }
                else
-                if ( mImagep.notNull() && mScaleImage)
                {
-                        mImagep->draw(0, 0, getRect().getWidth(), getRect().getHeight(), getEnabled() ? mImageColor : mDisabledImageColor  );
+                        mImagep->draw(0, 0, getEnabled() ? mImageColor : mDisabledImageColor );
                        if (mCurGlowStrength > 0.01f)
                        {
-                                gGL.blendFunc(GL_SRC_ALPHA, GL_ONE);
+                                glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-                                mImagep->drawSolid(0, 0, getRect().getWidth(), getRect().getHeight(), LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
+                                mImagep->drawSolid(0, 0, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
-                                gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                        }
                }
-                else
+        }
-                {
+        else
-                        // no image
+        {
-                        llwarns << "No image for button " << getName() << llendl;
+                // no image
-                        // draw it in pink so we can find it
+                llwarns << "No image for button " << getName() << llendl;
-                        gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, LLColor4::pink1, FALSE);
+                // draw it in pink so we can find it
-                }
+                gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, LLColor4::pink1, FALSE);
+        }
-                // let overlay image and text play well together
-                S32 text_left = mLeftHPad;
-                S32 text_right = getRect().getWidth() - mRightHPad;
-                S32 text_width = getRect().getWidth() - mLeftHPad - mRightHPad;
-                // draw overlay image
-                if (mImageOverlay.notNull())
-                {
-                        // get max width and height (discard level 0)
-                        S32 overlay_width = mImageOverlay->getWidth();
-                        S32 overlay_height = mImageOverlay->getHeight();
-                        F32 scale_factor = llmin((F32)getRect().getWidth() / (F32)overlay_width, (F32)getRect().getHeight() / (F32)overlay_height, 1.f);
+        // let overlay image and text play well together
-                        overlay_width = llround((F32)overlay_width * scale_factor);
+        S32 text_left = mLeftHPad;
-                        overlay_height = llround((F32)overlay_height * scale_factor);
+        S32 text_right = getRect().getWidth() - mRightHPad;
+        S32 text_width = getRect().getWidth() - mLeftHPad - mRightHPad;
-                        S32 center_x = getLocalRect().getCenterX();
+        // draw overlay image
-                        S32 center_y = getLocalRect().getCenterY();
+        if (mImageOverlay.notNull())
+        {
+                // get max width and height (discard level 0)
+                S32 overlay_width = mImageOverlay->getWidth();
+                S32 overlay_height = mImageOverlay->getHeight();
-                        //FUGLY HACK FOR "DEPRESSED" BUTTONS
+                F32 scale_factor = llmin((F32)getRect().getWidth() / (F32)overlay_width, (F32)getRect().getHeight() / (F32)overlay_height, 1.f);
-                        if (pressed)
+                overlay_width = llround((F32)overlay_width * scale_factor);
-                        {
+                overlay_height = llround((F32)overlay_height * scale_factor);
-                                center_y--;
-                                center_x++;
-                        }
-                        // fade out overlay images on disabled buttons
+                S32 center_x = getLocalRect().getCenterX();
-                        LLColor4 overlay_color = mImageOverlayColor;
+                S32 center_y = getLocalRect().getCenterY();
-                        if (!getEnabled())
-                        {
-                                overlay_color.mV[VALPHA] = 0.5f;
-                        }
-                        switch(mImageOverlayAlignment)
+                //FUGLY HACK FOR "DEPRESSED" BUTTONS
-                        {
+                if (pressed)
-                        case LLFontGL::LEFT:
+                {
-                                text_left += overlay_width + 1;
+                        center_y--;
-                                text_width -= overlay_width + 1;
+                        center_x++;
-                                mImageOverlay->draw(
-                                        mLeftHPad, 
-                                        center_y - (overlay_height / 2), 
-                                        overlay_width, 
-                                        overlay_height, 
-                                        overlay_color);
-                                break;
-                        case LLFontGL::HCENTER:
-                                mImageOverlay->draw(
-                                        center_x - (overlay_width / 2), 
-                                        center_y - (overlay_height / 2), 
-                                        overlay_width, 
-                                        overlay_height, 
-                                        overlay_color);
-                                break;
-                        case LLFontGL::RIGHT:
-                                text_right -= overlay_width + 1;                                
-                                text_width -= overlay_width + 1;
-                                mImageOverlay->draw(
-                                        getRect().getWidth() - mRightHPad - overlay_width, 
-                                        center_y - (overlay_height / 2), 
-                                        overlay_width, 
-                                        overlay_height, 
-                                        overlay_color);
-                                break;
-                        default:
-                                // draw nothing
-                                break;
-                        }
                }
-                // Draw label
+                // fade out overlay images on disabled buttons
-                if( !label.empty() )
+                LLColor4 overlay_color = mImageOverlayColor;
+                if (!getEnabled())
                {
-                        LLWString::trim(label);
+                        overlay_color.mV[VALPHA] = 0.5f;
+                }
-                        S32 x;
+                switch(mImageOverlayAlignment)
-                        switch( mHAlign )
+                {
-                        {
+                case LLFontGL::LEFT:
-                        case LLFontGL::RIGHT:
+                        text_left += overlay_width + 1;
-                                x = text_right;
+                        text_width -= overlay_width + 1;
-                                break;
+                        mImageOverlay->draw(
-                        case LLFontGL::HCENTER:
+                                mLeftHPad, 
-                                x = getRect().getWidth() / 2;
+                                center_y - (overlay_height / 2), 
-                                break;
+                                overlay_width, 
-                        case LLFontGL::LEFT:
+                                overlay_height, 
-                        default:
+                                overlay_color);
-                                x = text_left;
+                        break;
-                                break;
+                case LLFontGL::HCENTER:
-                        }
+                        mImageOverlay->draw(
+                                center_x - (overlay_width / 2), 
+                                center_y - (overlay_height / 2), 
+                                overlay_width, 
+                                overlay_height, 
+                                overlay_color);
+                        break;
+                case LLFontGL::RIGHT:
+                        text_right -= overlay_width + 1;                                
+                        text_width -= overlay_width + 1;
+                        mImageOverlay->draw(
+                                getRect().getWidth() - mRightHPad - overlay_width, 
+                                center_y - (overlay_height / 2), 
+                                overlay_width, 
+                                overlay_height, 
+                                overlay_color);
+                        break;
+                default:
+                        // draw nothing
+                        break;
+                }
+        }
-                        S32 y_offset = 2 + (getRect().getHeight() - 20)/2;
+        // Draw label
-                
+        if( !label.empty() )
-                        if (pressed)
+        {
-                        {
+                LLWString::trim(label);
-                                y_offset--;
-                                x++;
-                        }
-                        mGLFont->render(label, 0, (F32)x, (F32)(LLBUTTON_V_PAD + y_offset), 
+                S32 x;
-                                label_color,
+                switch( mHAlign )
-                                mHAlign, LLFontGL::BOTTOM,
+                {
-                                mDropShadowedText ? LLFontGL::DROP_SHADOW_SOFT : LLFontGL::NORMAL,
+                case LLFontGL::RIGHT:
-                                U32_MAX, text_width,
+                        x = text_right;
-                                NULL, FALSE, FALSE);
+                        break;
+                case LLFontGL::HCENTER:
+                        x = getRect().getWidth() / 2;
+                        break;
+                case LLFontGL::LEFT:
+                default:
+                        x = text_left;
+                        break;
                }
-                if (sDebugRects 
+                S32 y_offset = 2 + (getRect().getHeight() - 20)/2;
-                        || (LLView::sEditingUI && this == LLView::sEditingUIView))
+        
+                if (pressed)
                {
-                        drawDebugRect();
+                        y_offset--;
+                        x++;
                }
+                mGLFont->render(label, 0, (F32)x, (F32)(LLBUTTON_V_PAD + y_offset), 
+                        label_color,
+                        mHAlign, LLFontGL::BOTTOM,
+                        mDropShadowedText ? LLFontGL::DROP_SHADOW_SOFT : LLFontGL::NORMAL,
+                        U32_MAX, text_width,
+                        NULL, FALSE, FALSE);
        }
+        if (sDebugRects 
+                || (LLView::sEditingUI && this == LLView::sEditingUIView))
+        {
+                drawDebugRect();
+        }
        // reset hover status for next frame
        mNeedsHighlight = FALSE;
 }
 void LLButton::drawBorder(const LLColor4& color, S32 size)
 {
-        S32 left = -size;
-        S32 top = getRect().getHeight() + size;
-        S32 right = getRect().getWidth() + size;
-        S32 bottom = -size;
-        if (mImagep.isNull())
-        {
-                gl_rect_2d(left, top, right, bottom, color, FALSE);
-                return;
-        }
        if (mScaleImage)
        {
-                mImagep->drawSolid(left, bottom, right-left, top-bottom, color);
+                mImagep->drawBorder(getLocalRect(), color, size);
        }
        else
        {
-                mImagep->drawSolid(left, bottom, mImagep->getWidth() + size * 2, mImagep->getHeight() + size * 2, color);
+                mImagep->drawBorder(0, 0, color, size);
        }
 }
@@ -778,9 +739,8 @@ void LLButton::setToggleState(BOOL b)
 {
        if( b != mToggleState )
        {
-                mToggleState = b;
+                setControlValue(b); // will fire LLControlVariable callbacks (if any)
-                LLValueChangedEvent *evt = new LLValueChangedEvent(this, mToggleState);
+                mToggleState = b; // may or may not be redundant
-                fireEvent(evt, "");
        }
 }
@@ -924,7 +884,7 @@ void LLButton::setImageOverlay(const LLString &image_name, LLFontGL::HAlign alig
        }
        else
        {
-                mImageOverlay = LLUI::getUIImageByName(image_name);
+                mImageOverlay = LLUI::getUIImage(image_name);
                mImageOverlayAlignment = alignment;
                mImageOverlayColor = color;
        }
@@ -957,37 +917,37 @@ S32 round_up(S32 grid, S32 value)
 void                    LLButton::setImageUnselected(const LLString &image_name)
 {       
-        setImageUnselected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
+        setImageUnselected(LLUI::getUIImage(image_name));
        mImageUnselectedName = image_name;
 }
 void                    LLButton::setImageSelected(const LLString &image_name)
 {       
-        setImageSelected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
+        setImageSelected(LLUI::getUIImage(image_name));
        mImageSelectedName = image_name;
 }
 void                    LLButton::setImageHoverSelected(const LLString &image_name)
 {
-        setImageHoverSelected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
+        setImageHoverSelected(LLUI::getUIImage(image_name));
        mImageHoverSelectedName = image_name;
 }
 void                    LLButton::setImageHoverUnselected(const LLString &image_name)
 {
-        setImageHoverUnselected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
+        setImageHoverUnselected(LLUI::getUIImage(image_name));
        mImageHoverUnselectedName = image_name;
 }
 void                    LLButton::setImageDisabled(const LLString &image_name)
 {
-        setImageDisabled(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
+        setImageDisabled(LLUI::getUIImage(image_name));
        mImageDisabledName = image_name;
 }
 void                    LLButton::setImageDisabledSelected(const LLString &image_name)
 {
-        setImageDisabledSelected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
+        setImageDisabledSelected(LLUI::getUIImage(image_name));
        mImageDisabledSelectedName = image_name;
 }
@@ -1038,7 +998,7 @@ void clicked_help(void* data)
                return;
        }
        
-        LLUI::sHtmlHelp->show(self->getHelpURL(), "");
+        LLUI::sHtmlHelp->show(self->getHelpURL());
 }
 // static
diff --git a/linden/indra/llui/llbutton.h b/linden/indra/llui/llbutton.h
index 18f4e07..a101a3c 100644
--- a/linden/indra/llui/llbutton.h
+++ b/linden/indra/llui/llbutton.h
@@ -87,16 +87,15 @@ public:
        virtual ~LLButton();
        void init(void (*click_callback)(void*), void *callback_data, const LLFontGL* font, const LLString& control_name);
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        
        void                    addImageAttributeToXML(LLXMLNodePtr node, const LLString& imageName,
                                                                                const LLUUID&   imageID,const LLString& xmlTagName) const;
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-        virtual BOOL    handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+        virtual BOOL    handleUnicodeCharHere(llwchar uni_char);
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleKeyHere(KEY key, MASK mask);
        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);
@@ -104,7 +103,6 @@ public:
        virtual void    onMouseCaptureLost();
-        // HACK: "committing" a button is the same as clicking on it.
        virtual void    onCommit();
        void                    setUnselectedLabelColor( const LLColor4& c )            { mUnselectedLabelColor = c; }
diff --git a/linden/indra/llui/llcheckboxctrl.cpp b/linden/indra/llui/llcheckboxctrl.cpp
index ecb6342..33de4da 100644
--- a/linden/indra/llui/llcheckboxctrl.cpp
+++ b/linden/indra/llui/llcheckboxctrl.cpp
@@ -45,10 +45,11 @@
 #include "llfontgl.h"
 #include "lltextbox.h"
 #include "llkeyboard.h"
-#include "llviewborder.h"
 const U32 MAX_STRING_LENGTH = 10;
+static LLRegisterWidget<LLCheckBoxCtrl> r("check_box");
 
 LLCheckBoxCtrl::LLCheckBoxCtrl(const LLString& name, const LLRect& rect, 
                                                            const LLString& label, 
diff --git a/linden/indra/llui/llcheckboxctrl.h b/linden/indra/llui/llcheckboxctrl.h
index 6df0e77..6518272 100644
--- a/linden/indra/llui/llcheckboxctrl.h
+++ b/linden/indra/llui/llcheckboxctrl.h
@@ -75,8 +75,7 @@ public:
        virtual ~LLCheckBoxCtrl();
        // LLView interface
-        virtual EWidgetType getWidgetType() const       { return WIDGET_TYPE_CHECKBOX; }
-        virtual LLString getWidgetTag() const { return LL_CHECK_BOX_CTRL_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index c486042..0523a11 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -57,6 +57,8 @@ S32 LLCOMBOBOX_HEIGHT = 0;
 S32 LLCOMBOBOX_WIDTH = 0;
 S32 MAX_COMBO_WIDTH = 500;
+static LLRegisterWidget<LLComboBox> r1("combo_box");
 LLComboBox::LLComboBox( const LLString& name, const LLRect &rect, const LLString& label,
        void (*commit_callback)(LLUICtrl*,void*),
        void *callback_userdata
@@ -74,9 +76,10 @@ LLComboBox::LLComboBox(	const LLString& name, const LLRect &rect, const LLString
 {
        // Always use text box 
        // Text label button
-        mButton = new LLButton("comboxbox button",
+        mButton = new LLButton(label,
-                                                                 LLRect(), label, NULL, LLString::null,
+                                                                LLRect(), 
-                                                                 NULL, this);
+                                                                LLString::null,
+                                                                NULL, this);
        mButton->setImageUnselected("square_btn_32x128.tga");
        mButton->setImageSelected("square_btn_selected_32x128.tga");
        mButton->setImageDisabled("square_btn_32x128.tga");
@@ -99,13 +102,7 @@ LLComboBox::LLComboBox(	const LLString& name, const LLRect &rect, const LLString
        mList->setCommitOnKeyboardMovement(FALSE);
        addChild(mList);
-        LLRect border_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
+        mArrowImage = LLUI::sImageProvider->getUIImage("combobox_arrow.tga");
-        mBorder = new LLViewBorder( "combo border", border_rect );
-        addChild( mBorder );
-        mBorder->setFollowsAll();
-        LLUUID arrow_image_id( LLUI::sAssetsGroup->getString("combobox_arrow.tga") );
-        mArrowImage = LLUI::sImageProvider->getImageByID(arrow_image_id);
        mButton->setImageOverlay("combobox_arrow.tga", LLFontGL::RIGHT);
        updateLayout();
@@ -447,7 +444,7 @@ void LLComboBox::setButtonVisible(BOOL visible)
                LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
                if (visible)
                {
-                        text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth(0)) + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
+                        text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth()) + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
                }
                //mTextEntry->setRect(text_entry_rect);
                mTextEntry->reshape(text_entry_rect.getWidth(), text_entry_rect.getHeight(), TRUE);
@@ -456,15 +453,10 @@ void LLComboBox::setButtonVisible(BOOL visible)
 void LLComboBox::draw()
 {
-        if( getVisible() )
+        mButton->setEnabled(getEnabled() /*&& !mList->isEmpty()*/);
-        {
-                mBorder->setKeyboardFocusHighlight(hasFocus());
-                mButton->setEnabled(getEnabled() /*&& !mList->isEmpty()*/);
-                // Draw children normally
+        // Draw children normally
-                LLUICtrl::draw();
+        LLUICtrl::draw();
-        }
 }
 BOOL LLComboBox::setCurrentByIndex( S32 index )
@@ -494,14 +486,14 @@ void LLComboBox::updateLayout()
        if (mAllowTextEntry)
        {
                S32 shadow_size = LLUI::sConfigGroup->getS32("DropShadowButton");
-                mButton->setRect(LLRect( getRect().getWidth() - llmax(8,mArrowImage->getWidth(0)) - 2 * shadow_size,
+                mButton->setRect(LLRect( getRect().getWidth() - llmax(8,mArrowImage->getWidth()) - 2 * shadow_size,
                                                                rect.mTop, rect.mRight, rect.mBottom));
                mButton->setTabStop(FALSE);
                if (!mTextEntry)
                {
                        LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
-                        text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth(0)) + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
+                        text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth()) + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
                        // clear label on button
                        LLString cur_label = mButton->getLabelSelected();
                        mTextEntry = new LLLineEditor("combo_text_entry",
@@ -512,11 +504,7 @@ void LLComboBox::updateLayout()
                                                                                onTextCommit,
                                                                                onTextEntry,
                                                                                NULL,
-                                                                                this,
+                                                                                this);
-                                                                                NULL,           // prevalidate func
-                                                                                LLViewBorder::BEVEL_NONE,
-                                                                                LLViewBorder::STYLE_LINE,
-                                                                                0);     // no border
                        mTextEntry->setSelectAllonFocusReceived(TRUE);
                        mTextEntry->setHandleEditKeysDirectly(TRUE);
                        mTextEntry->setCommitOnFocusLost(FALSE);
@@ -761,7 +749,7 @@ BOOL LLComboBox::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_
                tool_tip = getToolTip();
                if (tool_tip.empty())
                {
-                        tool_tip = getValue().asString();
+                        tool_tip = getSelectedItemLabel();
                }
        }
        
@@ -780,10 +768,10 @@ BOOL LLComboBox::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_
        return TRUE;
 }
-BOOL LLComboBox::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLComboBox::handleKeyHere(KEY key, MASK mask)
 {
        BOOL result = FALSE;
-        if (gFocusMgr.childHasKeyboardFocus(this))
+        if (hasFocus())
        {
                //give list a chance to pop up and handle key
                LLScrollListItem* last_selected_item = mList->getLastSelectedItem();
@@ -792,7 +780,7 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
                        // highlight the original selection before potentially selecting a new item
                        mList->highlightNthItem(mList->getItemIndex(last_selected_item));
                }
-                result = mList->handleKeyHere(key, mask, FALSE);
+                result = mList->handleKeyHere(key, mask);
                // if selection has changed, pop open list
                if (mList->getLastSelectedItem() != last_selected_item)
                {
@@ -802,7 +790,7 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
        return result;
 }
-BOOL LLComboBox::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent)
+BOOL LLComboBox::handleUnicodeCharHere(llwchar uni_char)
 {
        BOOL result = FALSE;
        if (gFocusMgr.childHasKeyboardFocus(this))
@@ -816,7 +804,7 @@ BOOL LLComboBox::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent
                                // highlight the original selection before potentially selecting a new item
                                mList->highlightNthItem(mList->getItemIndex(last_selected_item));
                        }
-                        result = mList->handleUnicodeCharHere(uni_char, called_from_parent);
+                        result = mList->handleUnicodeCharHere(uni_char);
                        if (mList->getLastSelectedItem() != last_selected_item)
                        {
                                showList();
@@ -1095,6 +1083,8 @@ BOOL LLComboBox::selectItemRange( S32 first, S32 last )
 // LLFlyoutButton
 //
+static LLRegisterWidget<LLFlyoutButton> r2("flyout_button");
 const S32 FLYOUT_BUTTON_ARROW_WIDTH = 24;
 LLFlyoutButton::LLFlyoutButton(
@@ -1109,9 +1099,8 @@ LLFlyoutButton::LLFlyoutButton(
 {
        // Always use text box 
        // Text label button
-        mActionButton = new LLButton("flyout_button_main",
+        mActionButton = new LLButton(label,
-                                                                 LLRect(), label, NULL, LLString::null,
+                                        LLRect(), LLString::null, NULL, this);
-                                                                 NULL, this);
        mActionButton->setScaleImage(TRUE);
        mActionButton->setClickedCallback(onActionButtonClick);
@@ -1120,24 +1109,24 @@ LLFlyoutButton::LLFlyoutButton(
        mActionButton->setLabel(label);
        addChild(mActionButton);
-        mActionButtonImage = LLUI::getUIImageByName("flyout_btn_left.tga");
+        mActionButtonImage = LLUI::getUIImage("flyout_btn_left.tga");
-        mExpanderButtonImage = LLUI::getUIImageByName("flyout_btn_right.tga");
+        mExpanderButtonImage = LLUI::getUIImage("flyout_btn_right.tga");
-        mActionButtonImageSelected = LLUI::getUIImageByName("flyout_btn_left_selected.tga");
+        mActionButtonImageSelected = LLUI::getUIImage("flyout_btn_left_selected.tga");
-        mExpanderButtonImageSelected = LLUI::getUIImageByName("flyout_btn_right_selected.tga");
+        mExpanderButtonImageSelected = LLUI::getUIImage("flyout_btn_right_selected.tga");
+        mActionButtonImageDisabled = LLUI::getUIImage("flyout_btn_left_disabled.tga");
+        mExpanderButtonImageDisabled = LLUI::getUIImage("flyout_btn_right_disabled.tga");
        mActionButton->setImageSelected(mActionButtonImageSelected);
        mActionButton->setImageUnselected(mActionButtonImage);
-        mActionButton->setImageDisabled(LLPointer<LLUIImage>(NULL));
+        mActionButton->setImageDisabled(mActionButtonImageDisabled);
        mActionButton->setImageDisabledSelected(LLPointer<LLUIImage>(NULL));
        mButton->setImageSelected(mExpanderButtonImageSelected);
        mButton->setImageUnselected(mExpanderButtonImage);
-        mButton->setImageDisabled(LLPointer<LLUIImage>(NULL));
+        mButton->setImageDisabled(mExpanderButtonImageDisabled);
        mButton->setImageDisabledSelected(LLPointer<LLUIImage>(NULL));
        mButton->setRightHPad(6);
-        mBorder->setVisible(FALSE);
        updateLayout();
 }
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index f9ca4d2..b35d078 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -73,8 +73,7 @@ public:
        virtual ~LLComboBox(); 
        // LLView interface
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_COMBO_BOX; }
-        virtual LLString getWidgetTag() const { return LL_COMBO_BOX_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
@@ -85,8 +84,8 @@ public:
        virtual void    setEnabled(BOOL enabled);
        virtual BOOL    handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect);
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleKeyHere(KEY key, MASK mask);
-        virtual BOOL    handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+        virtual BOOL    handleUnicodeCharHere(llwchar uni_char);
        // LLUICtrl interface
        virtual void    clear();                                        // select nothing
@@ -187,9 +186,8 @@ public:
 protected:
        LLButton*                       mButton;
        LLScrollListCtrl*       mList;
-        LLViewBorder*           mBorder;
        EPreferredPosition      mListPosition;
-        LLPointer<LLImageGL> mArrowImage;
+        LLPointer<LLUIImage>    mArrowImage;
 private:
        S32                                     mButtonPadding;
@@ -211,9 +209,6 @@ public:
                void (*commit_callback)(LLUICtrl*, void*) = NULL,
                void *callback_userdata = NULL);
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_FLYOUT_BUTTON; }
-        virtual LLString getWidgetTag() const { return LL_FLYOUT_BUTTON_TAG; }
        virtual void    updateLayout();
        virtual void    draw();
        virtual void    setEnabled(BOOL enabled);
@@ -230,6 +225,8 @@ protected:
        LLPointer<LLUIImage>    mExpanderButtonImage;
        LLPointer<LLUIImage>    mActionButtonImageSelected;
        LLPointer<LLUIImage>    mExpanderButtonImageSelected;
+        LLPointer<LLUIImage>    mActionButtonImageDisabled;
+        LLPointer<LLUIImage>    mExpanderButtonImageDisabled;
        BOOL                                    mToggleState;
 };
diff --git a/linden/indra/llui/lldraghandle.cpp b/linden/indra/llui/lldraghandle.cpp
index 516afc6..f033371 100644
--- a/linden/indra/llui/lldraghandle.cpp
+++ b/linden/indra/llui/lldraghandle.cpp
@@ -101,16 +101,6 @@ LLDragHandleTop::LLDragHandleTop(const LLString& name, const LLRect &rect, const
        setTitle( title );
 }
-EWidgetType LLDragHandleTop::getWidgetType() const
-{
-        return WIDGET_TYPE_DRAG_HANDLE_TOP;
-}
-LLString LLDragHandleTop::getWidgetTag() const
-{
-        return LL_DRAG_HANDLE_TOP_TAG;
-}
 LLDragHandleLeft::LLDragHandleLeft(const LLString& name, const LLRect &rect, const LLString& title)
 :       LLDragHandle(name, rect, title)
 {
@@ -118,22 +108,12 @@ LLDragHandleLeft::LLDragHandleLeft(const LLString& name, const LLRect &rect, con
        setTitle( title );
 }
-EWidgetType LLDragHandleLeft::getWidgetType() const
-{
-        return WIDGET_TYPE_DRAG_HANDLE_LEFT;
-}
-LLString LLDragHandleLeft::getWidgetTag() const
-{
-        return LL_DRAG_HANDLE_LEFT_TAG;
-}
 void LLDragHandleTop::setTitle(const LLString& title)
 {
        LLString trimmed_title = title;
        LLString::trim(trimmed_title);
-        const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
        LLTextBox* titlebox = new LLTextBox( "Drag Handle Title", getRect(), trimmed_title, font );
        titlebox->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT | FOLLOWS_RIGHT);
        titlebox->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
@@ -262,7 +242,7 @@ void LLDragHandleTop::reshapeTitleBox()
        {
                return;
        }
-        const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
        S32 title_width = font->getWidth( getTitleBox()->getText() ) + TITLE_PAD;
        if (getMaxTitleWidth() > 0)
                title_width = llmin(title_width, getMaxTitleWidth());
@@ -372,7 +352,7 @@ BOOL LLDragHandle::handleHover(S32 x, S32 y, MASK mask)
                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (active)" <<llendl;                
                handled = TRUE;
        }
-        else if( getVisible() )
+        else
        {
                getWindow()->setCursor(UI_CURSOR_ARROW);
                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (inactive)" << llendl;             
diff --git a/linden/indra/llui/lldraghandle.h b/linden/indra/llui/lldraghandle.h
index 88e16dc..fc10639 100644
--- a/linden/indra/llui/lldraghandle.h
+++ b/linden/indra/llui/lldraghandle.h
@@ -90,9 +90,6 @@ class LLDragHandleTop
 public:
        LLDragHandleTop(const LLString& name, const LLRect& rect, const LLString& title );
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual void    setTitle( const LLString& title );
        virtual const LLString& getTitle() const;
        virtual void    draw();
@@ -110,9 +107,6 @@ class LLDragHandleLeft
 public:
        LLDragHandleLeft(const LLString& name, const LLRect& rect, const LLString& title );
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual void    setTitle( const LLString& title );
        virtual const LLString& getTitle() const;
        virtual void    draw();
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 1e825d3..5142bf4 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -50,7 +50,6 @@
 #include "lltextbox.h"
 #include "llresmgr.h"
 #include "llui.h"
-#include "llviewborder.h"
 #include "llwindow.h"
 #include "llstl.h"
 #include "llcontrol.h"
@@ -131,8 +130,9 @@ LLFloaterView* gFloaterView = NULL;
 LLFloater::LLFloater() :
        //FIXME: we should initialize *all* member variables here
        mResizable(FALSE),
-        mDragOnLeft(FALSE)
+        mDragOnLeft(FALSE),
+        mMinWidth(0),
+        mMinHeight(0)
 {
        // automatically take focus when opened
        mAutoFocus = TRUE;
@@ -656,7 +656,8 @@ void LLFloater::setTitle( const LLString& title )
        {
                return;
        }
-        mDragHandle->setTitle( title );
+        if (mDragHandle)
+                mDragHandle->setTitle( title );
 }
 const LLString& LLFloater::getTitle() const
@@ -802,24 +803,10 @@ void LLFloater::setMinimized(BOOL minimize)
                        mButtonsEnabled[BUTTON_RESTORE] = TRUE;
                }
-                mMinimizedHiddenChildren.clear();
-                // hide all children
-                for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
-                {
-                        LLView* viewp = *child_it;
-                        if (!viewp->getVisible())
-                        {
-                                mMinimizedHiddenChildren.push_back(viewp->getHandle());
-                        }
-                        viewp->setVisible(FALSE);
-                }
-                // except the special controls
                if (mDragHandle)
                {
                        mDragHandle->setVisible(TRUE);
                }
                setBorderVisible(TRUE);
                for(handle_set_iter_t dependent_it = mDependents.begin();
@@ -843,6 +830,12 @@ void LLFloater::setMinimized(BOOL minimize)
                // Lose keyboard focus when minimized
                releaseFocus();
+                for (S32 i = 0; i < 4; i++)
+                {
+                        if (mResizeBar[i]) mResizeBar[i]->setEnabled(FALSE);
+                        if (mResizeHandle[i]) mResizeHandle[i]->setEnabled(FALSE);
+                }
                mMinimized = TRUE;
                // Reshape *after* setting mMinimized
@@ -867,24 +860,6 @@ void LLFloater::setMinimized(BOOL minimize)
                        mButtonsEnabled[BUTTON_RESTORE] = FALSE;
                }
-                // show all children
-                for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
-                {
-                        LLView* viewp = *child_it;
-                        viewp->setVisible(TRUE);
-                }
-                std::vector<LLHandle<LLView> >::iterator itor = mMinimizedHiddenChildren.begin();
-                for ( ; itor != mMinimizedHiddenChildren.end(); ++itor)
-                {
-                        LLView* viewp = itor->get();
-                        if(viewp)
-                        {
-                                viewp->setVisible(FALSE);
-                        }
-                }
-                mMinimizedHiddenChildren.clear();
                // show dependent floater
                for(handle_set_iter_t dependent_it = mDependents.begin();
                        dependent_it != mDependents.end();
@@ -898,6 +873,12 @@ void LLFloater::setMinimized(BOOL minimize)
                        }
                }
+                for (S32 i = 0; i < 4; i++)
+                {
+                        if (mResizeBar[i]) mResizeBar[i]->setEnabled(isResizable());
+                        if (mResizeHandle[i]) mResizeHandle[i]->setEnabled(isResizable());
+                }
                mMinimized = FALSE;
                // Reshape *after* setting mMinimized
@@ -954,7 +935,8 @@ void LLFloater::setIsChrome(BOOL is_chrome)
        }
        
        // no titles displayed on "chrome" floaters
-        mDragHandle->setTitleVisible(!is_chrome);
+        if (mDragHandle)
+                mDragHandle->setTitleVisible(!is_chrome);
        
        LLPanel::setIsChrome(is_chrome);
 }
@@ -965,7 +947,8 @@ void LLFloater::setForeground(BOOL front)
        if (front != mForeground)
        {
                mForeground = front;
-                mDragHandle->setForeground( front );
+                if (mDragHandle)
+                        mDragHandle->setForeground( front );
                if (!front)
                {
@@ -1310,49 +1293,72 @@ void LLFloater::onClickClose( void* userdata )
 // virtual
 void LLFloater::draw()
 {
-        if( getVisible() )
+        // draw background
+        if( isBackgroundVisible() )
        {
-                // draw background
+                S32 left = LLPANEL_BORDER_WIDTH;
-                if( isBackgroundVisible() )
+                S32 top = getRect().getHeight() - LLPANEL_BORDER_WIDTH;
-                {
+                S32 right = getRect().getWidth() - LLPANEL_BORDER_WIDTH;
-                        S32 left = LLPANEL_BORDER_WIDTH;
+                S32 bottom = LLPANEL_BORDER_WIDTH;
-                        S32 top = getRect().getHeight() - LLPANEL_BORDER_WIDTH;
-                        S32 right = getRect().getWidth() - LLPANEL_BORDER_WIDTH;
-                        S32 bottom = LLPANEL_BORDER_WIDTH;
-                        LLColor4 shadow_color = LLUI::sColorsGroup->getColor("ColorDropShadow");
+                LLColor4 shadow_color = LLUI::sColorsGroup->getColor("ColorDropShadow");
-                        F32 shadow_offset = (F32)LLUI::sConfigGroup->getS32("DropShadowFloater");
+                F32 shadow_offset = (F32)LLUI::sConfigGroup->getS32("DropShadowFloater");
-                        if (!isBackgroundOpaque())
+                if (!isBackgroundOpaque())
-                        {
+                {
-                                shadow_offset *= 0.2f;
+                        shadow_offset *= 0.2f;
-                                shadow_color.mV[VALPHA] *= 0.5f;
+                        shadow_color.mV[VALPHA] *= 0.5f;
-                        }
+                }
-                        gl_drop_shadow(left, top, right, bottom, 
+                gl_drop_shadow(left, top, right, bottom, 
-                                shadow_color, 
+                        shadow_color, 
-                                llround(shadow_offset));
+                        llround(shadow_offset));
-                        // No transparent windows in simple UI
+                // No transparent windows in simple UI
-                        if (isBackgroundOpaque())
+                if (isBackgroundOpaque())
-                        {
+                {
-                                gl_rect_2d( left, top, right, bottom, getBackgroundColor() );
+                        gl_rect_2d( left, top, right, bottom, getBackgroundColor() );
-                        }
+                }
-                        else
+                else
-                        {
+                {
-                                gl_rect_2d( left, top, right, bottom, getTransparentColor() );
+                        gl_rect_2d( left, top, right, bottom, getTransparentColor() );
-                        }
+                }
-                        if(gFocusMgr.childHasKeyboardFocus(this) && !getIsChrome() && !getTitle().empty())
+                if(gFocusMgr.childHasKeyboardFocus(this) && !getIsChrome() && !getTitle().empty())
-                        {
+                {
-                                // draw highlight on title bar to indicate focus.  RDW
+                        // draw highlight on title bar to indicate focus.  RDW
-                                const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF );
+                        const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
-                                LLRect r = getRect();
+                        LLRect r = getRect();
-                                gl_rect_2d_offset_local(0, r.getHeight(), r.getWidth(), r.getHeight() - (S32)font->getLineHeight() - 1, 
+                        gl_rect_2d_offset_local(0, r.getHeight(), r.getWidth(), r.getHeight() - (S32)font->getLineHeight() - 1, 
-                                        LLUI::sColorsGroup->getColor("TitleBarFocusColor"), 0, TRUE);
+                                LLUI::sColorsGroup->getColor("TitleBarFocusColor"), 0, TRUE);
-                        }
                }
+        }
-                LLPanel::updateDefaultBtn();
+        LLPanel::updateDefaultBtn();
+        if( getDefaultButton() )
+        {
+                if (hasFocus() && getDefaultButton()->getEnabled())
+                {
+                        LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
+                        // is this button a direct descendent and not a nested widget (e.g. checkbox)?
+                        BOOL focus_is_child_button = dynamic_cast<LLButton*>(focus_ctrl) != NULL && focus_ctrl->getParent() == this;
+                        // only enable default button when current focus is not a button
+                        getDefaultButton()->setBorderEnabled(!focus_is_child_button);
+                }
+                else
+                {
+                        getDefaultButton()->setBorderEnabled(FALSE);
+                }
+        }
+        if (isMinimized())
+        {
+                for (S32 i = 0; i < BUTTON_COUNT; i++)
+                {
+                        drawChild(mButtons[i]);
+                }
+                drawChild(mDragHandle);
+        }
+        else
+        {
                // draw children
                LLView* focused_child = gFocusMgr.getKeyboardFocus();
                BOOL focused_child_visible = FALSE;
@@ -1365,36 +1371,35 @@ void LLFloater::draw()
                // don't call LLPanel::draw() since we've implemented custom background rendering
                LLView::draw();
-                if( isBackgroundVisible() )
-                {
-                        // add in a border to improve spacialized visual aclarity ;)
-                        // use lines instead of gl_rect_2d so we can round the edges as per james' recommendation
-                        LLUI::setLineWidth(1.5f);
-                        LLColor4 outlineColor = gFocusMgr.childHasKeyboardFocus(this) ? LLUI::sColorsGroup->getColor("FloaterFocusBorderColor") : LLUI::sColorsGroup->getColor("FloaterUnfocusBorderColor");
-                        gl_rect_2d_offset_local(0, getRect().getHeight() + 1, getRect().getWidth() + 1, 0, outlineColor, -LLPANEL_BORDER_WIDTH, FALSE);
-                        LLUI::setLineWidth(1.f);
-                }
-        
                if (focused_child_visible)
                {
                        focused_child->setVisible(TRUE);
                }
                drawChild(focused_child);
+        }
-                // update tearoff button for torn off floaters
+        if( isBackgroundVisible() )
-                // when last host goes away
+        {
-                if (mCanTearOff && !getHost())
+                // add in a border to improve spacialized visual aclarity ;)
+                // use lines instead of gl_rect_2d so we can round the edges as per james' recommendation
+                LLUI::setLineWidth(1.5f);
+                LLColor4 outlineColor = gFocusMgr.childHasKeyboardFocus(this) ? LLUI::sColorsGroup->getColor("FloaterFocusBorderColor") : LLUI::sColorsGroup->getColor("FloaterUnfocusBorderColor");
+                gl_rect_2d_offset_local(0, getRect().getHeight() + 1, getRect().getWidth() + 1, 0, outlineColor, -LLPANEL_BORDER_WIDTH, FALSE);
+                LLUI::setLineWidth(1.f);
+        }
+        // update tearoff button for torn off floaters
+        // when last host goes away
+        if (mCanTearOff && !getHost())
+        {
+                LLFloater* old_host = mLastHostHandle.get();
+                if (!old_host)
                {
-                        LLFloater* old_host = mLastHostHandle.get();
+                        setCanTearOff(FALSE);
-                        if (!old_host)
-                        {
-                                setCanTearOff(FALSE);
-                        }
                }
        }
 }
 void    LLFloater::setCanMinimize(BOOL can_minimize)
 {
        // removing minimize/restore button programmatically,
@@ -1540,7 +1545,13 @@ void LLFloater::updateButtons()
        S32 button_count = 0;
        for (S32 i = 0; i < BUTTON_COUNT; i++)
        {
-                if (mButtonsEnabled[i])
+                mButtons[i]->setEnabled(mButtonsEnabled[i]);
+                if (mButtonsEnabled[i] 
+                        //*HACK: always render close button for hosted floaters
+                        // so that users don't accidentally hit the button when closing multiple windows
+                        // in the chatterbox
+                        || (i == BUTTON_CLOSE && mButtonScale != 1.f))
                {
                        button_count++;
@@ -1564,18 +1575,16 @@ void LLFloater::updateButtons()
                        mButtons[i]->setRect(btn_rect);
                        mButtons[i]->setVisible(TRUE);
-                        mButtons[i]->setEnabled(TRUE);
                        // the restore button should have a tab stop so that it takes action when you Ctrl-Tab to a minimized floater
                        mButtons[i]->setTabStop(i == BUTTON_RESTORE);
                }
                else if (mButtons[i])
                {
                        mButtons[i]->setVisible(FALSE);
-                        mButtons[i]->setEnabled(FALSE);
                }
        }
+        if (mDragHandle)
-        mDragHandle->setMaxTitleWidth(getRect().getWidth() - (button_count * (LLFLOATER_CLOSE_BOX_SIZE + 1)));
+                mDragHandle->setMaxTitleWidth(getRect().getWidth() - (button_count * (LLFLOATER_CLOSE_BOX_SIZE + 1)));
 }
 void LLFloater::buildButtons()
@@ -2076,7 +2085,7 @@ void LLFloaterView::closeAllChildren(bool app_quitting)
                // Attempt to close floater.  This will cause the "do you want to save"
                // dialogs to appear.
-                if (floaterp->canClose())
+                if (floaterp->canClose() && !floaterp->isDead())
                {
                        floaterp->close(app_quitting);
                }
@@ -2093,7 +2102,7 @@ BOOL LLFloaterView::allChildrenClosed()
                LLView* viewp = *it;
                LLFloater* floaterp = (LLFloater*)viewp;
-                if (floaterp->getVisible() && floaterp->canClose())
+                if (floaterp->getVisible() && !floaterp->isDead() && floaterp->canClose())
                {
                        return false;
                }
@@ -2332,7 +2341,9 @@ void LLFloaterView::popVisibleAll(const skip_list_t& skip_list)
 LLMultiFloater::LLMultiFloater() :
        mTabContainer(NULL),
        mTabPos(LLTabContainer::TOP),
-        mAutoResize(TRUE)
+        mAutoResize(TRUE),
+        mOrigMinWidth(0),
+        mOrigMinHeight(0)
 {
 }
@@ -2340,7 +2351,9 @@ LLMultiFloater::LLMultiFloater() :
 LLMultiFloater::LLMultiFloater(LLTabContainer::TabPosition tab_pos) :
        mTabContainer(NULL),
        mTabPos(tab_pos),
-        mAutoResize(TRUE)
+        mAutoResize(TRUE),
+        mOrigMinWidth(0),
+        mOrigMinHeight(0)
 {
 }
@@ -2349,7 +2362,9 @@ LLMultiFloater::LLMultiFloater(const LLString &name) :
        LLFloater(name),
        mTabContainer(NULL),
        mTabPos(LLTabContainer::TOP),
-        mAutoResize(FALSE)
+        mAutoResize(FALSE),
+        mOrigMinWidth(0),
+        mOrigMinHeight(0)
 {
 }
@@ -2361,7 +2376,9 @@ LLMultiFloater::LLMultiFloater(
        LLFloater(name, rect, name),
        mTabContainer(NULL),
        mTabPos(LLTabContainer::TOP),
-        mAutoResize(auto_resize)
+        mAutoResize(auto_resize),
+        mOrigMinWidth(0),
+        mOrigMinHeight(0)
 {
        mTabContainer = new LLTabContainer("Preview Tabs", 
                LLRect(LLPANEL_BORDER_WIDTH, getRect().getHeight() - LLFLOATER_HEADER_SIZE, getRect().getWidth() - LLPANEL_BORDER_WIDTH, 0), 
@@ -2385,7 +2402,9 @@ LLMultiFloater::LLMultiFloater(
        LLFloater(name, rect_control, name),
        mTabContainer(NULL),
        mTabPos(tab_pos),
-        mAutoResize(auto_resize)
+        mAutoResize(auto_resize),
+        mOrigMinWidth(0),
+        mOrigMinHeight(0)
 {
        mTabContainer = new LLTabContainer("Preview Tabs", 
                LLRect(LLPANEL_BORDER_WIDTH, getRect().getHeight() - LLFLOATER_HEADER_SIZE, getRect().getWidth() - LLPANEL_BORDER_WIDTH, 0), 
@@ -2678,24 +2697,20 @@ void LLMultiFloater::setVisible(BOOL visible)
        }
 }
-BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask)
 {
-        if (getEnabled()
+        if (key == 'W' && mask == MASK_CONTROL)
-                && mask == MASK_CONTROL)
        {
-                if (key == 'W')
+                LLFloater* floater = getActiveFloater();
+                // is user closeable and is system closeable
+                if (floater && floater->canClose() && floater->isCloseable())
                {
-                        LLFloater* floater = getActiveFloater();
+                        floater->close();
-                        // is user closeable and is system closeable
-                        if (floater && floater->canClose() && floater->isCloseable())
-                        {
-                                floater->close();
-                        }
-                        return TRUE;
                }
+                return TRUE;
        }
-        return LLFloater::handleKeyHere(key, mask, called_from_parent);
+        return LLFloater::handleKeyHere(key, mask);
 }
 LLFloater* LLMultiFloater::getActiveFloater()
@@ -2763,15 +2778,18 @@ void LLMultiFloater::setCanResize(BOOL can_resize)
 BOOL LLMultiFloater::postBuild()
 {
+        // remember any original xml minimum size
+        getResizeLimits(&mOrigMinWidth, &mOrigMinHeight);
        if (mTabContainer)
        {
                return TRUE;
        }
-        requires("Preview Tabs", WIDGET_TYPE_TAB_CONTAINER);
+        requires<LLTabContainer>("Preview Tabs");
        if (checkRequirements())
        {
-                mTabContainer = LLUICtrlFactory::getTabContainerByName(this, "Preview Tabs");
+                mTabContainer = getChild<LLTabContainer>("Preview Tabs");
                return TRUE;
        }
@@ -2780,10 +2798,11 @@ BOOL LLMultiFloater::postBuild()
 void LLMultiFloater::updateResizeLimits()
 {
-        S32 new_min_width = 0;
+        // initialize minimum size constraint to the original xml values.
-        S32 new_min_height = 0;
+        S32 new_min_width = mOrigMinWidth;
-        S32 tab_idx;
+        S32 new_min_height = mOrigMinHeight;
-        for (tab_idx = 0; tab_idx < mTabContainer->getTabCount(); ++tab_idx)
+        // possibly increase minimum size constraint due to children's minimums.
+        for (S32 tab_idx = 0; tab_idx < mTabContainer->getTabCount(); ++tab_idx)
        {
                LLFloater* floaterp = (LLFloater*)mTabContainer->getPanelByIndex(tab_idx);
                if (floaterp)
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index f0bbcaf..8068741 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -50,7 +50,7 @@ class LLMultiFloater;
 const S32 LLFLOATER_VPAD = 6;
 const S32 LLFLOATER_HPAD = 6;
 const S32 LLFLOATER_CLOSE_BOX_SIZE = 16;
-const S32 LLFLOATER_HEADER_SIZE = 16;
+const S32 LLFLOATER_HEADER_SIZE = 18;
 const BOOL RESIZE_YES = TRUE;
 const BOOL RESIZE_NO = FALSE;
@@ -122,8 +122,6 @@ public:
        virtual void            initFloater(const LLString& title, BOOL resizable, 
                                                S32 min_width, S32 min_height, BOOL drag_on_left,
                                                BOOL minimizable, BOOL close_btn);
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_FLOATER; }
-        virtual LLString getWidgetTag() const { return LL_FLOATER_TAG; };
        virtual void    open(); /* Flawfinder: ignore */
@@ -187,6 +185,8 @@ public:
        // Defaults to destroy().
        virtual void    onClose(bool app_quitting) { destroy(); }
+        // This cannot be "const" until all derived floater canClose()
+        // methods are const as well.  JC
        virtual BOOL    canClose() { return TRUE; }
        virtual void    setVisible(BOOL visible);
@@ -302,9 +302,6 @@ class LLFloaterView : public LLUICtrl
 public:
        LLFloaterView( const LLString& name, const LLRect& rect );
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_FLOATER_VIEW; }
-        virtual LLString getWidgetTag() const { return LL_FLOATER_VIEW_TAG; }
        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
        void reshapeFloater(S32 width, S32 height, BOOL called_from_parent, BOOL adjust_vertical);
@@ -373,9 +370,7 @@ public:
        /*virtual*/ void onClose(bool app_quitting);
        /*virtual*/ void draw();
        /*virtual*/ void setVisible(BOOL visible);
-        /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
-        /*virtual*/ EWidgetType getWidgetType() const { return WIDGET_TYPE_MULTI_FLOATER; }
-        /*virtual*/ LLString getWidgetTag() const { return LL_MULTI_FLOATER_TAG; };
        virtual void setCanResize(BOOL can_resize);
        virtual void growToFit(S32 content_width, S32 content_height);
@@ -418,6 +413,7 @@ protected:
        
        LLTabContainer::TabPosition mTabPos;
        BOOL                            mAutoResize;
+        S32                                     mOrigMinWidth, mOrigMinHeight;  // logically const but initialized late
 };
 // visibility policy specialized for floaters
diff --git a/linden/indra/llui/llfocusmgr.cpp b/linden/indra/llui/llfocusmgr.cpp
index 0634513..e2d1f46 100644
--- a/linden/indra/llui/llfocusmgr.cpp
+++ b/linden/indra/llui/llfocusmgr.cpp
@@ -46,6 +46,7 @@ LLFocusMgr::LLFocusMgr()
        mKeyboardFocus( NULL ),
        mLastKeyboardFocus( NULL ),
        mDefaultKeyboardFocus( NULL ),
+        mKeystrokesOnly(FALSE),
        mTopCtrl( NULL ),
        mFocusWeight(0.f),
        mAppHasFocus(TRUE)   // Macs don't seem to notify us that we've gotten focus, so default to true
@@ -85,7 +86,7 @@ void LLFocusMgr::releaseFocusIfNeeded( const LLView* view )
 }
-void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock)
+void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystrokes_only)
 {
        if (mLockedView && 
                (new_focus == NULL || 
@@ -98,6 +99,8 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock)
        //llinfos << "Keyboard focus handled by " << (new_focus ? new_focus->getName() : "nothing") << llendl;
+        mKeystrokesOnly = keystrokes_only;
        if( new_focus != mKeyboardFocus )
        {
                mLastKeyboardFocus = mKeyboardFocus;
diff --git a/linden/indra/llui/llfocusmgr.h b/linden/indra/llui/llfocusmgr.h
index 842c874..49aba93 100644
--- a/linden/indra/llui/llfocusmgr.h
+++ b/linden/indra/llui/llfocusmgr.h
@@ -54,13 +54,17 @@ public:
        BOOL                    childHasMouseCapture( const LLView* parent ) const;
        // Keyboard Focus
-        void                    setKeyboardFocus(LLUICtrl* new_focus, BOOL lock = FALSE);               // new_focus = NULL to release the focus.
+        void                    setKeyboardFocus(LLUICtrl* new_focus, BOOL lock = FALSE, BOOL keystrokes_only = FALSE);         // new_focus = NULL to release the focus.
        LLUICtrl*               getKeyboardFocus() const { return mKeyboardFocus; }  
        LLUICtrl*               getLastKeyboardFocus() const { return mLastKeyboardFocus; }  
        BOOL                    childHasKeyboardFocus( const LLView* parent ) const;
        void                    removeKeyboardFocusWithoutCallback( const LLView* focus );
+        BOOL                    getKeystrokesOnly() { return mKeystrokesOnly; }
+        void                    setKeystrokesOnly(BOOL keystrokes_only) { mKeystrokesOnly = keystrokes_only; }
        F32                             getFocusTime() const { return mFocusTimer.getElapsedTimeF32(); }
        F32                             getFocusFlashAmt() const;
+        S32                             getFocusFlashWidth() const { return llround(lerp(1.f, 3.f, getFocusFlashAmt())); }
        LLColor4                getFocusColor() const;
        void                    triggerFocusFlash();
        BOOL                    getAppHasFocus() const { return mAppHasFocus; }
@@ -96,6 +100,7 @@ private:
        LLUICtrl*                       mKeyboardFocus;                         // Keyboard events are preemptively routed to this object
        LLUICtrl*                       mLastKeyboardFocus;                     // who last had focus
        LLUICtrl*                       mDefaultKeyboardFocus;
+        BOOL                            mKeystrokesOnly;
        // Top View
        LLUICtrl*                       mTopCtrl;
diff --git a/linden/indra/llui/llhtmlhelp.h b/linden/indra/llui/llhtmlhelp.h
index d4ec9e3..254faa2 100644
--- a/linden/indra/llui/llhtmlhelp.h
+++ b/linden/indra/llui/llhtmlhelp.h
@@ -36,7 +36,8 @@ class LLHtmlHelp
 {
 public:
        virtual ~LLHtmlHelp() {}
-        virtual void show(std::string start_url, std::string title) = 0;
+        virtual void show() = 0;
+        virtual void show(std::string help_url) = 0;
 };
 #endif  // LL_LLFLOATERHTMLHELP_H
diff --git a/linden/indra/llui/lliconctrl.cpp b/linden/indra/llui/lliconctrl.cpp
index 6a1d77c..f35de85 100644
--- a/linden/indra/llui/lliconctrl.cpp
+++ b/linden/indra/llui/lliconctrl.cpp
@@ -42,14 +42,15 @@
 const F32 RESOLUTION_BUMP = 1.f;
+static LLRegisterWidget<LLIconCtrl> r("icon");
 LLIconCtrl::LLIconCtrl(const LLString& name, const LLRect &rect, const LLUUID &image_id)
 :       LLUICtrl(name, 
                         rect, 
                         FALSE, // mouse opaque
                         NULL, NULL, 
                         FOLLOWS_LEFT | FOLLOWS_TOP),
-        mColor( LLColor4::white ),
+        mColor( LLColor4::white )
-        mImageName("")
 {
        setImage( image_id );
        setTabStop(FALSE);
@@ -64,9 +65,7 @@ LLIconCtrl::LLIconCtrl(const LLString& name, const LLRect &rect, const LLString
        mColor( LLColor4::white ),
        mImageName(image_name)
 {
-        LLUUID image_id;
+        setImage( image_name );
-        image_id.set(LLUI::sAssetsGroup->getString( image_name ));
-        setImage( image_id );
        setTabStop(FALSE);
 }
@@ -77,32 +76,52 @@ LLIconCtrl::~LLIconCtrl()
 }
-void LLIconCtrl::setImage(const LLUUID &image_id)
+void LLIconCtrl::setImage(const LLString& image_name)
 {
-        mImageID = image_id;
+        //RN: support UUIDs masquerading as strings
+        if (LLUUID::validate(image_name))
+        {
+                mImageID = LLUUID(image_name);
+                setImage(mImageID);
+        }
+        else
+        {
+                mImageName = image_name;
+                mImagep = LLUI::sImageProvider->getUIImage(image_name);
+                mImageID.setNull();
+        }
+}
+void LLIconCtrl::setImage(const LLUUID& image_id)
+{
+        mImageName.clear();
        mImagep = LLUI::sImageProvider->getUIImageByID(image_id);
+        mImageID = image_id;
 }
 void LLIconCtrl::draw()
 {
-        if( getVisible() ) 
+        if( mImagep.notNull() )
        {
-                if( mImagep.notNull() )
+                mImagep->draw(getLocalRect(), mColor );
-                {
-                        mImagep->draw(0, 0, 
-                                                  getRect().getWidth(), getRect().getHeight(), 
-                                                  mColor );
-                }
-                LLUICtrl::draw();
        }
+        LLUICtrl::draw();
 }
 // virtual
 void LLIconCtrl::setValue(const LLSD& value )
 {
-        setImage(value.asUUID());
+        if (value.isUUID())
+        {
+                setImage(value.asUUID());
+        }
+        else
+        {
+                setImage(value.asString());
+        }
 }
 // virtual
@@ -135,18 +154,16 @@ LLView* LLIconCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
        LLRect rect;
        createRect(node, rect, parent, LLRect());
-        LLUUID image_id;
+        LLString image_name;
        if (node->hasAttribute("image_name"))
        {
-                LLString image_name;
                node->getAttributeString("image_name", image_name);
-                image_id.set(LLUI::sAssetsGroup->getString( image_name ));
        }
        LLColor4 color(LLColor4::white);
        LLUICtrlFactory::getAttributeColor(node,"color", color);
-        LLIconCtrl* icon = new LLIconCtrl(name, rect, image_id);
+        LLIconCtrl* icon = new LLIconCtrl(name, rect, image_name);
        icon->setColor(color);
diff --git a/linden/indra/llui/lliconctrl.h b/linden/indra/llui/lliconctrl.h
index b0c191f..055b504 100644
--- a/linden/indra/llui/lliconctrl.h
+++ b/linden/indra/llui/lliconctrl.h
@@ -51,14 +51,14 @@ public:
        LLIconCtrl(const LLString& name, const LLRect &rect, const LLUUID &image_id);
        LLIconCtrl(const LLString& name, const LLRect &rect, const LLString &image_name);
        virtual ~LLIconCtrl();
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_ICON; }
-        virtual LLString getWidgetTag() const { return LL_ICON_CTRL_TAG; }
        // llview overrides
        virtual void    draw();
-        void                    setImage(const LLUUID &image_id);
+        void                    setImage(const LLString& image_name);
+        void                    setImage(const LLUUID& image_name);
        const LLUUID    &getImage() const                                               { return mImageID; }
+        LLString                getImageName() const                                            { return mImageName; }
        // Takes a UUID, wraps get/setImage
        virtual void    setValue(const LLSD& value );
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 1c96bc4..aeb906c 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -70,7 +70,6 @@ const F32	CURSOR_FLASH_DELAY = 1.0f;  // in seconds
 const S32       SCROLL_INCREMENT_ADD = 0;       // make space for typing
 const S32   SCROLL_INCREMENT_DEL = 4;   // make space for baskspacing
 const F32   AUTO_SCROLL_TIME = 0.05f;
-const F32       LABEL_HPAD = 5.f;
 const F32       PREEDIT_MARKER_BRIGHTNESS = 0.4f;
 const S32       PREEDIT_MARKER_GAP = 1;
@@ -81,6 +80,10 @@ const S32	PREEDIT_STANDOUT_GAP = 1;
 const S32       PREEDIT_STANDOUT_POSITION = 2;
 const S32       PREEDIT_STANDOUT_THICKNESS = 2;
+static LLRegisterWidget<LLLineEditor> r1("line_editor");
+/* static */ LLPointer<LLUIImage> LLLineEditor::sImage;
 //
 // Member functions
 //
@@ -101,8 +104,8 @@ LLLineEditor::LLLineEditor(const LLString& name, const LLRect& rect,
                mMaxLengthBytes(max_length_bytes),
                mCursorPos( 0 ),
                mScrollHPos( 0 ),
-                mBorderLeft(0),
+                mTextPadLeft(0),
-                mBorderRight(0),
+                mTextPadRight(0),
                mCommitOnFocusLost( TRUE ),
                mRevertOnEsc( TRUE ),
                mKeystrokeCallback( keystroke_callback ),
@@ -128,7 +131,8 @@ LLLineEditor::LLLineEditor(const LLString& name, const LLRect& rect,
                mHandleEditKeysDirectly( FALSE ),
                mSelectAllonFocusReceived( FALSE ),
                mPassDelete(FALSE),
-                mReadOnly(FALSE)
+                mReadOnly(FALSE),
+                mImage( sImage )
 {
        llassert( max_length_bytes > 0 );
@@ -151,8 +155,7 @@ LLLineEditor::LLLineEditor(const LLString& name, const LLRect& rect,
        setFocusLostCallback(focus_lost_callback);
-        mMinHPixels = mBorderThickness + UI_LINEEDITOR_H_PAD + mBorderLeft;
+        setTextPadding(0, 0);
-        mMaxHPixels = getRect().getWidth() - mMinHPixels - mBorderThickness - mBorderRight;
        mScrollTimer.reset();
@@ -166,6 +169,12 @@ LLLineEditor::LLLineEditor(const LLString& name, const LLRect& rect,
        mBorder = new LLViewBorder( "line ed border", border_rect, border_bevel, border_style, mBorderThickness );
        addChild( mBorder );
        mBorder->setFollows(FOLLOWS_LEFT|FOLLOWS_RIGHT|FOLLOWS_TOP|FOLLOWS_BOTTOM);
+        if( ! sImage)
+        {
+                sImage = LLUI::getUIImage("sm_rounded_corners_simple.tga");
+        }
+        mImage = sImage;
 }
@@ -243,9 +252,9 @@ void LLLineEditor::updateHistory()
 void LLLineEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
-        LLUICtrl::reshape(width, height, called_from_parent );
+        LLUICtrl::reshape(width, height, called_from_parent);
+        setTextPadding(mTextPadLeft, mTextPadRight); // For clamping side-effect.
-        mMaxHPixels = getRect().getWidth() - 2 * (mBorderThickness + UI_LINEEDITOR_H_PAD) + 1 - mBorderRight;
+        setCursor(mCursorPos); // For clamping side-effect.
 }
 void LLLineEditor::setEnabled(BOOL enabled)
@@ -262,12 +271,12 @@ void LLLineEditor::setMaxTextLength(S32 max_text_length)
        mMaxLengthBytes = max_len;
 } 
-void LLLineEditor::setBorderWidth(S32 left, S32 right)
+void LLLineEditor::setTextPadding(S32 left, S32 right)
 {
-        mBorderLeft = llclamp(left, 0, getRect().getWidth());
+        mTextPadLeft = llclamp(left, 0, getRect().getWidth());
-        mBorderRight = llclamp(right, 0, getRect().getWidth());
+        mTextPadRight = llclamp(right, 0, getRect().getWidth());
-        mMinHPixels = mBorderThickness + UI_LINEEDITOR_H_PAD + mBorderLeft;
+        mMinHPixels = UI_LINEEDITOR_H_PAD + mTextPadLeft;
-        mMaxHPixels = getRect().getWidth() - mMinHPixels - mBorderThickness - mBorderRight;
+        mMaxHPixels = getRect().getWidth() - mMinHPixels - mTextPadRight;
 }
@@ -483,9 +492,10 @@ BOOL LLLineEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 BOOL LLLineEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-        if (x < mBorderLeft || x > (getRect().getWidth() - mBorderRight))
+        // Check first whether the "clear search" button wants to deal with this.
+        if(childrenHandleMouseDown(x, y, mask) != NULL) 
        {
-                return LLUICtrl::handleMouseDown(x, y, mask);
+                return TRUE;
        }
        if (mSelectAllonFocusReceived
                && gFocusMgr.getKeyboardFocus() != this)
@@ -563,61 +573,62 @@ BOOL LLLineEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 BOOL LLLineEditor::handleHover(S32 x, S32 y, MASK mask)
 {
        BOOL handled = FALSE;
-        if (!hasMouseCapture() && (x < mBorderLeft || x > (getRect().getWidth() - mBorderRight)))
+        // Check first whether the "clear search" button wants to deal with this.
+        if(!hasMouseCapture())
        {
-                return LLUICtrl::handleHover(x, y, mask);
+                if(childrenHandleHover(x, y, mask) != NULL) 
+                {
+                        return TRUE;
+                }
        }
-        if( getVisible() )
+        if( (hasMouseCapture()) && mIsSelecting )
        {
-                if( (hasMouseCapture()) && mIsSelecting )
+                if (x != mLastSelectionX || y != mLastSelectionY)
                {
-                        if (x != mLastSelectionX || y != mLastSelectionY)
+                        mLastSelectionX = x;
+                        mLastSelectionY = y;
+                }
+                // Scroll if mouse cursor outside of bounds
+                if (mScrollTimer.hasExpired())
+                {
+                        S32 increment = llround(mScrollTimer.getElapsedTimeF32() / AUTO_SCROLL_TIME);
+                        mScrollTimer.reset();
+                        mScrollTimer.setTimerExpirySec(AUTO_SCROLL_TIME);
+                        if( (x < mMinHPixels) && (mScrollHPos > 0 ) )
                        {
-                                mLastSelectionX = x;
+                                // Scroll to the left
-                                mLastSelectionY = y;
+                                mScrollHPos = llclamp(mScrollHPos - increment, 0, mText.length());
                        }
-                        // Scroll if mouse cursor outside of bounds
+                        else
-                        if (mScrollTimer.hasExpired())
+                        if( (x > mMaxHPixels) && (mCursorPos < (S32)mText.length()) )
                        {
-                                S32 increment = llround(mScrollTimer.getElapsedTimeF32() / AUTO_SCROLL_TIME);
+                                // If scrolling one pixel would make a difference...
-                                mScrollTimer.reset();
+                                S32 pixels_after_scrolling_one_char = findPixelNearestPos(1);
-                                mScrollTimer.setTimerExpirySec(AUTO_SCROLL_TIME);
+                                if( pixels_after_scrolling_one_char >= mMaxHPixels )
-                                if( (x < mMinHPixels) && (mScrollHPos > 0 ) )
-                                {
-                                        // Scroll to the left
-                                        mScrollHPos = llclamp(mScrollHPos - increment, 0, mText.length());
-                                }
-                                else
-                                if( (x > mMaxHPixels) && (mCursorPos < (S32)mText.length()) )
                                {
-                                        // If scrolling one pixel would make a difference...
+                                        // ...scroll to the right
-                                        S32 pixels_after_scrolling_one_char = findPixelNearestPos(1);
+                                        mScrollHPos = llclamp(mScrollHPos + increment, 0, mText.length());
-                                        if( pixels_after_scrolling_one_char >= mMaxHPixels )
-                                        {
-                                                // ...scroll to the right
-                                                mScrollHPos = llclamp(mScrollHPos + increment, 0, mText.length());
-                                        }
                                }
                        }
+                }
-                        setCursorAtLocalPos( x );
+                setCursorAtLocalPos( x );
-                        mSelectionEnd = getCursor();
+                mSelectionEnd = getCursor();
-                        // delay cursor flashing
+                // delay cursor flashing
-                        mKeystrokeTimer.reset();
+                mKeystrokeTimer.reset();
-                        getWindow()->setCursor(UI_CURSOR_IBEAM);
+                getWindow()->setCursor(UI_CURSOR_IBEAM);
-                        lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (active)" << llendl;               
+                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (active)" << llendl;               
-                        handled = TRUE;
+                handled = TRUE;
-                }
+        }
-                if( !handled  )
+        if( !handled  )
-                {
+        {
-                        getWindow()->setCursor(UI_CURSOR_IBEAM);
+                getWindow()->setCursor(UI_CURSOR_IBEAM);
-                        lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (inactive)" << llendl;             
+                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (inactive)" << llendl;             
-                        handled = TRUE;
+                handled = TRUE;
-                }
        }
        return handled;
@@ -634,9 +645,10 @@ BOOL LLLineEditor::handleMouseUp(S32 x, S32 y, MASK mask)
                handled = TRUE;
        }
-        if (!handled && (x < mBorderLeft || x > (getRect().getWidth() - mBorderRight)))
+        // Check first whether the "clear search" button wants to deal with this.
+        if(!handled && childrenHandleMouseUp(x, y, mask) != NULL) 
        {
-                return LLUICtrl::handleMouseUp(x, y, mask);
+                return TRUE;
        }
        if( mIsSelecting )
@@ -1223,12 +1235,12 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
 }
-BOOL LLLineEditor::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLLineEditor::handleKeyHere(KEY key, MASK mask )
 {
        BOOL    handled = FALSE;
        BOOL    selection_modified = FALSE;
-        if ( (gFocusMgr.getKeyboardFocus() == this) && getVisible())
+        if ( gFocusMgr.getKeyboardFocus() == this )
        {
                LLLineEditorRollback rollback( this );
@@ -1291,7 +1303,7 @@ BOOL LLLineEditor::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent )
 }
-BOOL LLLineEditor::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent)
+BOOL LLLineEditor::handleUnicodeCharHere(llwchar uni_char)
 {
        if ((uni_char < 0x20) || (uni_char == 0x7F)) // Control character or DEL
        {
@@ -1381,11 +1393,6 @@ void LLLineEditor::doDelete()
 void LLLineEditor::draw()
 {
-        if( !getVisible() )
-        {
-                return;
-        }
        S32 text_len = mText.length();
        LLString saved_text;
@@ -1406,6 +1413,13 @@ void LLLineEditor::draw()
        LLColor4 bg_color = mReadOnlyBgColor;
+#if 0 // for when we're ready for image art.
+        if( hasFocus())
+        {
+                mImage->drawBorder(0, 0, getRect().getWidth(), getRect().getHeight(), gFocusMgr.getFocusColor(), gFocusMgr.getFocusFlashWidth());
+        }
+        mImage->draw(getLocalRect(), mReadOnly ? mReadOnlyBgColor : mWriteableBgColor  );
+#else // the old programmer art.
        // drawing solids requires texturing be disabled
        {
                LLGLSNoTexture no_texture;
@@ -1423,6 +1437,7 @@ void LLLineEditor::draw()
                }
                gl_rect_2d(background, bg_color);
        }
+#endif
        // draw text
@@ -1560,10 +1575,14 @@ void LLLineEditor::draw()
                        mMaxHPixels - llround(rendered_pixels_right),
                        &rendered_pixels_right);
        }
+#if 0 // for when we're ready for image art.
+        mBorder->setVisible(FALSE); // no more programmatic art.
+#endif
        // If we're editing...
        if( gFocusMgr.getKeyboardFocus() == this)
        {
+                //mBorder->setVisible(TRUE); // ok, programmer art just this once.
                // (Flash the cursor every half second)
                if (gShowTextEditCursor && !mReadOnly)
                {
@@ -1616,7 +1635,7 @@ void LLLineEditor::draw()
                if (0 == mText.length())
                {
                        mGLFont->render(mLabel.getWString(), 0, 
-                                                        LABEL_HPAD, (F32)text_bottom,
+                                                        mMinHPixels, (F32)text_bottom,
                                                        label_color,
                                                        LLFontGL::LEFT, LLFontGL::BOTTOM,
                                                        LLFontGL::NORMAL,
@@ -1757,7 +1776,7 @@ BOOL LLLineEditor::prevalidateFloat(const LLWString &str)
        if( 0 < len )
        {
                // May be a comma or period, depending on the locale
-                llwchar decimal_point = (llwchar)gResMgr->getDecimalPoint();
+                llwchar decimal_point = (llwchar)LLResMgr::getInstance()->getDecimalPoint();
                S32 i = 0;
@@ -1806,7 +1825,7 @@ BOOL LLLineEditor::postvalidateFloat(const LLString &str)
                }
                // May be a comma or period, depending on the locale
-                llwchar decimal_point = (llwchar)gResMgr->getDecimalPoint();
+                llwchar decimal_point = (llwchar)LLResMgr::getInstance()->getDecimalPoint();
                for( ; i < len; i++ )
                {
@@ -2244,8 +2263,27 @@ LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
        return line_editor;
 }
+//static
+void LLLineEditor::cleanupClass()
+{
+        sImage = NULL;
+}
+/* static */ 
+LLPointer<LLUIImage> LLLineEditor::parseImage(LLString name, LLXMLNodePtr from, LLPointer<LLUIImage> def)
+{
+        LLString xml_name;
+        if (from->hasAttribute(name)) from->getAttributeString(name, xml_name);
+        if (xml_name == LLString::null) return def;
+        LLPointer<LLUIImage> image = LLUI::getUIImage(xml_name);
+        return image.isNull() ? def : image;
+}
 void LLLineEditor::setColorParameters(LLXMLNodePtr node)
 {
+        // overrides default image if supplied.
+        mImage = parseImage("image", node, mImage);
        LLColor4 color;
        if (LLUICtrlFactory::getAttributeColor(node,"cursor_color", color)) 
        {
@@ -2510,6 +2548,9 @@ S32 LLLineEditor::getPreeditFontSize() const
 }
+static LLRegisterWidget<LLSearchEditor> r2("search_editor");
 LLSearchEditor::LLSearchEditor(const LLString& name, 
                const LLRect& rect,
                S32 max_length_bytes,
@@ -2539,7 +2580,7 @@ LLSearchEditor::LLSearchEditor(const LLString& name,
        LLRect clear_btn_rect(rect.getWidth() - btn_width, rect.getHeight(), rect.getWidth(), 0);
        mClearSearchButton = new LLButton("clear search", 
                                                                clear_btn_rect, 
-                                                                "closebox.tga",
+                                                                "icn_clear_lineeditor.tga",
                                                                "UIImgBtnCloseInactiveUUID",
                                                                LLString::null,
                                                                onClearSearch,
@@ -2552,9 +2593,42 @@ LLSearchEditor::LLSearchEditor(const LLString& name,
        mClearSearchButton->setTabStop(FALSE);
        mSearchEdit->addChild(mClearSearchButton);
-        mSearchEdit->setBorderWidth(0, btn_width);
+        mSearchEdit->setTextPadding(0, btn_width);
+}
+//virtual
+void LLSearchEditor::setValue(const LLSD& value )
+{
+        mSearchEdit->setValue(value);
+}
+//virtual
+LLSD LLSearchEditor::getValue() const
+{
+        return mSearchEdit->getValue();
 }
+//virtual
+BOOL LLSearchEditor::setTextArg( const LLString& key, const LLStringExplicit& text )
+{
+        return mSearchEdit->setTextArg(key, text);
+}
+//virtual
+BOOL LLSearchEditor::setLabelArg( const LLString& key, const LLStringExplicit& text )
+{
+        return mSearchEdit->setLabelArg(key, text);
+}
+//virtual
+void LLSearchEditor::clear()
+{
+        if (mSearchEdit)
+        {
+                mSearchEdit->clear();
+        }
+}
 void LLSearchEditor::draw()
 {
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index ba3c697..bf0dcb5 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -78,19 +78,19 @@ public:
                                 S32 border_thickness = 1);
        virtual ~LLLineEditor();
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_LINE_EDITOR; }
-        virtual LLString getWidgetTag() const { return LL_LINE_EDITOR_TAG; };
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        void setColorParameters(LLXMLNodePtr node);
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+        static void cleanupClass();
        // mousehandler overrides
        /*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*/ BOOL        handleDoubleClick(S32 x,S32 y,MASK mask);
-        /*virtual*/ BOOL        handleKeyHere(KEY key, MASK mask, BOOL called_from_parent );
+        /*virtual*/ BOOL        handleKeyHere(KEY key, MASK mask );
-        /*virtual*/ BOOL        handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+        /*virtual*/ BOOL        handleUnicodeCharHere(llwchar uni_char);
        /*virtual*/ void        onMouseCaptureLost();
        // LLEditMenuHandler overrides
@@ -189,8 +189,8 @@ public:
        void                    setKeystrokeCallback(void (*keystroke_callback)(LLLineEditor* caller, void* user_data));
-        void                    setMaxTextLength(S32 max_text_length); 
+        void                    setMaxTextLength(S32 max_text_length);
-        void                    setBorderWidth(S32 left, S32 right);
+        void                    setTextPadding(S32 left, S32 right); // Used to specify room for children before or after text.
        static BOOL             isPartOfWord(llwchar c);
        // Prevalidation controls which keystrokes can affect the editor
@@ -212,7 +212,7 @@ public:
        void                    updateHistory(); // stores current line in history
 private:
-        // private helper classes
+        // private helper methods
        void                    removeChar();
        void                    addChar(const llwchar c);
        void                    setCursorAtLocalPos(S32 local_mouse_x);
@@ -254,10 +254,10 @@ protected:
        S32                     mCursorPos;                                     // I-beam is just after the mCursorPos-th character.
        S32                     mScrollHPos;                            // Horizontal offset from the start of mText.  Used for scrolling.
        LLFrameTimer mScrollTimer;
+        S32                     mTextPadLeft;                           // Used to reserve space before the beginning of the text for children.
+        S32                     mTextPadRight;                          // Used to reserve space after the end of the text for children.
        S32                     mMinHPixels;
        S32                     mMaxHPixels;
-        S32                     mBorderLeft;
-        S32                     mBorderRight;
        BOOL            mCommitOnFocusLost;
        BOOL            mRevertOnEsc;
@@ -302,6 +302,15 @@ protected:
        std::vector<S32> mPreeditPositions;
        LLPreeditor::standouts_t mPreeditStandouts;
+private:
+        // Utility on top of LLUI::getUIImage, looks up a named image in a given XML node and returns it if possible
+        // or returns a given default image if anything in the process fails.
+        static LLPointer<LLUIImage> parseImage(LLString name, LLXMLNodePtr from, LLPointer<LLUIImage> def);
+        // Global instance used as default for member instance below.
+        static LLPointer<LLUIImage> sImage;
+        // Instances that by default point to the statics but can be overidden in XML.
+        LLPointer<LLUIImage> mImage;
        // private helper class
        class LLLineEditorRollback
        {
@@ -359,8 +368,6 @@ public:
        /*virtual*/ void        draw();
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SEARCH_EDITOR; }
-        virtual LLString getWidgetTag() const { return LL_SEARCH_EDITOR_TAG; }
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
        void setText(const LLStringExplicit &new_text) { mSearchEdit->setText(new_text); }
@@ -368,12 +375,11 @@ public:
        void setSearchCallback(void (*search_callback)(const LLString& search_string, void* user_data), void* data) { mSearchCallback = search_callback; mCallbackUserData = data; }
        // LLUICtrl interface
-        virtual void    setValue(const LLSD& value ) { mSearchEdit->setValue(value); }
+        virtual void    setValue(const LLSD& value );
-        virtual LLSD    getValue() const { return mSearchEdit->getValue(); }
+        virtual LLSD    getValue() const;
-        virtual BOOL    setTextArg(  const LLString& key, const LLStringExplicit& text ) { return mSearchEdit->setTextArg( key, text); }
+        virtual BOOL    setTextArg(  const LLString& key, const LLStringExplicit& text );
-        virtual BOOL    setLabelArg( const LLString& key, const LLStringExplicit& text ) { return mSearchEdit->setLabelArg(key, text); }
+        virtual BOOL    setLabelArg( const LLString& key, const LLStringExplicit& text );
-        virtual void    clear() { if (mSearchEdit) mSearchEdit->clear(); }
+        virtual void    clear();
 private:
        static void onSearchEdit(LLLineEditor* caller, void* user_data );
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index cb54476..f2486f1 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -188,31 +188,6 @@ LLXMLNodePtr LLMenuItemGL::getXML(bool save_children) const
        return node;
 }
-BOOL LLMenuItemGL::handleKey(KEY key, MASK mask, BOOL called_from_parent)
-{
-        // modified from LLView::handleKey
-        // ignore visibility, as keyboard accelerators should still trigger menu items
-        // even when they are not visible
-        // also, ignore enabled flag for self, as that can change based on menu callbacks
-        BOOL handled = FALSE;
-        if( called_from_parent )  
-        {
-                // Downward traversal
-                if (getEnabled())
-                {
-                        handled = childrenHandleKey( key, mask ) != NULL;
-                }
-        }
-        
-        if( !handled )
-        {
-                handled = handleKeyHere( key, mask, called_from_parent );
-        }
-        return handled;
-}
 BOOL LLMenuItemGL::handleAcceleratorKey(KEY key, MASK mask)
 {
        if( getEnabled() && (!gKeyboard->getKeyRepeated(key) || mAllowKeyRepeat) && (key == mAcceleratorKey) && (mask == (mAcceleratorMask & MASK_NORMALKEYS)) )
@@ -400,7 +375,7 @@ void LLMenuItemGL::doIt( void )
 }
-BOOL LLMenuItemGL::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLMenuItemGL::handleKeyHere( KEY key, MASK mask )
 {
        if (getHighlight() && 
                getMenu()->isOpen())
@@ -436,29 +411,21 @@ BOOL LLMenuItemGL::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
 BOOL LLMenuItemGL::handleMouseUp( S32 x, S32 y, MASK )
 {
-        if (getEnabled())
+        // switch to mouse navigation mode
-        {
+        LLMenuGL::setKeyboardMode(FALSE);
-                // switch to mouse navigation mode
-                LLMenuGL::setKeyboardMode(FALSE);
-                doIt();
+        doIt();
-                make_ui_sound("UISndClickRelease");
+        make_ui_sound("UISndClickRelease");
-                return TRUE;
+        return TRUE;
-        }
-        return FALSE;
 }
 BOOL LLMenuItemGL::handleMouseDown( S32 x, S32 y, MASK )
 {
-        if (getEnabled())
+        // switch to mouse navigation mode
-        {
+        LLMenuGL::setKeyboardMode(FALSE);
-                // switch to mouse navigation mode
-                LLMenuGL::setKeyboardMode(FALSE);
-                setHighlight(TRUE);
+        setHighlight(TRUE);
-                return TRUE;
+        return TRUE;
-        }
-        return FALSE;
 }
@@ -560,9 +527,6 @@ public:
        virtual LLString getType() const        { return "separator"; }
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU_ITEM_SEPARATOR; }
-        virtual LLString getWidgetTag() const { return LL_MENU_ITEM_SEPARATOR_GL_TAG; }
        // doIt() - do the primary funcationality of the menu item.
        virtual void doIt( void ) {}
@@ -641,9 +605,6 @@ class LLMenuItemVerticalSeparatorGL
 public:
        LLMenuItemVerticalSeparatorGL( void );
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU_SEPARATOR_VERTICAL; }
-        virtual LLString getWidgetTag() const { return LL_MENU_ITEM_VERTICAL_SEPARATOR_GL_TAG; }
        virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; }
 };
@@ -739,8 +700,6 @@ public:
        {
                setEnabled(FALSE);
        }
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU_ITEM_BLANK; }
-        virtual LLString getWidgetTag() const { return LL_MENU_ITEM_BLANK_GL_TAG; }
        virtual void doIt( void ) {}
        virtual void draw( void ) {}
 };
@@ -827,57 +786,33 @@ void LLMenuItemCallGL::setEnabledControl(LLString enabled_control, LLView *conte
        // Register new listener
        if (!enabled_control.empty())
        {
-                LLControlBase *control = context->findControl(enabled_control);
+                LLControlVariable *control = context->findControl(enabled_control);
-                if (control)
+                if (!control)
-                {
-                        LLSD state = control->registerListener(this, "ENABLED");
-                        setEnabled(state);
-                }
-                else
                {
                        context->addBoolControl(enabled_control, getEnabled());
                        control = context->findControl(enabled_control);
-                        control->registerListener(this, "ENABLED");
+                        llassert_always(control);
                }
+                control->getSignal()->connect(boost::bind(&LLView::controlListener, _1, getHandle(), std::string("enabled")));
+                setEnabled(control->getValue());
        }
 }
-void LLMenuItemCallGL::setVisibleControl(LLString enabled_control, LLView *context)
+void LLMenuItemCallGL::setVisibleControl(LLString visible_control, LLView *context)
 {
        // Register new listener
-        if (!enabled_control.empty())
+        if (!visible_control.empty())
        {
-                LLControlBase *control = context->findControl(enabled_control);
+                LLControlVariable *control = context->findControl(visible_control);
-                if (control)
+                if (!control)
                {
-                        LLSD state = control->registerListener(this, "VISIBLE");
+                        context->addBoolControl(visible_control, getVisible());
-                        setVisible(state);
+                        control = context->findControl(visible_control);
+                        llassert_always(control);
                }
-                else
+                control->getSignal()->connect(boost::bind(&LLView::controlListener, _1, getHandle(), std::string("visible")));
-                {
+                setVisible(control->getValue());
-                        context->addBoolControl(enabled_control, getEnabled());
-                        control = context->findControl(enabled_control);
-                        control->registerListener(this, "VISIBLE");
-                }
-        }
-}
-// virtual
-bool LLMenuItemCallGL::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-{
-        if (userdata.asString() == "ENABLED" && event->desc() == "value_changed")
-        {
-                LLSD state = event->getValue();
-                setEnabled(state);
-                return TRUE;
        }
-        if (userdata.asString() == "VISIBLE" && event->desc() == "value_changed")
-        {
-                LLSD state = event->getValue();
-                setVisible(state);
-                return TRUE;
-        }
-        return LLMenuItemGL::handleEvent(event, userdata);
 }
 // virtual
@@ -1000,44 +935,35 @@ LLMenuItemCheckGL::LLMenuItemCheckGL ( const LLString& name,
        setControlName(control_name, context);
 }
-void LLMenuItemCheckGL::setCheckedControl(LLString checked_control, LLView *context)
+//virtual
+void LLMenuItemCheckGL::setValue(const LLSD& value)
 {
-        // Register new listener
+        mChecked = value.asBoolean();
-        if (!checked_control.empty())
+        if(mChecked)
        {
-                LLControlBase *control = context->findControl(checked_control);
+                mDrawBoolLabel = BOOLEAN_TRUE_PREFIX;
-                if (control)
+        }
-                {
+        else
-                        LLSD state = control->registerListener(this, "CHECKED");
+        {
-                        mChecked = state;
+                mDrawBoolLabel.clear();
-                }
-                else
-                {
-                        context->addBoolControl(checked_control, mChecked);
-                        control = context->findControl(checked_control);
-                        control->registerListener(this, "CHECKED");
-                }
        }
 }
-// virtual
+void LLMenuItemCheckGL::setCheckedControl(LLString checked_control, LLView *context)
-bool LLMenuItemCheckGL::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
-        if (userdata.asString() == "CHECKED" && event->desc() == "value_changed")
+        // Register new listener
+        if (!checked_control.empty())
        {
-                LLSD state = event->getValue();
+                LLControlVariable *control = context->findControl(checked_control);
-                mChecked = state;
+                if (!control)
-                if(mChecked)
-                {
-                        mDrawBoolLabel = BOOLEAN_TRUE_PREFIX;
-                }
-                else
                {
-                        mDrawBoolLabel.clear();
+                        context->addBoolControl(checked_control, mChecked);
+                        control = context->findControl(checked_control);
+                        llassert_always(control);
                }
-                return TRUE;
+                control->getSignal()->connect(boost::bind(&LLView::controlListener, _1, getHandle(), std::string("value")));
+                mChecked = control->getValue();
        }
-        return LLMenuItemCallGL::handleEvent(event, userdata);
 }
 // virtual
@@ -1119,29 +1045,31 @@ LLMenuItemBranchGL::LLMenuItemBranchGL( const LLString& name, const LLString& la
 }
 // virtual
-LLView* LLMenuItemBranchGL::getChildByName(const LLString& name, BOOL recurse) const
+LLView* LLMenuItemBranchGL::getChildView(const LLString& name, BOOL recurse, BOOL create_if_missing) const
 {
+        // richard: this is redundant with parent, remove
        if (mBranch->getName() == name)
        {
                return mBranch;
        }
        // Always recurse on branches
-        return mBranch->getChild<LLView>(name, recurse);
+        LLView* child = mBranch->getChildView(name, recurse, FALSE);
+        if (!child)
+        {
+                child = LLView::getChildView(name, recurse, create_if_missing);
+        }
+        return child;
 }
 // virtual
 BOOL LLMenuItemBranchGL::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-        if (getEnabled())
+        // switch to mouse navigation mode
-        {
+        LLMenuGL::setKeyboardMode(FALSE);
-                // switch to mouse navigation mode
-                LLMenuGL::setKeyboardMode(FALSE);
-                doIt();
+        doIt();
-                make_ui_sound("UISndClickRelease");
+        make_ui_sound("UISndClickRelease");
-                return TRUE;
+        return TRUE;
-        }
-        return FALSE;
 }
 BOOL LLMenuItemBranchGL::handleAcceleratorKey(KEY key, MASK mask)
@@ -1299,7 +1227,7 @@ void LLMenuItemBranchGL::onVisibilityChange( BOOL new_visibility )
        LLMenuItemGL::onVisibilityChange(new_visibility);
 }
-BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask )
 {
        if (getMenu()->getVisible() && mBranch->getVisible() && key == KEY_LEFT)
        {
@@ -1318,8 +1246,7 @@ BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask, BOOL called_from_par
                return handled;
        }
-        if (getEnabled() &&
+        if (getHighlight() && 
-                getHighlight() && 
                getMenu()->isOpen() && 
                key == KEY_RIGHT && !mBranch->getHighlightedItem())
        {
@@ -1333,7 +1260,7 @@ BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask, BOOL called_from_par
                }
        }
-        return LLMenuItemGL::handleKeyHere(key, mask, called_from_parent);
+        return LLMenuItemGL::handleKeyHere(key, mask);
 }
 void LLMenuItemBranchGL::openMenu()
@@ -1403,9 +1330,6 @@ public:
        LLMenuItemBranchDownGL( const LLString& name, const LLString& label, LLMenuGL* branch,
                                                        KEY key = KEY_NONE, MASK mask = MASK_NONE );
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU_ITEM_BRANCH_DOWN; }
-        virtual LLString getWidgetTag() const { return LL_MENU_ITEM_BRANCH_DOWN_GL_TAG; }
        virtual LLString getType() const        { return "menu"; }
        // returns the normal width of this control in pixels - this is
@@ -1429,7 +1353,7 @@ public:
        virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
        virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask ); 
        virtual void draw( void );
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
        
        virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
 };
@@ -1566,7 +1490,7 @@ BOOL LLMenuItemBranchDownGL::handleAcceleratorKey(KEY key, MASK mask)
        return handled;
 }
-BOOL LLMenuItemBranchDownGL::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLMenuItemBranchDownGL::handleKeyHere(KEY key, MASK mask)
 {
        BOOL menu_open = getBranch()->getVisible();
        // don't do keyboard navigation of top-level menus unless in keyboard mode, or menu expanded
@@ -1605,7 +1529,7 @@ BOOL LLMenuItemBranchDownGL::handleKeyHere(KEY key, MASK mask, BOOL called_from_
                        // switch to keyboard navigation mode
                        LLMenuGL::setKeyboardMode(TRUE);
-                        if (getEnabled() && !isActive())
+                        if (!isActive())
                        {
                                doIt();
                        }
@@ -1617,7 +1541,7 @@ BOOL LLMenuItemBranchDownGL::handleKeyHere(KEY key, MASK mask, BOOL called_from_
                        // switch to keyboard navigation mode
                        LLMenuGL::setKeyboardMode(TRUE);
-                        if (getEnabled() && !isActive())
+                        if (!isActive())
                        {
                                doIt();
                        }
@@ -1690,6 +1614,8 @@ void LLMenuItemBranchDownGL::draw( void )
 /// Class LLMenuGL
 ///============================================================================
+static LLRegisterWidget<LLMenuGL> r1("menu");
 // Default constructor
 LLMenuGL::LLMenuGL( const LLString& name, const LLString& label, LLHandle<LLFloater> parent_floater_handle )
 :       LLUICtrl( name, LLRect(), FALSE, NULL, NULL ),
@@ -1946,7 +1872,7 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
                                                        {
                                                                continue;
                                                        }
-                                                        LLControlBase *control = parent->findControl(control_name);
+                                                        LLControlVariable *control = parent->findControl(control_name);
                                                        if (!control)
                                                        {
                                                                parent->addBoolControl(control_name, FALSE);
@@ -2685,8 +2611,8 @@ LLMenuItemGL* LLMenuGL::highlightNextItem(LLMenuItemGL* cur_item, BOOL skip_disa
        while(1)
        {
-                // skip separators and disabled items
+                // skip separators and disabled/invisible items
-                if ((*next_item_iter)->getEnabled() && (*next_item_iter)->getType() != SEPARATOR_NAME)
+                if ((*next_item_iter)->getEnabled() && (*next_item_iter)->getVisible() && (*next_item_iter)->getType() != SEPARATOR_NAME)
                {
                        if (cur_item)
                        {
@@ -2751,8 +2677,8 @@ LLMenuItemGL* LLMenuGL::highlightPrevItem(LLMenuItemGL* cur_item, BOOL skip_disa
        while(1)
        {
-                // skip separators and disabled items
+                // skip separators and disabled/invisible items
-                if ((*prev_item_iter)->getEnabled() && (*prev_item_iter)->getName() != SEPARATOR_NAME)
+                if ((*prev_item_iter)->getEnabled() && (*prev_item_iter)->getVisible() && (*prev_item_iter)->getName() != SEPARATOR_NAME)
                {
                        (*prev_item_iter)->setHighlight(TRUE);
                        return (*prev_item_iter);
@@ -2801,37 +2727,6 @@ void LLMenuGL::updateParent(LLView* parentp)
        }
 }
-// LLView functionality
-BOOL LLMenuGL::handleKey( KEY key, MASK mask, BOOL called_from_parent )
-{
-        BOOL handled = FALSE;
-        // Pass down even if not visible
-        if( getEnabled() && called_from_parent )
-        {
-                for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
-                {
-                        LLView* viewp = *child_it;
-                        if (viewp->handleKey(key, mask, TRUE))
-                        {
-                                handled = TRUE;
-                                break;
-                        }
-                }
-        }
-        if( !handled )
-        {
-                handled = handleKeyHere( key, mask, called_from_parent );
-                if (handled && LLView::sDebugKeys)
-                {
-                        llinfos << "Key handled by " << getName() << llendl;
-                }
-        }
-        return handled;
-}
 BOOL LLMenuGL::handleAcceleratorKey(KEY key, MASK mask)
 {
        // don't handle if not enabled
@@ -2854,7 +2749,7 @@ BOOL LLMenuGL::handleAcceleratorKey(KEY key, MASK mask)
        return FALSE;
 }
-BOOL LLMenuGL::handleUnicodeCharHere( llwchar uni_char, BOOL called_from_parent )
+BOOL LLMenuGL::handleUnicodeCharHere( llwchar uni_char )
 {
        if (jumpKeysActive())
        {
@@ -2980,17 +2875,19 @@ void LLMenuGL::setVisible(BOOL visible)
 LLMenuGL* LLMenuGL::getChildMenuByName(const LLString& name, BOOL recurse) const
 {
-        LLView* view = getChildByName(name, recurse);
+        LLView* view = getChildView(name, recurse, FALSE);
        if (view)
        {
-                if (view->getWidgetType() == WIDGET_TYPE_MENU_ITEM_BRANCH)
+                LLMenuItemBranchGL* branch = dynamic_cast<LLMenuItemBranchGL*>(view);
+                if (branch)
                {
-                        LLMenuItemBranchGL *branch = (LLMenuItemBranchGL *)view;
                        return branch->getBranch();
                }
-                if (view->getWidgetType() == WIDGET_TYPE_MENU || view->getWidgetType() == WIDGET_TYPE_PIE_MENU)
+                LLMenuGL* menup = dynamic_cast<LLMenuGL*>(view);
+                if (menup)
                {
-                        return (LLMenuGL*)view;
+                        return menup;
                }
        }
        llwarns << "Child Menu " << name << " not found in menu " << getName() << llendl;
@@ -3070,9 +2967,6 @@ class LLPieMenuBranch : public LLMenuItemGL
 public:
        LLPieMenuBranch(const LLString& name, const LLString& label, LLPieMenu* branch);
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_PIE_MENU_BRANCH; }
-        virtual LLString getWidgetTag() const { return LL_PIE_MENU_BRANCH_TAG; }
        // called to rebuild the draw label
        virtual void buildDrawLabel( void );
@@ -3842,6 +3736,8 @@ void LLPieMenu::hide(BOOL item_selected)
 /// Class LLMenuBarGL
 ///============================================================================
+static LLRegisterWidget<LLMenuBarGL> r2("menu_bar");
 // Default constructor
 LLMenuBarGL::LLMenuBarGL( const LLString& name ) : LLMenuGL ( name, name )
 {
@@ -3897,9 +3793,10 @@ LLView* LLMenuBarGL::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
        LLMenuBarGL *menubar = new LLMenuBarGL(name);
        LLHandle<LLFloater> parent_handle;
-        if (parent->getWidgetType() == WIDGET_TYPE_FLOATER)
+        LLFloater* parent_floater = dynamic_cast<LLFloater*>(parent);
+        if (parent_floater)
        {
-                parent_handle = ((LLFloater*)parent)->getHandle();
+                parent_handle = parent_floater->getHandle();
        }
        // We need to have the rect early so that it's around when building
@@ -3991,7 +3888,7 @@ BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask)
        return result;
 }
-BOOL LLMenuBarGL::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLMenuBarGL::handleKeyHere(KEY key, MASK mask)
 {
        if(key == KEY_ALT && !gKeyboard->getKeyRepeated(key) && LLUI::sConfigGroup->getBOOL("UseAltKeyForMenus"))
        {
@@ -4005,7 +3902,7 @@ BOOL LLMenuBarGL::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
        // before processing any other key, check to see if ALT key has triggered menu access
        checkMenuTrigger();
-        return LLMenuGL::handleKeyHere(key, mask, called_from_parent);
+        return LLMenuGL::handleKeyHere(key, mask);
 }
 BOOL LLMenuBarGL::handleJumpKey(KEY key)
@@ -4295,7 +4192,7 @@ 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() && viewp->getWidgetType() != WIDGET_TYPE_MENU_BAR)
+                if (viewp->getVisible() && dynamic_cast<LLMenuBarGL*>(viewp) == NULL)
                {
                        return TRUE;
                }
@@ -4319,7 +4216,7 @@ BOOL LLMenuHolderGL::hideMenus()
                {
                        LLView* viewp = *child_it;
                        // clicks off of menu do not hide menu bar
-                        if (viewp->getWidgetType() != WIDGET_TYPE_MENU_BAR && viewp->getVisible())
+                        if (dynamic_cast<LLMenuBarGL*>(viewp) == NULL && viewp->getVisible())
                        {
                                viewp->setVisible(FALSE);
                        }
@@ -4429,7 +4326,7 @@ BOOL LLTearOffMenu::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
        return mMenu->handleUnicodeChar(uni_char, TRUE);
 }
-BOOL LLTearOffMenu::handleKey(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLTearOffMenu::handleKeyHere(KEY key, MASK mask)
 {
        if (!mMenu->getHighlightedItem())
        {
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index cd39006..e7b009a 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -91,14 +91,11 @@ public:
        LLMenuItemGL( const LLString& name, const LLString& label, KEY key = KEY_NONE, MASK = MASK_NONE );
        virtual void setValue(const LLSD& value) { setLabel(value.asString()); }
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU_ITEM; }
-        virtual LLString getWidgetTag() const { return LL_MENU_ITEM_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        virtual LLString getType() const        { return "item"; }
-        virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
        virtual BOOL handleHover(S32 x, S32 y, MASK mask);
        virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
@@ -165,7 +162,7 @@ public:
        virtual void setEnabledSubMenus(BOOL enable){};
        // LLView Functionality
-        virtual BOOL handleKeyHere( KEY key, MASK mask, BOOL called_from_parent );
+        virtual BOOL handleKeyHere( KEY key, MASK mask );
        virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
        virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );
        virtual void draw( void );
@@ -225,7 +222,7 @@ private:
 // calls a user defined callback.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLMenuItemCallGL : public LLMenuItemGL
+class LLMenuItemCallGL : public LLMenuItemGL, public LLObservable
 {
 public:
        // normal constructor
@@ -267,8 +264,6 @@ public:
        virtual LLString getType() const        { return "call"; }
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU_ITEM_CALL; }
-        virtual LLString getWidgetTag() const { return LL_MENU_ITEM_CALL_GL_TAG; }
        void setEnabledControl(LLString enabled_control, LLView *context);
        void setVisibleControl(LLString enabled_control, LLView *context);
@@ -291,7 +286,6 @@ public:
        //virtual void draw();
-        virtual bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
 private:
        menu_callback                   mCallback;
@@ -341,17 +335,13 @@ public:
        void setCheckedControl(LLString checked_control, LLView *context);
-        virtual void setValue(const LLSD& value) { mChecked = value.asBoolean(); }
+        virtual void setValue(const LLSD& value);
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU_ITEM_CHECK; }
-        virtual LLString getWidgetTag() const { return LL_MENU_ITEM_CHECK_GL_TAG; }
        virtual LLString getType() const        { return "check"; }
        // called to rebuild the draw label
        virtual void buildDrawLabel( void );
-        virtual bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
 private:
        check_callback mCheckCallback;
        BOOL mChecked;
@@ -408,6 +398,8 @@ class LLMenuGL
 // TODO: The menu and menu item classes share a great deal of functionality and perhaps should be united.
 // I think it may make the most sense to make LLMenuGL be a subclass of LLMenuItemGL. -MG
 {
+        // let branching menu items use my protected traversal methods
+        friend class LLMenuItemBranchGL;
 public:
        LLMenuGL( const LLString& name, const LLString& label, LLHandle<LLFloater> parent_floater = LLHandle<LLFloater>());
        LLMenuGL( const LLString& label, LLHandle<LLFloater> parent_floater = LLHandle<LLFloater>() );
@@ -417,13 +409,9 @@ public:
        void parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory *factory);
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU; }
-        virtual LLString getWidgetTag() const { return LL_MENU_GL_TAG; }
        // LLView Functionality
-        virtual BOOL handleKey( KEY key, MASK mask, BOOL called_from_parent );
+        virtual BOOL handleUnicodeCharHere( llwchar uni_char );
-        //virtual BOOL handleKeyHere( KEY key, MASK mask, BOOL called_from_parent );
-        virtual BOOL handleUnicodeCharHere( llwchar uni_char, BOOL called_from_parent );
        virtual BOOL handleHover( S32 x, S32 y, MASK mask );
        virtual void draw( void );
        virtual void drawBackground(LLMenuItemGL* itemp, LLColor4& color);
@@ -579,9 +567,6 @@ public:
        virtual LLString getType() const { return "menu"; }
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU_ITEM_BRANCH; }
-        virtual LLString getWidgetTag() const { return LL_MENU_ITEM_BRANCH_GL_TAG; }
        virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
        virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
@@ -602,7 +587,7 @@ public:
        // 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 handleKeyHere(KEY key, MASK mask);
        virtual BOOL isActive() const { return isOpen() && mBranch->getHighlightedItem(); }
@@ -621,8 +606,7 @@ public:
        virtual void openMenu();
-protected:
+        virtual LLView* getChildView(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
-        virtual LLView* getChildByName(const LLString& name, BOOL recurse) const;
 private:
        LLMenuGL* mBranch;
@@ -643,16 +627,12 @@ public:
        LLPieMenu(const LLString& name);
        virtual ~LLPieMenu() {}
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_PIE_MENU; }
-        virtual LLString getWidgetTag() const { return LL_PIE_MENU_TAG; }
        void initXML(LLXMLNodePtr node, LLView *context, LLUICtrlFactory *factory);
        // LLView Functionality
        // can't set visibility directly, must call show or hide
        virtual void setVisible(BOOL visible);
        
-        //virtual BOOL handleKey( KEY key, MASK mask, BOOL called_from_parent );
        virtual BOOL handleHover( S32 x, S32 y, MASK mask );
        virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
        virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
@@ -672,7 +652,6 @@ public:
        void show(S32 x, S32 y, BOOL mouse_down);
        void hide(BOOL item_selected);
-        
 private:
        LLMenuItemGL *pieItemFromXY(S32 x, S32 y);
        S32                       pieItemIndexFromXY(S32 x, S32 y);
@@ -708,11 +687,8 @@ public:
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU_BAR; }
-        virtual LLString getWidgetTag() const { return LL_MENU_BAR_GL_TAG; }
        virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
        virtual BOOL handleJumpKey(KEY key);
        // rearrange the child rects so they fit the shape of the menu
@@ -754,9 +730,6 @@ public:
        LLMenuHolderGL(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows = FOLLOWS_NONE);
        virtual ~LLMenuHolderGL() {}
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU_HOLDER; }
-        virtual LLString getWidgetTag() const { return LL_MENU_HOLDER_GL_TAG; }
        virtual BOOL hideMenus();
        void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
        void setCanHide(BOOL can_hide) { mCanHide = can_hide; }
@@ -794,7 +767,7 @@ public:
        virtual void onFocusReceived();
        virtual void onFocusLost();
        virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
-        virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
        virtual void translate(S32 x, S32 y);
 private:
@@ -816,9 +789,6 @@ class LLMenuItemTearOffGL : public LLMenuItemGL
 public:
        LLMenuItemTearOffGL( LLHandle<LLFloater> parent_floater_handle = LLHandle<LLFloater>());
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_TEAROFF_MENU; }
-        virtual LLString getWidgetTag() const { return LL_MENU_ITEM_TEAR_OFF_GL_TAG; }
        virtual LLString getType() const { return "tearoff_menu"; }
        virtual void doIt(void);
diff --git a/linden/indra/llui/llmodaldialog.cpp b/linden/indra/llui/llmodaldialog.cpp
index 392c122..160495d 100644
--- a/linden/indra/llui/llmodaldialog.cpp
+++ b/linden/indra/llui/llmodaldialog.cpp
@@ -211,11 +211,9 @@ BOOL LLModalDialog::handleRightMouseDown(S32 x, S32 y, MASK mask)
 }
-BOOL LLModalDialog::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLModalDialog::handleKeyHere(KEY key, MASK mask )
 {
-        childrenHandleKey(key, mask);
+        LLFloater::handleKeyHere(key, mask );
-        LLFloater::handleKeyHere(key, mask, called_from_parent );
        if (mModal)
        {
@@ -246,33 +244,30 @@ void LLModalDialog::onClose(bool app_quitting)
 // virtual
 void LLModalDialog::draw()
 {
-        if (getVisible())
+        LLColor4 shadow_color = LLUI::sColorsGroup->getColor("ColorDropShadow");
-        {
+        S32 shadow_lines = LLUI::sConfigGroup->getS32("DropShadowFloater");
-                LLColor4 shadow_color = LLUI::sColorsGroup->getColor("ColorDropShadow");
-                S32 shadow_lines = LLUI::sConfigGroup->getS32("DropShadowFloater");
+        gl_drop_shadow( 0, getRect().getHeight(), getRect().getWidth(), 0,
+                shadow_color, shadow_lines);
-                gl_drop_shadow( 0, getRect().getHeight(), getRect().getWidth(), 0,
+        LLFloater::draw();
-                        shadow_color, shadow_lines);
+        if (mModal)
+        {
+                // If we've lost focus to a non-child, get it back ASAP.
+                if( gFocusMgr.getTopCtrl() != this )
+                {
+                        gFocusMgr.setTopCtrl( this );
+                }
-                LLFloater::draw();
+                if( !gFocusMgr.childHasKeyboardFocus( this ) )
+                {
+                        setFocus(TRUE);
+                }
-                if (mModal)
+                if( !gFocusMgr.childHasMouseCapture( this ) )
                {
-                        // If we've lost focus to a non-child, get it back ASAP.
+                        gFocusMgr.setMouseCapture( this );
-                        if( gFocusMgr.getTopCtrl() != this )
-                        {
-                                gFocusMgr.setTopCtrl( this );
-                        }
-                        if( !gFocusMgr.childHasKeyboardFocus( this ) )
-                        {
-                                setFocus(TRUE);
-                        }
-                        if( !gFocusMgr.childHasMouseCapture( this ) )
-                        {
-                                gFocusMgr.setMouseCapture( this );
-                        }
                }
        }
 }
diff --git a/linden/indra/llui/llmodaldialog.h b/linden/indra/llui/llmodaldialog.h
index 0199498..77bd9db 100644
--- a/linden/indra/llui/llmodaldialog.h
+++ b/linden/indra/llui/llmodaldialog.h
@@ -60,7 +60,7 @@ public:
        /*virtual*/ BOOL        handleScrollWheel(S32 x, S32 y, S32 clicks);
        /*virtual*/ BOOL        handleDoubleClick(S32 x, S32 y, MASK mask);
        /*virtual*/ BOOL        handleRightMouseDown(S32 x, S32 y, MASK mask);
-        /*virtual*/ BOOL        handleKeyHere(KEY key, MASK mask, BOOL called_from_parent );
+        /*virtual*/ BOOL        handleKeyHere(KEY key, MASK mask );
        /*virtual*/ void        onClose(bool app_quitting);
diff --git a/linden/indra/llui/llmultislider.cpp b/linden/indra/llui/llmultislider.cpp
index d0c9002..dfa36fa 100644
--- a/linden/indra/llui/llmultislider.cpp
+++ b/linden/indra/llui/llmultislider.cpp
@@ -43,6 +43,8 @@
 #include <sstream>
+static LLRegisterWidget<LLMultiSlider> r("multi_slider_bar");
 const S32 MULTI_THUMB_WIDTH = 8;
 const S32 MULTI_TRACK_HEIGHT = 6;
 const F32 FLOAT_THRESHOLD = 0.00001f;
@@ -98,16 +100,6 @@ LLMultiSlider::LLMultiSlider(
        setValue(getValue());
 }
-EWidgetType LLMultiSlider::getWidgetType() const
-{
-        return WIDGET_TYPE_MULTI_SLIDER_BAR;
-}
-LLString LLMultiSlider::getWidgetTag() const
-{
-        return LL_MULTI_SLIDER_TAG;
-}
 void LLMultiSlider::setSliderValue(const LLString& name, F32 value, BOOL from_event)
 {
        // exit if not there
@@ -403,31 +395,28 @@ BOOL LLMultiSlider::handleMouseDown(S32 x, S32 y, MASK mask)
        return TRUE;
 }
-BOOL    LLMultiSlider::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL    LLMultiSlider::handleKeyHere(KEY key, MASK mask)
 {
        BOOL handled = FALSE;
-        if( getVisible() && getEnabled() && !called_from_parent )
+        switch(key)
        {
-                switch(key)
+        case KEY_UP:
-                {
+        case KEY_DOWN:
-                case KEY_UP:
+                // eat up and down keys to be consistent
-                case KEY_DOWN:
+                handled = TRUE;
-                        // eat up and down keys to be consistent
+                break;
-                        handled = TRUE;
+        case KEY_LEFT:
-                        break;
+                setCurSliderValue(getCurSliderValue() - getIncrement());
-                case KEY_LEFT:
+                onCommit();
-                        setCurSliderValue(getCurSliderValue() - getIncrement());
+                handled = TRUE;
-                        onCommit();
+                break;
-                        handled = TRUE;
+        case KEY_RIGHT:
-                        break;
+                setCurSliderValue(getCurSliderValue() + getIncrement());
-                case KEY_RIGHT:
+                onCommit();
-                        setCurSliderValue(getCurSliderValue() + getIncrement());
+                handled = TRUE;
-                        onCommit();
+                break;
-                        handled = TRUE;
+        default:
-                        break;
+                break;
-                default:
-                        break;
-                }
        }
        return handled;
 }
@@ -438,177 +427,142 @@ void LLMultiSlider::draw()
        std::map<LLString, LLRect>::iterator mIt;
        std::map<LLString, LLRect>::iterator curSldrIt;
-        if( getVisible() )
-        {
-                // Draw background and thumb.
-                // drawing solids requires texturing be disabled
+        // Draw background and thumb.
-                LLGLSNoTexture no_texture;
-                LLRect rect(mDragStartThumbRect);
+        // drawing solids requires texturing be disabled
+        LLGLSNoTexture no_texture;
-                F32 opacity = getEnabled() ? 1.f : 0.3f;
+        LLRect rect(mDragStartThumbRect);
-                // Track
+        F32 opacity = getEnabled() ? 1.f : 0.3f;
-                LLUUID thumb_image_id;
-                thumb_image_id.set(LLUI::sAssetsGroup->getString("rounded_square.tga"));
-                LLPointer<LLImageGL> thumb_imagep(LLUI::sImageProvider->getUIImageByID(thumb_image_id)->getImage());
-                S32 height_offset = (getRect().getHeight() - MULTI_TRACK_HEIGHT) / 2;
+        // Track
-                LLRect track_rect(0, getRect().getHeight() - height_offset, getRect().getWidth(), height_offset );
+        LLUIImagePtr thumb_imagep = LLUI::sImageProvider->getUIImage("rounded_square.tga");
+        S32 height_offset = (getRect().getHeight() - MULTI_TRACK_HEIGHT) / 2;
+        LLRect track_rect(0, getRect().getHeight() - height_offset, getRect().getWidth(), height_offset );
-                if(mDrawTrack)
-                {
-                        track_rect.stretch(-1);
-                        gl_draw_scaled_image_with_border(track_rect.mLeft, track_rect.mBottom, 16, 16, track_rect.getWidth(), track_rect.getHeight(),
-                                thumb_imagep, mTrackColor % opacity);
-                }
-                // if we're supposed to use a drawn triangle
+        if(mDrawTrack)
-                // simple gl call for the triangle
+        {
-                if(mUseTriangle) {
+                track_rect.stretch(-1);
+                thumb_imagep->draw(track_rect, mTrackColor % opacity);
+        }
-                        for(mIt = mThumbRects.begin(); mIt != mThumbRects.end(); mIt++) {
+        // if we're supposed to use a drawn triangle
+        // simple gl call for the triangle
+        if(mUseTriangle) {
-                                gl_triangle_2d(
+                for(mIt = mThumbRects.begin(); mIt != mThumbRects.end(); mIt++) {
-                                        mIt->second.mLeft - EXTRA_TRIANGLE_WIDTH, 
-                                        mIt->second.mTop + EXTRA_TRIANGLE_HEIGHT,
+                        gl_triangle_2d(
-                                        mIt->second.mRight + EXTRA_TRIANGLE_WIDTH, 
+                                mIt->second.mLeft - EXTRA_TRIANGLE_WIDTH, 
-                                        mIt->second.mTop + EXTRA_TRIANGLE_HEIGHT,
+                                mIt->second.mTop + EXTRA_TRIANGLE_HEIGHT,
-                                        mIt->second.mLeft + mIt->second.getWidth() / 2, 
+                                mIt->second.mRight + EXTRA_TRIANGLE_WIDTH, 
-                                        mIt->second.mBottom - EXTRA_TRIANGLE_HEIGHT,
+                                mIt->second.mTop + EXTRA_TRIANGLE_HEIGHT,
-                                        mTriangleColor, TRUE);
+                                mIt->second.mLeft + mIt->second.getWidth() / 2, 
-                        }
+                                mIt->second.mBottom - EXTRA_TRIANGLE_HEIGHT,
+                                mTriangleColor, TRUE);
                }
-                else if (!thumb_imagep)
+        }
-                {
+        else if (!thumb_imagep)
-                        // draw all the thumbs
+        {
-                        curSldrIt = mThumbRects.end();
+                // draw all the thumbs
-                        for(mIt = mThumbRects.begin(); mIt != mThumbRects.end(); mIt++) {
+                curSldrIt = mThumbRects.end();
+                for(mIt = mThumbRects.begin(); mIt != mThumbRects.end(); mIt++) {
+                        
+                        // choose the color
+                        curThumbColor = mThumbCenterColor;
+                        if(mIt->first == mCurSlider) {
                                
-                                // choose the color
+                                curSldrIt = mIt;
-                                curThumbColor = mThumbCenterColor;
+                                continue;
-                                if(mIt->first == mCurSlider) {
+                                //curThumbColor = mThumbCenterSelectedColor;
-                                        
-                                        curSldrIt = mIt;
-                                        continue;
-                                        //curThumbColor = mThumbCenterSelectedColor;
-                                }
-                                // the draw command
-                                gl_rect_2d(mIt->second, curThumbColor, TRUE);
                        }
-                        // now draw the current slider
+                        // the draw command
-                        if(curSldrIt != mThumbRects.end()) {
+                        gl_rect_2d(mIt->second, curThumbColor, TRUE);
-                                gl_rect_2d(curSldrIt->second, mThumbCenterSelectedColor, TRUE);
+                }
-                        }
-                        // and draw the drag start
+                // now draw the current slider
-                        if (gFocusMgr.getMouseCapture() == this)
+                if(curSldrIt != mThumbRects.end()) {
-                        {
+                        gl_rect_2d(curSldrIt->second, mThumbCenterSelectedColor, TRUE);
-                                gl_rect_2d(mDragStartThumbRect, mThumbCenterColor % opacity, FALSE);
-                        }
                }
-                else if( gFocusMgr.getMouseCapture() == this )
+                // and draw the drag start
+                if (gFocusMgr.getMouseCapture() == this)
                {
-                        // draw drag start
+                        gl_rect_2d(mDragStartThumbRect, mThumbCenterColor % opacity, FALSE);
-                        gl_draw_scaled_image_with_border(mDragStartThumbRect.mLeft, 
+                }
-                                mDragStartThumbRect.mBottom, 16, 16, 
+        }
-                                mDragStartThumbRect.getWidth(), 
+        else if( gFocusMgr.getMouseCapture() == this )
-                                mDragStartThumbRect.getHeight(), 
+        {
-                                thumb_imagep, mThumbCenterColor % 0.3f, TRUE);
+                // draw drag start
+                thumb_imagep->drawSolid(mDragStartThumbRect, mThumbCenterColor % 0.3f);
-                        // draw the highlight
-                        if (hasFocus())
+                // draw the highlight
+                if (hasFocus())
+                {
+                        thumb_imagep->drawBorder(mThumbRects[mCurSlider], gFocusMgr.getFocusColor(), gFocusMgr.getFocusFlashWidth());
+                }
+                // draw the thumbs
+                curSldrIt = mThumbRects.end();
+                for(mIt = mThumbRects.begin(); mIt != mThumbRects.end(); mIt++) 
+                {
+                        // choose the color
+                        curThumbColor = mThumbCenterColor;
+                        if(mIt->first == mCurSlider) 
                        {
-                                F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
+                                // don't draw now, draw last
-                                LLRect highlight_rect = mThumbRects[mCurSlider];
+                                curSldrIt = mIt;
-                                highlight_rect.stretch(llround(lerp(1.f, 3.f, lerp_amt)));
+                                continue;                               
-                                gl_draw_scaled_image_with_border(highlight_rect.mLeft, 
-                                        highlight_rect.mBottom, 16, 16, highlight_rect.getWidth(), 
-                                        highlight_rect.getHeight(),
-                                        thumb_imagep, gFocusMgr.getFocusColor());
                        }
+                        
+                        // the draw command
+                        thumb_imagep->drawSolid(mIt->second, curThumbColor);
+                }
+                
+                // draw cur slider last
+                if(curSldrIt != mThumbRects.end()) 
+                {
+                        thumb_imagep->drawSolid(curSldrIt->second, mThumbCenterSelectedColor);
+                }
+                
+        }
+        else
+        { 
+                // draw highlight
+                if (hasFocus())
+                {
+                        thumb_imagep->drawBorder(mThumbRects[mCurSlider], gFocusMgr.getFocusColor(), gFocusMgr.getFocusFlashWidth());
+                }
-                        // draw the thumbs
+                // draw thumbs
-                        curSldrIt = mThumbRects.end();
+                curSldrIt = mThumbRects.end();
-                        for(mIt = mThumbRects.begin(); mIt != mThumbRects.end(); mIt++) {
+                for(mIt = mThumbRects.begin(); mIt != mThumbRects.end(); mIt++) 
-                                
+                {
-                                // choose the color
-                                curThumbColor = mThumbCenterColor;
-                                if(mIt->first == mCurSlider) {
-                                        // don't draw now, draw last
-                                        curSldrIt = mIt;
-                                        continue;                               
-                                }
-                                
-                                // the draw command
-                                gl_draw_scaled_image_with_border(
-                                        mIt->second.mLeft, 
-                                        mIt->second.mBottom, 16, 16, 
-                                        mIt->second.getWidth(), 
-                                        mIt->second.getHeight(), thumb_imagep, 
-                                        curThumbColor, TRUE);
-                        }
                        
-                        // draw cur slider last
+                        // choose the color
-                        if(curSldrIt != mThumbRects.end()) {
+                        curThumbColor = mThumbCenterColor;
-                                gl_draw_scaled_image_with_border(
+                        if(mIt->first == mCurSlider) 
-                                        curSldrIt->second.mLeft, 
+                        {
-                                        curSldrIt->second.mBottom, 16, 16, 
+                                curSldrIt = mIt;
-                                        curSldrIt->second.getWidth(), 
+                                continue;
-                                        curSldrIt->second.getHeight(), thumb_imagep, 
+                                //curThumbColor = mThumbCenterSelectedColor;
-                                        mThumbCenterSelectedColor, TRUE);
+                        }                               
-                        }
                        
+                        thumb_imagep->drawSolid(mIt->second, curThumbColor % opacity);
                }
-                else
-                { 
-                        // draw highlight
-                        if (hasFocus())
-                        {
-                                F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
-                                LLRect highlight_rect = mThumbRects[mCurSlider];
-                                highlight_rect.stretch(llround(lerp(1.f, 3.f, lerp_amt)));
-                                gl_draw_scaled_image_with_border(highlight_rect.mLeft, highlight_rect.mBottom, 16, 16, highlight_rect.getWidth(), highlight_rect.getHeight(),
-                                        thumb_imagep, gFocusMgr.getFocusColor());
-                        }
-                        // draw thumbs
+                if(curSldrIt != mThumbRects.end()) 
-                        curSldrIt = mThumbRects.end();
+                {
-                        for(mIt = mThumbRects.begin(); mIt != mThumbRects.end(); mIt++) {
+                        thumb_imagep->drawSolid(curSldrIt->second, mThumbCenterSelectedColor % opacity);
-                                
-                                // choose the color
-                                curThumbColor = mThumbCenterColor;
-                                if(mIt->first == mCurSlider) {
-                                        curSldrIt = mIt;
-                                        continue;
-                                        //curThumbColor = mThumbCenterSelectedColor;
-                                }                               
-                                
-                                // the draw command
-                                gl_draw_scaled_image_with_border(
-                                        mIt->second.mLeft, 
-                                        mIt->second.mBottom, 16, 16, 
-                                        mIt->second.getWidth(), 
-                                        mIt->second.getHeight(), thumb_imagep, 
-                                        curThumbColor % opacity, TRUE);
-                        }
-                        if(curSldrIt != mThumbRects.end()) {
-                                gl_draw_scaled_image_with_border(
-                                        curSldrIt->second.mLeft, 
-                                        curSldrIt->second.mBottom, 16, 16, 
-                                        curSldrIt->second.getWidth(), 
-                                        curSldrIt->second.getHeight(), thumb_imagep, 
-                                        mThumbCenterSelectedColor % opacity, TRUE);
-                        }
                }
-                LLUICtrl::draw();
        }
+        LLUICtrl::draw();
 }
 // virtual
diff --git a/linden/indra/llui/llmultislider.h b/linden/indra/llui/llmultislider.h
index 7cd5061..df6153a 100644
--- a/linden/indra/llui/llmultislider.h
+++ b/linden/indra/llui/llmultislider.h
@@ -55,8 +55,6 @@ public:
                BOOL use_triangle,
                const LLString& control_name = LLString::null );
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static  LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
@@ -94,7 +92,7 @@ public:
        virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
        virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
        virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleKeyHere(KEY key, MASK mask);
        virtual void    draw();
 protected:
diff --git a/linden/indra/llui/llmultisliderctrl.cpp b/linden/indra/llui/llmultisliderctrl.cpp
index 47e21d8..c242d18 100644
--- a/linden/indra/llui/llmultisliderctrl.cpp
+++ b/linden/indra/llui/llmultisliderctrl.cpp
@@ -50,6 +50,8 @@
 #include "llfocusmgr.h"
 #include "llresmgr.h"
+static LLRegisterWidget<LLMultiSliderCtrl> r("multi_slider");
 const U32 MAX_STRING_LENGTH = 10;
 
diff --git a/linden/indra/llui/llmultisliderctrl.h b/linden/indra/llui/llmultisliderctrl.h
index 5e2d13c..6a298c8 100644
--- a/linden/indra/llui/llmultisliderctrl.h
+++ b/linden/indra/llui/llmultisliderctrl.h
@@ -71,8 +71,6 @@ public:
                const LLString& control_which = LLString::null );
        virtual ~LLMultiSliderCtrl();
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MULTI_SLIDER; }
-        virtual LLString getWidgetTag() const { return LL_MULTI_SLIDER_CTRL_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 567d29e..7db3725 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -65,6 +65,8 @@ LLPanel::alert_queue_t LLPanel::sAlertQueue;
 const S32 RESIZE_BAR_OVERLAP = 1;
 const S32 RESIZE_BAR_HEIGHT = 3;
+static LLRegisterWidget<LLPanel> r1("panel");
 void LLPanel::init()
 {
        // mRectControl
@@ -126,18 +128,6 @@ LLPanel::~LLPanel()
 }
 // virtual
-EWidgetType LLPanel::getWidgetType() const
-{
-        return WIDGET_TYPE_PANEL;
-}
-// virtual
-LLString LLPanel::getWidgetTag() const
-{
-        return LL_PANEL_TAG;
-}
-// virtual
 BOOL LLPanel::isPanel() const
 {
        return TRUE;
@@ -227,7 +217,8 @@ void LLPanel::updateDefaultBtn()
                if (gFocusMgr.childHasKeyboardFocus( this ) && mDefaultBtn->getEnabled())
                {
                        LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
-                        BOOL focus_is_child_button = focus_ctrl->getWidgetType() == WIDGET_TYPE_BUTTON && static_cast<LLButton *>(focus_ctrl)->getCommitOnReturn();
+                        LLButton* buttonp = dynamic_cast<LLButton*>(focus_ctrl);
+                        BOOL focus_is_child_button = buttonp && buttonp->getCommitOnReturn();
                        // only enable default button when current focus is not a return-capturing button
                        mDefaultBtn->setBorderEnabled(!focus_is_child_button);
                }
@@ -259,7 +250,7 @@ void LLPanel::setDefaultBtn(LLButton* btn)
 void LLPanel::setDefaultBtn(const LLString& id)
 {
-        LLButton *button = LLUICtrlFactory::getButtonByName(this, id);
+        LLButton *button = getChild<LLButton>(id);
        if (button)
        {
                setDefaultBtn(button);
@@ -270,77 +261,6 @@ void LLPanel::setDefaultBtn(const LLString& id)
        }
 }
-BOOL LLPanel::handleKey(KEY key, MASK mask, BOOL called_from_parent)
-{
-        BOOL handled = FALSE;
-        if (getVisible() && getEnabled())
-        {
-                if( (mask == MASK_SHIFT) && (KEY_TAB == key))   
-                {
-                        //SHIFT-TAB
-                        LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
-                        if (cur_focus && gFocusMgr.childHasKeyboardFocus(this))
-                        {
-                                LLUICtrl* focus_root = cur_focus;
-                                while(cur_focus->getParentUICtrl())
-                                {
-                                        cur_focus = cur_focus->getParentUICtrl();
-                                        if (cur_focus->isFocusRoot())
-                                        {
-                                                // this is the root-most focus root found so far
-                                                focus_root = cur_focus;
-                                        }
-                                }
-                                handled = focus_root->focusPrevItem(FALSE);
-                        }
-                        else if (!cur_focus && isFocusRoot())
-                        {
-                                handled = focusLastItem();
-                                if (!handled)
-                                {
-                                        setFocus(TRUE);
-                                        handled = TRUE;
-                                }
-                        }
-                }
-                else
-                if( (mask == MASK_NONE ) && (KEY_TAB == key))   
-                {
-                        //TAB
-                        LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
-                        if (cur_focus && gFocusMgr.childHasKeyboardFocus(this))
-                        {
-                                LLUICtrl* focus_root = cur_focus;
-                                while(cur_focus->getParentUICtrl())
-                                {
-                                        cur_focus = cur_focus->getParentUICtrl();
-                                        if (cur_focus->isFocusRoot())
-                                        {
-                                                focus_root = cur_focus;
-                                        }
-                                }
-                                handled = focus_root->focusNextItem(FALSE);
-                        }
-                        else if (!cur_focus && isFocusRoot())
-                        {
-                                handled = focusFirstItem();
-                                if (!handled)
-                                {
-                                        setFocus(TRUE);
-                                        handled = TRUE;
-                                }
-                        }
-                }
-        }
-        if (!handled)
-        {
-                handled = LLView::handleKey(key, mask, called_from_parent);
-        }
-        return handled;
-}
 void LLPanel::addCtrl( LLUICtrl* ctrl, S32 tab_group)
 {
        mLastTabGroup = tab_group;
@@ -355,83 +275,90 @@ void LLPanel::addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group)
        LLView::addCtrlAtEnd(ctrl, tab_group);
 }
-BOOL LLPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLPanel::handleKeyHere( KEY key, MASK mask )
 {
        BOOL handled = FALSE;
-        if( getVisible() && getEnabled() && 
+        LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
-                gFocusMgr.childHasKeyboardFocus(this) && !called_from_parent )
-        {
-                // handle user hitting ESC to defocus
-                if (key == KEY_ESCAPE)
-                {
-                        gFocusMgr.setKeyboardFocus(NULL);
-                        return TRUE;
-                }
-                LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
+        // handle user hitting ESC to defocus
-                // If we have a default button, click it when
+        if (key == KEY_ESCAPE)
-                // return is pressed, unless current focus is a return-capturing button
+        {
-                // in which case *that* button will handle the return key
+                gFocusMgr.setKeyboardFocus(NULL);
-                if (cur_focus && !(cur_focus->getWidgetType() == WIDGET_TYPE_BUTTON && static_cast<LLButton *>(cur_focus)->getCommitOnReturn()))
+                return TRUE;
+        }
+        else if( (mask == MASK_SHIFT) && (KEY_TAB == key))
+        {
+                //SHIFT-TAB
+                if (cur_focus)
                {
-                        // RETURN key means hit default button in this case
+                        LLUICtrl* focus_root = cur_focus->findRootMostFocusRoot();
-                        if (key == KEY_RETURN && mask == MASK_NONE 
+                        if (focus_root)
-                                && mDefaultBtn != NULL 
-                                && mDefaultBtn->getVisible()
-                                && mDefaultBtn->getEnabled())
                        {
-                                mDefaultBtn->onCommit();
+                                handled = focus_root->focusPrevItem(FALSE);
-                                handled = TRUE;
                        }
                }
+        }
-                if (key == KEY_RETURN && mask == MASK_NONE)
+        else if( (mask == MASK_NONE ) && (KEY_TAB == key))      
+        {
+                //TAB
+                if (cur_focus)
                {
-                        // set keyboard focus to self to trigger commitOnFocusLost behavior on current ctrl
+                        LLUICtrl* focus_root = cur_focus->findRootMostFocusRoot();
-                        if (cur_focus && cur_focus->acceptsTextInput())
+                        if (focus_root)
                        {
-                                cur_focus->onCommit();
+                                handled = focus_root->focusNextItem(FALSE);
-                                handled = TRUE;
                        }
                }
        }
-        return handled;
+        // 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
-void LLPanel::requires(LLString name, EWidgetType type)
+        LLButton* focused_button = dynamic_cast<LLButton*>(cur_focus);
-{
+        if (cur_focus && !(focused_button && focused_button->getCommitOnReturn()))
-        mRequirements[name] = type;
+        {
-}
+                // RETURN key means hit default button in this case
+                if (key == KEY_RETURN && mask == MASK_NONE 
-BOOL LLPanel::checkRequirements() const
+                        && mDefaultBtn != NULL 
-{
+                        && mDefaultBtn->getVisible()
-        BOOL retval = TRUE;
+                        && mDefaultBtn->getEnabled())
-        LLString message;
+                {
+                        mDefaultBtn->onCommit();
+                        handled = TRUE;
+                }
+        }
-        for (requirements_map_t::const_iterator i = mRequirements.begin(); i != mRequirements.end(); ++i)
+        if (key == KEY_RETURN && mask == MASK_NONE)
        {
-                if (!this->getCtrlByNameAndType(i->first, i->second))
+                // set keyboard focus to self to trigger commitOnFocusLost behavior on current ctrl
+                if (cur_focus && cur_focus->acceptsTextInput())
                {
-                        retval = FALSE;
+                        cur_focus->onCommit();
-                        message += i->first + " " + LLUICtrlFactory::getWidgetType(i->second) + "\n";
+                        handled = TRUE;
                }
        }
-        if (!retval)
+        return handled;
+}
+BOOL LLPanel::checkRequirements()
+{
+        if (!mRequirementsError.empty())
        {
                LLString::format_map_t args;
-                args["[COMPONENTS]"] = message;
+                args["[COMPONENTS]"] = mRequirementsError;
                args["[FLOATER]"] = getName();
                llwarns << getName() << " failed requirements check on: \n"  
-                                << message << llendl;
+                                << mRequirementsError << llendl;
                        
                alertXml("FailedRequirementsCheck", args);
+                mRequirementsError.clear();
+                return FALSE;
        }
-        return retval;
+        return TRUE;
 }
 //static
@@ -494,30 +421,6 @@ void LLPanel::setBorderVisible(BOOL b)
        }
 }
-LLUICtrl* LLPanel::getCtrlByNameAndType(const LLString& name, EWidgetType type) const
-{
-        LLView* view = getChildByName(name, TRUE);
-        if (view && view->isCtrl())
-        {
-                if (type ==     WIDGET_TYPE_DONTCARE || view->getWidgetType() == type)
-                {
-                        return (LLUICtrl*)view;
-                }
-                else
-                {
-                        llwarns << "Widget " << name << " has improper type in panel " << getName() << "\n"
-                                        << "Is: \t\t" << view->getWidgetType() << "\n" 
-                                        << "Should be: \t" << type 
-                                        << llendl;
-                }
-        }
-        else
-        {
-                childNotFound(name);
-        }
-        return NULL;
-}
 // virtual
 LLXMLNodePtr LLPanel::getXML(bool save_children) const
 {
@@ -973,7 +876,7 @@ BOOL LLPanel::childSetLabelArg(const LLString& id, const LLString& key, const LL
 BOOL LLPanel::childSetToolTipArg(const LLString& id, const LLString& key, const LLStringExplicit& text)
 {
-        LLView* child = getChildByName(id, true);
+        LLView* child = getChildView(id, true, FALSE);
        if (child)
        {
                return child->setToolTipArg(key, text);
@@ -1001,7 +904,7 @@ void LLPanel::childSetMaxValue(const LLString& id, LLSD max_value)
 void LLPanel::childShowTab(const LLString& id, const LLString& tabname, bool visible)
 {
-        LLTabContainer* child = LLUICtrlFactory::getTabContainerByName(this, id);
+        LLTabContainer* child = getChild<LLTabContainer>(id);
        if (child)
        {
                child->selectTabByName(tabname);
@@ -1010,7 +913,7 @@ void LLPanel::childShowTab(const LLString& id, const LLString& tabname, bool vis
 LLPanel *LLPanel::childGetVisibleTab(const LLString& id) const
 {
-        LLTabContainer* child = LLUICtrlFactory::getTabContainerByName(this, id);
+        LLTabContainer* child = getChild<LLTabContainer>(id);
        if (child)
        {
                return child->getCurrentPanel();
@@ -1020,7 +923,7 @@ LLPanel *LLPanel::childGetVisibleTab(const LLString& id) const
 void LLPanel::childSetTabChangeCallback(const LLString& id, const LLString& tabname, void (*on_tab_clicked)(void*, bool), void *userdata)
 {
-        LLTabContainer* child = LLUICtrlFactory::getTabContainerByName(this, id);
+        LLTabContainer* child = getChild<LLTabContainer>(id);
        if (child)
        {
                LLPanel *panel = child->getPanelByName(tabname);
@@ -1034,7 +937,7 @@ void LLPanel::childSetTabChangeCallback(const LLString& id, const LLString& tabn
 void LLPanel::childSetKeystrokeCallback(const LLString& id, void (*keystroke_callback)(LLLineEditor* caller, void* user_data), void *user_data)
 {
-        LLLineEditor* child = LLUICtrlFactory::getLineEditorByName(this, id);
+        LLLineEditor* child = getChild<LLLineEditor>(id);
        if (child)
        {
                child->setKeystrokeCallback(keystroke_callback);
@@ -1047,7 +950,7 @@ void LLPanel::childSetKeystrokeCallback(const LLString& id, void (*keystroke_cal
 void LLPanel::childSetPrevalidate(const LLString& id, BOOL (*func)(const LLWString &) )
 {
-        LLLineEditor* child = LLUICtrlFactory::getLineEditorByName(this, id);
+        LLLineEditor* child = getChild<LLLineEditor>(id);
        if (child)
        {
                child->setPrevalidate(func);
@@ -1056,7 +959,7 @@ void LLPanel::childSetPrevalidate(const LLString& id, BOOL (*func)(const LLWStri
 void LLPanel::childSetWrappedText(const LLString& id, const LLString& text, bool visible)
 {
-        LLTextBox* child = (LLTextBox*)getCtrlByNameAndType(id, WIDGET_TYPE_TEXT_BOX);
+        LLTextBox* child = getChild<LLTextBox>(id);
        if (child)
        {
                child->setVisible(visible);
@@ -1066,7 +969,7 @@ void LLPanel::childSetWrappedText(const LLString& id, const LLString& text, bool
 void LLPanel::childSetAction(const LLString& id, void(*function)(void*), void* value)
 {
-        LLButton* button = (LLButton*)getCtrlByNameAndType(id, WIDGET_TYPE_BUTTON);
+        LLButton* button = getChild<LLButton>(id);
        if (button)
        {
                button->setClickedCallback(function, value);
@@ -1075,7 +978,7 @@ void LLPanel::childSetAction(const LLString& id, void(*function)(void*), void* v
 void LLPanel::childSetActionTextbox(const LLString& id, void(*function)(void*))
 {
-        LLTextBox* textbox = (LLTextBox*)getCtrlByNameAndType(id, WIDGET_TYPE_TEXT_BOX);
+        LLTextBox* textbox = getChild<LLTextBox>(id);
        if (textbox)
        {
                textbox->setClickedCallback(function);
@@ -1092,13 +995,18 @@ void LLPanel::childSetControlName(const LLString& id, const LLString& control_na
 }
 //virtual
-LLView* LLPanel::getChildByName(const LLString& name, BOOL recurse) const
+LLView* LLPanel::getChildView(const LLString& name, BOOL recurse, BOOL create_if_missing) const
 {
-        LLView* view = LLUICtrl::getChildByName(name, recurse);
+        // just get child, don't try to create a dummy one
+        LLView* view = LLUICtrl::getChildView(name, recurse, FALSE);
        if (!view && !recurse)
        {
                childNotFound(name);
        }
+        if (!view && create_if_missing)
+        {
+                view = createDummyWidget<LLView>(name);
+        }
        return view;
 }
@@ -1191,6 +1099,8 @@ struct LLLayoutStack::LLEmbeddedPanel
        F32 mVisibleAmt;
 };
+static LLRegisterWidget<LLLayoutStack> r2("layout_stack");
 LLLayoutStack::LLLayoutStack(eLayoutOrientation orientation) : 
                mOrientation(orientation),
                mMinWidth(0),
@@ -1204,19 +1114,6 @@ LLLayoutStack::~LLLayoutStack()
        std::for_each(mPanels.begin(), mPanels.end(), DeletePointer());
 }
-// virtual
-EWidgetType LLLayoutStack::getWidgetType() const
-{
-        return WIDGET_TYPE_LAYOUT_STACK;
-}
-// virtual
-LLString LLLayoutStack::getWidgetTag() const
-{
-        return LL_LAYOUT_STACK_TAG;
-}
 void LLLayoutStack::draw()
 {
        updateLayout();
@@ -1304,18 +1201,18 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
        LLXMLNodePtr child;
        for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
        {
+                S32 min_width = 0;
+                S32 min_height = 0;
+                BOOL auto_resize = TRUE;
+                child->getAttributeS32("min_width", min_width);
+                child->getAttributeS32("min_height", min_height);
+                child->getAttributeBOOL("auto_resize", auto_resize);
                if (child->hasName("layout_panel"))
                {
-                        S32 min_width = 0;
-                        S32 min_height = 0;
-                        BOOL auto_resize = TRUE;
                        BOOL user_resize = TRUE;
-                        child->getAttributeS32("min_width", min_width);
-                        child->getAttributeS32("min_height", min_height);
-                        child->getAttributeBOOL("auto_resize", auto_resize);
                        child->getAttributeBOOL("user_resize", user_resize);
                        LLPanel* panelp = (LLPanel*)LLPanel::fromXML(child, layout_stackp, factory);
                        if (panelp)
                        {
@@ -1323,6 +1220,26 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
                                layout_stackp->addPanel(panelp, min_width, min_height, auto_resize, user_resize);
                        }
                }
+                else
+                {
+                        BOOL user_resize = FALSE;
+                        child->getAttributeBOOL("user_resize", user_resize);
+                        LLPanel* panelp = new LLPanel("auto_panel");
+                        LLView* new_child = factory->createWidget(panelp, child);
+                        if (new_child)
+                        {
+                                // put child in new embedded panel
+                                layout_stackp->addPanel(panelp, min_width, min_height, auto_resize, user_resize);
+                                // resize panel to contain widget and move widget to be contained in panel
+                                panelp->setRect(new_child->getRect());
+                                new_child->setOrigin(0, 0);
+                        }
+                        else
+                        {
+                                panelp->die();
+                        }
+                }
        }
        layout_stackp->updateLayout();
@@ -1411,6 +1328,11 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                if (mOrientation == HORIZONTAL)
                {
+                        // enforce minimize size constraint by default
+                        if (panelp->getRect().getWidth() < (*panel_it)->mMinWidth)
+                        {
+                                panelp->reshape((*panel_it)->mMinWidth, panelp->getRect().getHeight());
+                        }
                total_width += llround(panelp->getRect().getWidth() * (*panel_it)->mVisibleAmt);
                // want n-1 panel gaps for n panels
                        if (panel_it != mPanels.begin())
@@ -1420,6 +1342,11 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                }
                else //VERTICAL
                {
+                        // enforce minimize size constraint by default
+                        if (panelp->getRect().getHeight() < (*panel_it)->mMinHeight)
+                        {
+                                panelp->reshape(panelp->getRect().getWidth(), (*panel_it)->mMinHeight);
+                        }
                        total_height += llround(panelp->getRect().getHeight() * (*panel_it)->mVisibleAmt);
                        if (panel_it != mPanels.begin())
                        {
@@ -1438,6 +1365,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                {
                        continue;
                }
                // if currently resizing a panel or the panel is flagged as not automatically resizing
                // only track total available headroom, but don't use it for automatic resize logic
                if ((*panel_it)->mResizeBar->hasMouseCapture() 
@@ -1469,6 +1397,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                }
        }
+        // calculate how many pixels need to be distributed among layout panels
        // positive means panels need to grow, negative means shrink
        S32 pixels_to_distribute;
        if (mOrientation == HORIZONTAL)
@@ -1480,6 +1409,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                pixels_to_distribute = getRect().getHeight() - total_height;
        }
+        // now we distribute the pixels...
        S32 cur_x = 0;
        S32 cur_y = getRect().getHeight();
@@ -1505,13 +1435,17 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                                if (pixels_to_distribute < 0)
                                {
                                        // shrink proportionally to amount over minimum
-                                        delta_size = (shrink_headroom_available > 0) ? llround((F32)pixels_to_distribute * (F32)(cur_width - (*panel_it)->mMinWidth) / (F32)shrink_headroom_available) : 0;
+                                        // so we can do this in one pass
+                                        delta_size = (shrink_headroom_available > 0) ? llround((F32)pixels_to_distribute * ((F32)(cur_width - (*panel_it)->mMinWidth) / (F32)shrink_headroom_available)) : 0;
+                                        shrink_headroom_available -= (cur_width - (*panel_it)->mMinWidth);
                                }
                                else
                                {
                                        // grow all elements equally
                                        delta_size = llround((F32)pixels_to_distribute / (F32)num_resizable_panels);
+                                        num_resizable_panels--;
                                }
+                                pixels_to_distribute -= delta_size;
                                new_width = llmax((*panel_it)->mMinWidth, cur_width + delta_size);
                        }
                        else
@@ -1524,12 +1458,16 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                                if (pixels_to_distribute < 0)
                                {
                                        // shrink proportionally to amount over minimum
-                                        delta_size = (shrink_headroom_available > 0) ? llround((F32)pixels_to_distribute * (F32)(cur_height - (*panel_it)->mMinHeight) / (F32)shrink_headroom_available) : 0;
+                                        // so we can do this in one pass
+                                        delta_size = (shrink_headroom_available > 0) ? llround((F32)pixels_to_distribute * ((F32)(cur_height - (*panel_it)->mMinHeight) / (F32)shrink_headroom_available)) : 0;
+                                        shrink_headroom_available -= (cur_height - (*panel_it)->mMinHeight);
                                }
                                else
                                {
                                        delta_size = llround((F32)pixels_to_distribute / (F32)num_resizable_panels);
+                                        num_resizable_panels--;
                                }
+                                pixels_to_distribute -= delta_size;
                                new_height = llmax((*panel_it)->mMinHeight, cur_height + delta_size);
                        }
                        else
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h
index e0f48ca..c7627ff 100644
--- a/linden/indra/llui/llpanel.h
+++ b/linden/indra/llui/llpanel.h
@@ -82,13 +82,12 @@ public:
        /*virtual*/ ~LLPanel();
        // LLView interface
-        /*virtual*/ EWidgetType getWidgetType() const;
-        /*virtual*/ LLString getWidgetTag() const;
        /*virtual*/ BOOL        isPanel() const;
        /*virtual*/ void        draw(); 
-        /*virtual*/ BOOL        handleKey( KEY key, MASK mask, BOOL called_from_parent );
+        /*virtual*/ BOOL        handleKeyHere( KEY key, MASK mask );
-        /*virtual*/ BOOL        handleKeyHere( KEY key, MASK mask, BOOL called_from_parent );
        /*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
+        // Override to set not found list:
+        virtual LLView* getChildView(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
        // From LLFocusableElement
        /*virtual*/ void        setFocus( BOOL b );
@@ -106,8 +105,21 @@ public:
        BOOL                    hasBorder() const { return mBorder != NULL; }
        void                    setBorderVisible( BOOL b );
-        void                    requires(LLString name, EWidgetType type = WIDGET_TYPE_DONTCARE);
+        template <class T> void requires(LLString name)
-        BOOL                    checkRequirements() const;
+        {
+                // check for widget with matching type and name
+                if (LLView::getChild<T>(name) == NULL)
+                {
+                        mRequirementsError += name + "\n";
+                }
+        }
+        
+        // requires LLView by default
+        void requires(LLString name)
+        {
+                requires<LLView>(name);
+        }
+        BOOL                    checkRequirements();
        void                    setBackgroundColor( const LLColor4& color ) { mBgColorOpaque = color; }
        const LLColor4& getBackgroundColor() const { return mBgColorOpaque; }
@@ -133,8 +145,6 @@ public:
        S32                             getLastTabGroup() const { return mLastTabGroup; }
-        LLUICtrl*               getCtrlByNameAndType(const LLString& name, EWidgetType type) const;
        const LLCallbackMap::map_t& getFactoryMap() const { return mFactoryMap; }
        BOOL initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
@@ -226,9 +236,6 @@ protected:
        LLButton*               getDefaultButton() { return mDefaultBtn; }
        LLCallbackMap::map_t mFactoryMap;
-        // Override to set not found list:
-        virtual LLView* getChildByName(const LLString& name, BOOL recurse = FALSE) const;
 private:
        // common construction logic
        void init();
@@ -257,8 +264,7 @@ private:
        typedef std::map<LLString, LLUIString> ui_string_map_t;
        ui_string_map_t mUIStrings;
-        typedef std::map<LLString, EWidgetType> requirements_map_t;
+        LLString                mRequirementsError;
-        requirements_map_t mRequirements;
        typedef std::queue<LLAlertInfo> alert_queue_t;
        static alert_queue_t sAlertQueue;
@@ -281,9 +287,6 @@ public:
        /*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
        /*virtual*/ void removeCtrl(LLUICtrl* ctrl);
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
        S32 getMinWidth() const { return mMinWidth; }
@@ -291,16 +294,17 @@ public:
        
        void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, S32 index = S32_MAX);
        void removePanel(LLPanel* panel);
-        void updateLayout(BOOL force_resize = FALSE);
 private:
+        struct LLEmbeddedPanel;
+        void updateLayout(BOOL force_resize = FALSE);
        void calcMinExtents();
        S32 getDefaultHeight(S32 cur_height);
        S32 getDefaultWidth(S32 cur_width);
        const eLayoutOrientation mOrientation;
-        struct LLEmbeddedPanel;
        typedef std::vector<LLEmbeddedPanel*> e_panel_list_t;
        e_panel_list_t mPanels;
        LLEmbeddedPanel* findEmbeddedPanel(LLPanel* panelp) const;
diff --git a/linden/indra/llui/llradiogroup.cpp b/linden/indra/llui/llradiogroup.cpp
index 039fe81..d7373f1 100644
--- a/linden/indra/llui/llradiogroup.cpp
+++ b/linden/indra/llui/llradiogroup.cpp
@@ -42,6 +42,7 @@
 #include "llui.h"
 #include "llfocusmgr.h"
+static LLRegisterWidget<LLRadioGroup> r("radio_group");
 LLRadioGroup::LLRadioGroup(const LLString& name, const LLRect& rect,
                                                   const LLString& control_name,
@@ -161,11 +162,11 @@ BOOL LLRadioGroup::setSelectedIndex(S32 index, BOOL from_event)
        return TRUE;
 }
-BOOL LLRadioGroup::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLRadioGroup::handleKeyHere(KEY key, MASK mask)
 {
        BOOL handled = FALSE;
        // do any of the tab buttons have keyboard focus?
-        if (getEnabled() && !called_from_parent && mask == MASK_NONE)
+        if (mask == MASK_NONE)
        {
                switch(key)
                {
diff --git a/linden/indra/llui/llradiogroup.h b/linden/indra/llui/llradiogroup.h
index 87591a4..e208b79 100644
--- a/linden/indra/llui/llradiogroup.h
+++ b/linden/indra/llui/llradiogroup.h
@@ -82,10 +82,8 @@ public:
                                 BOOL border = TRUE);
        virtual ~LLRadioGroup();
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_RADIO_GROUP; }
-        virtual LLString getWidgetTag() const { return LL_RADIO_GROUP_TAG; }
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
        virtual void setEnabled(BOOL enabled);
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
diff --git a/linden/indra/llui/llresizebar.cpp b/linden/indra/llui/llresizebar.cpp
index b4933bd..e89bfee 100644
--- a/linden/indra/llui/llresizebar.cpp
+++ b/linden/indra/llui/llresizebar.cpp
@@ -85,16 +85,13 @@ LLResizeBar::LLResizeBar( const LLString& name, LLView* resizing_view, const LLR
 BOOL LLResizeBar::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-        if( getEnabled() )
+        // Route future Mouse messages here preemptively.  (Release on mouse up.)
-        {
+        // No handler needed for focus lost since this clas has no state that depends on it.
-                // Route future Mouse messages here preemptively.  (Release on mouse up.)
+        gFocusMgr.setMouseCapture( this );
-                // No handler needed for focus lost since this clas has no state that depends on it.
-                gFocusMgr.setMouseCapture( this );
-                localPointToScreen(x, y, &mDragLastScreenX, &mDragLastScreenY);
+        localPointToScreen(x, y, &mDragLastScreenX, &mDragLastScreenY);
-                mLastMouseScreenX = mDragLastScreenX;
+        mLastMouseScreenX = mDragLastScreenX;
-                mLastMouseScreenY = mDragLastScreenY;
+        mLastMouseScreenY = mDragLastScreenY;
-        }
        return TRUE;
 }
diff --git a/linden/indra/llui/llresizebar.h b/linden/indra/llui/llresizebar.h
index 5446811..d03dafa 100644
--- a/linden/indra/llui/llresizebar.h
+++ b/linden/indra/llui/llresizebar.h
@@ -42,9 +42,6 @@ public:
        LLResizeBar(const LLString& name, LLView* resizing_view, const LLRect& rect, S32 min_size, S32 max_size, Side side );
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_RESIZE_BAR; }
-        virtual LLString getWidgetTag() const { return LL_RESIZE_BAR_TAG; }
 //      virtual void    draw();  No appearance
        virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
        virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/llui/llresizehandle.cpp b/linden/indra/llui/llresizehandle.cpp
index d3e066b..3aa968f 100644
--- a/linden/indra/llui/llresizehandle.cpp
+++ b/linden/indra/llui/llresizehandle.cpp
@@ -59,8 +59,7 @@ LLResizeHandle::LLResizeHandle( const LLString& name, const LLRect& rect, S32 mi
        if( RIGHT_BOTTOM == mCorner)
        {
-                LLUUID image_id(LLUI::sConfigGroup->getString("UIImgResizeBottomRightUUID"));
+                mImage = LLUI::sImageProvider->getUIImage("UIImgResizeBottomRightUUID");
-                mImage = LLUI::sImageProvider->getImageByID(image_id);
        }
        switch( mCorner )
@@ -78,19 +77,16 @@ LLResizeHandle::LLResizeHandle( const LLString& name, const LLRect& rect, S32 mi
 BOOL LLResizeHandle::handleMouseDown(S32 x, S32 y, MASK mask)
 {
        BOOL handled = FALSE;
-        if( getVisible() && pointInHandle(x, y) )
+        if( pointInHandle(x, y) )
        {
                handled = TRUE;
-                if( getEnabled() )
+                // Route future Mouse messages here preemptively.  (Release on mouse up.)
-                {
+                // No handler needed for focus lost since this clas has no state that depends on it.
-                        // Route future Mouse messages here preemptively.  (Release on mouse up.)
+                gFocusMgr.setMouseCapture( this );
-                        // No handler needed for focus lost since this clas has no state that depends on it.
-                        gFocusMgr.setMouseCapture( this );
-                        localPointToScreen(x, y, &mDragLastScreenX, &mDragLastScreenY);
+                localPointToScreen(x, y, &mDragLastScreenX, &mDragLastScreenY);
-                        mLastMouseScreenX = mDragLastScreenX;
+                mLastMouseScreenX = mDragLastScreenX;
-                        mLastMouseScreenY = mDragLastScreenY;
+                mLastMouseScreenY = mDragLastScreenY;
-                }
        }
        return handled;
@@ -107,8 +103,7 @@ BOOL LLResizeHandle::handleMouseUp(S32 x, S32 y, MASK mask)
                gFocusMgr.setMouseCapture( NULL );
                handled = TRUE;
        }
-        else
+        else if( pointInHandle(x, y) )
-        if( getVisible() && pointInHandle(x, y) )
        {
                handled = TRUE;
        }
@@ -284,7 +279,7 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask)
        }
        else // don't have mouse capture
        {
-                if( getVisible() && pointInHandle( x, y ) )
+                if( pointInHandle( x, y ) )
                {
                        handled = TRUE;
                }
@@ -314,7 +309,7 @@ void LLResizeHandle::draw()
 {
        if( mImage.notNull() && getVisible() && (RIGHT_BOTTOM == mCorner) ) 
        {
-                gl_draw_image( 0, 0, mImage );
+                mImage->draw(0, 0);
        }
 }
diff --git a/linden/indra/llui/llresizehandle.h b/linden/indra/llui/llresizehandle.h
index 77ebcb9..5302612 100644
--- a/linden/indra/llui/llresizehandle.h
+++ b/linden/indra/llui/llresizehandle.h
@@ -46,9 +46,6 @@ public:
        
        LLResizeHandle(const LLString& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner = RIGHT_BOTTOM );
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_RESIZE_HANDLE; }
-        virtual LLString getWidgetTag() const { return LL_RESIZE_HANDLE_TAG; }
        virtual void    draw();
        virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
        virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
@@ -64,7 +61,7 @@ private:
        S32                             mLastMouseScreenX;
        S32                             mLastMouseScreenY;
        LLCoordGL               mLastMouseDir;
-        LLPointer<LLImageGL>    mImage;
+        LLPointer<LLUIImage>    mImage;
        S32                             mMinWidth;
        S32                             mMinHeight;
        const ECorner   mCorner;
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp
index 83ad440..b5b9174 100644
--- a/linden/indra/llui/llresmgr.cpp
+++ b/linden/indra/llui/llresmgr.cpp
@@ -39,8 +39,6 @@
 #include "llerror.h"
 #include "llstring.h"
-// Global singleton
-LLResMgr* gResMgr = NULL;
 LLResMgr::LLResMgr()
 {
diff --git a/linden/indra/llui/llresmgr.h b/linden/indra/llui/llresmgr.h
index 810d386..f9ec115 100644
--- a/linden/indra/llui/llresmgr.h
+++ b/linden/indra/llui/llresmgr.h
@@ -36,6 +36,7 @@
 #include "locale.h"
 #include "stdtypes.h"
 #include "llstring.h"
+#include "llmemory.h"
 enum LLLOCALE_ID
 {
@@ -44,67 +45,6 @@ enum LLLOCALE_ID
        LLLOCALE_COUNT  // Number of values in this enum.  Keep at end.
 };
-/*
-enum LLSTR_ID 
-{
-        LLSTR_HELLO,
-        LLSTR_GOODBYE,
-        LLSTR_CHAT_LABEL,
-        LLSTR_STATUS_LABEL,
-        LLSTR_X,
-        LLSTR_Y,
-        LLSTR_Z,
-        LLSTR_POSITION,
-        LLSTR_SCALE,
-        LLSTR_ROTATION,
-        LLSTR_HAS_PHYSICS,
-        LLSTR_SCRIPT,
-        LLSTR_HELP,
-        LLSTR_REMOVE,
-        LLSTR_CLEAR,
-        LLSTR_APPLY,
-        LLSTR_CANCEL,
-        LLSTR_MATERIAL,
-        LLSTR_FACE,
-        LLSTR_TEXTURE,
-        LLSTR_TEXTURE_SIZE,
-        LLSTR_TEXTURE_OFFSET,
-        LLSTR_TEXTURE_ROTATION,
-        LLSTR_U,
-        LLSTR_V,
-        LLSTR_OWNERSHIP,
-        LLSTR_PUBLIC,
-        LLSTR_PRIVATE,
-        LLSTR_REVERT,
-        LLSTR_INSERT_SAMPLE,
-        LLSTR_SET_TEXTURE,
-        LLSTR_EDIT_SCRIPT,
-        LLSTR_MOUSELOOK_INSTRUCTIONS,
-        LLSTR_EDIT_FACE_INSTRUCTIONS,
-        LLSTR_CLOSE,
-        LLSTR_MOVE,
-        LLSTR_ROTATE,
-        LLSTR_RESIZE,
-        LLSTR_PLACE_BOX,
-        LLSTR_PLACE_PRISM,
-        LLSTR_PLACE_PYRAMID,
-        LLSTR_PLACE_TETRAHEDRON,
-        LLSTR_PLACE_CYLINDER,
-        LLSTR_PLACE_HALF_CYLINDER,
-        LLSTR_PLACE_CONE,
-        LLSTR_PLACE_HALF_CONE,
-        LLSTR_PLACE_SPHERE,
-        LLSTR_PLACE_HALF_SPHERE,
-        LLSTR_PLACE_BIRD,
-        LLSTR_PLACE_SNAKE,
-        LLSTR_PLACE_ROCK,
-        LLSTR_PLACE_TREE,
-        LLSTR_PLACE_GRASS,
-        LLSTR_MODIFY_LAND,
-        LLSTR_COUNT             // Number of values in this enum.  Keep at end.
-};
-*/
 enum LLFONT_ID
 {
        LLFONT_OCRA,
@@ -117,7 +57,7 @@ enum LLFONT_ID
 class LLFontGL;
-class LLResMgr
+class LLResMgr : public LLSingleton<LLResMgr>
 {
 public:
        LLResMgr();
@@ -162,6 +102,4 @@ private:
        LLString        mPrevLocaleString;
 };
-extern LLResMgr* gResMgr;
 #endif  // LL_RESMGR_
diff --git a/linden/indra/llui/llrootview.h b/linden/indra/llui/llrootview.h
index 5f130b9..f4c047c 100644
--- a/linden/indra/llui/llrootview.h
+++ b/linden/indra/llui/llrootview.h
@@ -38,9 +38,6 @@ class LLRootView : public LLView
 {
 public:
        LLRootView(const LLString& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE);
-        /*virtual*/ EWidgetType getWidgetType() const { return WIDGET_TYPE_ROOT_VIEW; }
-        /*virtual*/ LLString getWidgetTag() const { return LL_ROOT_VIEW_TAG; }
 };
 #endif
diff --git a/linden/indra/llui/llscrollbar.cpp b/linden/indra/llui/llscrollbar.cpp
index cf64742..cdabda0 100644
--- a/linden/indra/llui/llscrollbar.cpp
+++ b/linden/indra/llui/llscrollbar.cpp
@@ -414,17 +414,8 @@ BOOL LLScrollbar::handleHover(S32 x, S32 y, MASK mask)
 BOOL LLScrollbar::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-        BOOL handled = FALSE;
+        changeLine( clicks * mStepSize, TRUE );
-        if( getVisible() && getRect().localPointInRect( x, y ) )
+        return TRUE;
-        {
-                if( getEnabled() )
-                {
-                        changeLine( clicks * mStepSize, TRUE );
-                }
-                handled = TRUE;
-        }
-        return handled;
 }
 BOOL LLScrollbar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
@@ -475,85 +466,68 @@ void LLScrollbar::reshape(S32 width, S32 height, BOOL called_from_parent)
 void LLScrollbar::draw()
 {
-        if( getVisible() )
+        S32 local_mouse_x;
+        S32 local_mouse_y;
+        LLCoordWindow cursor_pos_window;
+        getWindow()->getCursorPosition(&cursor_pos_window);
+        LLCoordGL cursor_pos_gl;
+        getWindow()->convertCoords(cursor_pos_window, &cursor_pos_gl);
+        screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, &local_mouse_x, &local_mouse_y);
+        BOOL other_captor = gFocusMgr.getMouseCapture() && gFocusMgr.getMouseCapture() != this;
+        BOOL hovered = getEnabled() && !other_captor && (hasMouseCapture() || mThumbRect.pointInRect(local_mouse_x, local_mouse_y));
+        if (hovered)
        {
-                S32 local_mouse_x;
+                mCurGlowStrength = lerp(mCurGlowStrength, mHoverGlowStrength, LLCriticalDamp::getInterpolant(0.05f));
-                S32 local_mouse_y;
+        }
-                LLCoordWindow cursor_pos_window;
+        else
-                getWindow()->getCursorPosition(&cursor_pos_window);
+        {
-                LLCoordGL cursor_pos_gl;
+                mCurGlowStrength = lerp(mCurGlowStrength, 0.f, LLCriticalDamp::getInterpolant(0.05f));
-                getWindow()->convertCoords(cursor_pos_window, &cursor_pos_gl);
+        }
-                screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, &local_mouse_x, &local_mouse_y);
-                BOOL other_captor = gFocusMgr.getMouseCapture() && gFocusMgr.getMouseCapture() != this;
-                BOOL hovered = getEnabled() && !other_captor && (hasMouseCapture() || mThumbRect.pointInRect(local_mouse_x, local_mouse_y));
-                if (hovered)
-                {
-                        mCurGlowStrength = lerp(mCurGlowStrength, mHoverGlowStrength, LLCriticalDamp::getInterpolant(0.05f));
-                }
-                else
-                {
-                        mCurGlowStrength = lerp(mCurGlowStrength, 0.f, LLCriticalDamp::getInterpolant(0.05f));
-                }
-                // Draw background and thumb.
+        // Draw background and thumb.
-                LLUUID rounded_rect_image_id;
+        LLUIImage* rounded_rect_imagep = LLUI::sImageProvider->getUIImage("rounded_square.tga");
-                rounded_rect_image_id.set(LLUI::sAssetsGroup->getString("rounded_square.tga"));
-                LLImageGL* rounded_rect_imagep = LLUI::sImageProvider->getImageByID(rounded_rect_image_id);
-                if (!rounded_rect_imagep)
+        if (!rounded_rect_imagep)
-                {
+        {
-                        gl_rect_2d(mOrientation == HORIZONTAL ? SCROLLBAR_SIZE : 0, 
+                gl_rect_2d(mOrientation == HORIZONTAL ? SCROLLBAR_SIZE : 0, 
-                        mOrientation == VERTICAL ? getRect().getHeight() - 2 * SCROLLBAR_SIZE : getRect().getHeight(),
+                mOrientation == VERTICAL ? getRect().getHeight() - 2 * SCROLLBAR_SIZE : getRect().getHeight(),
-                        mOrientation == HORIZONTAL ? getRect().getWidth() - 2 * SCROLLBAR_SIZE : getRect().getWidth(), 
+                mOrientation == HORIZONTAL ? getRect().getWidth() - 2 * SCROLLBAR_SIZE : getRect().getWidth(), 
-                        mOrientation == VERTICAL ? SCROLLBAR_SIZE : 0, mTrackColor, TRUE);
+                mOrientation == VERTICAL ? SCROLLBAR_SIZE : 0, mTrackColor, TRUE);
-                        gl_rect_2d(mThumbRect, mThumbColor, TRUE);
+                gl_rect_2d(mThumbRect, mThumbColor, TRUE);
-                }
+        }
-                else
+        else
-                {
+        {
-                        // Background
+                // Thumb
-                        gl_draw_scaled_image_with_border(mOrientation == HORIZONTAL ? SCROLLBAR_SIZE : 0, 
+                LLRect outline_rect = mThumbRect;
-                                mOrientation == VERTICAL ? SCROLLBAR_SIZE : 0,
+                outline_rect.stretch(2);
-                                16,
-                                16,
-                                mOrientation == HORIZONTAL ? getRect().getWidth() - 2 * SCROLLBAR_SIZE : getRect().getWidth(), 
-                                mOrientation == VERTICAL ? getRect().getHeight() - 2 * SCROLLBAR_SIZE : getRect().getHeight(),
-                                rounded_rect_imagep, 
-                                mTrackColor,
-                                TRUE);
-                        // Thumb
-                        LLRect outline_rect = mThumbRect;
-                        outline_rect.stretch(2);
-                        if (gFocusMgr.getKeyboardFocus() == this)
-                        {
-                                gl_draw_scaled_image_with_border(outline_rect.mLeft, outline_rect.mBottom, 16, 16, outline_rect.getWidth(), outline_rect.getHeight(), 
-                                                        rounded_rect_imagep, gFocusMgr.getFocusColor() );
-                        }
-                        gl_draw_scaled_image_with_border(mThumbRect.mLeft, mThumbRect.mBottom, 16, 16, mThumbRect.getWidth(), mThumbRect.getHeight(), 
+                if (gFocusMgr.getKeyboardFocus() == this)
-                                                        rounded_rect_imagep, mThumbColor );
+                {
-                        if (mCurGlowStrength > 0.01f)
+                        rounded_rect_imagep->draw(outline_rect, gFocusMgr.getFocusColor());
-                        {
-                                gGL.blendFunc(GL_SRC_ALPHA, GL_ONE);
-                                gl_draw_scaled_image_with_border(mThumbRect.mLeft, mThumbRect.mBottom, 16, 16, mThumbRect.getWidth(), mThumbRect.getHeight(), 
-                                                        rounded_rect_imagep, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength), TRUE);
-                                gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-                        }
                }
-                BOOL was_scrolled_to_bottom = (getDocPos() == getDocPosMax());
+                rounded_rect_imagep->draw(mThumbRect, mThumbColor);
-                if (mOnScrollEndCallback && was_scrolled_to_bottom)
+                if (mCurGlowStrength > 0.01f)
                {
-                        mOnScrollEndCallback(mOnScrollEndData);
+                        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+                        rounded_rect_imagep->drawSolid(mThumbRect, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
+                        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                }
-                // Draw children
-                LLView::draw();
        }
+        BOOL was_scrolled_to_bottom = (getDocPos() == getDocPosMax());
+        if (mOnScrollEndCallback && was_scrolled_to_bottom)
+        {
+                mOnScrollEndCallback(mOnScrollEndData);
+        }
+        // Draw children
+        LLView::draw();
 } // end draw
@@ -582,42 +556,39 @@ void LLScrollbar::setValue(const LLSD& value)
 }
-BOOL LLScrollbar::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLScrollbar::handleKeyHere(KEY key, MASK mask)
 {
        BOOL handled = FALSE;
-        if( getVisible() && getEnabled() && !called_from_parent )
+        switch( key )
        {
-                switch( key )
+        case KEY_HOME:
-                {
+                changeLine( -mDocPos, TRUE );
-                case KEY_HOME:
+                handled = TRUE;
-                        changeLine( -mDocPos, TRUE );
+                break;
-                        handled = TRUE;
+        
-                        break;
+        case KEY_END:
-                
+                changeLine( getDocPosMax() - mDocPos, TRUE );
-                case KEY_END:
+                handled = TRUE;
-                        changeLine( getDocPosMax() - mDocPos, TRUE );
+                break;
-                        handled = TRUE;
+        
-                        break;
+        case KEY_DOWN:
-                
+                changeLine( mStepSize, TRUE );
-                case KEY_DOWN:
+                handled = TRUE;
-                        changeLine( mStepSize, TRUE );
+                break;
-                        handled = TRUE;
+        
-                        break;
+        case KEY_UP:
-                
+                changeLine( - mStepSize, TRUE );
-                case KEY_UP:
+                handled = TRUE;
-                        changeLine( - mStepSize, TRUE );
+                break;
-                        handled = TRUE;
-                        break;
+        case KEY_PAGE_DOWN:
+                pageDown(1);
-                case KEY_PAGE_DOWN:
+                break;
-                        pageDown(1);
-                        break;
+        case KEY_PAGE_UP:
+                pageUp(1);
-                case KEY_PAGE_UP:
+                break;
-                        pageUp(1);
-                        break;
-                }
        }
        return handled;
diff --git a/linden/indra/llui/llscrollbar.h b/linden/indra/llui/llscrollbar.h
index b4586c3..52f19d1 100644
--- a/linden/indra/llui/llscrollbar.h
+++ b/linden/indra/llui/llscrollbar.h
@@ -62,11 +62,8 @@ public:
        virtual void setValue(const LLSD& value);
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SCROLLBAR; }
-        virtual LLString getWidgetTag() const { return LL_SCROLLBAR_TAG; }
        // Overrides from LLView
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleKeyHere(KEY key, MASK mask);
        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);
diff --git a/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp
index 15b59d4..a6c1c6d 100644
--- a/linden/indra/llui/llscrollcontainer.cpp
+++ b/linden/indra/llui/llscrollcontainer.cpp
@@ -61,6 +61,8 @@ static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f;
 /// Class LLScrollableContainerView
 ///----------------------------------------------------------------------------
+static LLRegisterWidget<LLScrollableContainerView> r("scroll_container");
 // Default constructor
 LLScrollableContainerView::LLScrollableContainerView( const LLString& name,
                                                                                                          const LLRect& rect,
@@ -210,63 +212,33 @@ void LLScrollableContainerView::reshape(S32 width, S32 height,
        }
 }
-BOOL LLScrollableContainerView::handleKey( KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLScrollableContainerView::handleKeyHere(KEY key, MASK mask)
 {
-        if( getVisible() && getEnabled() )
+        for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
        {
-                if( called_from_parent )
+                if( mScrollbar[i]->handleKeyHere(key, mask) )
-                {
-                        // Downward traversal
-                        // Don't pass keys to scrollbars on downward.
-                        // Handle 'child' view.
-                        if( mScrolledView && mScrolledView->handleKey(key, mask, TRUE) )
-                        {
-                                return TRUE;
-                        }
-                }
-                else
                {
-                        // Upward traversal
+                        return TRUE;
-                        
-                        for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
-                        {
-                                // Note: the scrollbar _is_ actually being called from it's parent.  Here
-                                // we're delgating LLScrollableContainerView's upward traversal to the scrollbars
-                                if( mScrollbar[i]->handleKey(key, mask, TRUE) )
-                                {
-                                        return TRUE;
-                                }
-                        }
-                        if (getParent()) 
-                        {
-                                return getParent()->handleKey( key, mask, FALSE );
-                        }
                }
-        }
+        }       
        return FALSE;
 }
 BOOL LLScrollableContainerView::handleScrollWheel( S32 x, S32 y, S32 clicks )
 {
-        if( getEnabled() )
+        for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
        {
-                for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
+                // Note: tries vertical and then horizontal
-                {
-                        // Note: tries vertical and then horizontal
-                        // Pretend the mouse is over the scrollbar
+                // Pretend the mouse is over the scrollbar
-                        if( mScrollbar[i]->handleScrollWheel( 0, 0, clicks ) )
+                if( mScrollbar[i]->handleScrollWheel( 0, 0, clicks ) )
-                        {
+                {
-                                return TRUE;
+                        return TRUE;
-                        }
                }
        }
-        // Opaque
+        // Eat scroll wheel event (to avoid scrolling nested containers?)
        return TRUE;
 }
@@ -446,80 +418,78 @@ void LLScrollableContainerView::draw()
        // clear this flag to be set on next call to handleDragAndDrop
        mAutoScrolling = FALSE;
-        if( getVisible() )
+        // auto-focus when scrollbar active
+        // this allows us to capture user intent (i.e. stop automatically scrolling the view/etc)
+        if (!gFocusMgr.childHasKeyboardFocus(this) && 
+                (mScrollbar[VERTICAL]->hasMouseCapture() || mScrollbar[HORIZONTAL]->hasMouseCapture()))
        {
-                // auto-focus when scrollbar active
+                focusFirstItem();
-                // this allows us to capture user intent (i.e. stop automatically scrolling the view/etc)
+        }
-                if (!gFocusMgr.childHasKeyboardFocus(this) && 
-                        (mScrollbar[VERTICAL]->hasMouseCapture() || mScrollbar[HORIZONTAL]->hasMouseCapture()))
-                {
-                        focusFirstItem();
-                }
-                // Draw background
+        // Draw background
-                if( mIsOpaque )
+        if( mIsOpaque )
+        {
+                LLGLSNoTexture no_texture;
+                glColor4fv( mBackgroundColor.mV );
+                gl_rect_2d( mInnerRect );
+        }
+        
+        // Draw mScrolledViews and update scroll bars.
+        // get a scissor region ready, and draw the scrolling view. The
+        // scissor region ensures that we don't draw outside of the bounds
+        // of the rectangle.
+        if( mScrolledView )
+        {
+                updateScroll();
+                // Draw the scrolled area.
                {
-                        LLGLSNoTexture no_texture;
+                        S32 visible_width = 0;
-                        gGL.color4fv( mBackgroundColor.mV );
+                        S32 visible_height = 0;
-                        gl_rect_2d( mInnerRect );
+                        BOOL show_v_scrollbar = FALSE;
+                        BOOL show_h_scrollbar = FALSE;
+                        calcVisibleSize( mScrolledView->getRect(), &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
+                        LLLocalClipRect clip(LLRect(mInnerRect.mLeft, 
+                                        mInnerRect.mBottom + (show_h_scrollbar ? SCROLLBAR_SIZE : 0) + visible_height,
+                                        visible_width,
+                                        mInnerRect.mBottom + (show_h_scrollbar ? SCROLLBAR_SIZE : 0)
+                                        ));
+                        drawChild(mScrolledView);
                }
-                
+        }
-                // Draw mScrolledViews and update scroll bars.
-                // get a scissor region ready, and draw the scrolling view. The
-                // scissor region ensures that we don't draw outside of the bounds
-                // of the rectangle.
-                if( mScrolledView )
-                {
-                        updateScroll();
-                        // Draw the scrolled area.
+        // Highlight border if a child of this container has keyboard focus
-                        {
+        if( mBorder->getVisible() )
-                                S32 visible_width = 0;
+        {
-                                S32 visible_height = 0;
+                mBorder->setKeyboardFocusHighlight( gFocusMgr.childHasKeyboardFocus(this) );
-                                BOOL show_v_scrollbar = FALSE;
+        }
-                                BOOL show_h_scrollbar = FALSE;
-                                calcVisibleSize( mScrolledView->getRect(), &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
-                                LLLocalClipRect clip(LLRect(mInnerRect.mLeft, 
-                                                mInnerRect.mBottom + (show_h_scrollbar ? SCROLLBAR_SIZE : 0) + visible_height,
-                                                visible_width,
-                                                mInnerRect.mBottom + (show_h_scrollbar ? SCROLLBAR_SIZE : 0)
-                                                ));
-                                drawChild(mScrolledView);
-                        }
-                }
-                // Highlight border if a child of this container has keyboard focus
+        // Draw all children except mScrolledView
-                if( mBorder->getVisible() )
+        // Note: scrollbars have been adjusted by above drawing code
+        for (child_list_const_reverse_iter_t child_iter = getChildList()->rbegin();
+                 child_iter != getChildList()->rend(); ++child_iter)
+        {
+                LLView *viewp = *child_iter;
+                if( sDebugRects )
                {
-                        mBorder->setKeyboardFocusHighlight( gFocusMgr.childHasKeyboardFocus(this) );
+                        sDepth++;
                }
+                if( (viewp != mScrolledView) && viewp->getVisible() )
-                // Draw all children except mScrolledView
-                // Note: scrollbars have been adjusted by above drawing code
-                for (child_list_const_reverse_iter_t child_iter = getChildList()->rbegin();
-                         child_iter != getChildList()->rend(); ++child_iter)
                {
-                        LLView *viewp = *child_iter;
+                        drawChild(viewp);
-                        if( sDebugRects )
-                        {
-                                sDepth++;
-                        }
-                        if( (viewp != mScrolledView) && viewp->getVisible() )
-                        {
-                                drawChild(viewp);
-                        }
-                        if( sDebugRects )
-                        {
-                                sDepth--;
-                        }
                }
+                if( sDebugRects )
-                if (sDebugRects)
                {
-                        drawDebugRect();
+                        sDepth--;
                }
        }
+        if (sDebugRects)
+        {
+                drawDebugRect();
+        }
 } // end draw
 void LLScrollableContainerView::updateScroll()
diff --git a/linden/indra/llui/llscrollcontainer.h b/linden/indra/llui/llscrollcontainer.h
index 51b1527..b6999e6 100644
--- a/linden/indra/llui/llscrollcontainer.h
+++ b/linden/indra/llui/llscrollcontainer.h
@@ -70,8 +70,6 @@ public:
        void setScrolledView(LLView* view) { mScrolledView = view; }
        virtual void setValue(const LLSD& value) { mInnerRect.setValue(value); }
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SCROLL_CONTAINER; }
-        virtual LLString getWidgetTag() const { return LL_SCROLLABLE_CONTAINER_VIEW_TAG; }
        void                    calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const;
        void                    calcVisibleSize( const LLRect& doc_rect, S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const;
@@ -90,7 +88,7 @@ public:
        // LLView functionality
        virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
-        virtual BOOL    handleKey(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleKeyHere(KEY key, MASK mask);
        virtual BOOL    handleScrollWheel( S32 x, S32 y, S32 clicks );
        virtual BOOL    handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                                                                   EDragAndDropType cargo_type,
diff --git a/linden/indra/llui/llscrollingpanellist.cpp b/linden/indra/llui/llscrollingpanellist.cpp
index 8f85bc8..c9cdf3f 100644
--- a/linden/indra/llui/llscrollingpanellist.cpp
+++ b/linden/indra/llui/llscrollingpanellist.cpp
@@ -34,6 +34,9 @@
 #include "llscrollingpanellist.h"
+static LLRegisterWidget<LLScrollingPanelList> r("scrolling_panel_list");
 /////////////////////////////////////////////////////////////////////
 // LLScrollingPanelList
@@ -129,10 +132,8 @@ void LLScrollingPanelList::updatePanelVisiblilty()
 void LLScrollingPanelList::draw()
 {
-        if( getVisible() )
+        updatePanelVisiblilty();
-        {
-                updatePanelVisiblilty();
-        }
        LLUICtrl::draw();
 }
diff --git a/linden/indra/llui/llscrollingpanellist.h b/linden/indra/llui/llscrollingpanellist.h
index 6fe35cd..7729250 100644
--- a/linden/indra/llui/llscrollingpanellist.h
+++ b/linden/indra/llui/llscrollingpanellist.h
@@ -56,8 +56,6 @@ public:
                :       LLUICtrl(name, rect, TRUE, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_BOTTOM ) {}
        virtual void setValue(const LLSD& value) {};
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SCROLLING_PANEL_LIST; }
-        virtual LLString getWidgetTag() const { return LL_SCROLLING_PANEL_LIST_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children) const { return LLUICtrl::getXML(); }
        
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 01c37d9..2066819 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -55,10 +55,11 @@
 #include "llkeyboard.h"
 #include "llresizebar.h"
-const S32 LIST_BORDER_PAD = 0;          // white space inside the border and to the left of the scrollbar
 const S32 MIN_COLUMN_WIDTH = 20;
 const S32 LIST_SNAP_PADDING = 5;
+static LLRegisterWidget<LLScrollListCtrl> r("scroll_list");
 // local structures & classes.
 struct SortScrollListItem
 {
@@ -68,37 +69,26 @@ struct SortScrollListItem
        bool operator()(const LLScrollListItem* i1, const LLScrollListItem* i2)
        {
-                if ( mSortOrders.empty() ) return true;
+                if ( mSortOrders.empty() )
+                        return i1 < i2;
-                const LLScrollListCell *cell1 = NULL;
-                const LLScrollListCell *cell2 = NULL;
-                
-                sort_order_t::const_reverse_iterator end_it = mSortOrders.rend();
-                sort_order_t::const_reverse_iterator it;
                // sort over all columns in order specified by mSortOrders
                S32 sort_result = 0;
-                for (it = mSortOrders.rbegin(); it != end_it; ++it)
+                for (sort_order_t::const_reverse_iterator it = mSortOrders.rbegin();
+                         it != mSortOrders.rend(); ++it)
                {
                        S32 col_idx = it->first;
                        BOOL sort_ascending = it->second;
-                        cell1 = i1->getColumn(col_idx);
+                        const LLScrollListCell *cell1 = i1->getColumn(col_idx);
-                        cell2 = i2->getColumn(col_idx);
+                        const LLScrollListCell *cell2 = i2->getColumn(col_idx);
-                        // ascending or descending sort for this column?
+                        S32 order = sort_ascending ? 1 : -1; // ascending or descending sort for this column?
-                        S32 order = 1;
-                        if (!sort_ascending)
-                        {
-                                order = -1;
-                        }
                        if (cell1 && cell2)
                        {
-                                sort_result = (order * LLString::compareDict(cell1->getValue().asString(), cell2->getValue().asString()));
+                                sort_result = order * LLString::compareDict(cell1->getValue().asString(), cell2->getValue().asString());
                                if (sort_result != 0)
                                {
-                                        // we have a sort order!
+                                        break; // we have a sort order!
-                                        break;
                                }
                        }
                }
@@ -114,24 +104,49 @@ struct SortScrollListItem
 //
 // LLScrollListIcon
 //
-LLScrollListIcon::LLScrollListIcon(const LLUUID& icon_id, S32 width)
+LLScrollListIcon::LLScrollListIcon(LLUIImagePtr icon, S32 width)
+        : LLScrollListCell(width),
+          mIcon(icon),
+          mColor(LLColor4::white)
+{
+}
+LLScrollListIcon::LLScrollListIcon(const LLSD& value, S32 width)
        : LLScrollListCell(width),
-          mColor(LLColor4::white),
+        mColor(LLColor4::white)
-          mImageUUID(icon_id)
 {
-        // don't use default image specified by LLUUID::null, use no image in that case
+        setValue(value);
-        mIcon = icon_id.isNull() ? NULL : LLUI::sImageProvider->getImageByID(icon_id);
 }
 LLScrollListIcon::~LLScrollListIcon()
 {
 }
 void LLScrollListIcon::setValue(const LLSD& value)
 {
-        mImageUUID = value.asUUID();
+        if (value.isUUID())
-        // don't use default image specified by LLUUID::null, use no image in that case
+        {
-        mIcon = mImageUUID.isNull() ? NULL : LLUI::sImageProvider->getImageByID(mImageUUID);
+                // don't use default image specified by LLUUID::null, use no image in that case
+                LLUUID image_id = value.asUUID();
+                mIcon = image_id.notNull() ? LLUI::sImageProvider->getUIImageByID(image_id) : LLUIImagePtr(NULL);
+        }
+        else
+        {
+                LLString value_string = value.asString();
+                if (LLUUID::validate(value_string))
+                {
+                        setValue(LLUUID(value_string));
+                }
+                else if (!value_string.empty())
+                {
+                        mIcon = LLUI::getUIImage(value.asString());
+                }
+                else
+                {
+                        mIcon = NULL;
+                }
+        }
 }
@@ -143,7 +158,7 @@ void LLScrollListIcon::setColor(const LLColor4& color)
 S32     LLScrollListIcon::getWidth() const 
 {
        // if no specified fix width, use width of icon
-        if (LLScrollListCell::getWidth() == 0)
+        if (LLScrollListCell::getWidth() == 0 && mIcon.notNull())
        {
                return mIcon->getWidth();
        }
@@ -151,11 +166,11 @@ S32	LLScrollListIcon::getWidth() const
 }
-void LLScrollListIcon::draw(const LLColor4& color, const LLColor4& highlight_color) const       
+void LLScrollListIcon::draw(const LLColor4& color, const LLColor4& highlight_color)      const
 {
        if (mIcon)
        {
-                gl_draw_image(0, 0, mIcon, mColor); 
+                mIcon->draw(0, 0, mColor);
        }
 }
@@ -206,6 +221,13 @@ LLScrollListSeparator::LLScrollListSeparator(S32 width) : LLScrollListCell(width
 {
 }
+//virtual 
+S32 LLScrollListSeparator::getHeight() const
+{
+        return 5;
+}
 void LLScrollListSeparator::draw(const LLColor4& color, const LLColor4& highlight_color) const
 {
        //*FIXME: use dynamic item heights and make separators narrow, and inactive
@@ -234,9 +256,34 @@ LLScrollListText::LLScrollListText( const LLString& text, const LLFontGL* font,
        // initialize rounded rect image
        if (!mRoundedRectImage)
        {
-                mRoundedRectImage = LLUI::sImageProvider->getImageByID(LLUUID(LLUI::sAssetsGroup->getString("rounded_square.tga")));
+                mRoundedRectImage = LLUI::sImageProvider->getUIImage("rounded_square.tga");
        }
 }
+//virtual 
+void LLScrollListText::highlightText(S32 offset, S32 num_chars)
+{
+        mHighlightOffset = offset;
+        mHighlightCount = num_chars;
+}
+//virtual 
+BOOL LLScrollListText::isText() const
+{
+        return TRUE;
+}
+//virtual 
+BOOL LLScrollListText::getVisible() const
+{
+        return mVisible;
+}
+//virtual 
+S32 LLScrollListText::getHeight() const
+{
+        return llround(mFont->getLineHeight());
+}
 LLScrollListText::~LLScrollListText()
 {
@@ -266,6 +313,13 @@ void LLScrollListText::setValue(const LLSD& text)
        setText(text.asString());
 }
+//virtual 
+const LLSD LLScrollListText::getValue() const           
+{ 
+        return LLSD(mText.getString()); 
+}
 void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_color) const
 {
        LLColor4 display_color;
@@ -280,8 +334,6 @@ void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_col
        if (mHighlightCount > 0)
        {
-                mRoundedRectImage->bind();
-                gGL.color4fv(highlight_color.mV);
                S32 left = 0;
                switch(mFontAlignment)
                {
@@ -295,13 +347,11 @@ void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_col
                        left = (getWidth() - mFont->getWidth(mText.getString())) / 2;
                        break;
                }
-                gl_segmented_rect_2d_tex(left - 2, 
+                LLRect highlight_rect(left - 2, 
                                llround(mFont->getLineHeight()) + 1, 
                                left + mFont->getWidth(mText.getString(), mHighlightOffset, mHighlightCount) + 1, 
-                                1, 
+                                1);
-                                mRoundedRectImage->getWidth(), 
+                mRoundedRectImage->draw(highlight_rect, highlight_color);
-                                mRoundedRectImage->getHeight(), 
-                                16);
        }
        // Try to draw the entire string
@@ -389,8 +439,6 @@ void LLScrollListItem::draw(const LLRect& rect, const LLColor4& fg_color, const
 {
        // draw background rect
        LLRect bg_rect = rect;
-        // pad background rectangle to separate it from contents
-        bg_rect.stretch(LIST_BORDER_PAD, 0);
        {
                LLGLSNoTexture no_texture;
                gGL.color4fv(bg_color.mV);
@@ -432,7 +480,7 @@ LLScrollListItemComment::LLScrollListItemComment(const LLString& comment_string,
 : LLScrollListItem(FALSE),
        mColor(color)
 {
-        addColumn( comment_string, gResMgr->getRes( LLFONT_SANSSERIF_SMALL ) );
+        addColumn( comment_string, LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ) );
 }
 void LLScrollListItemComment::draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding)
@@ -541,10 +589,10 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
        mDrewSelected(FALSE)
 {
        mItemListRect.setOriginAndSize(
-                mBorderThickness + LIST_BORDER_PAD,
+                mBorderThickness,
-                mBorderThickness + LIST_BORDER_PAD,
+                mBorderThickness,
-                getRect().getWidth() - 2*( mBorderThickness + LIST_BORDER_PAD ),
+                getRect().getWidth() - 2 * mBorderThickness,
-                getRect().getHeight() - 2*( mBorderThickness + LIST_BORDER_PAD ) );
+                getRect().getHeight() - 2 * mBorderThickness );
        updateLineHeight();
@@ -738,10 +786,10 @@ void LLScrollListCtrl::updateLayout()
        // reserve room for column headers, if needed
        S32 heading_size = (mDisplayColumnHeaders ? mHeadingHeight : 0);
        mItemListRect.setOriginAndSize(
-                mBorderThickness + LIST_BORDER_PAD,
+                mBorderThickness,
-                mBorderThickness + LIST_BORDER_PAD,
+                mBorderThickness,
-                getRect().getWidth() - 2*( mBorderThickness + LIST_BORDER_PAD ),
+                getRect().getWidth() - 2 * mBorderThickness,
-                getRect().getHeight() - 2*( mBorderThickness + LIST_BORDER_PAD ) - heading_size );
+                getRect().getHeight() - (2 * mBorderThickness ) - heading_size );
        // how many lines of content in a single "page"
        mPageLines = mLineHeight? mItemListRect.getHeight() / mLineHeight : 0;
@@ -749,7 +797,7 @@ void LLScrollListCtrl::updateLayout()
        if (scrollbar_visible)
        {
                // provide space on the right for scrollbar
-                mItemListRect.mRight = getRect().getWidth() - ( mBorderThickness + LIST_BORDER_PAD ) - SCROLLBAR_SIZE;
+                mItemListRect.mRight = getRect().getWidth() - mBorderThickness - SCROLLBAR_SIZE;
        }
        mScrollbar->reshape(SCROLLBAR_SIZE, mItemListRect.getHeight() + (mDisplayColumnHeaders ? mHeadingHeight : 0));
@@ -775,7 +823,7 @@ LLRect LLScrollListCtrl::getRequiredRect()
 {
        S32 heading_size = (mDisplayColumnHeaders ? mHeadingHeight : 0);
        S32 height = (mLineHeight * getItemCount()) 
-                                + (2 * ( mBorderThickness + LIST_BORDER_PAD )) 
+                                + (2 * mBorderThickness ) 
                                + heading_size;
        S32 width = getRect().getWidth();
@@ -1357,7 +1405,6 @@ LLScrollListItem* LLScrollListCtrl::addCommentText(const LLString& comment_text,
        LLScrollListItem* item = NULL;
        if (getItemCount() < mMaxItemCount)
        {
-                // simple items have their LLSD data set to their label
                // always draw comment text with "enabled" color
                item = new LLScrollListItemComment( comment_text, mFgUnselectedColor );
                addItem( item, pos, FALSE );
@@ -1525,7 +1572,7 @@ LLScrollListItem* LLScrollListCtrl::addStringUUIDItem(const LLString& item_text,
        if (getItemCount() < mMaxItemCount)
        {
                item = new LLScrollListItem( enabled, NULL, id );
-                item->addColumn(item_text, gResMgr->getRes(LLFONT_SANSSERIF_SMALL), column_width);
+                item->addColumn(item_text, LLResMgr::getInstance()->getRes(LLFONT_SANSSERIF_SMALL), column_width);
                addItem( item, pos );
        }
        return item;
@@ -1664,7 +1711,6 @@ void LLScrollListCtrl::drawItems()
                                fg_color = (item->getEnabled() ? mFgUnselectedColor : mFgDisabledColor);
                                if( item->getSelected() && mCanSelect)
                                {
-                                        // Draw background of selected item
                                        bg_color = mBgSelectedColor;
                                        fg_color = (item->getEnabled() ? mFgSelectedColor : mFgDisabledColor);
                                }
@@ -1697,43 +1743,40 @@ void LLScrollListCtrl::drawItems()
 void LLScrollListCtrl::draw()
 {
-        if( getVisible() )
+        // if user specifies sort, make sure it is maintained
+        if (needsSorting() && !isSorted())
        {
-                // if user specifies sort, make sure it is maintained
+                sortItems();
-                if (needsSorting() && !isSorted())
+        }
-                {
-                        sortItems();
-                }
-                if (mNeedsScroll)
-                {
-                        scrollToShowSelected();
-                        mNeedsScroll = FALSE;
-                }
-                LLRect background(0, getRect().getHeight(), getRect().getWidth(), 0);
-                // Draw background
-                if (mBackgroundVisible)
-                {
-                        LLGLSNoTexture no_texture;
-                        gGL.color4fv( getEnabled() ? mBgWriteableColor.mV : mBgReadOnlyColor.mV );
-                        gl_rect_2d(background);
-                }
-                if (mColumnsDirty)
+        if (mNeedsScroll)
-                {
+        {
-                        updateColumns();
+                scrollToShowSelected();
-                        mColumnsDirty = FALSE;
+                mNeedsScroll = FALSE;
-                }
+        }
+        LLRect background(0, getRect().getHeight(), getRect().getWidth(), 0);
+        // Draw background
+        if (mBackgroundVisible)
+        {
+                LLGLSNoTexture no_texture;
+                glColor4fv( getEnabled() ? mBgWriteableColor.mV : mBgReadOnlyColor.mV );
+                gl_rect_2d(background);
+        }
-                drawItems();
+        if (mColumnsDirty)
+        {
+                updateColumns();
+                mColumnsDirty = FALSE;
+        }
-                if (mBorder)
+        drawItems();
-                {
-                        mBorder->setKeyboardFocusHighlight(gFocusMgr.getKeyboardFocus() == this);
-                }
-                LLUICtrl::draw();
+        if (mBorder)
+        {
+                mBorder->setKeyboardFocusHighlight(gFocusMgr.getKeyboardFocus() == this);
        }
+        LLUICtrl::draw();
 }
 void LLScrollListCtrl::setEnabled(BOOL enabled)
@@ -1950,23 +1993,21 @@ BOOL LLScrollListCtrl::handleMouseUp(S32 x, S32 y, MASK mask)
 BOOL LLScrollListCtrl::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
        //BOOL handled = FALSE;
-        if(getVisible())
+        BOOL handled = handleClick(x, y, mask);
-        {
-                BOOL handled = handleClick(x, y, mask);
-                if (!handled)
+        if (!handled)
+        {
+                // Offer the click to the children, even if we aren't enabled
+                // so the scroll bars will work.
+                if (NULL == LLView::childrenHandleDoubleClick(x, y, mask))
                {
-                        // Offer the click to the children, even if we aren't enabled
+                        if( mCanSelect && mOnDoubleClickCallback )
-                        // so the scroll bars will work.
-                        if (NULL == LLView::childrenHandleDoubleClick(x, y, mask))
                        {
-                                if( mCanSelect && mOnDoubleClickCallback )
+                                mOnDoubleClickCallback( mCallbackUserData );
-                                {
-                                        mOnDoubleClickCallback( mCallbackUserData );
-                                }
                        }
                }
        }
        return TRUE;
 }
@@ -2146,12 +2187,12 @@ BOOL LLScrollListCtrl::handleHover(S32 x,S32 y,MASK mask)
 }
-BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask, BOOL called_from_parent )
+BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask )
 {
        BOOL handled = FALSE;
        // not called from parent means we have keyboard focus or a child does
-        if (mCanSelect && !called_from_parent) 
+        if (mCanSelect) 
        {
                // Ignore capslock
                mask = mask;
@@ -2234,7 +2275,7 @@ BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask, BOOL called_from_parent
                                // JC - Special case: Only claim to have handled it
                                // if we're the special non-commit-on-move
                                // type. AND we are visible
-                                if (!mCommitOnKeyboardMovement && mask == MASK_NONE && getVisible())
+                                if (!mCommitOnKeyboardMovement && mask == MASK_NONE)
                                {
                                        onCommit();
                                        mSearchString.clear();
@@ -2281,7 +2322,7 @@ BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask, BOOL called_from_parent
        return handled;
 }
-BOOL LLScrollListCtrl::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent)
+BOOL LLScrollListCtrl::handleUnicodeCharHere(llwchar uni_char)
 {
        if ((uni_char < 0x20) || (uni_char == 0x7F)) // Control character or DEL
        {
@@ -3207,17 +3248,16 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                LLColor4 color = ((*itor)["color"]);
                BOOL enabled = !(*itor).has("enabled") || (*itor)["enabled"].asBoolean() == true;
-                const LLFontGL *font = gResMgr->getRes(fontname);
+                const LLFontGL *font = LLResMgr::getInstance()->getRes(fontname);
                if (!font)
                {
-                        font = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
+                        font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
                }
                U8 font_style = LLFontGL::getStyleFromString(fontstyle);
                if (type == "icon")
                {
-                        LLUUID image_id = value.asUUID();
+                        LLScrollListIcon* cell = new LLScrollListIcon(value, width);
-                        LLScrollListIcon* cell = new LLScrollListIcon(value.asUUID(), width);
                        if (has_color)
                        {
                                cell->setColor(color);
@@ -3270,7 +3310,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                if (new_item->getColumn(column_idx) == NULL)
                {
                        LLScrollListColumn* column_ptr = &column_it->second;
-                        new_item->setColumn(column_idx, new LLScrollListText("", gResMgr->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->mWidth, LLFontGL::NORMAL));
+                        new_item->setColumn(column_idx, new LLScrollListText("", LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->mWidth, LLFontGL::NORMAL));
                }
        }
@@ -3290,7 +3330,7 @@ LLScrollListItem* LLScrollListCtrl::addSimpleElement(const LLString& value, EAdd
        LLScrollListItem *new_item = new LLScrollListItem(entry_id);
-        const LLFontGL *font = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
+        const LLFontGL *font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
        new_item->addColumn(value, font, getRect().getWidth());
@@ -3438,29 +3478,25 @@ LLColumnHeader::~LLColumnHeader()
 void LLColumnHeader::draw()
 {
-        if( getVisible() )
+        BOOL draw_arrow = !mColumn->mLabel.empty() && mColumn->mParentCtrl->isSorted() && mColumn->mParentCtrl->getSortColumnName() == mColumn->mSortingColumn;
-        {
-                BOOL draw_arrow = !mColumn->mLabel.empty() && mColumn->mParentCtrl->isSorted() && mColumn->mParentCtrl->getSortColumnName() == mColumn->mSortingColumn;
-                BOOL is_ascending = mColumn->mParentCtrl->getSortAscending();
+        BOOL is_ascending = mColumn->mParentCtrl->getSortAscending();
-                mButton->setImageOverlay(is_ascending ? "up_arrow.tga" : "down_arrow.tga", LLFontGL::RIGHT, draw_arrow ? LLColor4::white : LLColor4::transparent);
+        mButton->setImageOverlay(is_ascending ? "up_arrow.tga" : "down_arrow.tga", LLFontGL::RIGHT, draw_arrow ? LLColor4::white : LLColor4::transparent);
-                mArrowImage = mButton->getImageOverlay()->getImage();
+        mArrowImage = mButton->getImageOverlay();
-                //BOOL clip = getRect().mRight > mColumn->mParentCtrl->getItemListRect().getWidth();
+        //BOOL clip = getRect().mRight > mColumn->mParentCtrl->getItemListRect().getWidth();
-                //LLGLEnable scissor_test(clip ? GL_SCISSOR_TEST : GL_FALSE);
+        //LLGLEnable scissor_test(clip ? GL_SCISSOR_TEST : GL_FALSE);
-                //LLRect column_header_local_rect(-getRect().mLeft, getRect().getHeight(), mColumn->mParentCtrl->getItemListRect().getWidth() - getRect().mLeft, 0);
+        //LLRect column_header_local_rect(-getRect().mLeft, getRect().getHeight(), mColumn->mParentCtrl->getItemListRect().getWidth() - getRect().mLeft, 0);
-                //LLUI::setScissorRegionLocal(column_header_local_rect);
+        //LLUI::setScissorRegionLocal(column_header_local_rect);
-                // Draw children
+        // Draw children
-                LLComboBox::draw();
+        LLComboBox::draw();
-                if (mList->getVisible())
-                {
-                        // sync sort order with list selection every frame
-                        mColumn->mParentCtrl->sortByColumn(mColumn->mSortingColumn, getCurrentIndex() == 0);
-                }
+        if (mList->getVisible())
+        {
+                // sync sort order with list selection every frame
+                mColumn->mParentCtrl->sortByColumn(mColumn->mSortingColumn, getCurrentIndex() == 0);
        }
 }
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 716d18a..8a31154 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -90,7 +90,7 @@ public:
        LLScrollListSeparator(S32 width);
        virtual ~LLScrollListSeparator() {};
        virtual void                    draw(const LLColor4& color, const LLColor4& highlight_color) const;             // truncate to given width, if possible
-        virtual S32                             getHeight() const { return 5; };
+        virtual S32                             getHeight() const;
        virtual BOOL                    isText() const { return FALSE; }
 };
@@ -105,14 +105,14 @@ public:
        virtual void    draw(const LLColor4& color, const LLColor4& highlight_color) const;
        virtual S32             getContentWidth() const;
-        virtual S32             getHeight() const                       { return llround(mFont->getLineHeight()); }
+        virtual S32             getHeight() const;
        virtual void    setValue(const LLSD& value);
-        virtual const LLSD getValue() const             { return LLSD(mText.getString()); }
+        virtual const LLSD getValue() const;
-        virtual BOOL    getVisible() const  { return mVisible; }
+        virtual BOOL    getVisible() const;
-        virtual void    highlightText(S32 offset, S32 num_chars) {mHighlightOffset = offset; mHighlightCount = num_chars;}
+        virtual void    highlightText(S32 offset, S32 num_chars);
        virtual void    setColor(const LLColor4&);
-        virtual BOOL    isText() const { return TRUE; }
+        virtual BOOL    isText() const;
        void                    setText(const LLStringExplicit& text);
        void                    setFontStyle(const U8 font_style) { mFontStyle = font_style; }
@@ -128,7 +128,7 @@ private:
        S32                             mHighlightCount;
        S32                             mHighlightOffset;
-        LLPointer<LLImageGL> mRoundedRectImage;
+        LLPointer<LLUIImage> mRoundedRectImage;
        static U32 sCount;
 };
@@ -139,20 +139,19 @@ private:
 class LLScrollListIcon : public LLScrollListCell
 {
 public:
-        LLScrollListIcon( const LLUUID& icon_id, S32 width = 0);
+        LLScrollListIcon( LLUIImagePtr icon, S32 width = 0);
+        LLScrollListIcon(const LLSD& value, S32 width = 0);
        /*virtual*/ ~LLScrollListIcon();
        virtual void    draw(const LLColor4& color, const LLColor4& highlight_color) const;
        virtual S32             getWidth() const;
        virtual S32             getHeight() const                       { return mIcon ? mIcon->getHeight() : 0; }
-        // used as sort criterion
+        virtual const LLSD              getValue() const { return mIcon.isNull() ? LLString::null : mIcon->getName(); }
-        virtual const LLSD              getValue() const { return LLSD(mImageUUID); }
        virtual void    setColor(const LLColor4&);
        virtual BOOL    isText()const { return FALSE; }
        virtual void    setValue(const LLSD& value);
 private:
-        LLPointer<LLImageGL> mIcon;
+        LLUIImagePtr mIcon;
-        LLUUID mImageUUID;
        LLColor4 mColor;
 };
@@ -342,8 +341,8 @@ public:
        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( const LLUUID& icon_id, S32 width = 0 )
+        void    addColumn( LLUIImagePtr icon, S32 width = 0 )
-                                { mColumns.push_back( new LLScrollListIcon(icon_id, width) ); }
+                                { mColumns.push_back( new LLScrollListIcon(icon, width) ); }
        void    addColumn( LLCheckBoxCtrl* check, S32 width = 0 )
                                { mColumns.push_back( new LLScrollListCheck(check,width) ); }
@@ -404,8 +403,7 @@ public:
                BOOL draw_border = TRUE);
        virtual ~LLScrollListCtrl();
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SCROLL_LIST; }
-        virtual LLString getWidgetTag() const { return LL_SCROLL_LIST_CTRL_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        void setScrollListParameters(LLXMLNodePtr node);
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
@@ -562,8 +560,8 @@ public:
        /*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        handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        /*virtual*/ BOOL        handleKeyHere(KEY key, MASK mask);
-        /*virtual*/ BOOL        handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+        /*virtual*/ BOOL        handleUnicodeCharHere(llwchar uni_char);
        /*virtual*/ BOOL        handleScrollWheel(S32 x, S32 y, S32 clicks);
        /*virtual*/ BOOL        handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect);
        /*virtual*/ void        setEnabled(BOOL enabled);
@@ -618,6 +616,7 @@ public:
        S32             selectMultiple( LLDynamicArray<LLUUID> ids );
        void                    sortItems();
        // manually call this whenever editing list items in place to flag need for resorting
        void                    setSorted(BOOL sorted) { mSorted = sorted; }
        void                    dirtyColumns(); // some operation has potentially affected column layout or ordering
diff --git a/linden/indra/llui/llslider.cpp b/linden/indra/llui/llslider.cpp
index 02841ee..12d794c 100644
--- a/linden/indra/llui/llslider.cpp
+++ b/linden/indra/llui/llslider.cpp
@@ -41,6 +41,10 @@
 #include "llcontrol.h"
 #include "llimagegl.h"
+static LLRegisterWidget<LLSlider> r1("slider_bar");
+static LLRegisterWidget<LLSlider> r2("volume_slider");
 LLSlider::LLSlider( 
        const LLString& name,
        const LLRect& rect,
@@ -68,9 +72,9 @@ LLSlider::LLSlider(
        mMouseDownCallback( NULL ),
        mMouseUpCallback( NULL )
 {
-        mThumbImage = LLUI::sImageProvider->getImageByID(LLUUID(LLUI::sAssetsGroup->getString("icn_slide-thumb_dark.tga")));
+        mThumbImage = LLUI::sImageProvider->getUIImage("icn_slide-thumb_dark.tga");
-        mTrackImage = LLUI::sImageProvider->getImageByID(LLUUID(LLUI::sAssetsGroup->getString("icn_slide-groove_dark.tga")));
+        mTrackImage = LLUI::sImageProvider->getUIImage("icn_slide-groove_dark.tga");
-        mTrackHighlightImage = LLUI::sImageProvider->getImageByID(LLUUID(LLUI::sAssetsGroup->getString("icn_slide-highlight.tga")));
+        mTrackHighlightImage = LLUI::sImageProvider->getUIImage("icn_slide-highlight.tga");
        // properly handle setting the starting thumb rect
        // do it this way to handle both the operating-on-settings
@@ -217,98 +221,68 @@ BOOL LLSlider::handleMouseDown(S32 x, S32 y, MASK mask)
        return TRUE;
 }
-BOOL LLSlider::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLSlider::handleKeyHere(KEY key, MASK mask)
 {
        BOOL handled = FALSE;
-        if( getVisible() && getEnabled() && !called_from_parent )
+        switch(key)
        {
-                switch(key)
+        case KEY_UP:
-                {
+        case KEY_DOWN:
-                case KEY_UP:
+                // eat up and down keys to be consistent
-                case KEY_DOWN:
+                handled = TRUE;
-                        // eat up and down keys to be consistent
+                break;
-                        handled = TRUE;
+        case KEY_LEFT:
-                        break;
+                setValueAndCommit(getValueF32() - getIncrement());
-                case KEY_LEFT:
+                handled = TRUE;
-                        setValueAndCommit(getValueF32() - getIncrement());
+                break;
-                        handled = TRUE;
+        case KEY_RIGHT:
-                        break;
+                setValueAndCommit(getValueF32() + getIncrement());
-                case KEY_RIGHT:
+                handled = TRUE;
-                        setValueAndCommit(getValueF32() + getIncrement());
+                break;
-                        handled = TRUE;
+        default:
-                        break;
+                break;
-                default:
-                        break;
-                }
        }
        return handled;
 }
 void LLSlider::draw()
 {
-        if( getVisible() )
+        // since thumb image might still be decoding, need thumb to accomodate image size
-        {
+        updateThumbRect();
-                // since thumb image might still be decoding, need thumb to accomodate image size
-                updateThumbRect();
-                // Draw background and thumb.
-                // drawing solids requires texturing be disabled
-                LLGLSNoTexture no_texture;
-                LLRect rect(mDragStartThumbRect);
-                F32 opacity = getEnabled() ? 1.f : 0.3f;
-                LLColor4 center_color = (mThumbCenterColor % opacity);
-                LLColor4 track_color = (mTrackColor % opacity);
-                // Track
-                LLRect track_rect(mThumbImage->getWidth() / 2, 
-                                                        getLocalRect().getCenterY() + (mTrackImage->getHeight() / 2), 
-                                                        getRect().getWidth() - mThumbImage->getWidth() / 2, 
-                                                        getLocalRect().getCenterY() - (mTrackImage->getHeight() / 2) );
-                gl_draw_scaled_image_with_border(track_rect.mLeft, track_rect.mBottom, 3, 3, track_rect.getWidth(), track_rect.getHeight(),
-                                                                                        mTrackImage, track_color);
-                gl_draw_scaled_image_with_border(track_rect.mLeft, track_rect.mBottom, 3, 3, mThumbRect.mLeft, track_rect.getHeight(),
-                                                                                        mTrackHighlightImage, track_color);
+        // Draw background and thumb.
-                // Thumb
+        // drawing solids requires texturing be disabled
-                if( hasMouseCapture() )
+        LLGLSNoTexture no_texture;
-                {
-                        gl_draw_scaled_image(mDragStartThumbRect.mLeft, mDragStartThumbRect.mBottom, mDragStartThumbRect.getWidth(), mDragStartThumbRect.getHeight(), 
-                                                                                         mThumbImage, mThumbCenterColor % 0.3f);
-                        if (hasFocus())
+        F32 opacity = getEnabled() ? 1.f : 0.3f;
-                        {
+        LLColor4 center_color = (mThumbCenterColor % opacity);
-                                F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
+        LLColor4 track_color = (mTrackColor % opacity);
-                                LLRect highlight_rect = mThumbRect;
-                                highlight_rect.stretch(llround(lerp(1.f, 3.f, lerp_amt)));
-                                gl_draw_scaled_image_with_border(highlight_rect.mLeft, highlight_rect.mBottom, 0, 0, highlight_rect.getWidth(), highlight_rect.getHeight(),
-                                                                                                 mThumbImage, gFocusMgr.getFocusColor(), TRUE);
-                        }
-                        gl_draw_scaled_image(mThumbRect.mLeft, mThumbRect.mBottom, mThumbRect.getWidth(), mThumbRect.getHeight(), 
+        // Track
-                                                                                         mThumbImage, mThumbOutlineColor);
+        LLRect track_rect(mThumbImage->getWidth() / 2, 
+                                                getLocalRect().getCenterY() + (mTrackImage->getHeight() / 2), 
+                                                getRect().getWidth() - mThumbImage->getWidth() / 2, 
+                                                getLocalRect().getCenterY() - (mTrackImage->getHeight() / 2) );
+        LLRect highlight_rect(track_rect.mLeft, track_rect.mTop, mThumbRect.getCenterX(), track_rect.mBottom);
+        mTrackImage->draw(track_rect);
+        mTrackHighlightImage->draw(highlight_rect);
-                }
+        // Thumb
-                else
+        if( hasMouseCapture() )
-                { 
+        {
-                        if (hasFocus())
+                // Show ghost where thumb was before dragging began.
-                        {
+                mThumbImage->draw(mDragStartThumbRect, mThumbCenterColor % 0.3f);
-                                F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
-                                LLRect highlight_rect = mThumbRect;
-                                highlight_rect.stretch(llround(lerp(1.f, 3.f, lerp_amt)));
-                                gl_draw_scaled_image_with_border(highlight_rect.mLeft, highlight_rect.mBottom, 0, 0, highlight_rect.getWidth(), highlight_rect.getHeight(),
-                                                                                                 mThumbImage, gFocusMgr.getFocusColor(), TRUE);
-                        }
-                        gl_draw_scaled_image(mThumbRect.mLeft, mThumbRect.mBottom, mThumbRect.getWidth(), mThumbRect.getHeight(), 
-                                                                                         mThumbImage, center_color);
-                }
-                LLUICtrl::draw();
        }
+        if (hasFocus())
+        {
+                // Draw focus highlighting.
+                mThumbImage->drawBorder(mThumbRect, gFocusMgr.getFocusColor(), gFocusMgr.getFocusFlashWidth());
+        }
+        // Fill in the thumb.
+        mThumbImage->draw(mThumbRect, hasMouseCapture() ? mThumbOutlineColor : center_color);
+        LLUICtrl::draw();
 }
 // virtual
diff --git a/linden/indra/llui/llslider.h b/linden/indra/llui/llslider.h
index 506a6bd..1c9d5e1 100644
--- a/linden/indra/llui/llslider.h
+++ b/linden/indra/llui/llslider.h
@@ -52,8 +52,6 @@ public:
                BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no?  -MG
                const LLString& control_name = LLString::null );
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SLIDER_BAR; }
-        virtual LLString getWidgetTag() const { return LL_SLIDER_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static  LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
@@ -79,7 +77,7 @@ public:
        virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
        virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
        virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleKeyHere(KEY key, MASK mask);
        virtual void    draw();
 private:
@@ -96,9 +94,9 @@ private:
        S32                             mMouseOffset;
        LLRect                  mDragStartThumbRect;
-        LLImageGL*              mThumbImage;
+        LLUIImage*              mThumbImage;
-        LLImageGL*              mTrackImage;
+        LLUIImage*              mTrackImage;
-        LLImageGL*              mTrackHighlightImage;
+        LLUIImage*              mTrackHighlightImage;
        LLRect                  mThumbRect;
        LLColor4                mTrackColor;
diff --git a/linden/indra/llui/llsliderctrl.cpp b/linden/indra/llui/llsliderctrl.cpp
index 58ab4ae..d3dc35f 100644
--- a/linden/indra/llui/llsliderctrl.cpp
+++ b/linden/indra/llui/llsliderctrl.cpp
@@ -52,6 +52,7 @@
 const U32 MAX_STRING_LENGTH = 10;
+static LLRegisterWidget<LLSliderCtrl> r("slider");
 
 LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect, 
                                                   const LLString& label,
diff --git a/linden/indra/llui/llsliderctrl.h b/linden/indra/llui/llsliderctrl.h
index 705fa5c..0c8a8b6 100644
--- a/linden/indra/llui/llsliderctrl.h
+++ b/linden/indra/llui/llsliderctrl.h
@@ -63,8 +63,7 @@ public:
                const LLString& control_which = LLString::null );
        virtual ~LLSliderCtrl() {} // Children all cleaned up by default view destructor.
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SLIDER; }
-        virtual LLString getWidgetTag() const { return LL_SLIDER_CTRL_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index 98cdae1..9e85b20 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -52,6 +52,7 @@
 const U32 MAX_STRING_LENGTH = 32;
+static LLRegisterWidget<LLSpinCtrl> r2("spinner");
 
 LLSpinCtrl::LLSpinCtrl( const LLString& name, const LLRect& rect, const LLString& label, const LLFontGL* font,
        void (*commit_callback)(LLUICtrl*, void*),
@@ -409,26 +410,23 @@ void LLSpinCtrl::draw()
 BOOL LLSpinCtrl::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-        if( getEnabled() )
+        if( clicks > 0 )
        {
-                if( clicks > 0 )
+                while( clicks-- )
                {
-                        while( clicks-- )
+                        LLSpinCtrl::onDownBtn(this);
-                        {
-                                LLSpinCtrl::onDownBtn(this);
-                        }
-                }
-                else
-                while( clicks++ )
-                {
-                        LLSpinCtrl::onUpBtn(this);
                }
        }
+        else
+        while( clicks++ )
+        {
+                LLSpinCtrl::onUpBtn(this);
+        }
        return TRUE;
 }
-BOOL LLSpinCtrl::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLSpinCtrl::handleKeyHere(KEY key, MASK mask)
 {
        if (mEditor->hasFocus())
        {
diff --git a/linden/indra/llui/llspinctrl.h b/linden/indra/llui/llspinctrl.h
index f1f971e..790e216 100644
--- a/linden/indra/llui/llspinctrl.h
+++ b/linden/indra/llui/llspinctrl.h
@@ -62,8 +62,7 @@ public:
                S32 label_width = SPINCTRL_DEFAULT_LABEL_WIDTH );
        virtual ~LLSpinCtrl() {} // Children all cleaned up by default view destructor.
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SPINNER; }
-        virtual LLString getWidgetTag() const { return LL_SPIN_CTRL_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
@@ -101,7 +100,7 @@ public:
        void                    forceEditorCommit();                    // for commit on external button
        virtual BOOL    handleScrollWheel(S32 x,S32 y,S32 clicks);
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleKeyHere(KEY key, MASK mask);
        virtual void    draw();
diff --git a/linden/indra/llui/llstyle.cpp b/linden/indra/llui/llstyle.cpp
index cdf87d3..7c46114 100644
--- a/linden/indra/llui/llstyle.cpp
+++ b/linden/indra/llui/llstyle.cpp
@@ -138,12 +138,34 @@ void LLStyle::setFontName(const LLString& fontname)
 }
-void LLStyle::setImage(const LLString& src)
+void LLStyle::setLinkHREF(const LLString& href)
 {
-        if (src.size() >= UUID_STR_LENGTH - 1)
+        mLink = href;
-        {
+}
-                mImagep = LLUI::sImageProvider->getImageByID(LLUUID(src));
-        }
+BOOL LLStyle::isLink() const
+{
+        return mLink.size();
+}
+BOOL LLStyle::isVisible() const
+{
+        return mVisible;
+}
+void LLStyle::setVisible(BOOL is_visible)
+{
+        mVisible = is_visible;
+}
+LLUIImagePtr LLStyle::getImage() const
+{
+        return mImagep;
+}
+void LLStyle::setImage(const LLUUID& src)
+{
+        mImagep = LLUI::sImageProvider->getUIImageByID(src);
 }
diff --git a/linden/indra/llui/llstyle.h b/linden/indra/llui/llstyle.h
index d6ae900..6f0099c 100644
--- a/linden/indra/llui/llstyle.h
+++ b/linden/indra/llui/llstyle.h
@@ -35,7 +35,7 @@
 #include "v4color.h"
 #include "llresmgr.h"
 #include "llfont.h"
-#include "llimagegl.h"
+#include "llui.h"
 class LLStyle
 {
@@ -53,19 +53,20 @@ public:
        virtual const LLColor4& getColor() const { return mColor; }
        virtual void setColor(const LLColor4 &color) { mColor = color; }
-        virtual BOOL isVisible() const { return mVisible; }
+        virtual BOOL isVisible() const;
-        virtual void setVisible(BOOL is_visible) { mVisible = is_visible; }
+        virtual void setVisible(BOOL is_visible);
        virtual const LLString& getFontString() const { return mFontName; }
        virtual void setFontName(const LLString& fontname);
        virtual LLFONT_ID getFontID() const { return mFontID; }
        virtual const LLString& getLinkHREF() const { return mLink; }
-        virtual void setLinkHREF(const LLString& href) { mLink = href; }
+        virtual void setLinkHREF(const LLString& href);
-        virtual BOOL isLink() const { return mLink.size(); }
+        virtual BOOL isLink() const;
+        virtual LLUIImagePtr getImage() const;
+        virtual void setImage(const LLUUID& src);
-        virtual LLImageGL *getImage() const { return mImagep; }
-        virtual void setImage(const LLString& src);
        virtual BOOL isImage() const { return ((mImageWidth != 0) && (mImageHeight != 0)); }
        virtual void setImageSize(S32 width, S32 height);
@@ -106,7 +107,7 @@ private:
        LLString        mFontName;
        LLFONT_ID   mFontID;
        LLString        mLink;
-        LLPointer<LLImageGL> mImagep;
+        LLUIImagePtr mImagep;
        BOOL            mIsEmbeddedItem;
 };
diff --git a/linden/indra/llui/lltabcontainer.cpp b/linden/indra/llui/lltabcontainer.cpp
index e632cf1..7f581dc 100644
--- a/linden/indra/llui/lltabcontainer.cpp
+++ b/linden/indra/llui/lltabcontainer.cpp
@@ -64,7 +64,7 @@ const S32 TABCNTRV_HEADER_HEIGHT = LLPANEL_BORDER_WIDTH + TABCNTRV_CLOSE_BTN_SIZ
 const S32 TABCNTRV_ARROW_BTN_SIZE = 16;
 const S32 TABCNTRV_PAD = 0;
+static LLRegisterWidget<LLTabContainer> r("tab_container");
 LLTabContainer::LLTabContainer(const LLString& name, const LLRect& rect, TabPosition pos,
                                                           BOOL bordered, BOOL is_vertical )
@@ -115,18 +115,6 @@ void LLTabContainer::setValue(const LLSD& value)
 }
 //virtual
-EWidgetType LLTabContainer::getWidgetType() const
-{
-        return WIDGET_TYPE_TAB_CONTAINER;
-}
-//virtual
-LLString LLTabContainer::getWidgetTag() const
-{
-        return LL_TAB_CONTAINER_COMMON_TAG;
-}
-//virtual
 void LLTabContainer::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
        LLPanel::reshape( width, height, called_from_parent );
@@ -134,7 +122,7 @@ void LLTabContainer::reshape(S32 width, S32 height, BOOL called_from_parent)
 }
 //virtual
-LLView* LLTabContainer::getChildByName(const LLString& name, BOOL recurse) const
+LLView* LLTabContainer::getChildView(const LLString& name, BOOL recurse, BOOL create_if_missing) const
 {
        tuple_list_t::const_iterator itor;
        for (itor = mTabList.begin(); itor != mTabList.end(); ++itor)
@@ -145,19 +133,20 @@ LLView* LLTabContainer::getChildByName(const LLString& name, BOOL recurse) const
                        return panel;
                }
        }
        if (recurse)
        {
                for (itor = mTabList.begin(); itor != mTabList.end(); ++itor)
                {
                        LLPanel *panel = (*itor)->mTabPanel;
-                        LLView *child = panel->getChild<LLView>(name, recurse);
+                        LLView *child = panel->getChildView(name, recurse, FALSE);
                        if (child)
                        {
                                return child;
                        }
                }
        }
-        return LLView::getChildByName(name, recurse);
+        return LLView::getChildView(name, recurse, create_if_missing);
 }
 // virtual
@@ -185,124 +174,122 @@ void LLTabContainer::draw()
        }
        setScrollPosPixels((S32)lerp((F32)getScrollPosPixels(), (F32)target_pixel_scroll, LLCriticalDamp::getInterpolant(0.08f)));
-        if( getVisible() )
+        BOOL has_scroll_arrows = (mMaxScrollPos > 0) || (mScrollPosPixels > 0);
+        if (!mIsVertical)
        {
-                BOOL has_scroll_arrows = (mMaxScrollPos > 0) || (mScrollPosPixels > 0);
+                mJumpPrevArrowBtn->setVisible( has_scroll_arrows );
-                if (!mIsVertical)
+                mJumpNextArrowBtn->setVisible( has_scroll_arrows );
-                {
+        }
-                        mJumpPrevArrowBtn->setVisible( has_scroll_arrows );
+        mPrevArrowBtn->setVisible( has_scroll_arrows );
-                        mJumpNextArrowBtn->setVisible( has_scroll_arrows );
+        mNextArrowBtn->setVisible( has_scroll_arrows );
-                }
-                mPrevArrowBtn->setVisible( has_scroll_arrows );
-                mNextArrowBtn->setVisible( has_scroll_arrows );
-                S32 left = 0, top = 0;
+        S32 left = 0, top = 0;
-                if (mIsVertical)
+        if (mIsVertical)
-                {
+        {
-                        top = getRect().getHeight() - getTopBorderHeight() - LLPANEL_BORDER_WIDTH - 1 - (has_scroll_arrows ? TABCNTRV_ARROW_BTN_SIZE : 0);
+                top = getRect().getHeight() - getTopBorderHeight() - LLPANEL_BORDER_WIDTH - 1 - (has_scroll_arrows ? TABCNTRV_ARROW_BTN_SIZE : 0);
-                        top += getScrollPosPixels();
+                top += getScrollPosPixels();
-                }
+        }
-                else
+        else
-                {
+        {
-                        // Set the leftmost position of the tab buttons.
+                // Set the leftmost position of the tab buttons.
-                        left = LLPANEL_BORDER_WIDTH + (has_scroll_arrows ? (TABCNTR_ARROW_BTN_SIZE * 2) : TABCNTR_TAB_H_PAD);
+                left = LLPANEL_BORDER_WIDTH + (has_scroll_arrows ? (TABCNTR_ARROW_BTN_SIZE * 2) : TABCNTR_TAB_H_PAD);
-                        left -= getScrollPosPixels();
+                left -= getScrollPosPixels();
-                }
+        }
-                
+        
-                // Hide all the buttons
+        // Hide all the buttons
+        for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
+        {
+                LLTabTuple* tuple = *iter;
+                tuple->mButton->setVisible( FALSE );
+        }
+        LLPanel::draw();
+        // if tabs are hidden, don't draw them and leave them in the invisible state
+        if (!getTabsHidden())
+        {
+                // Show all the buttons
                for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
                {
                        LLTabTuple* tuple = *iter;
-                        tuple->mButton->setVisible( FALSE );
+                        tuple->mButton->setVisible( TRUE );
                }
-                LLPanel::draw();
+                // Draw some of the buttons...
+                LLRect clip_rect = getLocalRect();
-                // if tabs are hidden, don't draw them and leave them in the invisible state
+                if (has_scroll_arrows)
-                if (!getTabsHidden())
                {
-                        // Show all the buttons
+                        // ...but clip them.
-                        for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
+                        if (mIsVertical)
                        {
-                                LLTabTuple* tuple = *iter;
+                                clip_rect.mBottom = mNextArrowBtn->getRect().mTop + 3*TABCNTRV_PAD;
-                                tuple->mButton->setVisible( TRUE );
+                                clip_rect.mTop = mPrevArrowBtn->getRect().mBottom - 3*TABCNTRV_PAD;
                        }
+                        else
-                        // Draw some of the buttons...
-                        LLRect clip_rect = getLocalRect();
-                        if (has_scroll_arrows)
                        {
-                                // ...but clip them.
+                                clip_rect.mLeft = mPrevArrowBtn->getRect().mRight;
-                                if (mIsVertical)
+                                clip_rect.mRight = mNextArrowBtn->getRect().mLeft;
-                                {
-                                        clip_rect.mBottom = mNextArrowBtn->getRect().mTop + 3*TABCNTRV_PAD;
-                                        clip_rect.mTop = mPrevArrowBtn->getRect().mBottom - 3*TABCNTRV_PAD;
-                                }
-                                else
-                                {
-                                        clip_rect.mLeft = mPrevArrowBtn->getRect().mRight;
-                                        clip_rect.mRight = mNextArrowBtn->getRect().mLeft;
-                                }
                        }
-                        LLLocalClipRect clip(clip_rect);
+                }
+                LLLocalClipRect clip(clip_rect);
-                        S32 max_scroll_visible = getTabCount() - getMaxScrollPos() + getScrollPos();
+                S32 max_scroll_visible = getTabCount() - getMaxScrollPos() + getScrollPos();
-                        S32 idx = 0;
+                S32 idx = 0;
-                        for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
+                for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
-                        {
+                {
-                                LLTabTuple* tuple = *iter;
+                        LLTabTuple* tuple = *iter;
-                                tuple->mButton->translate( left ? left - tuple->mButton->getRect().mLeft : 0,
+                        tuple->mButton->translate( left ? left - tuple->mButton->getRect().mLeft : 0,
-                                                                                   top ? top - tuple->mButton->getRect().mTop : 0 );
+                                                                           top ? top - tuple->mButton->getRect().mTop : 0 );
-                                if (top) top -= BTN_HEIGHT + TABCNTRV_PAD;
+                        if (top) top -= BTN_HEIGHT + TABCNTRV_PAD;
-                                if (left) left += tuple->mButton->getRect().getWidth();
+                        if (left) left += tuple->mButton->getRect().getWidth();
-                                if (!mIsVertical)
+                        if (!mIsVertical)
+                        {
+                                if( idx < getScrollPos() )
                                {
-                                        if( idx < getScrollPos() )
+                                        if( tuple->mButton->getFlashing() )
-                                        {
-                                                if( tuple->mButton->getFlashing() )
-                                                {
-                                                        mPrevArrowBtn->setFlashing( TRUE );
-                                                }
-                                        }
-                                        else if( max_scroll_visible < idx )
                                        {
-                                                if( tuple->mButton->getFlashing() )
+                                                mPrevArrowBtn->setFlashing( TRUE );
-                                                {
-                                                        mNextArrowBtn->setFlashing( TRUE );
-                                                }
                                        }
                                }
-                                LLUI::pushMatrix();
+                                else if( max_scroll_visible < idx )
                                {
-                                        LLUI::translate((F32)tuple->mButton->getRect().mLeft, (F32)tuple->mButton->getRect().mBottom, 0.f);
+                                        if( tuple->mButton->getFlashing() )
-                                        tuple->mButton->draw();
+                                        {
+                                                mNextArrowBtn->setFlashing( TRUE );
+                                        }
                                }
-                                LLUI::popMatrix();
-                                idx++;
                        }
+                        LLUI::pushMatrix();
-                        if( mIsVertical && has_scroll_arrows )
                        {
-                                // Redraw the arrows so that they appears on top.
+                                LLUI::translate((F32)tuple->mButton->getRect().mLeft, (F32)tuple->mButton->getRect().mBottom, 0.f);
-                                gGL.pushMatrix();
+                                tuple->mButton->draw();
-                                gGL.translatef((F32)mPrevArrowBtn->getRect().mLeft, (F32)mPrevArrowBtn->getRect().mBottom, 0.f);
-                                mPrevArrowBtn->draw();
-                                gGL.popMatrix();
-                                gGL.pushMatrix();
-                                gGL.translatef((F32)mNextArrowBtn->getRect().mLeft, (F32)mNextArrowBtn->getRect().mBottom, 0.f);
-                                mNextArrowBtn->draw();
-                                gGL.popMatrix();
                        }
+                        LLUI::popMatrix();
+                        idx++;
                }
-                mPrevArrowBtn->setFlashing(FALSE);
-                mNextArrowBtn->setFlashing(FALSE);
+                if( mIsVertical && has_scroll_arrows )
+                {
+                        // Redraw the arrows so that they appears on top.
+                        gGL.pushMatrix();
+                        gGL.translatef((F32)mPrevArrowBtn->getRect().mLeft, (F32)mPrevArrowBtn->getRect().mBottom, 0.f);
+                        mPrevArrowBtn->draw();
+                        gGL.popMatrix();
+                        gGL.pushMatrix();
+                        gGL.translatef((F32)mNextArrowBtn->getRect().mLeft, (F32)mNextArrowBtn->getRect().mBottom, 0.f);
+                        mNextArrowBtn->draw();
+                        gGL.popMatrix();
+                }
        }
+        mPrevArrowBtn->setFlashing(FALSE);
+        mNextArrowBtn->setFlashing(FALSE);
 }
@@ -524,12 +511,8 @@ BOOL LLTabContainer::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_
 }
 // virtual
-BOOL LLTabContainer::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLTabContainer::handleKeyHere(KEY key, MASK mask)
 {
-        if (!getEnabled()) return FALSE;
-        if (!gFocusMgr.childHasKeyboardFocus(this)) return FALSE;
        BOOL handled = FALSE;
        if (key == KEY_LEFT && mask == MASK_ALT)
        {
@@ -687,7 +670,7 @@ void LLTabContainer::addTabPanel(LLPanel* child,
                // already a child of mine
                return;
        }
-        const LLFontGL* font = gResMgr->getRes( mIsVertical ? LLFONT_SANSSERIF : LLFONT_SANSSERIF_SMALL );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( mIsVertical ? LLFONT_SANSSERIF : LLFONT_SANSSERIF_SMALL );
        // Store the original label for possible xml export.
        child->setLabel(label);
@@ -1272,7 +1255,7 @@ void LLTabContainer::setTabImage(LLPanel* child, std::string image_name, const L
                if (!mIsVertical)
                {
-                        const LLFontGL* fontp = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
+                        const LLFontGL* fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
                        // remove current width from total tab strip width
                        mTotalTabWidth -= tuple->mButton->getRect().getWidth();
@@ -1353,7 +1336,7 @@ void LLTabContainer::setPanelTitle(S32 index, const LLString& title)
        {
                LLTabTuple* tuple = getTab(index);
                LLButton* tab_button = tuple->mButton;
-                const LLFontGL* fontp = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
+                const LLFontGL* fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
                mTotalTabWidth -= tab_button->getRect().getWidth();
                tab_button->reshape(llclamp(fontp->getWidth(title) + TAB_PADDING + tuple->mPadding, mMinTabWidth, mMaxTabWidth), tab_button->getRect().getHeight());
                mTotalTabWidth += tab_button->getRect().getWidth();
diff --git a/linden/indra/llui/lltabcontainer.h b/linden/indra/llui/lltabcontainer.h
index 152bd05..16f8be5 100644
--- a/linden/indra/llui/lltabcontainer.h
+++ b/linden/indra/llui/lltabcontainer.h
@@ -62,19 +62,19 @@ public:
        // from LLView
        /*virtual*/ void setValue(const LLSD& value);
-        /*virtual*/ EWidgetType getWidgetType() const;
-        /*virtual*/ LLString getWidgetTag() const;      
        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
        /*virtual*/ void draw();
        /*virtual*/ BOOL handleMouseDown( S32 x, S32 y, MASK mask );
        /*virtual*/ BOOL handleHover( S32 x, S32 y, MASK mask );
        /*virtual*/ BOOL handleMouseUp( S32 x, S32 y, MASK mask );
        /*virtual*/ BOOL handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect );
-        /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
        /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,     BOOL drop,
                                                                           EDragAndDropType type, void* cargo_data,
                                                                           EAcceptance* accept, LLString& tooltip);
        /*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
+        /*virtual*/ LLView* getChildView(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
        void            addTabPanel(LLPanel* child, 
                                                        const LLString& label, 
@@ -142,10 +142,6 @@ public:
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-protected:
-        /*virtual*/ LLView* getChildByName(const LLString& name, BOOL recurse = FALSE) const;
 private:
        // Structure used to map tab buttons to and from tab panels
        struct LLTabTuple
diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index 9ad7849..0f411b8 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -34,6 +34,8 @@
 #include "lluictrlfactory.h"
 #include "llfocusmgr.h"
+static LLRegisterWidget<LLTextBox> r("text");
 LLTextBox::LLTextBox(const LLString& name, const LLRect& rect, const LLString& text,
                                         const LLFontGL* font, BOOL mouse_opaque)
 :       LLUICtrl(name, rect, mouse_opaque, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP ),
@@ -212,7 +214,7 @@ void LLTextBox::setLineLengths()
        LLString::size_type  cur = 0;
        LLString::size_type  len = mText.getWString().size();
-        while (cur < len)
+        while (cur < len) 
        {
                LLString::size_type end = mText.getWString().find('\n', cur);
                LLString::size_type runLen;
@@ -323,63 +325,60 @@ BOOL LLTextBox::setTextArg( const LLString& key, const LLStringExplicit& text )
 void LLTextBox::draw()
 {
-        if( getVisible() )
+        if (mBorderVisible)
        {
-                if (mBorderVisible)
+                gl_rect_2d_offset_local(getLocalRect(), 2, FALSE);
-                {
+        }
-                        gl_rect_2d_offset_local(getLocalRect(), 2, FALSE);
-                }
-                if( mBorderDropShadowVisible )
+        if( mBorderDropShadowVisible )
-                {
+        {
-                        static LLColor4 color_drop_shadow = LLUI::sColorsGroup->getColor("ColorDropShadow");
+                static LLColor4 color_drop_shadow = LLUI::sColorsGroup->getColor("ColorDropShadow");
-                        static S32 drop_shadow_tooltip = LLUI::sConfigGroup->getS32("DropShadowTooltip");
+                static S32 drop_shadow_tooltip = LLUI::sConfigGroup->getS32("DropShadowTooltip");
-                        gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0,
+                gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0,
-                                color_drop_shadow, drop_shadow_tooltip);
+                        color_drop_shadow, drop_shadow_tooltip);
-                }
+        }
-        
-                if (mBackgroundVisible)
-                {
-                        LLRect r( 0, getRect().getHeight(), getRect().getWidth(), 0 );
-                        gl_rect_2d( r, mBackgroundColor );
-                }
-                S32 text_x = 0;
+        if (mBackgroundVisible)
-                switch( mHAlign )
+        {
-                {
+                LLRect r( 0, getRect().getHeight(), getRect().getWidth(), 0 );
-                case LLFontGL::LEFT:    
+                gl_rect_2d( r, mBackgroundColor );
-                        text_x = mHPad;                                         
+        }
-                        break;
-                case LLFontGL::HCENTER:
-                        text_x = getRect().getWidth() / 2;
-                        break;
-                case LLFontGL::RIGHT:
-                        text_x = getRect().getWidth() - mHPad;
-                        break;
-                }
-                S32 text_y = getRect().getHeight() - mVPad;
+        S32 text_x = 0;
+        switch( mHAlign )
+        {
+        case LLFontGL::LEFT:    
+                text_x = mHPad;                                         
+                break;
+        case LLFontGL::HCENTER:
+                text_x = getRect().getWidth() / 2;
+                break;
+        case LLFontGL::RIGHT:
+                text_x = getRect().getWidth() - mHPad;
+                break;
+        }
-                if ( getEnabled() )
+        S32 text_y = getRect().getHeight() - mVPad;
+        if ( getEnabled() )
+        {
+                if(mHasHover)
                {
-                        if(mHasHover)
+                        drawText( text_x, text_y, mHoverColor );
-                        {
-                                drawText( text_x, text_y, mHoverColor );
-                        }
-                        else
-                        {
-                                drawText( text_x, text_y, mTextColor );
-                        }                               
                }
                else
                {
-                        drawText( text_x, text_y, mDisabledColor );
+                        drawText( text_x, text_y, mTextColor );
-                }
+                }                               
+        }
+        else
+        {
+                drawText( text_x, text_y, mDisabledColor );
+        }
-                if (sDebugRects)
+        if (sDebugRects)
-                {
+        {
-                        drawDebugRect();
+                drawDebugRect();
-                }
        }
        mHasHover = FALSE; // This is reset every frame.
diff --git a/linden/indra/llui/lltextbox.h b/linden/indra/llui/lltextbox.h
index 7bea722..ffe6f4c 100644
--- a/linden/indra/llui/lltextbox.h
+++ b/linden/indra/llui/lltextbox.h
@@ -57,8 +57,7 @@ public:
        LLTextBox(const LLString& name_and_label);
        virtual ~LLTextBox() {}
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_TEXT_BOX; }
-        virtual LLString getWidgetTag() const { return LL_TEXT_BOX_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 545fddb..4ed936f 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -64,6 +64,8 @@
 // 
 // Globals
 //
+static LLRegisterWidget<LLTextEditor> r("simple_text_editor");
 BOOL gDebugTextEditorTips = FALSE;
 //
@@ -304,10 +306,10 @@ LLTextEditor::LLTextEditor(
        // Init the scrollbar
        LLRect scroll_rect;
        scroll_rect.setOriginAndSize( 
-                getRect().getWidth() - UI_TEXTEDITOR_BORDER - SCROLLBAR_SIZE,
+                getRect().getWidth() - SCROLLBAR_SIZE,
-                UI_TEXTEDITOR_BORDER,
+                1,
                SCROLLBAR_SIZE,
-                getRect().getHeight() - 2 * UI_TEXTEDITOR_BORDER );
+                getRect().getHeight() - 1);
        S32 lines_in_doc = getLineCount();
        mScrollbar = new LLScrollbar( "Scrollbar", scroll_rect,
                LLScrollbar::VERTICAL,
@@ -1102,14 +1104,7 @@ BOOL LLTextEditor::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rec
 BOOL LLTextEditor::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
        // Pretend the mouse is over the scrollbar
-        if (getVisible())
+        return mScrollbar->handleScrollWheel( 0, 0, clicks );
-        {
-                return mScrollbar->handleScrollWheel( 0, 0, clicks );
-        }
-        else
-        {
-                return FALSE;
-        }
 }
 BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
@@ -1197,91 +1192,88 @@ BOOL LLTextEditor::handleHover(S32 x, S32 y, MASK mask)
        BOOL handled = FALSE;
        mHoverSegment = NULL;
-        if( getVisible() )
+        if(hasMouseCapture() )
        {
-                if(hasMouseCapture() )
+                if( mIsSelecting ) 
                {
-                        if( mIsSelecting ) 
+                        if (x != mLastSelectionX || y != mLastSelectionY)
                        {
-                                if (x != mLastSelectionX || y != mLastSelectionY)
+                                mLastSelectionX = x;
-                                {
+                                mLastSelectionY = y;
-                                        mLastSelectionX = x;
+                        }
-                                        mLastSelectionY = y;
-                                }
-                                if( y > mTextRect.mTop )
+                        if( y > mTextRect.mTop )
+                        {
+                                mScrollbar->setDocPos( mScrollbar->getDocPos() - 1 );
+                        }
+                        else
+                        if( y < mTextRect.mBottom )
+                        {
+                                mScrollbar->setDocPos( mScrollbar->getDocPos() + 1 );
+                        }
+                        setCursorAtLocalPos( x, y, TRUE );
+                        mSelectionEnd = mCursorPos;
+                        
+                        updateScrollFromCursor();
+                }
+                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (active)" << llendl;               
+                getWindow()->setCursor(UI_CURSOR_IBEAM);
+                handled = TRUE;
+        }
+        if( !handled )
+        {
+                // Pass to children
+                handled = LLView::childrenHandleHover(x, y, mask) != NULL;
+        }
+        if( handled )
+        {
+                // Delay cursor flashing
+                resetKeystrokeTimer();
+        }
+        // Opaque
+        if( !handled && mTakesNonScrollClicks)
+        {
+                // Check to see if we're over an HTML-style link
+                if( !mSegments.empty() )
+                {
+                        const LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
+                        if( cur_segment )
+                        {
+                                if(cur_segment->getStyle().isLink())
                                {
-                                        mScrollbar->setDocPos( mScrollbar->getDocPos() - 1 );
+                                        lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over link, inactive)" << llendl;          
+                                        getWindow()->setCursor(UI_CURSOR_HAND);
+                                        handled = TRUE;
                                }
                                else
-                                if( y < mTextRect.mBottom )
+                                if(cur_segment->getStyle().getIsEmbeddedItem())
                                {
-                                        mScrollbar->setDocPos( mScrollbar->getDocPos() + 1 );
+                                        lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over embedded item, inactive)" << llendl;         
+                                        getWindow()->setCursor(UI_CURSOR_HAND);
+                                        //getWindow()->setCursor(UI_CURSOR_ARROW);
+                                        handled = TRUE;
                                }
+                                mHoverSegment = cur_segment;
-                                setCursorAtLocalPos( x, y, TRUE );
-                                mSelectionEnd = mCursorPos;
-                                
-                                updateScrollFromCursor();
                        }
-                        lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (active)" << llendl;               
-                        getWindow()->setCursor(UI_CURSOR_IBEAM);
-                        handled = TRUE;
                }
                if( !handled )
                {
-                        // Pass to children
+                        lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (inactive)" << llendl;             
-                        handled = LLView::childrenHandleHover(x, y, mask) != NULL;
+                        if (!mScrollbar->getVisible() || x < getRect().getWidth() - SCROLLBAR_SIZE)
-                }
-                if( handled )
-                {
-                        // Delay cursor flashing
-                        resetKeystrokeTimer();
-                }
-        
-                // Opaque
-                if( !handled && mTakesNonScrollClicks)
-                {
-                        // Check to see if we're over an HTML-style link
-                        if( !mSegments.empty() )
                        {
-                                const LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
+                                getWindow()->setCursor(UI_CURSOR_IBEAM);
-                                if( cur_segment )
-                                {
-                                        if(cur_segment->getStyle().isLink())
-                                        {
-                                                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over link, inactive)" << llendl;          
-                                                getWindow()->setCursor(UI_CURSOR_HAND);
-                                                handled = TRUE;
-                                        }
-                                        else
-                                        if(cur_segment->getStyle().getIsEmbeddedItem())
-                                        {
-                                                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over embedded item, inactive)" << llendl;         
-                                                getWindow()->setCursor(UI_CURSOR_HAND);
-                                                //getWindow()->setCursor(UI_CURSOR_ARROW);
-                                                handled = TRUE;
-                                        }
-                                        mHoverSegment = cur_segment;
-                                }
                        }
+                        else
-                        if( !handled )
                        {
-                                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (inactive)" << llendl;             
+                                getWindow()->setCursor(UI_CURSOR_ARROW);
-                                if (!mScrollbar->getVisible() || x < getRect().getWidth() - SCROLLBAR_SIZE)
-                                {
-                                        getWindow()->setCursor(UI_CURSOR_IBEAM);
-                                }
-                                else
-                                {
-                                        getWindow()->setCursor(UI_CURSOR_ARROW);
-                                }
-                                handled = TRUE;
                        }
+                        handled = TRUE;
                }
        }
@@ -2154,14 +2146,14 @@ void LLTextEditor::unindentLineBeforeCloseBrace()
 }
-BOOL LLTextEditor::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLTextEditor::handleKeyHere(KEY key, MASK mask )
 {
        BOOL    handled = FALSE;
        BOOL    selection_modified = FALSE;
        BOOL    return_key_hit = FALSE;
        BOOL    text_may_have_changed = TRUE;
-        if ( (gFocusMgr.getKeyboardFocus() == this) && getVisible())
+        if ( gFocusMgr.getKeyboardFocus() == this )
        {
                // Special case for TAB.  If want to move to next field, report
                // not handled and let the parent take care of field movement.
@@ -2245,7 +2237,7 @@ BOOL LLTextEditor::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent )
 }
-BOOL LLTextEditor::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent)
+BOOL LLTextEditor::handleUnicodeCharHere(llwchar uni_char)
 {
        if ((uni_char < 0x20) || (uni_char == 0x7F)) // Control character or DEL
        {
@@ -2254,7 +2246,7 @@ BOOL LLTextEditor::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_pare
        BOOL    handled = FALSE;
-        if ( (gFocusMgr.getKeyboardFocus() == this) && getVisible())
+        if ( gFocusMgr.getKeyboardFocus() == this )
        {
                // Handle most keys only if the text editor is writeable.
                if( !mReadOnly )
@@ -2939,8 +2931,8 @@ void LLTextEditor::drawText()
                                LLStyle style = cur_segment->getStyle();
                                if ( style.isImage() && (cur_segment->getStart() >= seg_start) && (cur_segment->getStart() <= clipped_end))
                                {
-                                        LLImageGL *image = style.getImage();
+                                        LLUIImagePtr image = style.getImage();
-                                        gl_draw_scaled_image( llround(text_x), llround(text_y)+line_height-style.mImageHeight, style.mImageWidth, style.mImageHeight, image, LLColor4::white );
+                                        image->draw(llround(text_x), llround(text_y)+line_height-style.mImageHeight, style.mImageWidth, style.mImageHeight);
                                }
                                if (cur_segment == mHoverSegment && style.getIsEmbeddedItem())
@@ -2984,7 +2976,7 @@ void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32
        if ( style.getFontString()[0] )
        {
-                font = gResMgr->getRes(style.getFontID());
+                font = LLResMgr::getInstance()->getRes(style.getFontID());
        }
        U8 font_flags = LLFontGL::NORMAL;
@@ -3051,10 +3043,6 @@ void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32
 void LLTextEditor::draw()
 {
-        if( !getVisible() )
-        {
-                return;
-        }
        {
                LLLocalClipRect clip(LLRect(0, getRect().getHeight(), getRect().getWidth() - (mScrollbar->getVisible() ? SCROLLBAR_SIZE : 0), 0));
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 7943129..54a34cc 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -71,9 +71,6 @@ public:
        virtual ~LLTextEditor();
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_TEXT_EDITOR; }
-        virtual LLString getWidgetTag() const { return LL_TEXT_EDITOR_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
        void    setTextEditorParameters(LLXMLNodePtr node);
@@ -85,8 +82,8 @@ public:
        virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
        virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks);
        virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask );
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent );
+        virtual BOOL    handleKeyHere(KEY key, MASK mask );
-        virtual BOOL    handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+        virtual BOOL    handleUnicodeCharHere(llwchar uni_char);
        virtual BOOL    handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect);
        virtual BOOL    handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index ec8c94e..aafd3af 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -55,6 +55,7 @@
 //#include "llstartup.h"
 #include "llui.h"
 #include "llview.h"
+#include "lllineeditor.h"
 #include "llwindow.h"
 #include "llglheaders.h"
@@ -73,7 +74,6 @@ std::list<LLString> gUntranslated;
 LLControlGroup* LLUI::sConfigGroup = NULL;
 LLControlGroup* LLUI::sColorsGroup = NULL;
-LLControlGroup* LLUI::sAssetsGroup = NULL;
 LLImageProviderInterface* LLUI::sImageProvider = NULL;
 LLUIAudioCallback LLUI::sAudioCallback = NULL;
 LLVector2               LLUI::sGLScaleFactor(1.f, 1.f);
@@ -321,7 +321,7 @@ void gl_drop_shadow(S32 left, S32 top, S32 right, S32 bottom, const LLColor4 &st
 void gl_line_2d(S32 x1, S32 y1, S32 x2, S32 y2 )
 {
        // Work around bug in ATI driver: vertical lines are offset by (-1,-1)
-        if( gGLManager.mATIOffsetVerticalLines && (x1 == x2) )
+        if( (x1 == x2) && gGLManager.mATIOffsetVerticalLines )
        {
                x1++;
                x2++;
@@ -340,7 +340,7 @@ void gl_line_2d(S32 x1, S32 y1, S32 x2, S32 y2 )
 void gl_line_2d(S32 x1, S32 y1, S32 x2, S32 y2, const LLColor4 &color )
 {
        // Work around bug in ATI driver: vertical lines are offset by (-1,-1)
-        if( gGLManager.mATIOffsetVerticalLines && (x1 == x2) )
+        if( (x1 == x2) && gGLManager.mATIOffsetVerticalLines )
        {
                x1++;
                x2++;
@@ -458,24 +458,30 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLIma
                return;
        }
-        // scale screen size of borders down
+        // shrink scaling region to be proportional to clipped image region
-        LLRectf clipped_scale_rect = uv_rect;
+        LLRectf scale_rect_uv(
-        clipped_scale_rect.intersectWith(scale_rect);
+                uv_rect.mLeft + (scale_rect.mLeft * uv_rect.getWidth()),
+                uv_rect.mBottom + (scale_rect.mTop * uv_rect.getHeight()),
+                uv_rect.mLeft + (scale_rect.mRight * uv_rect.getWidth()),
+                uv_rect.mBottom + (scale_rect.mBottom * uv_rect.getHeight()));
+        S32 image_natural_width = llround((F32)image->getWidth(0) * uv_rect.getWidth());
+        S32 image_natural_height = llround((F32)image->getHeight(0) * uv_rect.getHeight());
        LLRect draw_rect(0, height, width, 0);
-        LLRect draw_scale_rect(llround((F32)image->getWidth() * scale_rect.mLeft),
+        LLRect draw_scale_rect(llround(scale_rect_uv.mLeft * (F32)image->getWidth(0)),
-                                                llround((F32)image->getHeight() * scale_rect.mTop),
+                                                llround(scale_rect_uv.mTop * (F32)image->getHeight(0)),
-                                                llround((F32)image->getWidth() * scale_rect.mRight),
+                                                llround(scale_rect_uv.mRight * (F32)image->getWidth(0)),
-                                                llround((F32)image->getHeight() * scale_rect.mBottom));
+                                                llround(scale_rect_uv.mBottom * (F32)image->getHeight(0)));
-        // scale fixed region of image up with drawn region
+        // scale fixed region of image to drawn region
-        draw_scale_rect.mRight += width - image->getWidth();
+        draw_scale_rect.mRight += width - image_natural_width;
-        draw_scale_rect.mTop += height - image->getHeight();
+        draw_scale_rect.mTop += height - image_natural_height;
        S32 border_shrink_width = llmax(0, draw_scale_rect.mLeft - draw_scale_rect.mRight);
        S32 border_shrink_height = llmax(0, draw_scale_rect.mBottom - draw_scale_rect.mTop);
-        F32 shrink_width_ratio = scale_rect.getWidth() == 1.f ? 0.f : border_shrink_width / ((F32)image->getWidth() * (1.f - scale_rect.getWidth()));
+        F32 shrink_width_ratio = scale_rect.getWidth() == 1.f ? 0.f : border_shrink_width / ((F32)image_natural_width * (1.f - scale_rect.getWidth()));
-        F32 shrink_height_ratio = scale_rect.getHeight() == 1.f ? 0.f : border_shrink_height / ((F32)image->getHeight() * (1.f - scale_rect.getHeight()));
+        F32 shrink_height_ratio = scale_rect.getHeight() == 1.f ? 0.f : border_shrink_height / ((F32)image_natural_height * (1.f - scale_rect.getHeight()));
        F32 shrink_scale = 1.f - llmax(shrink_width_ratio, shrink_height_ratio);
        draw_scale_rect.mLeft = llround((F32)draw_scale_rect.mLeft * shrink_scale);
@@ -515,117 +521,117 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLIma
                        gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
                        gGL.vertex2i(0, 0);
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, uv_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, uv_rect.mBottom);
                        gGL.vertex2i(draw_scale_rect.mLeft, 0);
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, scale_rect_uv.mBottom);
                        gGL.vertex2i(draw_scale_rect.mLeft, draw_scale_rect.mBottom);
-                        gGL.texCoord2f(uv_rect.mLeft, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(uv_rect.mLeft, scale_rect_uv.mBottom);
                        gGL.vertex2i(0, draw_scale_rect.mBottom);
                        // draw bottom middle
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, uv_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, uv_rect.mBottom);
                        gGL.vertex2i(draw_scale_rect.mLeft, 0);
-                        gGL.texCoord2f(clipped_scale_rect.mRight, uv_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mRight, uv_rect.mBottom);
                        gGL.vertex2i(draw_scale_rect.mRight, 0);
-                        gGL.texCoord2f(clipped_scale_rect.mRight, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mRight, scale_rect_uv.mBottom);
                        gGL.vertex2i(draw_scale_rect.mRight, draw_scale_rect.mBottom);
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, scale_rect_uv.mBottom);
                        gGL.vertex2i(draw_scale_rect.mLeft, draw_scale_rect.mBottom);
                        // draw bottom right
-                        gGL.texCoord2f(clipped_scale_rect.mRight, uv_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mRight, uv_rect.mBottom);
                        gGL.vertex2i(draw_scale_rect.mRight, 0);
                        gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
                        gGL.vertex2i(width, 0);
-                        gGL.texCoord2f(uv_rect.mRight, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(uv_rect.mRight, scale_rect_uv.mBottom);
                        gGL.vertex2i(width, draw_scale_rect.mBottom);
-                        gGL.texCoord2f(clipped_scale_rect.mRight, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mRight, scale_rect_uv.mBottom);
                        gGL.vertex2i(draw_scale_rect.mRight, draw_scale_rect.mBottom);
                        // draw left 
-                        gGL.texCoord2f(uv_rect.mLeft, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(uv_rect.mLeft, scale_rect_uv.mBottom);
                        gGL.vertex2i(0, draw_scale_rect.mBottom);
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, scale_rect_uv.mBottom);
                        gGL.vertex2i(draw_scale_rect.mLeft, draw_scale_rect.mBottom);
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, scale_rect_uv.mTop);
                        gGL.vertex2i(draw_scale_rect.mLeft, draw_scale_rect.mTop);
-                        gGL.texCoord2f(uv_rect.mLeft, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(uv_rect.mLeft, scale_rect_uv.mTop);
                        gGL.vertex2i(0, draw_scale_rect.mTop);
                        // draw middle
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, scale_rect_uv.mBottom);
                        gGL.vertex2i(draw_scale_rect.mLeft, draw_scale_rect.mBottom);
-                        gGL.texCoord2f(clipped_scale_rect.mRight, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mRight, scale_rect_uv.mBottom);
                        gGL.vertex2i(draw_scale_rect.mRight, draw_scale_rect.mBottom);
-                        gGL.texCoord2f(clipped_scale_rect.mRight, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mRight, scale_rect_uv.mTop);
                        gGL.vertex2i(draw_scale_rect.mRight, draw_scale_rect.mTop);
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, scale_rect_uv.mTop);
                        gGL.vertex2i(draw_scale_rect.mLeft, draw_scale_rect.mTop);
                        // draw right 
-                        gGL.texCoord2f(clipped_scale_rect.mRight, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(scale_rect_uv.mRight, scale_rect_uv.mBottom);
                        gGL.vertex2i(draw_scale_rect.mRight, draw_scale_rect.mBottom);
-                        gGL.texCoord2f(uv_rect.mRight, clipped_scale_rect.mBottom);
+                        gGL.texCoord2f(uv_rect.mRight, scale_rect_uv.mBottom);
                        gGL.vertex2i(width, draw_scale_rect.mBottom);
-                        gGL.texCoord2f(uv_rect.mRight, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(uv_rect.mRight, scale_rect_uv.mTop);
                        gGL.vertex2i(width, draw_scale_rect.mTop);
-                        gGL.texCoord2f(clipped_scale_rect.mRight, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mRight, scale_rect_uv.mTop);
                        gGL.vertex2i(draw_scale_rect.mRight, draw_scale_rect.mTop);
                        // draw top left
-                        gGL.texCoord2f(uv_rect.mLeft, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(uv_rect.mLeft, scale_rect_uv.mTop);
                        gGL.vertex2i(0, draw_scale_rect.mTop);
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, scale_rect_uv.mTop);
                        gGL.vertex2i(draw_scale_rect.mLeft, draw_scale_rect.mTop);
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, uv_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, uv_rect.mTop);
                        gGL.vertex2i(draw_scale_rect.mLeft, height);
                        gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);
                        gGL.vertex2i(0, height);
                        // draw top middle
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, scale_rect_uv.mTop);
                        gGL.vertex2i(draw_scale_rect.mLeft, draw_scale_rect.mTop);
-                        gGL.texCoord2f(clipped_scale_rect.mRight, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mRight, scale_rect_uv.mTop);
                        gGL.vertex2i(draw_scale_rect.mRight, draw_scale_rect.mTop);
-                        gGL.texCoord2f(clipped_scale_rect.mRight, uv_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mRight, uv_rect.mTop);
                        gGL.vertex2i(draw_scale_rect.mRight, height);
-                        gGL.texCoord2f(clipped_scale_rect.mLeft, uv_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mLeft, uv_rect.mTop);
                        gGL.vertex2i(draw_scale_rect.mLeft, height);
                        // draw top right
-                        gGL.texCoord2f(clipped_scale_rect.mRight, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mRight, scale_rect_uv.mTop);
                        gGL.vertex2i(draw_scale_rect.mRight, draw_scale_rect.mTop);
-                        gGL.texCoord2f(uv_rect.mRight, clipped_scale_rect.mTop);
+                        gGL.texCoord2f(uv_rect.mRight, scale_rect_uv.mTop);
                        gGL.vertex2i(width, draw_scale_rect.mTop);
                        gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
                        gGL.vertex2i(width, height);
-                        gGL.texCoord2f(clipped_scale_rect.mRight, uv_rect.mTop);
+                        gGL.texCoord2f(scale_rect_uv.mRight, uv_rect.mTop);
                        gGL.vertex2i(draw_scale_rect.mRight, height);
                }
                gGL.end();
@@ -1556,20 +1562,14 @@ void gl_segmented_rect_3d_tex_top(const LLVector2& border_scale, const LLVector3
        gl_segmented_rect_3d_tex(border_scale, border_width, border_height, width_vec, height_vec, ROUNDED_RECT_TOP);
 }
-class LLShowXUINamesListener: public LLSimpleListener
+bool handleShowXUINamesChanged(const LLSD& newvalue)
 {
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        LLUI::sShowXUINames = newvalue.asBoolean();
-        {
+        return true;
-                LLUI::sShowXUINames = (BOOL) event->getValue().asBoolean();
+}
-                return true;
-        }
-};
-static LLShowXUINamesListener show_xui_names_listener;
 void LLUI::initClass(LLControlGroup* config, 
                                         LLControlGroup* colors, 
-                                         LLControlGroup* assets, 
                                         LLImageProviderInterface* image_provider,
                                         LLUIAudioCallback audio_callback,
                                         const LLVector2* scale_factor,
@@ -1577,7 +1577,6 @@ void LLUI::initClass(LLControlGroup* config,
 {
        sConfigGroup = config;
        sColorsGroup = colors;
-        sAssetsGroup = assets;
        sImageProvider = image_provider;
        sAudioCallback = audio_callback;
        sGLScaleFactor = (scale_factor == NULL) ? LLVector2(1.f, 1.f) : *scale_factor;
@@ -1585,11 +1584,13 @@ void LLUI::initClass(LLControlGroup* config,
        LLFontGL::sShadowColor = colors->getColor("ColorDropShadow");
        LLUI::sShowXUINames = LLUI::sConfigGroup->getBOOL("ShowXUINames");
-        LLUI::sConfigGroup->getControl("ShowXUINames")->addListener(&show_xui_names_listener);
+        LLUI::sConfigGroup->getControl("ShowXUINames")->getSignal()->connect(boost::bind(&handleShowXUINamesChanged, _1));
 }
 void LLUI::cleanupClass()
 {
+        sImageProvider->cleanUp();
+        LLLineEditor::cleanupClass();
 }
@@ -1732,28 +1733,15 @@ void LLUI::glRectToScreen(const LLRect& gl, LLRect *screen)
        glPointToScreen(gl.mRight, gl.mBottom, &screen->mRight, &screen->mBottom);
 }
-//static
-LLUUID                  LLUI::findAssetUUIDByName(const LLString        &asset_name)
-{
-        if(asset_name == LLString::null) return LLUUID::null;
-        LLString        foundValue = LLUI::sConfigGroup->findString(asset_name);
-        if(foundValue==LLString::null)
-        {
-                foundValue = LLUI::sAssetsGroup->findString(asset_name);
-        }
-        if(foundValue == LLString::null){
-                return LLUUID::null;
-        }
-        return LLUUID( foundValue );
-}
 //static 
-LLUIImage* LLUI::getUIImageByName(const LLString& name)
+LLUIImage* LLUI::getUIImage(const LLString& name)
 {
-        return sImageProvider->getUIImageByID(findAssetUUIDByName(name));
+        if (!name.empty())
+                return sImageProvider->getUIImage(name);
+        else
+                return NULL;
 }
 // static 
 void LLUI::setHtmlHelp(LLHtmlHelp* html_help)
 {
@@ -1834,7 +1822,8 @@ LLLocalClipRect::LLLocalClipRect(const LLRect &rect, BOOL enabled)
 // LLUIImage
 //
-LLUIImage::LLUIImage(LLPointer<LLImageGL> image) :
+LLUIImage::LLUIImage(const LLString& name, LLPointer<LLImageGL> image) :
+                                                mName(name),
                                                mImage(image),
                                                mScaleRegion(0.f, 1.f, 1.f, 0.f),
                                                mClipRegion(0.f, 1.f, 1.f, 0.f),
@@ -1898,24 +1887,32 @@ void LLUIImage::drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& c
                mScaleRegion);
 }
-void LLUIImage::drawSolid(S32 x, S32 y, const LLColor4& color) const
+void LLUIImage::drawBorder(S32 x, S32 y, S32 width, S32 height, const LLColor4& color, S32 border_width) const
 {
-        gl_draw_scaled_image_with_border(
+        LLRect border_rect;
-                x, y, 
+        border_rect.setOriginAndSize(x, y, width, height);
-                getWidth(), getHeight(), 
+        border_rect.stretch(border_width, border_width);
-                mImage, 
+        drawSolid(border_rect, color);
-                color, 
-                TRUE,
-                mClipRegion,
-                mScaleRegion);
 }
 S32 LLUIImage::getWidth() const
 { 
-        return mImage->getWidth(0); 
+        // return clipped dimensions of actual image area
+        return llround((F32)mImage->getWidth(0) * mClipRegion.getWidth()); 
 }
 S32 LLUIImage::getHeight() const
 { 
-        return mImage->getHeight(0); 
+        // return clipped dimensions of actual image area
+        return llround((F32)mImage->getHeight(0) * mClipRegion.getHeight()); 
+}
+S32 LLUIImage::getTextureWidth() const
+{
+        return mImage->getWidth(0);
+}
+S32 LLUIImage::getTextureHeight() const
+{
+        return mImage->getHeight(0);
 }
diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index 9e275a5..0b06913 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -161,7 +161,6 @@ public:
        //
        static void initClass(LLControlGroup* config, 
                                                  LLControlGroup* colors, 
-                                                  LLControlGroup* assets, 
                                                  LLImageProviderInterface* image_provider,
                                                  LLUIAudioCallback audio_callback = NULL,
                                                  const LLVector2 *scale_factor = NULL,
@@ -179,8 +178,7 @@ public:
        static void setCursorPositionLocal(const LLView* viewp, S32 x, S32 y);
        static void setScaleFactor(const LLVector2& scale_factor);
        static void setLineWidth(F32 width);
-        static LLUUID findAssetUUIDByName(const LLString& name);
+        static LLUIImage* getUIImage(const LLString& name);
-        static LLUIImage* getUIImageByName(const LLString& name);
        static LLVector2 getWindowSize();
        static void screenPointToGL(S32 screen_x, S32 screen_y, S32 *gl_x, S32 *gl_y);
        static void glPointToScreen(S32 gl_x, S32 gl_y, S32 *screen_x, S32 *screen_y);
@@ -193,7 +191,6 @@ public:
        //
        static LLControlGroup* sConfigGroup;
        static LLControlGroup* sColorsGroup;
-        static LLControlGroup* sAssetsGroup;
        static LLImageProviderInterface* sImageProvider;
        static LLUIAudioCallback sAudioCallback;
        static LLVector2                sGLScaleFactor;
@@ -209,101 +206,6 @@ public:
 };
-// UI widgets
-// This MUST match UICtrlNames in lluictrlfactory.cpp
-typedef enum e_widget_type
-{
-        WIDGET_TYPE_VIEW = 0,
-        WIDGET_TYPE_ROOT_VIEW,
-        WIDGET_TYPE_FLOATER_VIEW,
-        WIDGET_TYPE_BUTTON,
-        WIDGET_TYPE_JOYSTICK_TURN,
-        WIDGET_TYPE_JOYSTICK_SLIDE,
-        WIDGET_TYPE_CHECKBOX,
-        WIDGET_TYPE_COLOR_SWATCH,
-        WIDGET_TYPE_COMBO_BOX,
-        WIDGET_TYPE_LINE_EDITOR,
-        WIDGET_TYPE_SEARCH_EDITOR,
-        WIDGET_TYPE_SCROLL_LIST,
-        WIDGET_TYPE_NAME_LIST,
-        WIDGET_TYPE_WEBBROWSER,
-        WIDGET_TYPE_SLIDER,     // actually LLSliderCtrl
-        WIDGET_TYPE_SLIDER_BAR, // actually LLSlider
-        WIDGET_TYPE_VOLUME_SLIDER,//actually LLVolumeSliderCtrl
-        WIDGET_TYPE_MULTI_SLIDER,       // actually LLMultiSliderCtrl
-        WIDGET_TYPE_MULTI_SLIDER_BAR, // actually LLMultiSlider
-        WIDGET_TYPE_SPINNER,
-        WIDGET_TYPE_TEXT_EDITOR,
-        WIDGET_TYPE_TEXTURE_PICKER,
-        WIDGET_TYPE_TEXT_BOX,
-        WIDGET_TYPE_PAD,        // used in XML for positioning, not a real widget
-        WIDGET_TYPE_RADIO_GROUP,
-        WIDGET_TYPE_ICON,
-        WIDGET_TYPE_LANDMARK_PICKER,
-        WIDGET_TYPE_LOCATE,     // used in XML for positioning, not a real widget
-        WIDGET_TYPE_VIEW_BORDER,        // decorative border
-        WIDGET_TYPE_PANEL,
-        WIDGET_TYPE_MENU,
-        WIDGET_TYPE_PIE_MENU,
-        WIDGET_TYPE_PIE_MENU_BRANCH,
-        WIDGET_TYPE_MENU_ITEM,
-        WIDGET_TYPE_MENU_ITEM_SEPARATOR,
-        WIDGET_TYPE_MENU_SEPARATOR_VERTICAL,
-        WIDGET_TYPE_MENU_ITEM_CALL,
-        WIDGET_TYPE_MENU_ITEM_CHECK,
-        WIDGET_TYPE_MENU_ITEM_BRANCH,
-        WIDGET_TYPE_MENU_ITEM_BRANCH_DOWN,
-        WIDGET_TYPE_MENU_ITEM_BLANK,
-        WIDGET_TYPE_TEAROFF_MENU,
-        WIDGET_TYPE_MENU_BAR,
-        WIDGET_TYPE_TAB_CONTAINER,
-        WIDGET_TYPE_SCROLL_CONTAINER, // LLScrollableContainerView
-        WIDGET_TYPE_SCROLLBAR,
-        WIDGET_TYPE_INVENTORY_PANEL, // LLInventoryPanel
-        WIDGET_TYPE_FLOATER,
-        WIDGET_TYPE_DRAG_HANDLE_TOP,
-        WIDGET_TYPE_DRAG_HANDLE_LEFT,
-        WIDGET_TYPE_RESIZE_HANDLE,
-        WIDGET_TYPE_RESIZE_BAR,
-        WIDGET_TYPE_NAME_EDITOR,
-        WIDGET_TYPE_MULTI_FLOATER,
-        WIDGET_TYPE_MEDIA_REMOTE,
-        WIDGET_TYPE_FOLDER_VIEW,
-        WIDGET_TYPE_FOLDER_ITEM,
-        WIDGET_TYPE_FOLDER,
-        WIDGET_TYPE_STAT_GRAPH,
-        WIDGET_TYPE_STAT_VIEW,
-        WIDGET_TYPE_STAT_BAR,
-        WIDGET_TYPE_DROP_TARGET,
-        WIDGET_TYPE_TEXTURE_BAR,
-        WIDGET_TYPE_TEX_MEM_BAR,
-        WIDGET_TYPE_SNAPSHOT_LIVE_PREVIEW,
-        WIDGET_TYPE_STATUS_BAR,
-        WIDGET_TYPE_PROGRESS_VIEW,
-        WIDGET_TYPE_TALK_VIEW,
-        WIDGET_TYPE_OVERLAY_BAR,
-        WIDGET_TYPE_HUD_VIEW,
-        WIDGET_TYPE_HOVER_VIEW,
-        WIDGET_TYPE_MORPH_VIEW,
-        WIDGET_TYPE_NET_MAP,
-        WIDGET_TYPE_PERMISSIONS_VIEW,
-        WIDGET_TYPE_MENU_HOLDER,
-        WIDGET_TYPE_DEBUG_VIEW,
-        WIDGET_TYPE_SCROLLING_PANEL_LIST,
-        WIDGET_TYPE_AUDIO_STATUS,
-        WIDGET_TYPE_CONTAINER_VIEW,
-        WIDGET_TYPE_CONSOLE,
-        WIDGET_TYPE_FAST_TIMER_VIEW,
-        WIDGET_TYPE_VELOCITY_BAR,
-        WIDGET_TYPE_TEXTURE_VIEW,
-        WIDGET_TYPE_MEMORY_VIEW,
-        WIDGET_TYPE_FRAME_STAT_VIEW,
-        WIDGET_TYPE_LAYOUT_STACK,
-        WIDGET_TYPE_FLYOUT_BUTTON,
-        WIDGET_TYPE_DONTCARE,
-        WIDGET_TYPE_COUNT
-} EWidgetType;
 //      FactoryPolicy is a static class that controls the creation and lookup of UI elements, 
 //      such as floaters.
 //      The key parameter is used to provide a unique identifier and/or associated construction 
@@ -509,7 +411,7 @@ public:
 class LLUIImage : public LLRefCount
 {
 public:
-        LLUIImage(LLPointer<LLImageGL> image);
+        LLUIImage(const LLString& name, LLPointer<LLImageGL> image);
        void setClipRegion(const LLRectf& region);
        void setScaleRegion(const LLRectf& region);
@@ -517,15 +419,29 @@ public:
        LLPointer<LLImageGL> getImage() { return mImage; }
        const LLPointer<LLImageGL>& getImage() const { return mImage; }
-        void draw(S32 x, S32 y, const LLColor4& color = UI_VERTEX_COLOR) const;
        void draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color = UI_VERTEX_COLOR) const;
+        void draw(S32 x, S32 y, const LLColor4& color = UI_VERTEX_COLOR) const;
+        void draw(const LLRect& rect, const LLColor4& color = UI_VERTEX_COLOR) const { draw(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color); }
+        
        void drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const;
-        void drawSolid(S32 x, S32 y, const LLColor4& color) const;
+        void drawSolid(const LLRect& rect, const LLColor4& color) const { drawSolid(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color); }
+        void drawSolid(S32 x, S32 y, const LLColor4& color) const { drawSolid(x, y, mImage->getWidth(0), mImage->getHeight(0), color); }
+        void drawBorder(S32 x, S32 y, S32 width, S32 height, const LLColor4& color, S32 border_width) const;
+        void drawBorder(const LLRect& rect, const LLColor4& color, S32 border_width) const { drawBorder(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color, border_width); }
+        void drawBorder(S32 x, S32 y, const LLColor4& color, S32 border_width) const { drawBorder(x, y, mImage->getWidth(0), mImage->getHeight(0), color, border_width); }
+        
+        const LLString& getName() const { return mName; }
        S32 getWidth() const;
        S32 getHeight() const;
+        // returns dimensions of underlying textures, which might not be equal to ui image portion
+        S32 getTextureWidth() const;
+        S32 getTextureHeight() const;
 protected:
+        LLString                        mName;
        LLRectf                         mScaleRegion;
        LLRectf                         mClipRegion;
        LLPointer<LLImageGL> mImage;
@@ -533,6 +449,7 @@ protected:
        BOOL                            mNoClip;
 };
+typedef LLPointer<LLUIImage> LLUIImagePtr;
 template <typename T>
 class LLTombStone : public LLRefCount
@@ -667,6 +584,7 @@ private:
        LLRootHandle<T> mHandle;
 };
 //RN: maybe this needs to moved elsewhere?
 class LLImageProviderInterface
 {
@@ -674,8 +592,9 @@ public:
        LLImageProviderInterface() {};
        virtual ~LLImageProviderInterface() {};
-        virtual LLUIImage* getUIImageByID(const LLUUID& id, BOOL clamped = TRUE) = 0;
+        virtual LLUIImagePtr getUIImage(const LLString& name) = 0;
-        virtual LLImageGL* getImageByID(const LLUUID& id, BOOL clamped = TRUE) = 0;
+        virtual LLUIImagePtr getUIImageByID(const LLUUID& id) = 0;
+        virtual void cleanUp() = 0;
 };
 #endif
diff --git a/linden/indra/llui/lluictrl.cpp b/linden/indra/llui/lluictrl.cpp
index 0e6c155..66504b7 100644
--- a/linden/indra/llui/lluictrl.cpp
+++ b/linden/indra/llui/lluictrl.cpp
@@ -34,7 +34,9 @@
 #include "linden_common.h"
 #include "lluictrl.h"
 #include "llfocusmgr.h"
+#include "llpanel.h"
+static LLRegisterWidget<LLUICtrl> r("ui_ctrl");
 LLFocusableElement::LLFocusableElement()
 :       mFocusLostCallback(NULL),
@@ -473,7 +475,7 @@ BOOL LLUICtrl::focusPrevItem(BOOL text_fields_only)
        return focusPrev(result);
 }
-const LLUICtrl* LLUICtrl::findRootMostFocusRoot() const
+LLUICtrl* LLUICtrl::findRootMostFocusRoot() const
 {
        const LLUICtrl* focus_root = NULL;
        const LLUICtrl* next_view = this;
@@ -485,7 +487,9 @@ const LLUICtrl* LLUICtrl::findRootMostFocusRoot() const
                }
                next_view = next_view->getParentUICtrl();
        }
-        return focus_root;
+        // since focus_root could be this, need to cast away const to return
+        // a non-const result
+        return const_cast<LLUICtrl*>(focus_root);
 }
@@ -538,14 +542,22 @@ LLXMLNodePtr LLUICtrl::getXML(bool save_children) const
        return node;
 }
+//static 
+LLView* LLUICtrl::fromXML(LLXMLNodePtr node, LLView* parent, class LLUICtrlFactory* factory)
+{
+        LLUICtrl* ctrl = new LLUICtrl();
+        ctrl->initFromXML(node, parent);
+        return ctrl;
+}
 // *NOTE: If other classes derive from LLPanel, they will need to be
 // added to this function.
 LLPanel* LLUICtrl::getParentPanel() const
 {
        LLView* parent = getParent();
-        while (parent 
+        LLPanel* parent_panel = dynamic_cast<LLPanel*>(parent);
-                   && parent->getWidgetType() != WIDGET_TYPE_PANEL
+        while (!parent_panel)
-                   && parent->getWidgetType() != WIDGET_TYPE_FLOATER)
        {
                parent = parent->getParent();
        }
diff --git a/linden/indra/llui/lluictrl.h b/linden/indra/llui/lluictrl.h
index 0c43297..7bc5eeb 100644
--- a/linden/indra/llui/lluictrl.h
+++ b/linden/indra/llui/lluictrl.h
@@ -141,7 +141,9 @@ public:
        void                    setValidateBeforeCommit( BOOL(*cb)(LLUICtrl*, void*) )  { mValidateCallback = cb; }
        void                    setLostTopCallback( void (*cb)(LLUICtrl*, void*) )              { mLostTopCallback = cb; }
        
-        const LLUICtrl* findRootMostFocusRoot() const;
+        static LLView* fromXML(LLXMLNodePtr node, LLView* parent, class LLUICtrlFactory* factory);
+        LLUICtrl*               findRootMostFocusRoot() const;
        class LLTextInputFilter : public LLQueryFilter, public LLSingleton<LLTextInputFilter>
        {
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index cfee76a..cc8135c 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -71,100 +71,6 @@
 const char XML_HEADER[] = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>\n";
-// *NOTE: If you add a new class derived from LLPanel, add a check for its
-// widget type to LLUICtrl::getParentPanel().
-// *NOTE: This MUST match EWidgetType in llui.h
-//static
-const LLString LLUICtrlFactory::sUICtrlNames[WIDGET_TYPE_COUNT] = 
-{
-        LLString("view"),                       //WIDGET_TYPE_VIEW
-        LLString("root_view"),          //WIDGET_TYPE_ROOT_VIEW
-        LLString("floater_view"),       //WIDGET_TYPE_FLOATER_VIEW
-        LLString("button"),             //WIDGET_TYPE_BUTTON
-        LLString("joystick_turn"),      //WIDGET_TYPE_JOYSTICK_TURN
-        LLString("joystick_slide"),     //WIDGET_TYPE_JOYSTICK_SLIDE
-        LLString("check_box"),  //WIDGET_TYPE_CHECKBOX
-        LLString("color_swatch"),       //WIDGET_TYPE_COLOR_SWATCH
-        LLString("combo_box"),  //WIDGET_TYPE_COMBO_BOX
-        LLString("line_editor"),        //WIDGET_TYPE_LINE_EDITOR
-        LLString("search_editor"),      //WIDGET_TYPE_SEARCH_EDITOR
-        LLString("scroll_list"),        //WIDGET_TYPE_SCROLL_LIST
-        LLString("name_list"),  //WIDGET_TYPE_NAME_LIST
-        LLString("web_browser"),        //WIDGET_TYPE_WEBBROWSER
-        LLString("slider"),             //WIDGET_TYPE_SLIDER, actually LLSliderCtrl
-        LLString("slider_bar"), //WIDGET_TYPE_SLIDER_BAR, actually LLSlider
-        LLString("volume_slider"),      //WIDGET_TYPE_VOLUME_SLIDER, actually LLSlider + "volume" param
-        LLString("multi_slider"),               //WIDGET_TYPE_MULTI_SLIDER, actually LLMultiSliderCtrl
-        LLString("multi_slider_bar"), //WIDGET_TYPE_MULTI_SLIDER_BAR, actually LLMultiSlider
-        LLString("spinner"),            //WIDGET_TYPE_SPINNER, actually LLSpinCtrl
-        LLString("text_editor"),        //WIDGET_TYPE_TEXT_EDITOR
-        LLString("texture_picker"),//WIDGET_TYPE_TEXTURE_PICKER
-        LLString("text"),                       //WIDGET_TYPE_TEXT_BOX
-        LLString("pad"),                        //WIDGET_TYPE_PAD
-        LLString("radio_group"),        //WIDGET_TYPE_RADIO_GROUP
-        LLString("icon"),                       //WIDGET_TYPE_ICON
-        LLString("locate"),             //WIDGET_TYPE_LOCATE
-        LLString("view_border"),        //WIDGET_TYPE_VIEW_BORDER
-        LLString("panel"),              //WIDGET_TYPE_PANEL
-        LLString("menu"),               //WIDGET_TYPE_MENU
-        LLString("pie_menu"),   //WIDGET_TYPE_PIE_MENU
-        LLString("pie_menu_branch"), //WIDGET_TYPE_PIE_MENU_BRANCH
-        LLString("menu_item"), //WIDGET_TYPE_MENU_ITEM
-        LLString("menu_item_separator"), //WIDGET_TYPE_MENU_ITEM_SEPARATOR
-        LLString("menu_separator_vertical"), // WIDGET_TYPE_MENU_SEPARATOR_VERTICAL
-        LLString("menu_item_call"), // WIDGET_TYPE_MENU_ITEM_CALL
-        LLString("menu_item_check"),// WIDGET_TYPE_MENU_ITEM_CHECK
-        LLString("menu_item_branch"), // WIDGET_TYPE_MENU_ITEM_BRANCH
-        LLString("menu_item_branch_down"), //WIDGET_TYPE_MENU_ITEM_BRANCH_DOWN,
-        LLString("menu_item_blank"), //WIDGET_TYPE_MENU_ITEM_BLANK,
-        LLString("tearoff_menu"), //WIDGET_TYPE_TEAROFF_MENU
-        LLString("menu_bar"),   //WIDGET_TYPE_MENU_BAR
-        LLString("tab_container"),//WIDGET_TYPE_TAB_CONTAINER
-        LLString("scroll_container"),//WIDGET_TYPE_SCROLL_CONTAINER
-        LLString("scrollbar"),  //WIDGET_TYPE_SCROLLBAR
-        LLString("inventory_panel"), //WIDGET_TYPE_INVENTORY_PANEL
-        LLString("floater"),            //WIDGET_TYPE_FLOATER
-        LLString("drag_handle_top"), //WIDGET_TYPE_DRAG_HANDLE_TOP
-        LLString("drag_handle_left"), //WIDGET_TYPE_DRAG_HANDLE_LEFT
-        LLString("resize_handle"), //WIDGET_TYPE_RESIZE_HANDLE
-        LLString("resize_bar"), //WIDGET_TYPE_RESIZE_BAR
-        LLString("name_editor"),        //WIDGET_TYPE_NAME_EDITOR
-        LLString("multi_floater"),      //WIDGET_TYPE_MULTI_FLOATER
-        LLString("media_remote"), //WIDGET_TYPE_MEDIA_REMOTE
-        LLString("folder_view"), //WIDGET_TYPE_FOLDER_VIEW
-        LLString("folder_item"), //WIDGET_TYPE_FOLDER_ITEM
-        LLString("folder"), //WIDGET_TYPE_FOLDER
-        LLString("stat_graph"), //WIDGET_TYPE_STAT_GRAPH
-        LLString("stat_view"), //WIDGET_TYPE_STAT_VIEW
-        LLString("stat_bar"), //WIDGET_TYPE_STAT_BAR
-        LLString("drop_target"), //WIDGET_TYPE_DROP_TARGET
-        LLString("texture_bar"), //WIDGET_TYPE_TEXTURE_BAR
-        LLString("tex_mem_bar"), //WIDGET_TYPE_TEX_MEM_BAR
-        LLString("snapshot_live_preview"), //WIDGET_TYPE_SNAPSHOT_LIVE_PREVIEW
-        LLString("status_bar"), //WIDGET_TYPE_STATUS_BAR
-        LLString("progress_view"), //WIDGET_TYPE_PROGRESS_VIEW
-        LLString("talk_view"), //WIDGET_TYPE_TALK_VIEW
-        LLString("overlay_bar"), //WIDGET_TYPE_OVERLAY_BAR
-        LLString("hud_view"), //WIDGET_TYPE_HUD_VIEW
-        LLString("hover_view"), //WIDGET_TYPE_HOVER_VIEW
-        LLString("morph_view"), //WIDGET_TYPE_MORPH_VIEW
-        LLString("net_map"), //WIDGET_TYPE_NET_MAP
-        LLString("permissions_view"), //WIDGET_TYPE_PERMISSIONS_VIEW
-        LLString("menu_holder"), //WIDGET_TYPE_MENU_HOLDER
-        LLString("debug_view"), //WIDGET_TYPE_DEBUG_VIEW
-        LLString("scrolling_panel_list"), //WIDGET_TYPE_SCROLLING_PANEL_LIST
-        LLString("audio_status"), //WIDGET_TYPE_AUDIO_STATUS
-        LLString("container_view"), //WIDGET_TYPE_CONTAINER_VIEW
-        LLString("console"), //WIDGET_TYPE_CONSOLE
-        LLString("fast_timer_view"), //WIDGET_TYPE_FAST_TIMER_VIEW
-        LLString("velocity_bar"), //WIDGET_TYPE_VELOCITY_BAR
-        LLString("texture_view"), //WIDGET_TYPE_TEXTURE_VIEW
-        LLString("memory_view"), //WIDGET_TYPE_MEMORY_VIEW
-        LLString("frame_stat_view"), //WIDGET_TYPE_FRAME_STAT_VIEW
-        LLString("layout_stack"), //WIDGET_TYPE_LAYOUT_STACK
-        LLString("DONT_CARE"),  //WIDGET_TYPE_DONTCARE
-};
 const S32 HPAD = 4;
 const S32 VPAD = 4;
 const S32 FLOATER_H_MARGIN = 15;
@@ -179,9 +85,6 @@ public:
        LLUICtrlLocate() : LLUICtrl("locate", LLRect(0,0,0,0), FALSE, NULL, NULL) { setTabStop(FALSE); }
        virtual void draw() { }
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_LOCATE; }
-        virtual LLString getWidgetTag() const { return LL_UI_CTRL_LOCATE_TAG; }
        static LLView *fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
        {
                LLString name("pad");
@@ -194,39 +97,14 @@ public:
        }
 };
+static LLRegisterWidget<LLUICtrlLocate> r1("locate");
+static LLRegisterWidget<LLUICtrlLocate> r2("pad");
 //-----------------------------------------------------------------------------
 // LLUICtrlFactory()
 //-----------------------------------------------------------------------------
 LLUICtrlFactory::LLUICtrlFactory()
 {
-        // Register controls
-        LLUICtrlCreator<LLButton>::registerCreator(LL_BUTTON_TAG, this);
-        LLUICtrlCreator<LLCheckBoxCtrl>::registerCreator(LL_CHECK_BOX_CTRL_TAG, this);
-        LLUICtrlCreator<LLComboBox>::registerCreator(LL_COMBO_BOX_TAG, this);
-        LLUICtrlCreator<LLFlyoutButton>::registerCreator(LL_FLYOUT_BUTTON_TAG, this);
-        LLUICtrlCreator<LLLineEditor>::registerCreator(LL_LINE_EDITOR_TAG, this);
-        LLUICtrlCreator<LLSearchEditor>::registerCreator(LL_SEARCH_EDITOR_TAG, this);
-        LLUICtrlCreator<LLScrollListCtrl>::registerCreator(LL_SCROLL_LIST_CTRL_TAG, this);
-        LLUICtrlCreator<LLSliderCtrl>::registerCreator(LL_SLIDER_CTRL_TAG, this);
-        LLUICtrlCreator<LLSlider>::registerCreator(LL_SLIDER_TAG, this);
-        LLUICtrlCreator<LLSlider>::registerCreator(LL_VOLUME_SLIDER_CTRL_TAG, this);
-        LLUICtrlCreator<LLMultiSliderCtrl>::registerCreator(LL_MULTI_SLIDER_CTRL_TAG, this);
-        LLUICtrlCreator<LLMultiSlider>::registerCreator(LL_MULTI_SLIDER_TAG, this);
-        LLUICtrlCreator<LLSpinCtrl>::registerCreator(LL_SPIN_CTRL_TAG, this);
-        LLUICtrlCreator<LLTextBox>::registerCreator(LL_TEXT_BOX_TAG, this);
-        LLUICtrlCreator<LLRadioGroup>::registerCreator(LL_RADIO_GROUP_TAG, this);
-        LLUICtrlCreator<LLIconCtrl>::registerCreator(LL_ICON_CTRL_TAG, this);
-        LLUICtrlCreator<LLUICtrlLocate>::registerCreator(LL_UI_CTRL_LOCATE_TAG, this);
-        LLUICtrlCreator<LLUICtrlLocate>::registerCreator(LL_PAD_TAG, this);
-        LLUICtrlCreator<LLViewBorder>::registerCreator(LL_VIEW_BORDER_TAG, this);
-        LLUICtrlCreator<LLTabContainer>::registerCreator(LL_TAB_CONTAINER_COMMON_TAG, this);
-        LLUICtrlCreator<LLScrollableContainerView>::registerCreator(LL_SCROLLABLE_CONTAINER_VIEW_TAG, this);
-        LLUICtrlCreator<LLPanel>::registerCreator(LL_PANEL_TAG, this);
-        LLUICtrlCreator<LLMenuGL>::registerCreator(LL_MENU_GL_TAG, this);
-        LLUICtrlCreator<LLMenuBarGL>::registerCreator(LL_MENU_BAR_GL_TAG, this);
-        LLUICtrlCreator<LLScrollingPanelList>::registerCreator(LL_SCROLLING_PANEL_LIST_TAG, this);
-        LLUICtrlCreator<LLLayoutStack>::registerCreator(LL_LAYOUT_STACK_TAG, this);
        setupPaths();
 }
@@ -548,43 +426,33 @@ void LLUICtrlFactory::rebuild()
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-// static
-EWidgetType LLUICtrlFactory::getWidgetType(const LLString& ctrl_type)
-{
-        U32 ctrl_id;
-        for (ctrl_id = 0; ctrl_id < WIDGET_TYPE_COUNT; ctrl_id++)
-        {
-                if (sUICtrlNames[ctrl_id] == ctrl_type)
-                {
-                        break;
-                }
-        }
-        return (EWidgetType) ctrl_id;
-}
-LLString LLUICtrlFactory::getWidgetType(EWidgetType ctrl_type)
-{
-        return sUICtrlNames[ctrl_type];
-}
 LLView *LLUICtrlFactory::createCtrlWidget(LLPanel *parent, LLXMLNodePtr node)
 {
+        // panel for holding dummy widgets, so they have a parent for layout purposes, etc.
+        // does not manage lifetime of child widgets
+        static LLPanel dummy_panel;
        LLString ctrl_type = node->getName()->mString;
        LLString::toLower(ctrl_type);
        
-        creator_list_t::const_iterator it = mCreatorFunctions.find(ctrl_type);
+        LLWidgetClassRegistry::factory_func_t func = LLWidgetClassRegistry::getInstance()->getCreatorFunc(ctrl_type);
-        if (it == mCreatorFunctions.end())
+        if (func == NULL)
        {
                llwarns << "Unknown control type " << ctrl_type << llendl;
                return NULL;
        }
-        LLView *ctrl = (*it->second)(node, parent, this);
+        if (parent == NULL)
+        {
+                parent = &dummy_panel;
+        }
+        LLView *ctrl = func(node, parent, this);
        return ctrl;
 }
-void LLUICtrlFactory::createWidget(LLPanel *parent, LLXMLNodePtr node)
+LLView* LLUICtrlFactory::createWidget(LLPanel *parent, LLXMLNodePtr node)
 {
        LLView* view = createCtrlWidget(parent, node);
@@ -595,6 +463,8 @@ void LLUICtrlFactory::createWidget(LLPanel *parent, LLXMLNodePtr node)
        {
                parent->addChild(view, tab_group);
        }
+        return view;
 }
 //-----------------------------------------------------------------------------
@@ -648,138 +518,3 @@ BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const LLString& name,
        return res;
 }
-//============================================================================
-LLButton*       LLUICtrlFactory::getButtonByName(const LLPanel* panelp, const LLString& name)
-{ 
-        return panelp->getChild<LLButton>(name); 
-}
-LLCheckBoxCtrl*         LLUICtrlFactory::getCheckBoxByName(const LLPanel* panelp, const LLString& name)         
-{ 
-        return panelp->getChild<LLCheckBoxCtrl>(name); 
-}
-LLComboBox*                     LLUICtrlFactory::getComboBoxByName(const LLPanel* panelp, const LLString& name)         
-{ 
-        return panelp->getChild<LLComboBox>(name); 
-}
-LLIconCtrl*                     LLUICtrlFactory::getIconByName(const LLPanel* panelp, const LLString& name)                     
-{ 
-        return panelp->getChild<LLIconCtrl>(name); 
-}
-LLLineEditor*           LLUICtrlFactory::getLineEditorByName(const LLPanel* panelp, const LLString& name)       
-{ 
-        return panelp->getChild<LLLineEditor>(name); 
-}
-LLRadioGroup*           LLUICtrlFactory::getRadioGroupByName(const LLPanel* panelp, const LLString& name)       
-{ 
-        return panelp->getChild<LLRadioGroup>(name); 
-}
-LLScrollListCtrl*       LLUICtrlFactory::getScrollListByName(const LLPanel* panelp, const LLString& name)       
-{ 
-        return panelp->getChild<LLScrollListCtrl>(name); 
-}
-LLSliderCtrl*           LLUICtrlFactory::getSliderByName(const LLPanel* panelp, const LLString& name)           
-{ 
-        return panelp->getChild<LLSliderCtrl>(name); 
-}
-LLSlider*                       LLUICtrlFactory::getSliderBarByName(const LLPanel* panelp, const LLString& name)                
-{ 
-        return panelp->getChild<LLSlider>(name); 
-}
-LLSpinCtrl*                     LLUICtrlFactory::getSpinnerByName(const LLPanel* panelp, const LLString& name)          
-{ 
-        return panelp->getChild<LLSpinCtrl>(name); 
-}
-LLTextBox*                      LLUICtrlFactory::getTextBoxByName(const LLPanel* panelp, const LLString& name)          
-{ 
-        return panelp->getChild<LLTextBox>(name);
-}
-LLTextEditor*           LLUICtrlFactory::getTextEditorByName(const LLPanel* panelp, const LLString& name)       
-{ 
-        return panelp->getChild<LLTextEditor>(name); 
-}
-LLTabContainer* LLUICtrlFactory::getTabContainerByName(const LLPanel* panelp, const LLString& name)     
-{ 
-        return panelp->getChild<LLTabContainer>(name); 
-}
-LLScrollableContainerView* LLUICtrlFactory::getScrollableContainerByName(const LLPanel* panelp, const LLString& name)
-{
-        return panelp->getChild<LLScrollableContainerView>(name); 
-}
-LLPanel* LLUICtrlFactory::getPanelByName(const LLPanel* panelp, const LLString& name)   
-{ 
-        return panelp->getChild<LLPanel>(name); 
-}
-LLMenuItemCallGL* LLUICtrlFactory::getMenuItemCallByName(const LLPanel* panelp, const LLString& name)
-{ 
-        return panelp->getChild<LLMenuItemCallGL>(name); 
-}
-LLScrollingPanelList* LLUICtrlFactory::getScrollingPanelList(const LLPanel* panelp, const LLString& name)
-{ 
-        return panelp->getChild<LLScrollingPanelList>(name);
-}
-LLMultiSliderCtrl* LLUICtrlFactory::getMultiSliderByName(const LLPanel* panelp, const LLString& name)           
-{ 
-        return panelp->getChild<LLMultiSliderCtrl>(name); 
-}
-LLMultiSlider* LLUICtrlFactory::getMultiSliderBarByName(const LLPanel* panelp, const LLString& name)            
-{ 
-        return panelp->getChild<LLMultiSlider>(name); 
-}
-LLCtrlListInterface* LLUICtrlFactory::getListInterfaceByName(const LLPanel* panelp, const LLString& name)
-{
-        LLView* viewp = panelp->getCtrlByNameAndType(name, WIDGET_TYPE_DONTCARE);
-        if (viewp && viewp->isCtrl())
-        {
-                return ((LLUICtrl*)viewp)->getListInterface();
-        }
-        return NULL;
-}
-LLCtrlSelectionInterface* LLUICtrlFactory::getSelectionInterfaceByName(const LLPanel* panelp, const LLString& name)
-{
-        LLView* viewp = panelp->getCtrlByNameAndType(name, WIDGET_TYPE_DONTCARE);
-        if (viewp && viewp->isCtrl())
-        {
-                return ((LLUICtrl*)viewp)->getSelectionInterface();
-        }
-        return NULL;
-}
-LLCtrlScrollInterface* LLUICtrlFactory::getScrollInterfaceByName(const LLPanel* panelp, const LLString& name)
-{
-        LLView* viewp = panelp->getCtrlByNameAndType(name, WIDGET_TYPE_DONTCARE);
-        if (viewp && viewp->isCtrl())
-        {
-                return ((LLUICtrl*)viewp)->getScrollInterface();
-        }
-        return NULL;
-}
-void LLUICtrlFactory::registerCreator(LLString ctrlname, creator_function_t function)
-{
-        LLString::toLower(ctrlname);
-        mCreatorFunctions[ctrlname] = function;
-}
diff --git a/linden/indra/llui/lluictrlfactory.h b/linden/indra/llui/lluictrlfactory.h
index e6a2cd3..b9325a0 100644
--- a/linden/indra/llui/lluictrlfactory.h
+++ b/linden/indra/llui/lluictrlfactory.h
@@ -41,7 +41,7 @@
 class LLView;
 class LLPanel;
-class LLUICtrlFactory
+class LLUICtrlFactory : public LLSingleton<LLUICtrlFactory>
 {
 public:
        LLUICtrlFactory();
@@ -49,7 +49,7 @@ public:
        virtual ~LLUICtrlFactory() {}
        void setupPaths();
-        
        void buildFloater(LLFloater* floaterp, const LLString &filename, 
                                        const LLCallbackMap::map_t* factory_map = NULL, BOOL open = TRUE);
        BOOL buildPanel(LLPanel* panelp, const LLString &filename,
@@ -65,84 +65,28 @@ public:
        // Returns 0 on success
        S32 saveToXML(LLView* viewp, const LLString& filename);
        // Rebuilds all currently built panels.
        void rebuild();
-        static EWidgetType getWidgetType(const LLString& ctrl_type);
-        static LLString getWidgetType(EWidgetType ctrl_type);
        static BOOL getAttributeColor(LLXMLNodePtr node, const LLString& name, LLColor4& color);
-        // specific typed getters
-        static class LLButton*                          getButtonByName(                const LLPanel* panelp, const LLString& name);
-        static class LLCheckBoxCtrl*            getCheckBoxByName(              const LLPanel* panelp, const LLString& name);
-        static class LLComboBox*                        getComboBoxByName(              const LLPanel* panelp, const LLString& name);
-        static class LLIconCtrl*                        getIconByName(                  const LLPanel* panelp, const LLString& name);
-        static class LLLineEditor*                      getLineEditorByName(    const LLPanel* panelp, const LLString& name);
-        static class LLRadioGroup*                      getRadioGroupByName(    const LLPanel* panelp, const LLString& name);
-        static class LLScrollListCtrl*          getScrollListByName(    const LLPanel* panelp, const LLString& name);
-        static class LLSliderCtrl*                      getSliderByName(                const LLPanel* panelp, const LLString& name);
-        static class LLSlider*                          getSliderBarByName(             const LLPanel* panelp, const LLString& name);
-        static class LLSpinCtrl*                        getSpinnerByName(               const LLPanel* panelp, const LLString& name);
-        static class LLTextBox*                         getTextBoxByName(               const LLPanel* panelp, const LLString& name);
-        static class LLTextEditor*                      getTextEditorByName(    const LLPanel* panelp, const LLString& name);
-        static class LLTabContainer*            getTabContainerByName(  const LLPanel* panelp, const LLString& name);
-        static class LLScrollableContainerView* getScrollableContainerByName(const LLPanel* panelp, const LLString& name);
-        static class LLPanel*                           getPanelByName(                 const LLPanel* panelp, const LLString& name);
-        static class LLMenuItemCallGL*          getMenuItemCallByName(  const LLPanel* panelp, const LLString& name);
-        static class LLScrollingPanelList*      getScrollingPanelList(  const LLPanel* panelp, const LLString& name);
-        static class LLMultiSliderCtrl*         getMultiSliderByName(   const LLPanel* panelp, const LLString& name);
-        static class LLMultiSlider*                     getMultiSliderBarByName(const LLPanel* panelp, const LLString& name);
-        // interface getters
-        static LLCtrlListInterface* getListInterfaceByName(     const LLPanel* panelp, const LLString& name);
-        static LLCtrlSelectionInterface* getSelectionInterfaceByName(const LLPanel* panelp, const LLString& name);
-        static LLCtrlScrollInterface* getScrollInterfaceByName(const LLPanel* panelp, const LLString& name);
        LLPanel* createFactoryPanel(LLString name);
        virtual LLView* createCtrlWidget(LLPanel *parent, LLXMLNodePtr node);
-        virtual void createWidget(LLPanel *parent, LLXMLNodePtr node);
+        virtual LLView* createWidget(LLPanel *parent, LLXMLNodePtr node);
-        template <class T> T* createDummyWidget(const LLString& name)
-        {
-                return NULL;
-                //static LLPanel dummy_panel;
-                //LLXMLNodePtr new_node_ptr = new LLXMLNode(T::getWidgetTag(), FALSE);
-                //return createWidget(&dummy_panel, new_node_ptr);
-        }
-        // Creator library
-        typedef LLView* (*creator_function_t)(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-        void registerCreator(LLString ctrlname, creator_function_t function);
        static bool getLayeredXMLNode(const LLString &filename, LLXMLNodePtr& root);
-protected:
-        template<class T>
-        class LLUICtrlCreator
-        {
-        public:
-                static void registerCreator(LLString name, LLUICtrlFactory *factory)
-                {
-                        factory->registerCreator(name, T::fromXML);
-                }
-        };
 private:
        typedef std::map<LLHandle<LLPanel>, LLString> built_panel_t;
        built_panel_t mBuiltPanels;
        typedef std::map<LLHandle<LLFloater>, LLString> built_floater_t;
        built_floater_t mBuiltFloaters;
        std::deque<const LLCallbackMap::map_t*> mFactoryStack;
-        static const LLString sUICtrlNames[];
-        typedef std::map<LLString, creator_function_t> creator_list_t;
-        creator_list_t mCreatorFunctions;
        static std::vector<LLString> mXUIPaths;
 };
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index e5415f8..c9828dd 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -49,7 +49,16 @@
 #include "lluictrl.h"
 #include "llwindow.h"
 #include "v3color.h"
+#include "lluictrlfactory.h"
+// for ui edit hack
+#include "llbutton.h"
+#include "lllineeditor.h"
+#include "lltexteditor.h"
+#include "lltextbox.h"
+//HACK: this allows you to instantiate LLView from xml with "<view/>" which we don't want
+static LLRegisterWidget<LLView> r("view");
 BOOL    LLView::sDebugRects = FALSE;
 BOOL    LLView::sDebugKeys = FALSE;
@@ -153,6 +162,8 @@ LLView::~LLView()
        std::for_each(mFloaterControls.begin(), mFloaterControls.end(),
                                  DeletePairedPointer());
+        std::for_each(mDummyWidgets.begin(), mDummyWidgets.end(),
+                                  DeletePairedPointer());
 }
 // virtual
@@ -716,7 +727,7 @@ BOOL LLView::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_scre
                tool_tip = getShowNamesToolTip();
        }
-        BOOL showNamesTextBox = LLUI::sShowXUINames && (getWidgetType() == WIDGET_TYPE_TEXT_BOX);
+        BOOL showNamesTextBox = LLUI::sShowXUINames && dynamic_cast<LLTextBox*>(this) != NULL;
        if( !handled && (blockMouseEvent(x, y) || showNamesTextBox) && !tool_tip.empty())
        {
@@ -741,23 +752,21 @@ BOOL LLView::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 {
        BOOL handled = FALSE;
-        if( called_from_parent )
+        if (getVisible() && getEnabled())
        {
-                // Downward traversal
+                if( called_from_parent )
-                if (getVisible() && getEnabled())
                {
+                        // Downward traversal
                        handled = childrenHandleKey( key, mask ) != NULL;
                }
-        }
-        // JC: Must pass to disabled views, since they could have
+                if (!handled)
-        // keyboard focus, which requires the escape key to exit.
-        if (!handled && getVisible())
-        {
-                handled = handleKeyHere( key, mask, called_from_parent );
-                if (handled && LLView::sDebugKeys)
                {
-                        llinfos << "Key handled by " << getName() << llendl;
+                        handled = handleKeyHere( key, mask );
+                        if (handled && LLView::sDebugKeys)
+                        {
+                                llinfos << "Key handled by " << getName() << llendl;
+                        }
                }
        }
@@ -771,7 +780,7 @@ BOOL LLView::handleKey(KEY key, MASK mask, BOOL called_from_parent)
 // Called from handleKey()
 // Handles key in this object.  Checking parents and children happens in handleKey()
-BOOL LLView::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLView::handleKeyHere(KEY key, MASK mask)
 {
        return FALSE;
 }
@@ -780,25 +789,24 @@ BOOL LLView::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
 {
        BOOL handled = FALSE;
-        if( called_from_parent )
+        if (getVisible() && getEnabled())
        {
-                // Downward traversal
+                if( called_from_parent )
-                if (getVisible() && getEnabled())
                {
+                        // Downward traversal
                        handled = childrenHandleUnicodeChar( uni_char ) != NULL;
                }
-        }
-        if (!handled && getVisible())
+                if (!handled)
-        {
-                handled = handleUnicodeCharHere(uni_char, called_from_parent);
-                if (handled && LLView::sDebugKeys)
                {
-                        llinfos << "Unicode key handled by " << getName() << llendl;
+                        handled = handleUnicodeCharHere(uni_char);
+                        if (handled && LLView::sDebugKeys)
+                        {
+                                llinfos << "Unicode key handled by " << getName() << llendl;
+                        }
                }
        }
        if (!handled && !called_from_parent && mParentView)
        {
                // Upward traversal
@@ -809,7 +817,7 @@ BOOL LLView::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
 }
-BOOL LLView::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent )
+BOOL LLView::handleUnicodeCharHere(llwchar uni_char )
 {
        return FALSE;
 }
@@ -903,11 +911,14 @@ BOOL LLView::handleMouseDown(S32 x, S32 y, MASK mask)
        if (sEditingUI && handled_view)
        {
                // need to find leaf views, big hack
-                EWidgetType type = handled_view->getWidgetType();
+                LLButton* buttonp = dynamic_cast<LLButton*>(handled_view);
-                if (type == WIDGET_TYPE_BUTTON
+                LLLineEditor* line_editorp = dynamic_cast<LLLineEditor*>(handled_view);
-                        || type == WIDGET_TYPE_LINE_EDITOR
+                LLTextEditor* text_editorp = dynamic_cast<LLTextEditor*>(handled_view);
-                        || type == WIDGET_TYPE_TEXT_EDITOR
+                LLTextBox* text_boxp = dynamic_cast<LLTextBox*>(handled_view);
-                        || type == WIDGET_TYPE_TEXT_BOX)
+                if (buttonp
+                        || line_editorp
+                        || text_editorp
+                        || text_boxp)
                {
                        sEditingUIView = handled_view;
                }
@@ -971,8 +982,10 @@ LLView* LLView::childrenHandleScrollWheel(S32 x, S32 y, S32 clicks)
                        LLView* viewp = *child_it;
                        S32 local_x = x - viewp->getRect().mLeft;
                        S32 local_y = y - viewp->getRect().mBottom;
-                        if (viewp->pointInView(local_x, local_y) && 
+                        if (viewp->pointInView(local_x, local_y) 
-                                viewp->handleScrollWheel( local_x, local_y, clicks ))
+                                && viewp->getVisible()
+                                && viewp->getEnabled()
+                                && viewp->handleScrollWheel( local_x, local_y, clicks ))
                        {
                                if (sDebugMouseHandling)
                                {
@@ -1528,7 +1541,7 @@ BOOL LLView::hasAncestor(const LLView* parentp) const
 BOOL LLView::childHasKeyboardFocus( const LLString& childname ) const
 {
-        LLView *child = getChildByName(childname);
+        LLView *child = getChildView(childname, TRUE, FALSE);
        if (child)
        {
                return gFocusMgr.childHasKeyboardFocus(child);
@@ -1543,16 +1556,17 @@ BOOL LLView::childHasKeyboardFocus( const LLString& childname ) const
 BOOL LLView::hasChild(const LLString& childname, BOOL recurse) const
 {
-        return getChildByName(childname, recurse) != NULL;
+        return getChildView(childname, recurse, FALSE) != NULL;
 }
 //-----------------------------------------------------------------------------
-// getChildByName()
+// getChildView()
 //-----------------------------------------------------------------------------
-LLView* LLView::getChildByName(const LLString& name, BOOL recurse) const
+LLView* LLView::getChildView(const LLString& name, BOOL recurse, BOOL create_if_missing) const
 {
-        if(name.empty())
+        //richard: should we allow empty names?
-                return NULL;
+        //if(name.empty())
+        //      return NULL;
        child_list_const_iter_t child_it;
        // Look for direct children *first*
        for ( child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
@@ -1569,13 +1583,18 @@ LLView* LLView::getChildByName(const LLString& name, BOOL recurse) const
                for ( child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
                {
                        LLView* childp = *child_it;
-                        LLView* viewp = childp->getChildByName(name, recurse);
+                        LLView* viewp = childp->getChildView(name, recurse, FALSE);
                        if ( viewp )
                        {
                                return viewp;
                        }
                }
        }
+        if (create_if_missing)
+        {
+                return createDummyWidget<LLView>(name);
+        }
        return NULL;
 }
@@ -1692,7 +1711,6 @@ BOOL LLView::translateIntoRect(const LLRect& constraint, BOOL allow_partial_outs
                if( getRect().mLeft + KEEP_ONSCREEN_PIXELS > constraint.mRight )
                {
                        delta_x = constraint.mRight - (getRect().mLeft + KEEP_ONSCREEN_PIXELS);
-                        delta_x += llmax( 0, getRect().getWidth() - constraint.getWidth() );
                }
                if( getRect().mTop > constraint.mTop )
@@ -1703,7 +1721,6 @@ BOOL LLView::translateIntoRect(const LLRect& constraint, BOOL allow_partial_outs
                if( getRect().mTop - KEEP_ONSCREEN_PIXELS < constraint.mBottom )
                {
                        delta_y = constraint.mBottom - (getRect().mTop - KEEP_ONSCREEN_PIXELS);
-                        delta_y -= llmax( 0, getRect().getHeight() - constraint.getHeight() );
                }
        }
        else
@@ -1716,6 +1733,7 @@ BOOL LLView::translateIntoRect(const LLRect& constraint, BOOL allow_partial_outs
                if( getRect().mRight > constraint.mRight )
                {
                        delta_x = constraint.mRight - getRect().mRight;
+                        // compensate for left edge possible going off screen
                        delta_x += llmax( 0, getRect().getWidth() - constraint.getWidth() );
                }
@@ -1727,6 +1745,7 @@ BOOL LLView::translateIntoRect(const LLRect& constraint, BOOL allow_partial_outs
                if( getRect().mBottom < constraint.mBottom )
                {
                        delta_y = constraint.mBottom - getRect().mBottom;
+                        // compensate for top edge possible going off screen
                        delta_y -= llmax( 0, getRect().getHeight() - constraint.getHeight() );
                }
        }
@@ -1832,9 +1851,8 @@ BOOL LLView::localRectToOtherView( const LLRect& local, LLRect* other, LLView* o
 // virtual
 LLXMLNodePtr LLView::getXML(bool save_children) const
 {
-        const LLString& type_name = getWidgetTag();
+        //FIXME: need to provide actual derived type tag, probably outside this method
+        LLXMLNodePtr node = new LLXMLNode("view", FALSE);
-        LLXMLNodePtr node = new LLXMLNode(type_name, FALSE);
        node->createChild("name", TRUE)->setStringValue(getName());
        node->createChild("width", TRUE)->setIntValue(getRect().getWidth());
@@ -1897,6 +1915,14 @@ LLXMLNodePtr LLView::getXML(bool save_children) const
        return node;
 }
+//static 
+LLView* LLView::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
+{
+        LLView* viewp = new LLView();
+        viewp->initFromXML(node, parent);
+        return viewp;
+}
 // static
 void LLView::addColorXML(LLXMLNodePtr node, const LLColor4& color,
                                                        const LLString& xml_name, const LLString& control_name)
@@ -2426,16 +2452,7 @@ LLSimpleListener* LLView::getListenerByName(const LLString& callback_name)
        return callback;
 }
-void LLView::addListenerToControl(LLEventDispatcher *dispatcher, const LLString& name, LLSD filter, LLSD userdata)
+LLControlVariable *LLView::findControl(LLString name)
-{
-        LLSimpleListener* listener = getListenerByName(name);
-        if (listener)
-        {
-                dispatcher->addListener(listener, filter, userdata);
-        }
-}
-LLControlBase *LLView::findControl(LLString name)
 {
        control_map_t::iterator itor = mFloaterControls.find(name);
        if (itor != mFloaterControls.end())
@@ -2791,9 +2808,15 @@ LLFontGL::StyleFlags LLView::selectFontStyle(LLXMLNodePtr node)
        return gl_font_style;
 }
-void LLView::setControlValue(const LLSD& value)
+bool LLView::setControlValue(const LLSD& value)
 {
-        LLUI::sConfigGroup->setValue(getControlName(), value);
+        LLString ctrlname = getControlName();
+        if (!ctrlname.empty())
+        {
+                LLUI::sConfigGroup->setValue(ctrlname, value);
+                return true;
+        }
+        return false;
 }
 //virtual
@@ -2804,43 +2827,57 @@ void LLView::setControlName(const LLString& control_name, LLView *context)
                context = this;
        }
-        // Unregister from existing listeners
        if (!mControlName.empty())
        {
-                clearDispatchers();
+                llwarns << "setControlName called twice on same control!" << llendl;
+                mControlConnection.disconnect(); // disconnect current signal
+                mControlName.clear();
        }
+        
        // Register new listener
        if (!control_name.empty())
        {
-                LLControlBase *control = context->findControl(control_name);
+                LLControlVariable *control = context->findControl(control_name);
                if (control)
                {
                        mControlName = control_name;
-                        LLSD state = control->registerListener(this, "DEFAULT");
+                        mControlConnection = control->getSignal()->connect(boost::bind(&controlListener, _1, getHandle(), std::string("value")));
-                        setValue(state);
+                        setValue(control->getValue());
                }
        }
 }
-// virtual
+// static
-bool LLView::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+bool LLView::controlListener(const LLSD& newvalue, LLHandle<LLView> handle, std::string type)
 {
-        if (userdata.asString() == "DEFAULT" && event->desc() == "value_changed")
+        LLView* view = handle.get();
+        if (view)
        {
-                LLSD state = event->getValue();
+                if (type == "value")
-                setValue(state);
+                {
-                return TRUE;
+                        view->setValue(newvalue);
+                        return true;
+                }
+                else if (type == "enabled")
+                {
+                        view->setEnabled(newvalue.asBoolean());
+                        return true;
+                }
+                else if (type == "visible")
+                {
+                        view->setVisible(newvalue.asBoolean());
+                        return true;
+                }
        }
-        return FALSE;
+        return false;
 }
 void LLView::addBoolControl(LLString name, bool initial_value)
 {
-        mFloaterControls[name] = new LLControl(name, TYPE_BOOLEAN, initial_value, "Internal floater control");
+        mFloaterControls[name] = new LLControlVariable(name, TYPE_BOOLEAN, initial_value, "Internal floater control");
 }
-LLControlBase *LLView::getControl(LLString name)
+LLControlVariable *LLView::getControl(LLString name)
 {
        control_map_t::iterator itor = mFloaterControls.find(name);
        if (itor != mFloaterControls.end())
@@ -2860,3 +2897,41 @@ LLSD	LLView::getValue() const
 {
        return LLSD();
 }
+LLView* LLView::createWidget(LLXMLNodePtr xml_node) const
+{
+        // forward requests to ui ctrl factory
+        return LLUICtrlFactory::getInstance()->createCtrlWidget(NULL, xml_node);
+}
+//
+// LLWidgetClassRegistry
+//
+LLWidgetClassRegistry::LLWidgetClassRegistry()
+{ 
+}
+void LLWidgetClassRegistry::registerCtrl(const LLString& tag, LLWidgetClassRegistry::factory_func_t function)
+{ 
+        LLString lower_case_tag = tag;
+        LLString::toLower(lower_case_tag);
+        
+        mCreatorFunctions[lower_case_tag] = function;
+}
+BOOL LLWidgetClassRegistry::isTagRegistered(const LLString &tag)
+{ 
+        return mCreatorFunctions.find(tag) != mCreatorFunctions.end();
+}
+LLWidgetClassRegistry::factory_func_t LLWidgetClassRegistry::getCreatorFunc(const LLString& ctrl_type)
+{ 
+        factory_map_t::const_iterator found_it = mCreatorFunctions.find(ctrl_type);
+        if (found_it == mCreatorFunctions.end())
+        {
+                return NULL;
+        }
+        return found_it->second;
+}
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 51c314a..9a04ed7 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -52,7 +52,6 @@
 #include "stdenums.h"
 #include "lluistring.h"
 const U32       FOLLOWS_NONE    = 0x00;
 const U32       FOLLOWS_LEFT    = 0x01;
 const U32       FOLLOWS_RIGHT   = 0x02;
@@ -65,7 +64,6 @@ const BOOL	NOT_MOUSE_OPAQUE = FALSE;
 const U32 GL_NAME_UI_RESERVED = 2;
 /*
 // virtual functions defined in LLView:
@@ -120,9 +118,7 @@ virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,EDragAndDropTy
                *
 virtual void    draw();
                *
-virtual EWidgetType getWidgetType() const = 0;
-                *
-virtual LLString getWidgetTag() const = 0;
                *
 virtual LLXMLNodePtr getXML(bool save_children = true) const;
                *
@@ -132,7 +128,7 @@ virtual void onFocusLost() {}
                LLUICtrl, LLScrollListCtrl, LLMenuGL, LLLineEditor, LLComboBox
 virtual void onFocusReceived() {}
                LLUICtrl, LLTextEditor, LLScrollListVtrl, LLMenuGL, LLLineEditor
-virtual LLView* getChildByName(const LLString& name, BOOL recurse = FALSE) const;
+virtual LLView* getChildView(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
                LLTabContainer, LLPanel, LLMenuGL
 virtual void    setControlName(const LLString& control, LLView *context);
                LLSliderCtrl, LLCheckBoxCtrl
@@ -144,13 +140,72 @@ virtual void	setValue(const LLSD& value);
                *
 protected:
-virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+virtual BOOL    handleKeyHere(KEY key, MASK mask);
                *
-virtual BOOL    handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+virtual BOOL    handleUnicodeCharHere(llwchar uni_char);
                *
 */
-class LLView : public LLMouseHandler, public LLMortician, public LLSimpleListenerObservable
+class LLUICtrlFactory;
+// maps xml strings to widget classes
+class LLWidgetClassRegistry : public LLSingleton<LLWidgetClassRegistry>
+{
+        friend class LLSingleton<LLWidgetClassRegistry>;
+public:
+        typedef LLView* (*factory_func_t)(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+        typedef std::map<LLString, factory_func_t> factory_map_t;
+        void registerCtrl(const LLString& xml_tag, factory_func_t function);
+        BOOL isTagRegistered(const LLString& xml_tag);
+        factory_func_t getCreatorFunc(const LLString& xml_tag);
+        // get (first) xml tag for a given class
+        template <class T> std::string getTag()
+        {
+                factory_map_t::iterator it;
+                for(it = mCreatorFunctions.begin(); it != mCreatorFunctions.end(); ++it)
+                {
+                        if (it->second == T::fromXML)
+                        {
+                                return it->first;
+                        }
+                }
+                return "";
+        }
+private:
+        LLWidgetClassRegistry();
+        virtual ~LLWidgetClassRegistry() {};
+        typedef std::set<LLString> ctrl_name_set_t;
+        ctrl_name_set_t mUICtrlNames;
+        // map of xml tags to widget creator functions
+        factory_map_t mCreatorFunctions;
+};
+template<class T>
+class LLRegisterWidget
+{
+public:
+        LLRegisterWidget(const std::string& tag) 
+        {
+                LLWidgetClassRegistry* registry = LLWidgetClassRegistry::getInstance();
+                if (registry->isTagRegistered(tag))
+                {
+                        //error!
+                        llerrs << "Widget named " << tag << " already registered!" << llendl;
+                }
+                else
+                {
+                        registry->registerCtrl(tag, T::fromXML);
+                }
+        }
+};
+class LLView : public LLMouseHandler, public LLMortician
 {
 public:
@@ -294,7 +349,6 @@ public:
        
        LLHandle<LLView>        getHandle()                             { mHandle.bind(this); return mHandle; }
        U32                     getFollows() const                              { return mReshapeFlags; }
        BOOL            followsLeft() const                             { return mReshapeFlags & FOLLOWS_LEFT; }
        BOOL            followsRight() const                    { return mReshapeFlags & FOLLOWS_RIGHT; }
@@ -355,10 +409,9 @@ public:
        virtual void    draw();
-        virtual EWidgetType getWidgetType() const = 0;
-        virtual LLString getWidgetTag() const = 0;
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
+        //FIXME: make LLView non-instantiable from XML
+        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
        virtual void initFromXML(LLXMLNodePtr node, LLView* parent);
        void parseFollowsFlags(LLXMLNodePtr node);
@@ -393,13 +446,13 @@ public:
        void addListenerToControl(LLEventDispatcher *observer, const LLString& name, LLSD filter, LLSD userdata);
        void addBoolControl(LLString name, bool initial_value);
-        LLControlBase *getControl(LLString name);
+        LLControlVariable *getControl(LLString name);
-        LLControlBase *findControl(LLString name);
+        LLControlVariable *findControl(LLString name);
-        void                    setControlValue(const LLSD& value);
+        bool setControlValue(const LLSD& value);
        virtual void    setControlName(const LLString& control, LLView *context);
        virtual LLString getControlName() const { return mControlName; }
-        virtual bool    handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+//      virtual bool    handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
        virtual void    setValue(const LLSD& value);
        virtual LLSD    getValue() const;
@@ -422,17 +475,74 @@ public:
        /*virtual*/ void        screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const;
        /*virtual*/ void        localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const;
-        template <class T> T* getChild(const LLString& name, BOOL recurse = TRUE) const
+        template <class T> T* getChild(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const
        {
-                T* result = dynamic_cast<T*>(getChildByName(name, TRUE));
+                LLView* child = getChildView(name, recurse, FALSE);
-                //if (!result)
+                T* result = dynamic_cast<T*>(child);
-                //{
+                if (!result)
-                //      // create dummy widget instance here
+                {
-                //      result = gUICtrlFactory->createDummyWidget<T>(name);
+                        // did we find *something* with that name?
-                //}
+                        if (child)
+                        {
+                                llwarns << "Found child named " << name << " but of wrong type" << llendl;
+                        }
+                        if (create_if_missing)
+                        {
+                                // create dummy widget instance here
+                                result = createDummyWidget<T>(name);
+                        }
+                }
                return result;
        }
+        virtual LLView* getChildView(const LLString& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+        template <class T> T* createDummyWidget(const LLString& name) const
+        {
+                T* widget = getDummyWidget<T>(name);
+                if (!widget)
+                {
+                        // get xml tag name corresponding to requested widget type (e.g. "button")
+                        LLString xml_tag = LLWidgetClassRegistry::getInstance()->getTag<T>();
+                        if (xml_tag.empty())
+                        {
+                                llwarns << "No xml tag registered for this class " << llendl;
+                                return NULL;
+                        }
+                        // create dummy xml node (<button name="foo"/>)
+                        LLXMLNodePtr new_node_ptr = new LLXMLNode(xml_tag, FALSE);
+                        new_node_ptr->createChild("name", TRUE)->setStringValue(name);
+                        
+                        widget = dynamic_cast<T*>(createWidget(new_node_ptr));
+                        if (widget)
+                        {
+                                // need non-const to update private dummy widget cache
+                                llwarns << "Making dummy " << xml_tag << " named " << name << " in " << getName() << llendl;
+                                const_cast<LLView*>(this)->mDummyWidgets.insert(std::make_pair(name, widget));
+                        }
+                        else
+                        {
+                                // dynamic cast will fail if T::fromXML only registered for base class
+                                llwarns << "Failed to create dummy widget of requested type " << llendl;
+                                return NULL;
+                        }
+                }
+                return widget;
+        }
+        template <class T> T* getDummyWidget(const LLString& name) const
+        {
+                dummy_widget_map_t::const_iterator found_it = mDummyWidgets.find(name);
+                if (found_it == mDummyWidgets.end())
+                {
+                        return NULL;
+                }
+                return dynamic_cast<T*>(found_it->second);
+        }
+        LLView* createWidget(LLXMLNodePtr xml_node) const;
        // statics
        static U32 createRect(LLXMLNodePtr node, LLRect &rect, LLView* parent_view, const LLRect &required_rect = LLRect());
        
@@ -471,8 +581,8 @@ public:
        
 protected:
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleKeyHere(KEY key, MASK mask);
-        virtual BOOL    handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+        virtual BOOL    handleUnicodeCharHere(llwchar uni_char);
        void                    drawDebugRect();
        void                    drawChild(LLView* childp, S32 x_offset = 0, S32 y_offset = 0, BOOL force_draw = FALSE);
@@ -494,10 +604,10 @@ protected:
        LLView* childrenHandleRightMouseDown(S32 x, S32 y, MASK mask);
        LLView* childrenHandleRightMouseUp(S32 x, S32 y, MASK mask);
-        typedef std::map<LLString, LLControlBase*> control_map_t;
+        static bool controlListener(const LLSD& newvalue, LLHandle<LLView> handle, std::string type);
-        control_map_t mFloaterControls;
-        virtual LLView* getChildByName(const LLString& name, BOOL recurse = FALSE) const;
+        typedef std::map<LLString, LLControlVariable*> control_map_t;
+        control_map_t mFloaterControls;
 private:
        LLView*         mParentView;
@@ -538,8 +648,11 @@ private:
        LLString                mControlName;
+        typedef std::map<LLString, LLView*> dummy_widget_map_t;
+        dummy_widget_map_t mDummyWidgets;
-// Just debugging stuff? We should try to hide anything that's not. -MG
+        boost::signals::connection mControlConnection;
+        
 public:
        static BOOL     sDebugRects;    // Draw debug rects behind everything.
        static BOOL sDebugKeys;
@@ -554,9 +667,6 @@ public:
        static BOOL sForceReshape;
 };
 class LLCompareByTabOrder
 {
 public:
@@ -568,4 +678,5 @@ private:
        LLView::child_tab_order_t mTabOrder;
 };
 #endif //LL_LLVIEW_H
diff --git a/linden/indra/llui/llviewborder.cpp b/linden/indra/llui/llviewborder.cpp
index 6c2d9fa..e8cff7b 100644
--- a/linden/indra/llui/llviewborder.cpp
+++ b/linden/indra/llui/llviewborder.cpp
@@ -33,6 +33,8 @@
 #include "llglimmediate.h"
 #include "llfocusmgr.h"
+static LLRegisterWidget<LLViewBorder> r("view_border");
 LLViewBorder::LLViewBorder( const LLString& name, const LLRect& rect, EBevel bevel, EStyle style, S32 width )
        :
        LLView( name, rect, FALSE ),
@@ -66,47 +68,45 @@ void LLViewBorder::setColorsExtended( const LLColor4& shadow_light, const LLColo
 void LLViewBorder::setTexture( const LLUUID &image_id )
 {
-        mTexture = LLUI::sImageProvider->getImageByID(image_id);
+        mTexture = LLUI::sImageProvider->getUIImageByID(image_id);
 }
 void LLViewBorder::draw()
 {
-        if( getVisible() )
+        if( STYLE_LINE == mStyle )
        {
-                if( STYLE_LINE == mStyle )
+                if( 0 == mBorderWidth )
+                {
+                        // no visible border
+                }
+                else
+                if( 1 == mBorderWidth )
+                {
+                        drawOnePixelLines();
+                }
+                else
+                if( 2 == mBorderWidth )
                {
-                        if( 0 == mBorderWidth )
+                        drawTwoPixelLines();
-                        {
-                                // no visible border
-                        }
-                        else
-                        if( 1 == mBorderWidth )
-                        {
-                                drawOnePixelLines();
-                        }
-                        else
-                        if( 2 == mBorderWidth )
-                        {
-                                drawTwoPixelLines();
-                        }
-                        else
-                        {
-                                llassert( FALSE );  // not implemented
-                        }
                }
                else
-                if( STYLE_TEXTURE == mStyle )
                {
-                        if( mTexture )
+                        llassert( FALSE );  // not implemented
-                        {
-                                drawTextures();
-                        }
                }
+        }
+        else
+        if( STYLE_TEXTURE == mStyle )
+        {
+                if( mTexture )
+                {
+                        drawTextures();
+                }
+        }
+        // draw the children
+        LLView::draw();
-                // draw the children
-                LLView::draw();
-        }       
 }
 void LLViewBorder::drawOnePixelLines()
@@ -134,11 +134,10 @@ void LLViewBorder::drawOnePixelLines()
        if( mHasKeyboardFocus )
        {
-                F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
                top_color = gFocusMgr.getFocusColor();
                bottom_color = top_color;
-                LLUI::setLineWidth(lerp(1.f, 3.f, lerp_amt));
+                LLUI::setLineWidth(lerp(1.f, 3.f, gFocusMgr.getFocusFlashAmt()));
        }
        S32 left        = 0;
@@ -225,20 +224,20 @@ void LLViewBorder::drawTwoPixelLines()
 void LLViewBorder::drawTextures()
 {
-        LLGLSUIDefault gls_ui;
+        //LLGLSUIDefault gls_ui;
-        llassert( FALSE );  // TODO: finish implementing
+        //llassert( FALSE );  // TODO: finish implementing
-        gGL.color4fv(UI_VERTEX_COLOR.mV);
+        //gGL.color4fv(UI_VERTEX_COLOR.mV);
-        mTexture->bind();
+        //mTexture->bind();
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
+        //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
-        glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
+        //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
-        drawTextureTrapezoid(   0.f, mBorderWidth, getRect().getWidth(),  0,                                    0 );
+        //drawTextureTrapezoid(   0.f, mBorderWidth, getRect().getWidth(),  0,                                  0 );
-        drawTextureTrapezoid(  90.f, mBorderWidth, getRect().getHeight(), (F32)getRect().getWidth(),0 );
+        //drawTextureTrapezoid(  90.f, mBorderWidth, getRect().getHeight(), (F32)getRect().getWidth(),0 );
-        drawTextureTrapezoid( 180.f, mBorderWidth, getRect().getWidth(),  (F32)getRect().getWidth(),(F32)getRect().getHeight() );
+        //drawTextureTrapezoid( 180.f, mBorderWidth, getRect().getWidth(),  (F32)getRect().getWidth(),(F32)getRect().getHeight() );
-        drawTextureTrapezoid( 270.f, mBorderWidth, getRect().getHeight(), 0,                                    (F32)getRect().getHeight() );
+        //drawTextureTrapezoid( 270.f, mBorderWidth, getRect().getHeight(), 0,                                  (F32)getRect().getHeight() );
 }
diff --git a/linden/indra/llui/llviewborder.h b/linden/indra/llui/llviewborder.h
index 4e5dfee..eacb2b5 100644
--- a/linden/indra/llui/llviewborder.h
+++ b/linden/indra/llui/llviewborder.h
@@ -44,8 +44,6 @@ public:
        LLViewBorder( const LLString& name, const LLRect& rect, EBevel bevel = BEVEL_OUT, EStyle style = STYLE_LINE, S32 width = 1 );
        virtual void setValue(const LLSD& val) { setRect(LLRect(val)); }
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_VIEW_BORDER; }
-        virtual LLString getWidgetTag() const { return LL_VIEW_BORDER_TAG; }
        virtual BOOL isCtrl() const { return FALSE; }
@@ -85,7 +83,7 @@ private:
        LLColor4        mShadowDark;
        LLColor4        mBackgroundColor;
        S32                     mBorderWidth;
-        LLPointer<LLImageGL>    mTexture;
+        LLUIImagePtr    mTexture;
        BOOL            mHasKeyboardFocus;
 };
diff --git a/linden/indra/llui/llviewquery.cpp b/linden/indra/llui/llviewquery.cpp
index 5c58ad6..b84fba5 100644
--- a/linden/indra/llui/llviewquery.cpp
+++ b/linden/indra/llui/llviewquery.cpp
@@ -66,11 +66,6 @@ filterResult_t LLCtrlFilter::operator() (const LLView* const view, const viewLis
        return filterResult_t(view->isCtrl(),TRUE);
 }
-filterResult_t LLWidgetTypeFilter::operator() (const LLView* const view, const viewList_t & children) const
-{
-        return filterResult_t(view->getWidgetType() == mType, TRUE);
-} 
 //
 // LLViewQuery
 //
diff --git a/linden/indra/llui/llviewquery.h b/linden/indra/llui/llviewquery.h
index 7e947cd..c76ed25 100644
--- a/linden/indra/llui/llviewquery.h
+++ b/linden/indra/llui/llviewquery.h
@@ -87,14 +87,14 @@ class LLCtrlFilter : public LLQueryFilter, public LLSingleton<LLCtrlFilter>
        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
 };
+template <class T>
 class LLWidgetTypeFilter : public LLQueryFilter
 {
-public:
+        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const
-        LLWidgetTypeFilter(EWidgetType type) : mType(type) {};
+        {
-private:
+                return filterResult_t(dynamic_cast<const T*>(view) != NULL, TRUE);
-        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+        }
-        EWidgetType mType;
 };
 // Algorithm for flattening
diff --git a/linden/indra/llvfs/llvfile.cpp b/linden/indra/llvfs/llvfile.cpp
index e8afbb0..61de885 100644
--- a/linden/indra/llvfs/llvfile.cpp
+++ b/linden/indra/llvfs/llvfile.cpp
@@ -45,7 +45,6 @@ const S32 LLVFile::APPEND		= 0x00000006;  // 0x00000004 & LLVFile::WRITE
 //----------------------------------------------------------------------------
 LLVFSThread* LLVFile::sVFSThread = NULL;
 BOOL LLVFile::sAllocdVFSThread = FALSE;
-BOOL LLVFile::ALLOW_ASYNC = TRUE;
 //----------------------------------------------------------------------------
 //============================================================================
diff --git a/linden/indra/llvfs/llvfile.h b/linden/indra/llvfs/llvfile.h
index b21c0e5..040e61a 100644
--- a/linden/indra/llvfs/llvfile.h
+++ b/linden/indra/llvfs/llvfile.h
@@ -78,8 +78,6 @@ public:
        static const S32 WRITE;
        static const S32 READ_WRITE;
        static const S32 APPEND;
-        static BOOL ALLOW_ASYNC;
        
 protected:
        LLAssetType::EType mFileType;
diff --git a/linden/indra/llwindow/lldxhardware.cpp b/linden/indra/llwindow/lldxhardware.cpp
index 352a5a3..4eb8cab 100644
--- a/linden/indra/llwindow/lldxhardware.cpp
+++ b/linden/indra/llwindow/lldxhardware.cpp
@@ -233,9 +233,10 @@ LLDXHardware::LLDXHardware()
 void LLDXHardware::cleanup()
 {
-        for_each(mDevices.begin(), mDevices.end(), DeletePairedPointer());
+  // for_each(mDevices.begin(), mDevices.end(), DeletePairedPointer());
 }
+/*
 LLString LLDXHardware::dumpDevices()
 {
        if (gWriteDebug)
@@ -284,6 +285,7 @@ LLDXDevice *LLDXHardware::findDevice(const std::string &vendor, const std::strin
        return NULL;
 }
+*/
 BOOL LLDXHardware::getInfo(BOOL vram_only)
 {
@@ -296,7 +298,7 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
    IDxDiagProvider *dx_diag_providerp = NULL;
    IDxDiagContainer *dx_diag_rootp = NULL;
        IDxDiagContainer *devices_containerp = NULL;
-        IDxDiagContainer *system_device_containerp= NULL;
+        // IDxDiagContainer *system_device_containerp= NULL;
        IDxDiagContainer *device_containerp = NULL;
        IDxDiagContainer *file_containerp = NULL;
        IDxDiagContainer *driver_containerp = NULL;
@@ -362,15 +364,18 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
                }
                
                // Get the English VRAM string
-                std::string ram_str = get_string(device_containerp, L"szDisplayMemoryEnglish");
+                {
+                  std::string ram_str = get_string(device_containerp, L"szDisplayMemoryEnglish");
-                // We don't need the device any more
+                  // We don't need the device any more
-                SAFE_RELEASE(device_containerp);
+                  SAFE_RELEASE(device_containerp);
+                  // Dump the string as an int into the structure
+                  char *stopstring;
+                  mVRAM = strtol(ram_str.c_str(), &stopstring, 10); 
+                  llinfos << "VRAM Detected: " << mVRAM << " DX9 string: " << ram_str << llendl;
+                }
-                // Dump the string as an int into the structure
-                char *stopstring;
-                mVRAM = strtol(ram_str.c_str(), &stopstring, 10); 
-                llinfos << "VRAM Detected: " << mVRAM << " DX9 string: " << ram_str << llendl;
                
                if (vram_only)
                {
@@ -378,6 +383,11 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
                        goto LCleanup;
                }
+                /* for now, we ONLY do vram_only the rest of this
+                   is commented out, to ensure no-one is tempted
+                   to use it
+                
                // Now let's get device and driver information
                // Get the IDxDiagContainer object called "DxDiag_SystemDevices".
                // This call may take some time while dxdiag gathers the info.
@@ -504,11 +514,12 @@ BOOL LLDXHardware::getInfo(BOOL vram_only)
                        }
                        SAFE_RELEASE(device_containerp);
                }
+                */
    }
-        dumpDevices();
+    // dumpDevices();
-        ok = TRUE;
+    ok = TRUE;
+        
 LCleanup:
        if (!ok)
        {
@@ -526,7 +537,7 @@ LCleanup:
    CoUninitialize();
    
    return ok;
-}
+    }
 LLSD LLDXHardware::getDisplayInfo()
 {
diff --git a/linden/indra/llwindow/lldxhardware.h b/linden/indra/llwindow/lldxhardware.h
index f4f364e..12d106a 100644
--- a/linden/indra/llwindow/lldxhardware.h
+++ b/linden/indra/llwindow/lldxhardware.h
@@ -85,6 +85,7 @@ class LLDXHardware
 {
 public:
        LLDXHardware();
        void setWriteDebugFunc(void (*func)(const char*));
        void cleanup();
@@ -100,12 +101,12 @@ public:
        // Empty strings indicate that you don't care.
        // You can separate multiple devices with '|' chars to indicate you want
        // ANY of them to match and return.
-        LLDXDevice *findDevice(const std::string &vendor, const std::string &devices);
+        // LLDXDevice *findDevice(const std::string &vendor, const std::string &devices);
-        LLString dumpDevices();
+        // LLString dumpDevices();
 public:
        typedef std::map<std::string, LLDXDevice *> device_map_t;
-        device_map_t mDevices;
+        // device_map_t mDevices;
 protected:
        S32 mVRAM;
 };
diff --git a/linden/indra/llwindow/llgl.cpp b/linden/indra/llwindow/llgl.cpp
index 07840c1..a059cd4 100644
--- a/linden/indra/llwindow/llgl.cpp
+++ b/linden/indra/llwindow/llgl.cpp
@@ -563,7 +563,9 @@ void LLGLManager::initExtensions()
        mHasCompressedTextures = glh_init_extensions("GL_ARB_texture_compression");
        mHasOcclusionQuery = ExtensionExists("GL_ARB_occlusion_query", gGLHExts.mSysExts);
        mHasVertexBufferObject = ExtensionExists("GL_ARB_vertex_buffer_object", gGLHExts.mSysExts);
-        mHasFramebufferObject = ExtensionExists("GL_EXT_framebuffer_object", gGLHExts.mSysExts);
+        // mask out FBO support when packed_depth_stencil isn't there 'cause we need it for LLRenderTarget -Brad
+        mHasFramebufferObject = ExtensionExists("GL_EXT_framebuffer_object", gGLHExts.mSysExts)
+                && ExtensionExists("GL_EXT_packed_depth_stencil", gGLHExts.mSysExts);
 #if !LL_DARWIN
        mHasPointParameters = !mIsATI && ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts);
 #endif
diff --git a/linden/indra/llwindow/llglstates.h b/linden/indra/llwindow/llglstates.h
index 7d65952..e53640c 100644
--- a/linden/indra/llwindow/llglstates.h
+++ b/linden/indra/llwindow/llglstates.h
@@ -62,7 +62,8 @@ protected:
        LLGLEnable mColorMaterial;
        LLGLDisable mAlphaTest, mBlend, mCullFace, mDither, mFog, 
                mLineSmooth, mLineStipple, mNormalize, mPolygonSmooth,
-                mTextureGenQ, mTextureGenR, mTextureGenS, mTextureGenT;
+                mTextureGenQ, mTextureGenR, mTextureGenS, mTextureGenT,
+                mGLMultisample;
 public:
        LLGLSDefault()
                :
@@ -81,7 +82,8 @@ public:
                mTextureGenQ(GL_TEXTURE_GEN_Q), 
                mTextureGenR(GL_TEXTURE_GEN_R),
                mTextureGenS(GL_TEXTURE_GEN_S), 
-                mTextureGenT(GL_TEXTURE_GEN_T)
+                mTextureGenT(GL_TEXTURE_GEN_T),
+                mGLMultisample(GL_MULTISAMPLE_ARB)
        { }
 };
@@ -117,7 +119,7 @@ public:
 //----------------------------------------------------------------------------
-class LLGLSUIDefault // : public LLGLSDefault
+class LLGLSUIDefault
 { 
 protected:
        LLGLEnable mBlend, mAlphaTest;
@@ -176,7 +178,7 @@ public:
 //----------------------------------------------------------------------------
-class LLGLSPipeline // : public LLGLSDefault
+class LLGLSPipeline
 { 
 protected:
        LLGLEnable mCullFace;
@@ -199,7 +201,7 @@ public:
        { }
 };
-class LLGLSPipelineEmbossBump // : public LLGLSPipelineAlpha
+class LLGLSPipelineEmbossBump
 {
 protected:
        LLGLDisable mFog;
@@ -209,7 +211,7 @@ public:
        { }
 };
-class LLGLSPipelineSelection // : public LLGLSPipelineAlpha
+class LLGLSPipelineSelection
 { 
 protected:
        LLGLDisable mCullFace;
@@ -219,7 +221,7 @@ public:
        {}
 };
-class LLGLSPipelineAvatar // : public LLGLSPipeline
+class LLGLSPipelineAvatar
 {
 protected:
        LLGLEnable mNormalize;
@@ -229,7 +231,7 @@ public:
        {}
 };
-class LLGLSPipelineSkyBox // : public LLGLSPipeline
+class LLGLSPipelineSkyBox
 { 
 protected:
        LLGLDisable mAlphaTest, mCullFace, mFog;
@@ -239,7 +241,7 @@ public:
        { }
 };
-class LLGLSTracker // : public LLGLSDefault
+class LLGLSTracker
 {
 protected:
        LLGLEnable mCullFace, mBlend, mAlphaTest;
diff --git a/linden/indra/llwindow/llkeyboard.cpp b/linden/indra/llwindow/llkeyboard.cpp
index 9be23df..c6502ed 100644
--- a/linden/indra/llwindow/llkeyboard.cpp
+++ b/linden/indra/llwindow/llkeyboard.cpp
@@ -96,6 +96,7 @@ LLKeyboard::LLKeyboard() : mCallbacks(NULL), mNumpadDistinct(ND_NUMLOCK_OFF)
        addKeyName(KEY_SUBTRACT, "Subtract" );
        addKeyName(KEY_MULTIPLY, "Multiply" );
        addKeyName(KEY_DIVIDE, "Divide" );
+        addKeyName(KEY_PAD_DIVIDE, "PAD_DIVIDE" );
        addKeyName(KEY_PAD_LEFT, "PAD_LEFT" );
        addKeyName(KEY_PAD_RIGHT, "PAD_RIGHT" );
        addKeyName(KEY_PAD_DOWN, "PAD_DOWN" );
diff --git a/linden/indra/llwindow/llkeyboardmacosx.cpp b/linden/indra/llwindow/llkeyboardmacosx.cpp
index 4cb1029..181e264 100644
--- a/linden/indra/llwindow/llkeyboardmacosx.cpp
+++ b/linden/indra/llwindow/llkeyboardmacosx.cpp
@@ -83,7 +83,7 @@ LLKeyboardMacOSX::LLKeyboardMacOSX()
        mTranslateKeyMap[0x29] = ';';
        mTranslateKeyMap[0x2a] = '\\';
        mTranslateKeyMap[0x2b] = ',';
-        mTranslateKeyMap[0x2c] = '/';
+        mTranslateKeyMap[0x2c] = KEY_DIVIDE;
        mTranslateKeyMap[0x2d] = 'N';
        mTranslateKeyMap[0x2e] = 'M';
        mTranslateKeyMap[0x2f] = '.';
@@ -100,7 +100,7 @@ LLKeyboardMacOSX::LLKeyboardMacOSX()
        mTranslateKeyMap[0x41] = '.';   // keypad
        mTranslateKeyMap[0x43] = '*';   // keypad
        mTranslateKeyMap[0x45] = '+';   // keypad
-        mTranslateKeyMap[0x4b] = '/';   // keypad
+        mTranslateKeyMap[0x4b] = KEY_PAD_DIVIDE;        // keypad
        mTranslateKeyMap[0x4c] = KEY_RETURN;    // keypad enter
        mTranslateKeyMap[0x4e] = '-';   // keypad
        mTranslateKeyMap[0x51] = '=';   // keypad
diff --git a/linden/indra/llwindow/llkeyboardsdl.cpp b/linden/indra/llwindow/llkeyboardsdl.cpp
index f9d59ac..196a623 100644
--- a/linden/indra/llwindow/llkeyboardsdl.cpp
+++ b/linden/indra/llwindow/llkeyboardsdl.cpp
@@ -103,7 +103,7 @@ LLKeyboardSDL::LLKeyboardSDL()
        mTranslateKeyMap[SDLK_KP_PLUS] = KEY_ADD;
        mTranslateKeyMap[SDLK_KP_MINUS] = KEY_SUBTRACT;
        mTranslateKeyMap[SDLK_KP_MULTIPLY] = KEY_MULTIPLY;
-        mTranslateKeyMap[SDLK_KP_DIVIDE] = KEY_DIVIDE;
+        mTranslateKeyMap[SDLK_KP_DIVIDE] = KEY_PAD_DIVIDE;
        mTranslateKeyMap[SDLK_F1] = KEY_F1;
        mTranslateKeyMap[SDLK_F2] = KEY_F2;
        mTranslateKeyMap[SDLK_F3] = KEY_F3;
@@ -121,7 +121,7 @@ LLKeyboardSDL::LLKeyboardSDL()
        mTranslateKeyMap[SDLK_MINUS]  = '-';
        mTranslateKeyMap[SDLK_PERIOD] = '.';
        mTranslateKeyMap[SDLK_BACKQUOTE] = '`';
-        mTranslateKeyMap[SDLK_SLASH] = '/';
+        mTranslateKeyMap[SDLK_SLASH] = KEY_DIVIDE;
        mTranslateKeyMap[SDLK_SEMICOLON] = ';';
        mTranslateKeyMap[SDLK_LEFTBRACKET] = '[';
        mTranslateKeyMap[SDLK_BACKSLASH] = '\\';
diff --git a/linden/indra/llwindow/llkeyboardwin32.cpp b/linden/indra/llwindow/llkeyboardwin32.cpp
index 1b68112..68cedf1 100644
--- a/linden/indra/llwindow/llkeyboardwin32.cpp
+++ b/linden/indra/llwindow/llkeyboardwin32.cpp
@@ -77,7 +77,7 @@ LLKeyboardWin32::LLKeyboardWin32()
        mTranslateKeyMap[VK_OEM_COMMA]  = ',';
        mTranslateKeyMap[VK_OEM_MINUS]  = '-';
        mTranslateKeyMap[VK_OEM_PERIOD] = '.';
-        mTranslateKeyMap[VK_OEM_2] = '/';
+        mTranslateKeyMap[VK_OEM_2] = KEY_PAD_DIVIDE;
        mTranslateKeyMap[VK_OEM_3] = '`';
        mTranslateKeyMap[VK_OEM_4] = '[';
        mTranslateKeyMap[VK_OEM_5] = '\\';
@@ -137,7 +137,11 @@ LLKeyboardWin32::LLKeyboardWin32()
        mTranslateNumpadMap[0x67] = KEY_PAD_HOME;       // keypad 7
        mTranslateNumpadMap[0x68] = KEY_PAD_UP;         // keypad 8
        mTranslateNumpadMap[0x69] = KEY_PAD_PGUP;       // keypad 9
+        mTranslateNumpadMap[0x6A] = KEY_PAD_MULTIPLY;   // keypad *
+        mTranslateNumpadMap[0x6B] = KEY_PAD_ADD;        // keypad +
+        mTranslateNumpadMap[0x6D] = KEY_PAD_SUBTRACT;   // keypad -
        mTranslateNumpadMap[0x6E] = KEY_PAD_DEL;        // keypad .
+        mTranslateNumpadMap[0x6F] = KEY_PAD_DIVIDE;     // keypad /
        for (iter = mTranslateNumpadMap.begin(); iter != mTranslateNumpadMap.end(); iter++)
        {
diff --git a/linden/indra/llwindow/lllogitechlcd.cpp b/linden/indra/llwindow/lllogitechlcd.cpp
index 8bd77cb..81e97a0 100644
--- a/linden/indra/llwindow/lllogitechlcd.cpp
+++ b/linden/indra/llwindow/lllogitechlcd.cpp
@@ -47,6 +47,7 @@ extern LLControlGroup gSavedSettings;
 LLLCDPageGroup::LLLCDPageGroup(CEzLcd *LCD, int type, HICON SLIcon):
 mType(type),
+mHandle(NULL),
 mSLIcon(SLIcon),
 mDisplayPage(false),
 mLCD(LCD)
@@ -100,7 +101,9 @@ mDebounceTimer(),
 mPageToShow(-1),
 mInstance(instance),
 mDestinationLCD(-1),
-mFirstTimeThru(true)
+mFirstTimeThru(true),
+mCurrentGroupBeingShown(NULL),
+mSLIcon(NULL)
 {
        HRESULT     res_ = S_OK;
diff --git a/linden/indra/llwindow/llpreeditor.h b/linden/indra/llwindow/llpreeditor.h
index f66a390..884101a 100644
--- a/linden/indra/llwindow/llpreeditor.h
+++ b/linden/indra/llwindow/llpreeditor.h
@@ -100,7 +100,7 @@ public:
        // This is a back door of the method of same name of LLWindowCallback.
        // called_from_parent should be set to FALSE if calling through LLPreeditor.
-        virtual BOOL handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent) = 0;
+        virtual BOOL handleUnicodeCharHere(llwchar uni_char) = 0;
 };
 #endif
diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index 5e05f03..9963228 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -143,6 +143,11 @@ BOOL LLWindowCallbacks::handleActivate(LLWindow *window, BOOL activated)
        return FALSE;
 }
+BOOL LLWindowCallbacks::handleActivateApp(LLWindow *window, BOOL activating)
+{
+        return FALSE;
+}
 void LLWindowCallbacks::handleMouseMove(LLWindow *window, const LLCoordGL pos, MASK mask)
 {
 }
@@ -190,6 +195,15 @@ void LLWindowCallbacks::handleDataCopy(LLWindow *window, S32 data_type, void *da
 {
 }
+BOOL LLWindowCallbacks::handleTimerEvent(LLWindow *window)
+{
+        return FALSE;
+}
+BOOL LLWindowCallbacks::handleDeviceChange(LLWindow *window)
+{
+        return FALSE;
+}
 S32 OSMessageBox(const char* text, const char* caption, U32 type)
 {
@@ -247,15 +261,6 @@ LLWindow::LLWindow(BOOL fullscreen, U32 flags)
          mFlags(flags),
          mHighSurrogate(0)
 {
-        for (U32 i = 0; i < 8; i++)
-        {
-                mJoyAxis[i] = 0;
-        }
-        for (U32 i = 0; i < 16; i++)
-        {
-                mJoyButtonState[i] = 0;
-        }
 }
        
 // virtual
@@ -273,24 +278,6 @@ void LLWindow::decBusyCount()
        }
 }
-F32 LLWindow::getJoystickAxis(U32 axis)
-{
-        if (axis < 8)
-        {
-                return mJoyAxis[axis];
-        }
-        return 0.f;
-}
-U8 LLWindow::getJoystickButton(U32 button)
-{
-        if (button < 16)
-        {
-                return mJoyButtonState[button];
-        }
-        return 0;
-}
 void LLWindow::setCallbacks(LLWindowCallbacks *callbacks)
 {
        mCallbacks = callbacks;
@@ -440,7 +427,8 @@ LLWindow* LLWindowManager::createWindow(
        BOOL clearBg,
        BOOL disable_vsync,
        BOOL use_gl,
-        BOOL ignore_pixel_depth)
+        BOOL ignore_pixel_depth,
+        U32 fsaa_samples)
 {
        LLWindow* new_window;
@@ -453,15 +441,15 @@ LLWindow* LLWindowManager::createWindow(
 #elif LL_SDL
                new_window = new LLWindowSDL(
                        title, x, y, width, height, flags, 
-                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
+                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
 #elif LL_WINDOWS
                new_window = new LLWindowWin32(
                        title, name, x, y, width, height, flags, 
-                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
+                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
 #elif LL_DARWIN
                new_window = new LLWindowMacOSX(
                        title, name, x, y, width, height, flags, 
-                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
+                        fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
 #elif LL_LINUX
                new_window = new LLWindowLinux(
                        title, name, x, y, width, height, flags, 
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 48ee4d6..89de5a0 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -107,6 +107,7 @@ public:
        virtual BOOL handleMiddleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
        virtual BOOL handleMiddleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);
        virtual BOOL handleActivate(LLWindow *window, BOOL activated);
+        virtual BOOL handleActivateApp(LLWindow *window, BOOL activating);
        virtual void handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask);
        virtual void handleScrollWheel(LLWindow *window,  S32 clicks);
        virtual void handleResize(LLWindow *window,  S32 width,  S32 height);
@@ -118,6 +119,8 @@ public:
        virtual void handleWindowBlock(LLWindow *window);                                                       // window is taking over CPU for a while
        virtual void handleWindowUnblock(LLWindow *window);                                                     // window coming back after taking over CPU for a while
        virtual void handleDataCopy(LLWindow *window, S32 data_type, void *data);
+        virtual BOOL handleTimerEvent(LLWindow *window);
+        virtual BOOL handleDeviceChange(LLWindow *window);
 };
 // Refer to llwindow_test in test/common/llwindow for usage example
@@ -154,7 +157,7 @@ public:
        virtual BOOL getSize(LLCoordWindow *size) = 0;
        virtual BOOL setPosition(LLCoordScreen position) = 0;
        virtual BOOL setSize(LLCoordScreen size) = 0;
-        virtual BOOL switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync) = 0;
+        virtual BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL) = 0;
        virtual BOOL setCursorPosition(LLCoordWindow position) = 0;
        virtual BOOL getCursorPosition(LLCoordWindow *position) = 0;
        virtual void showCursor() = 0;
@@ -184,6 +187,8 @@ public:
        virtual void flashIcon(F32 seconds) = 0;
        virtual F32 getGamma() = 0;
        virtual BOOL setGamma(const F32 gamma) = 0; // Set the gamma
+        virtual void setFSAASamples(const U32 fsaa_samples) = 0; //set number of FSAA samples
+        virtual U32      getFSAASamples() = 0;
        virtual BOOL restoreGamma() = 0;                        // Restore original gamma table (before updating gamma)
        virtual ESwapMethod getSwapMethod() { return mSwapMethod; }
        virtual void gatherInput() = 0;
@@ -212,9 +217,6 @@ public:
        virtual F32 getPixelAspectRatio() = 0;
        virtual void setNativeAspectRatio(F32 aspect) = 0;
        
-        F32 getJoystickAxis(U32 axis);
-        U8 getJoystickButton(U32 button);
        void setCallbacks(LLWindowCallbacks *callbacks);
        virtual void beforeDialog() {}; // prepare to put up an OS dialog (if special measures are required, such as in fullscreen mode)
@@ -258,8 +260,6 @@ protected:
        ESwapMethod mSwapMethod;
        BOOL            mHideCursorPermanent;
        U32                     mFlags;
-        F32                     mJoyAxis[8]; 
-        U8                      mJoyButtonState[16];
        U16                     mHighSurrogate;
        // Handle a UTF-16 encoding unit received from keyboard.
@@ -340,7 +340,8 @@ public:
                BOOL clearBg = FALSE,
                BOOL disable_vsync = TRUE,
                BOOL use_gl = TRUE,
-                BOOL ignore_pixel_depth = FALSE);
+                BOOL ignore_pixel_depth = FALSE,
+                U32 fsaa_samples = 0);
        static BOOL destroyWindow(LLWindow* window);
        static BOOL isWindowValid(LLWindow *window);
 };
diff --git a/linden/indra/llwindow/llwindowheadless.h b/linden/indra/llwindow/llwindowheadless.h
index 15e7196..7cef7d8 100644
--- a/linden/indra/llwindow/llwindowheadless.h
+++ b/linden/indra/llwindow/llwindowheadless.h
@@ -50,7 +50,7 @@ public:
        /*virtual*/ BOOL getSize(LLCoordWindow *size) {return FALSE;};
        /*virtual*/ BOOL setPosition(LLCoordScreen position) {return FALSE;};
        /*virtual*/ BOOL setSize(LLCoordScreen size) {return FALSE;};
-        /*virtual*/ BOOL switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync) {return FALSE;};
+        /*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL) {return FALSE;};
        /*virtual*/ BOOL setCursorPosition(LLCoordWindow position) {return FALSE;};
        /*virtual*/ BOOL getCursorPosition(LLCoordWindow *position) {return FALSE;};
        /*virtual*/ void showCursor() {};
@@ -69,6 +69,8 @@ public:
        /*virtual*/ void flashIcon(F32 seconds) {};
        /*virtual*/ F32 getGamma() {return 1.0f; };
        /*virtual*/ BOOL setGamma(const F32 gamma) {return FALSE; }; // Set the gamma
+        /*virtual*/ void setFSAASamples(const U32 fsaa_samples) { }
+        /*virtual*/ U32 getFSAASamples() { return 0; }
        /*virtual*/ BOOL restoreGamma() {return FALSE; };       // Restore original gamma table (before updating gamma)
        //virtual ESwapMethod getSwapMethod() { return mSwapMethod; }
        /*virtual*/ void gatherInput() {};
diff --git a/linden/indra/llwindow/llwindowlinux.h b/linden/indra/llwindow/llwindowlinux.h
index bebf25a..da80fd4 100644
--- a/linden/indra/llwindow/llwindowlinux.h
+++ b/linden/indra/llwindow/llwindowlinux.h
@@ -50,7 +50,7 @@ public:
        /*virtual*/ BOOL getSize(LLCoordWindow *size) {return FALSE;};
        /*virtual*/ BOOL setPosition(LLCoordScreen position) {return FALSE;};
        /*virtual*/ BOOL setSize(LLCoordScreen size) {return FALSE;};
-        /*virtual*/ BOOL switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync) {return FALSE;};
+        /*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL) {return FALSE;};
        /*virtual*/ BOOL setCursorPosition(LLCoordWindow position) {return FALSE;};
        /*virtual*/ BOOL getCursorPosition(LLCoordWindow *position) {return FALSE;};
        /*virtual*/ void showCursor() {};
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 5c91cc0..f5cc8c6 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -246,7 +246,8 @@ LLWindowMacOSX::LLWindowMacOSX(char *title, char *name, S32 x, S32 y, S32 width,
                                                           S32 height, U32 flags,
                                                           BOOL fullscreen, BOOL clearBg,
                                                           BOOL disable_vsync, BOOL use_gl,
-                                                           BOOL ignore_pixel_depth)
+                                                           BOOL ignore_pixel_depth,
+                                                           U32 fsaa_samples)
        : LLWindow(fullscreen, flags)
 {
        // Voodoo for calling cocoa from carbon (see llwindowmacosx-objc.mm).
@@ -277,6 +278,8 @@ LLWindowMacOSX::LLWindowMacOSX(char *title, char *name, S32 x, S32 y, S32 width,
        mTSMScriptCode = 0;
        mTSMLangCode = 0;
        mPreeditor = NULL;
+        mFSAASamples = fsaa_samples;
+        mForceRebuild = FALSE;
        
        // For reasons that aren't clear to me, LLTimers seem to be created in the "started" state.
        // Since the started state of this one is used to track whether the NMRec has been installed, it wants to start out in the "stopped" state.
@@ -558,6 +561,8 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
                                        AGL_RGBA,
                                                AGL_FULLSCREEN,
                                                //                      AGL_NO_RECOVERY,        // MBW -- XXX -- Not sure if we want this attribute
+                                                AGL_SAMPLE_BUFFERS_ARB, mFSAASamples > 0 ? 1 : 0,
+                                                AGL_SAMPLES_ARB, mFSAASamples,
                                                AGL_DOUBLEBUFFER,
                                                AGL_CLOSEST_POLICY,
                                                AGL_ACCELERATED,
@@ -586,6 +591,8 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
                                                AGL_DOUBLEBUFFER,
                                                AGL_CLOSEST_POLICY,
                                                AGL_ACCELERATED,
+                                                AGL_SAMPLE_BUFFERS_ARB, mFSAASamples > 0 ? 1 : 0,
+                                                AGL_SAMPLES_ARB, mFSAASamples,
                                                AGL_RED_SIZE, 8,
                                                AGL_GREEN_SIZE, 8,
                                                AGL_BLUE_SIZE, 8,
@@ -819,13 +826,16 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
                }
        }
+        //make sure multisample starts off disabled
+        glDisable(GL_MULTISAMPLE_ARB);
+        
        // Don't need to get the current gamma, since there's a call that restores it to the system defaults.
        return TRUE;
 }
 // changing fullscreen resolution, or switching between windowed and fullscreen mode.
-BOOL LLWindowMacOSX::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync)
+BOOL LLWindowMacOSX::switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp)
 {
        BOOL needsRebuild = FALSE;
        BOOL result = true;
@@ -897,8 +907,9 @@ BOOL LLWindowMacOSX::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL dis
        }
        stop_glerror();
-        if(needsRebuild)
+        if(needsRebuild || mForceRebuild)
        {
+                mForceRebuild = FALSE;
                destroyContext();
                result = createContext(0, 0, size.mX, size.mY, 0, fullscreen, disable_vsync);
                if (result)
@@ -1318,6 +1329,17 @@ F32 LLWindowMacOSX::getGamma()
        return result;
 }
+U32 LLWindowMacOSX::getFSAASamples()
+{
+        return mFSAASamples;
+}
+void LLWindowMacOSX::setFSAASamples(const U32 samples)
+{
+        mFSAASamples = samples;
+        mForceRebuild = TRUE;
+}
 BOOL LLWindowMacOSX::restoreGamma()
 {
        CGDisplayRestoreColorSyncSettings();
@@ -2031,7 +2053,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                                {
                                                        for (LLWString::const_iterator i = fix_string.begin(); i != fix_string.end(); i++)
                                                        {
-                                                                mPreeditor->handleUnicodeCharHere(*i, FALSE);
+                                                                mPreeditor->handleUnicodeCharHere(*i);
                                                        }
                                                }
diff --git a/linden/indra/llwindow/llwindowmacosx.h b/linden/indra/llwindow/llwindowmacosx.h
index 789e2ed..1edb218 100644
--- a/linden/indra/llwindow/llwindowmacosx.h
+++ b/linden/indra/llwindow/llwindowmacosx.h
@@ -59,7 +59,7 @@ public:
        /*virtual*/ BOOL getSize(LLCoordWindow *size);
        /*virtual*/ BOOL setPosition(LLCoordScreen position);
        /*virtual*/ BOOL setSize(LLCoordScreen size);
-        /*virtual*/ BOOL switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync);
+        /*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL);
        /*virtual*/ BOOL setCursorPosition(LLCoordWindow position);
        /*virtual*/ BOOL getCursorPosition(LLCoordWindow *position);
        /*virtual*/ void showCursor();
@@ -78,6 +78,8 @@ public:
        /*virtual*/ void flashIcon(F32 seconds);
        /*virtual*/ F32 getGamma();
        /*virtual*/ BOOL setGamma(const F32 gamma); // Set the gamma
+        /*virtual*/ U32 getFSAASamples();
+        /*virtual*/ void setFSAASamples(const U32 fsaa_samples);
        /*virtual*/ BOOL restoreGamma();                        // Restore original gamma table (before updating gamma)
        /*virtual*/ ESwapMethod getSwapMethod() { return mSwapMethod; }
        /*virtual*/ void gatherInput();
@@ -118,7 +120,8 @@ protected:
        LLWindowMacOSX(
                char *title, char *name, int x, int y, int width, int height, U32 flags,
                BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
-                BOOL ignore_pixel_depth);
+                BOOL ignore_pixel_depth,
+                U32 fsaa_samples);
        ~LLWindowMacOSX();
        void    initCursors();
@@ -184,7 +187,9 @@ protected:
        LLCoordScreen   mNeedsResizeSize;
        F32                     mOverrideAspectRatio;
        BOOL            mMinimized;
+        U32                     mFSAASamples;
+        BOOL            mForceRebuild;
+        
        F32                     mBounceTime;
        NMRec           mBounceRec;
        LLTimer         mBounceTimer;
@@ -195,7 +200,7 @@ protected:
        ScriptCode      mTSMScriptCode;
        LangCode        mTSMLangCode;
        LLPreeditor*    mPreeditor;
+        
        friend class LLWindowManager;
 };
diff --git a/linden/indra/llwindow/llwindowmesaheadless.h b/linden/indra/llwindow/llwindowmesaheadless.h
index 29e5878..fb32e38 100644
--- a/linden/indra/llwindow/llwindowmesaheadless.h
+++ b/linden/indra/llwindow/llwindowmesaheadless.h
@@ -54,7 +54,7 @@ public:
        /*virtual*/ BOOL getSize(LLCoordWindow *size) {return FALSE;};
        /*virtual*/ BOOL setPosition(LLCoordScreen position) {return FALSE;};
        /*virtual*/ BOOL setSize(LLCoordScreen size) {return FALSE;};
-        /*virtual*/ BOOL switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync) {return FALSE;};
+        /*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL) {return FALSE;};
        /*virtual*/ BOOL setCursorPosition(LLCoordWindow position) {return FALSE;};
        /*virtual*/ BOOL getCursorPosition(LLCoordWindow *position) {return FALSE;};
        /*virtual*/ void showCursor() {};
@@ -74,6 +74,8 @@ public:
        /*virtual*/ F32 getGamma() {return 1.0f; };
        /*virtual*/ BOOL setGamma(const F32 gamma) {return FALSE; }; // Set the gamma
        /*virtual*/ BOOL restoreGamma() {return FALSE; };       // Restore original gamma table (before updating gamma)
+        /*virtual*/ void setFSAASamples(const U32 fsaa_samples) { /* FSAA not supported yet on Mesa headless.*/ }
+        /*virtual*/ U32  getFSAASamples() { return 0; }
        //virtual ESwapMethod getSwapMethod() { return mSwapMethod; }
        /*virtual*/ void gatherInput() {};
        /*virtual*/ void delayInputProcessing() {};
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 73753c3..d9dc040 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -82,7 +82,7 @@ static BOOL was_fullscreen = FALSE;
 void maybe_lock_display(void)
 {
-        if (gWindowImplementation) {
+        if (gWindowImplementation && gWindowImplementation->Lock_Display) {
                gWindowImplementation->Lock_Display();
        }
 }
@@ -90,7 +90,7 @@ void maybe_lock_display(void)
 void maybe_unlock_display(void)
 {
-        if (gWindowImplementation) {
+        if (gWindowImplementation && gWindowImplementation->Unlock_Display) {
                gWindowImplementation->Unlock_Display();
        }
 }
@@ -218,7 +218,7 @@ LLWindowSDL::LLWindowSDL(char *title, S32 x, S32 y, S32 width,
                                                           S32 height, U32 flags,
                                                           BOOL fullscreen, BOOL clearBg,
                                                           BOOL disable_vsync, BOOL use_gl,
-                                                           BOOL ignore_pixel_depth)
+                                                           BOOL ignore_pixel_depth, U32 fsaa_samples)
        : LLWindow(fullscreen, flags), mGamma(1.0f)
 {
        // Initialize the keyboard
@@ -237,6 +237,7 @@ LLWindowSDL::LLWindowSDL(char *title, S32 x, S32 y, S32 width,
        mReallyCapturedCount = 0;
        mHaveInputFocus = -1;
        mIsMinimized = -1;
+        mFSAASamples = fsaa_samples;
 #if LL_X11
        mSDL_XWindowID = None;
@@ -261,7 +262,7 @@ LLWindowSDL::LLWindowSDL(char *title, S32 x, S32 y, S32 width,
        mWindowTitle = new char[strlen(title) + 1]; /* Flawfinder: ignore */
        if(mWindowTitle == NULL)
        {
-                llerrs << "Memory allocation failure" << llendl;
+                llwarns << "Memory allocation failure" << llendl;
                return;
        }
@@ -536,6 +537,12 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
        SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+        if (mFSAASamples > 0)
+        {
+                SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
+                SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, mFSAASamples);
+        }
+        
        mSDLFlags = sdlflags;
        if (mFullscreen)
@@ -747,6 +754,9 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
 #if LL_X11
        init_x11clipboard();
 #endif // LL_X11
+        //make sure multisampling is disabled by default
+        glDisable(GL_MULTISAMPLE_ARB);
        
        // We need to do this here, once video is init'd
        if (-1 == SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY,
@@ -759,7 +769,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
 // changing fullscreen resolution, or switching between windowed and fullscreen mode.
-BOOL LLWindowSDL::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync)
+BOOL LLWindowSDL::switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp)
 {
        const BOOL needsRebuild = TRUE;  // Just nuke the context and start over.
        BOOL result = true;
@@ -797,7 +807,6 @@ void LLWindowSDL::destroyContext()
        gGLManager.shutdownGL();
        llinfos << "SDL_QuitSS/VID begins" << llendl;
        SDL_QuitSubSystem(SDL_INIT_VIDEO);  // *FIX: this might be risky...
-        //unload_all_glsyms();
        mWindow = NULL;
 }
@@ -923,10 +932,10 @@ BOOL LLWindowSDL::getSize(LLCoordScreen *size)
    {
        size->mX = mWindow->w;
        size->mY = mWindow->h;
-                return (TRUE);
+        return (TRUE);
    }
-        llerrs << "LLWindowSDL::getPosition(): no window and not fullscreen!" << llendl;
+    llwarns << "LLWindowSDL::getPosition(): no window and not fullscreen!" << llendl;
    return (FALSE);
 }
@@ -936,10 +945,10 @@ BOOL LLWindowSDL::getSize(LLCoordWindow *size)
    {
        size->mX = mWindow->w;
        size->mY = mWindow->h;
-                return (TRUE);
+        return (TRUE);
    }
-        llerrs << "LLWindowSDL::getPosition(): no window and not fullscreen!" << llendl;
+    llwarns << "LLWindowSDL::getPosition(): no window and not fullscreen!" << llendl;
    return (FALSE);
 }
@@ -971,6 +980,16 @@ void LLWindowSDL::swapBuffers()
                SDL_GL_SwapBuffers();
 }
+U32 LLWindowSDL::getFSAASamples()
+{
+        return mFSAASamples;
+}
+void LLWindowSDL::setFSAASamples(const U32 samples)
+{
+        mFSAASamples = samples;
+}
 F32 LLWindowSDL::getGamma()
 {
        return 1/mGamma;
@@ -1117,8 +1136,10 @@ F32 LLWindowSDL::getPixelAspectRatio()
        if (getFullscreen())
        {
                LLCoordScreen screen_size;
-                getSize(&screen_size);
+                if (getSize(&screen_size))
-                pixel_aspect = getNativeAspectRatio() * (F32)screen_size.mY / (F32)screen_size.mX;
+                {
+                        pixel_aspect = getNativeAspectRatio() * (F32)screen_size.mY / (F32)screen_size.mX;
+                }
        }
        return pixel_aspect;
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h
index 3d102b9..d1b2b77 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -66,7 +66,7 @@ public:
        /*virtual*/ BOOL getSize(LLCoordWindow *size);
        /*virtual*/ BOOL setPosition(LLCoordScreen position);
        /*virtual*/ BOOL setSize(LLCoordScreen size);
-        /*virtual*/ BOOL switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync);
+        /*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL);
        /*virtual*/ BOOL setCursorPosition(LLCoordWindow position);
        /*virtual*/ BOOL getCursorPosition(LLCoordWindow *position);
        /*virtual*/ void showCursor();
@@ -85,6 +85,8 @@ public:
        /*virtual*/ void flashIcon(F32 seconds);
        /*virtual*/ F32 getGamma();
        /*virtual*/ BOOL setGamma(const F32 gamma); // Set the gamma
+        /*virtual*/ U32 getFSAASamples();
+        /*virtual*/ void setFSAASamples(const U32 samples);
        /*virtual*/ BOOL restoreGamma();                        // Restore original gamma table (before updating gamma)
        /*virtual*/ ESwapMethod getSwapMethod() { return mSwapMethod; }
        /*virtual*/ void gatherInput();
@@ -132,7 +134,7 @@ protected:
        LLWindowSDL(
                char *title, int x, int y, int width, int height, U32 flags,
                BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
-                BOOL ignore_pixel_depth);
+                BOOL ignore_pixel_depth, U32 fsaa_samples);
        ~LLWindowSDL();
        void    initCursors();
@@ -183,6 +185,7 @@ protected:
        LLCoordScreen   mNeedsResizeSize;
        F32                     mOverrideAspectRatio;
        F32             mGamma;
+        U32             mFSAASamples;
        int             mSDLFlags;
diff --git a/linden/indra/llwindow/llwindowsolaris.h b/linden/indra/llwindow/llwindowsolaris.h
index 7aeac58..7a271c0 100644
--- a/linden/indra/llwindow/llwindowsolaris.h
+++ b/linden/indra/llwindow/llwindowsolaris.h
@@ -50,7 +50,7 @@ public:
        /*virtual*/ BOOL getSize(LLCoordWindow *size) {return FALSE;};
        /*virtual*/ BOOL setPosition(LLCoordScreen position) {return FALSE;};
        /*virtual*/ BOOL setSize(LLCoordScreen size) {return FALSE;};
-        /*virtual*/ BOOL switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync) {return FALSE;};
+        /*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL) {return FALSE;};
        /*virtual*/ BOOL setCursorPosition(LLCoordWindow position) {return FALSE;};
        /*virtual*/ BOOL getCursorPosition(LLCoordWindow *position) {return FALSE;};
        /*virtual*/ void showCursor() {};
@@ -69,6 +69,8 @@ public:
        /*virtual*/ void flashIcon(F32 seconds) {};
        /*virtual*/ F32 getGamma() {return 1.0f; };
        /*virtual*/ BOOL setGamma(const F32 gamma) {return FALSE; }; // Set the gamma
+        /*virtual*/ U32 getFSAASamples() { return 0; }
+        /*virtual*/ void setFSAASamples(const U32 samples) { }
        /*virtual*/ BOOL restoreGamma() {return FALSE; };       // Restore original gamma table (before updating gamma)
        //virtual ESwapMethod getSwapMethod() { return mSwapMethod; }
        /*virtual*/ void gatherInput() {};
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index f6beb79..b14df5e 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -1,4 +1,4 @@
-/**
+/** 
 * @file llwindowwin32.cpp
 * @brief Platform-dependent implementation of llwindow
 *
@@ -46,7 +46,7 @@
 #define DIRECTINPUT_VERSION 0x0800
 #include <dinput.h>
+#include <Dbt.h.>
 #include "llkeyboardwin32.h"
 #include "llerror.h"
@@ -103,7 +103,7 @@ LLCoordWindow LLWindowWin32::sWinIMEWindowPosition(-1,-1);
 // as a default, and we can't link against imm32.lib statically.
 // I believe DLL loading of this type is best suited to do
 // in a static initialization of a class.  What I'm not sure is
-// whether it follows the Linden Conding Standard...
+// whether it follows the Linden Conding Standard... 
 // See http://wiki.secondlife.com/wiki/Coding_standards#Static_Members
 class LLWinImm
@@ -113,16 +113,16 @@ public:
 public:
        // Wrappers for IMM API.
-        static BOOL             isIME(HKL hkl);
+        static BOOL             isIME(HKL hkl);                                                                                                                 
        static HWND             getDefaultIMEWnd(HWND hwnd);
-        static HIMC             getContext(HWND hwnd);
+        static HIMC             getContext(HWND hwnd);                                                                                                  
        static BOOL             releaseContext(HWND hwnd, HIMC himc);
-        static BOOL             getOpenStatus(HIMC himc);
+        static BOOL             getOpenStatus(HIMC himc);                                                                                               
-        static BOOL             setOpenStatus(HIMC himc, BOOL status);
+        static BOOL             setOpenStatus(HIMC himc, BOOL status);                                                                  
-        static BOOL             getConversionStatus(HIMC himc, LPDWORD conversion, LPDWORD sentence);
+        static BOOL             getConversionStatus(HIMC himc, LPDWORD conversion, LPDWORD sentence);   
-        static BOOL             setConversionStatus(HIMC himc, DWORD conversion, DWORD sentence);
+        static BOOL             setConversionStatus(HIMC himc, DWORD conversion, DWORD sentence);               
-        static BOOL             getCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form);
+        static BOOL             getCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form);                                        
-        static BOOL             setCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form);
+        static BOOL             setCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form);                                        
        static LONG             getCompositionString(HIMC himc, DWORD index, LPVOID data, DWORD length);
        static BOOL             setCompositionString(HIMC himc, DWORD index, LPVOID pComp, DWORD compLength, LPVOID pRead, DWORD readLength);
        static BOOL             setCompositionFont(HIMC himc, LPLOGFONTW logfont);
@@ -160,10 +160,10 @@ LLWinImm LLWinImm::sTheInstance;
 LLWinImm::LLWinImm() : mHImmDll(NULL)
 {
-        // Check system metrics
+        // Check system metrics 
        if ( !GetSystemMetrics( SM_DBCSENABLED ) )
                return;
+        
        mHImmDll = LoadLibraryA("Imm32");
        if (mHImmDll != NULL)
@@ -200,13 +200,13 @@ LLWinImm::LLWinImm() : mHImmDll(NULL)
                        mImmSetCandidateWindow == NULL ||
                        mImmNotifyIME == NULL)
                {
-                        // If any of the above API entires are not found, we can't use IMM API.
+                        // If any of the above API entires are not found, we can't use IMM API.  
-                        // So, turn off the IMM support.  We should log some warning message in
+                        // So, turn off the IMM support.  We should log some warning message in 
-                        // the case, since it is very unusual; these APIs are available from
+                        // the case, since it is very unusual; these APIs are available from 
-                        // the beginning, and all versions of IMM32.DLL should have them all.
+                        // the beginning, and all versions of IMM32.DLL should have them all.  
-                        // Unfortunately, this code may be executed before initialization of
+                        // Unfortunately, this code may be executed before initialization of 
-                        // the logging channel (llwarns), and we can't do it here...  Yes, this
+                        // the logging channel (llwarns), and we can't do it here...  Yes, this 
-                        // is one of disadvantages to use static constraction to DLL loading.
+                        // is one of disadvantages to use static constraction to DLL loading. 
                        FreeLibrary(mHImmDll);
                        mHImmDll = NULL;
@@ -231,117 +231,117 @@ LLWinImm::LLWinImm() : mHImmDll(NULL)
 }
-// static
+// static 
-BOOL    LLWinImm::isIME(HKL hkl)
+BOOL    LLWinImm::isIME(HKL hkl)                                                                                                                        
-{
+{ 
        if ( sTheInstance.mImmIsIME )
-                return sTheInstance.mImmIsIME(hkl);
+                return sTheInstance.mImmIsIME(hkl); 
        return FALSE;
 }
-// static
+// static 
 HIMC            LLWinImm::getContext(HWND hwnd)
 {
        if ( sTheInstance.mImmGetContext )
-                return sTheInstance.mImmGetContext(hwnd);
+                return sTheInstance.mImmGetContext(hwnd); 
        return 0;
 }
-//static
+//static 
 BOOL            LLWinImm::releaseContext(HWND hwnd, HIMC himc)
-{
+{ 
        if ( sTheInstance.mImmIsIME )
-                return sTheInstance.mImmReleaseContext(hwnd, himc);
+                return sTheInstance.mImmReleaseContext(hwnd, himc); 
        return FALSE;
 }
-// static
+// static 
 BOOL            LLWinImm::getOpenStatus(HIMC himc)
-{
+{ 
        if ( sTheInstance.mImmGetOpenStatus )
-                return sTheInstance.mImmGetOpenStatus(himc);
+                return sTheInstance.mImmGetOpenStatus(himc); 
        return FALSE;
 }
-// static
+// static 
-BOOL            LLWinImm::setOpenStatus(HIMC himc, BOOL status)
+BOOL            LLWinImm::setOpenStatus(HIMC himc, BOOL status)                                                                 
-{
+{ 
        if ( sTheInstance.mImmSetOpenStatus )
-                return sTheInstance.mImmSetOpenStatus(himc, status);
+                return sTheInstance.mImmSetOpenStatus(himc, status); 
        return FALSE;
 }
-// static
+// static 
-BOOL            LLWinImm::getConversionStatus(HIMC himc, LPDWORD conversion, LPDWORD sentence)
+BOOL            LLWinImm::getConversionStatus(HIMC himc, LPDWORD conversion, LPDWORD sentence)  
-{
+{ 
        if ( sTheInstance.mImmGetConversionStatus )
-                return sTheInstance.mImmGetConversionStatus(himc, conversion, sentence);
+                return sTheInstance.mImmGetConversionStatus(himc, conversion, sentence); 
        return FALSE;
 }
-// static
+// static 
-BOOL            LLWinImm::setConversionStatus(HIMC himc, DWORD conversion, DWORD sentence)
+BOOL            LLWinImm::setConversionStatus(HIMC himc, DWORD conversion, DWORD sentence)              
-{
+{ 
        if ( sTheInstance.mImmSetConversionStatus )
-                return sTheInstance.mImmSetConversionStatus(himc, conversion, sentence);
+                return sTheInstance.mImmSetConversionStatus(himc, conversion, sentence); 
        return FALSE;
 }
-// static
+// static 
-BOOL            LLWinImm::getCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form)
+BOOL            LLWinImm::getCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form)                                       
-{
+{ 
        if ( sTheInstance.mImmGetCompostitionWindow )
-                return sTheInstance.mImmGetCompostitionWindow(himc, form);
+                return sTheInstance.mImmGetCompostitionWindow(himc, form);      
        return FALSE;
 }
-// static
+// static 
-BOOL            LLWinImm::setCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form)
+BOOL            LLWinImm::setCompositionWindow(HIMC himc, LPCOMPOSITIONFORM form)                                       
-{
+{ 
        if ( sTheInstance.mImmSetCompostitionWindow )
-                return sTheInstance.mImmSetCompostitionWindow(himc, form);
+                return sTheInstance.mImmSetCompostitionWindow(himc, form);      
        return FALSE;
 }
-// static
+// static 
-LONG            LLWinImm::getCompositionString(HIMC himc, DWORD index, LPVOID data, DWORD length)
+LONG            LLWinImm::getCompositionString(HIMC himc, DWORD index, LPVOID data, DWORD length)                                       
-{
+{ 
        if ( sTheInstance.mImmGetCompositionString )
-                return sTheInstance.mImmGetCompositionString(himc, index, data, length);
+                return sTheInstance.mImmGetCompositionString(himc, index, data, length);        
        return FALSE;
 }
-// static
+// static 
-BOOL            LLWinImm::setCompositionString(HIMC himc, DWORD index, LPVOID pComp, DWORD compLength, LPVOID pRead, DWORD readLength)
+BOOL            LLWinImm::setCompositionString(HIMC himc, DWORD index, LPVOID pComp, DWORD compLength, LPVOID pRead, DWORD readLength)                                  
-{
+{ 
        if ( sTheInstance.mImmSetCompositionString )
-                return sTheInstance.mImmSetCompositionString(himc, index, pComp, compLength, pRead, readLength);
+                return sTheInstance.mImmSetCompositionString(himc, index, pComp, compLength, pRead, readLength);        
        return FALSE;
 }
-// static
+// static 
-BOOL            LLWinImm::setCompositionFont(HIMC himc, LPLOGFONTW pFont)
+BOOL            LLWinImm::setCompositionFont(HIMC himc, LPLOGFONTW pFont)                                       
-{
+{ 
        if ( sTheInstance.mImmSetCompositionFont )
-                return sTheInstance.mImmSetCompositionFont(himc, pFont);
+                return sTheInstance.mImmSetCompositionFont(himc, pFont);        
        return FALSE;
 }
-// static
+// static 
-BOOL            LLWinImm::setCandidateWindow(HIMC himc, LPCANDIDATEFORM form)
+BOOL            LLWinImm::setCandidateWindow(HIMC himc, LPCANDIDATEFORM form)                                   
-{
+{ 
        if ( sTheInstance.mImmSetCandidateWindow )
-                return sTheInstance.mImmSetCandidateWindow(himc, form);
+                return sTheInstance.mImmSetCandidateWindow(himc, form); 
        return FALSE;
 }
-// static
+// static 
-BOOL            LLWinImm::notifyIME(HIMC himc, DWORD action, DWORD index, DWORD value)
+BOOL            LLWinImm::notifyIME(HIMC himc, DWORD action, DWORD index, DWORD value)                                  
-{
+{ 
        if ( sTheInstance.mImmNotifyIME )
-                return sTheInstance.mImmNotifyIME(himc, action, index, value);
+                return sTheInstance.mImmNotifyIME(himc, action, index, value);  
        return FALSE;
 }
@@ -359,22 +359,15 @@ LLWinImm::~LLWinImm()
 }
-LPDIRECTINPUT8       g_pDI              = NULL;
-LPDIRECTINPUTDEVICE8 g_pJoystick        = NULL;
-BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance,
-                                                                        VOID* pContext );
-BOOL CALLBACK EnumObjectsCallback( const DIDEVICEOBJECTINSTANCE* pdidoi,
-                                                                  VOID* pContext );
 LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
-                                                         S32 height, U32 flags,
+                                                         S32 height, U32 flags, 
                                                         BOOL fullscreen, BOOL clearBg,
                                                         BOOL disable_vsync, BOOL use_gl,
-                                                         BOOL ignore_pixel_depth)
+                                                         BOOL ignore_pixel_depth,
+                                                         U32 fsaa_samples)
        : LLWindow(fullscreen, flags)
 {
-        S32 i = 0;
+        mFSAASamples = fsaa_samples;
        mIconResource = gIconResource;
        mOverrideAspectRatio = 0.f;
        mNativeAspectRatio = 0.f;
@@ -389,10 +382,7 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
        // based on the system's (user's) default settings.
        allowLanguageTextInput(mPreeditor, FALSE);
-        GLuint                  pixel_format;
        WNDCLASS                wc;
-        DWORD                   dw_ex_style;
-        DWORD                   dw_style;
        RECT                    window_rect;
        // Set the window title
@@ -442,8 +432,8 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
        // Grab screen size to sanitize the window
        S32 window_border_y = GetSystemMetrics(SM_CYBORDER);
-        S32 virtual_screen_x = GetSystemMetrics(SM_XVIRTUALSCREEN);
+        S32 virtual_screen_x = GetSystemMetrics(SM_XVIRTUALSCREEN); 
-        S32 virtual_screen_y = GetSystemMetrics(SM_YVIRTUALSCREEN);
+        S32 virtual_screen_y = GetSystemMetrics(SM_YVIRTUALSCREEN); 
        S32 virtual_screen_width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
        S32 virtual_screen_height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
@@ -554,7 +544,7 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
                        success = setDisplayResolution(width, height, BITS_PER_PIXEL, closest_refresh);
                }
-                // Keep a copy of the actual current device mode in case we minimize
+                // Keep a copy of the actual current device mode in case we minimize 
                // and change the screen resolution.   JC
                EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dev_mode);
@@ -586,49 +576,7 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
                        OSMessageBox(error, "Error", OSMB_OK);
                }
        }
+        
-        //-----------------------------------------------------------------------
-        // Resize window to account for borders
-        //-----------------------------------------------------------------------
-        if (mFullscreen)
-        {
-                dw_ex_style = WS_EX_APPWINDOW;
-                dw_style = WS_POPUP;
-                // Move window borders out not to cover window contents
-                AdjustWindowRectEx(&window_rect, dw_style, FALSE, dw_ex_style);
-        }
-        else
-        {
-                // Window with an edge
-                dw_ex_style = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE;
-                dw_style = WS_OVERLAPPEDWINDOW;
-        }
-        //-----------------------------------------------------------------------
-        // Create the window
-        // Microsoft help indicates that GL windows must be created with
-        // WS_CLIPSIBLINGS and WS_CLIPCHILDREN, but not CS_PARENTDC
-        //-----------------------------------------------------------------------
-        mWindowHandle = CreateWindowEx(dw_ex_style,
-                mWindowClassName,
-                mWindowTitle,
-                WS_CLIPSIBLINGS | WS_CLIPCHILDREN | dw_style,
-                x,                                                                                              // x pos
-                y,                                                                                              // y pos
-                window_rect.right - window_rect.left,                   // width
-                window_rect.bottom - window_rect.top,                   // height
-                NULL,
-                NULL,
-                mhInstance,
-                NULL);
-        if (!mWindowHandle)
-        {
-                OSMessageBox("Window creation error", "Error", OSMB_OK);
-                return;
-        }
        // TODO: add this after resolving _WIN32_WINNT issue
        //      if (!fullscreen)
        //      {
@@ -637,380 +585,21 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
        //              track_mouse_event.dwFlags = TME_LEAVE;
        //              track_mouse_event.hwndTrack = mWindowHandle;
        //              track_mouse_event.dwHoverTime = HOVER_DEFAULT;
-        //              TrackMouseEvent( &track_mouse_event );
+        //              TrackMouseEvent( &track_mouse_event ); 
        //      }
+        
-        S32 pfdflags = PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER;
-        if (use_gl)
-        {
-                pfdflags |= PFD_SUPPORT_OPENGL;
-        }
        //-----------------------------------------------------------------------
        // Create GL drawing context
        //-----------------------------------------------------------------------
-        PIXELFORMATDESCRIPTOR pfd =
+        LLCoordScreen windowPos(x,y);
+        LLCoordScreen windowSize(window_rect.right - window_rect.left,
+                                                         window_rect.bottom - window_rect.top);
+        if (!switchContext(mFullscreen, windowSize, TRUE, &windowPos))
        {
-                sizeof(PIXELFORMATDESCRIPTOR),
-                        1,
-                        pfdflags,
-                        PFD_TYPE_RGBA,
-                        BITS_PER_PIXEL,
-                        0, 0, 0, 0, 0, 0,       // RGB bits and shift, unused
-                        8,                                      // alpha bits
-                        0,                                      // alpha shift
-                        0,                                      // accum bits
-                        0, 0, 0, 0,                     // accum RGBA
-                        24,                                     // depth bits
-                        8,                                      // stencil bits, avi added for stencil test
-                        0,
-                        PFD_MAIN_PLANE,
-                        0,
-                        0, 0, 0
-        };
-        if (!(mhDC = GetDC(mWindowHandle)))
-        {
-                close();
-                OSMessageBox("Can't make GL device context", "Error", OSMB_OK);
                return;
        }
+        
-        if (!(pixel_format = ChoosePixelFormat(mhDC, &pfd)))
-        {
-                close();
-                OSMessageBox("Can't find suitable pixel format", "Error", OSMB_OK);
-                return;
-        }
-        // Verify what pixel format we actually received.
-        if (!DescribePixelFormat(mhDC, pixel_format, sizeof(PIXELFORMATDESCRIPTOR),
-                &pfd))
-        {
-                close();
-                OSMessageBox("Can't get pixel format description", "Error", OSMB_OK);
-                return;
-        }
-        // sanity check pfd returned by Windows
-        if (!ignore_pixel_depth && (pfd.cColorBits < 32))
-        {
-                close();
-                OSMessageBox(
-                        "Second Life requires True Color (32-bit) to run in a window.\n"
-                        "Please go to Control Panels -> Display -> Settings and\n"
-                        "set the screen to 32-bit color.\n"
-                        "Alternately, if you choose to run fullscreen, Second Life\n"
-                        "will automatically adjust the screen each time it runs.",
-                        "Error",
-                        OSMB_OK);
-                return;
-        }
-        if (!ignore_pixel_depth && (pfd.cAlphaBits < 8))
-        {
-                close();
-                OSMessageBox(
-                        "Second Life is unable to run because it can't get an 8 bit alpha\n"
-                        "channel.  Usually this is due to video card driver issues.\n"
-                        "Please make sure you have the latest video card drivers installed.\n"
-                        "Also be sure your monitor is set to True Color (32-bit) in\n"
-                        "Control Panels -> Display -> Settings.\n"
-                        "If you continue to receive this message, contact customer service.",
-                        "Error",
-                        OSMB_OK);
-                return;
-        }
-        if (!SetPixelFormat(mhDC, pixel_format, &pfd))
-        {
-                close();
-                OSMessageBox("Can't set pixel format", "Error", OSMB_OK);
-                return;
-        }
-        if (use_gl)
-        {
-                if (!(mhRC = wglCreateContext(mhDC)))
-                {
-                        close();
-                        OSMessageBox("Can't create GL rendering context", "Error", OSMB_OK);
-                        return;
-                }
-                if (!wglMakeCurrent(mhDC, mhRC))
-                {
-                        close();
-                        OSMessageBox("Can't activate GL rendering context", "Error", OSMB_OK);
-                        return;
-                }
-                gGLManager.initWGL();
-                if (gGLManager.mHasWGLARBPixelFormat && (wglChoosePixelFormatARB != NULL))
-                {
-                        // OK, at this point, use the ARB wglChoosePixelFormatsARB function to see if we
-                        // can get exactly what we want.
-                        GLint attrib_list[256];
-                        S32 cur_attrib = 0;
-                        attrib_list[cur_attrib++] = WGL_DEPTH_BITS_ARB;
-                        attrib_list[cur_attrib++] = 24;
-                        attrib_list[cur_attrib++] = WGL_STENCIL_BITS_ARB;
-                        attrib_list[cur_attrib++] = 8;
-                        attrib_list[cur_attrib++] = WGL_DRAW_TO_WINDOW_ARB;
-                        attrib_list[cur_attrib++] = GL_TRUE;
-                        attrib_list[cur_attrib++] = WGL_ACCELERATION_ARB;
-                        attrib_list[cur_attrib++] = WGL_FULL_ACCELERATION_ARB;
-                        attrib_list[cur_attrib++] = WGL_SUPPORT_OPENGL_ARB;
-                        attrib_list[cur_attrib++] = GL_TRUE;
-                        attrib_list[cur_attrib++] = WGL_DOUBLE_BUFFER_ARB;
-                        attrib_list[cur_attrib++] = GL_TRUE;
-                        attrib_list[cur_attrib++] = WGL_COLOR_BITS_ARB;
-                        attrib_list[cur_attrib++] = 32;
-                        attrib_list[cur_attrib++] = WGL_RED_BITS_ARB;
-                        attrib_list[cur_attrib++] = 8;
-                        attrib_list[cur_attrib++] = WGL_GREEN_BITS_ARB;
-                        attrib_list[cur_attrib++] = 8;
-                        attrib_list[cur_attrib++] = WGL_BLUE_BITS_ARB;
-                        attrib_list[cur_attrib++] = 8;
-                        attrib_list[cur_attrib++] = WGL_ALPHA_BITS_ARB;
-                        attrib_list[cur_attrib++] = 8;
-                        // End the list
-                        attrib_list[cur_attrib++] = 0;
-                        GLint pixel_formats[256];
-                        U32 num_formats = 0;
-                        // First we try and get a 32 bit depth pixel format
-                        BOOL result = wglChoosePixelFormatARB(mhDC, attrib_list, NULL, 256, pixel_formats, &num_formats);
-                        if (!result)
-                        {
-                                close();
-                                show_window_creation_error("Error after wglChoosePixelFormatARB 32-bit");
-                                return;
-                        }
-                        if (!num_formats)
-                        {
-                                llinfos << "No 32 bit z-buffer, trying 24 bits instead" << llendl;
-                                // Try 24-bit format
-                                attrib_list[1] = 24;
-                                BOOL result = wglChoosePixelFormatARB(mhDC, attrib_list, NULL, 256, pixel_formats, &num_formats);
-                                if (!result)
-                                {
-                                        close();
-                                        show_window_creation_error("Error after wglChoosePixelFormatARB 24-bit");
-                                        return;
-                                }
-                                if (!num_formats)
-                                {
-                                        llwarns << "Couldn't get 24 bit z-buffer,trying 16 bits instead!" << llendl;
-                                        attrib_list[1] = 16;
-                                        BOOL result = wglChoosePixelFormatARB(mhDC, attrib_list, NULL, 256, pixel_formats, &num_formats);
-                                        if (!result || !num_formats)
-                                        {
-                                                close();
-                                                show_window_creation_error("Error after wglChoosePixelFormatARB 16-bit");
-                                                return;
-                                        }
-                                }
-                                llinfos << "Choosing pixel formats: " << num_formats << " pixel formats returned" << llendl;
-                                pixel_format = pixel_formats[0];
-                        }
-                        DestroyWindow(mWindowHandle);
-                        mWindowHandle = CreateWindowEx(dw_ex_style,
-                                mWindowClassName,
-                                mWindowTitle,
-                                WS_CLIPSIBLINGS | WS_CLIPCHILDREN | dw_style,
-                                x,                                                              // x pos
-                                y,                                                              // y pos
-                                window_rect.right - window_rect.left,                   // width
-                                window_rect.bottom - window_rect.top,                   // height
-                                NULL,
-                                NULL,
-                                mhInstance,
-                                NULL);
-                        if (!(mhDC = GetDC(mWindowHandle)))
-                        {
-                                close();
-                                OSMessageBox("Can't make GL device context", "Error", OSMB_OK);
-                                return;
-                        }
-                        if (!SetPixelFormat(mhDC, pixel_format, &pfd))
-                        {
-                                close();
-                                OSMessageBox("Can't set pixel format", "Error", OSMB_OK);
-                                return;
-                        }
-                        int swap_method = 0;
-                        GLint swap_query = WGL_SWAP_METHOD_ARB;
-                        if (wglGetPixelFormatAttribivARB(mhDC, pixel_format, 0, 1, &swap_query, &swap_method))
-                        {
-                                switch (swap_method)
-                                {
-                                case WGL_SWAP_EXCHANGE_ARB:
-                                        mSwapMethod = SWAP_METHOD_EXCHANGE;
-                                        llinfos << "Swap Method: Exchange" << llendl;
-                                        break;
-                                case WGL_SWAP_COPY_ARB:
-                                        mSwapMethod = SWAP_METHOD_COPY;
-                                        llinfos << "Swap Method: Copy" << llendl;
-                                        break;
-                                case WGL_SWAP_UNDEFINED_ARB:
-                                        mSwapMethod = SWAP_METHOD_UNDEFINED;
-                                        llinfos << "Swap Method: Undefined" << llendl;
-                                        break;
-                                default:
-                                        mSwapMethod = SWAP_METHOD_UNDEFINED;
-                                        llinfos << "Swap Method: Unknown" << llendl;
-                                        break;
-                                }
-                        }
-                }
-                else
-                {
-                        llwarns << "No wgl_ARB_pixel_format extension, using default ChoosePixelFormat!" << llendl;
-                }
-                // Verify what pixel format we actually received.
-                if (!DescribePixelFormat(mhDC, pixel_format, sizeof(PIXELFORMATDESCRIPTOR),
-                        &pfd))
-                {
-                        close();
-                        OSMessageBox("Can't get pixel format description", "Error", OSMB_OK);
-                        return;
-                }
-                llinfos << "GL buffer: Color Bits " << S32(pfd.cColorBits)
-                        << " Alpha Bits " << S32(pfd.cAlphaBits)
-                        << " Depth Bits " << S32(pfd.cDepthBits)
-                        << llendl;
-                if (pfd.cColorBits < 32)
-                {
-                        close();
-                        OSMessageBox(
-                                "Second Life requires True Color (32-bit) to run in a window.\n"
-                                "Please go to Control Panels -> Display -> Settings and\n"
-                                "set the screen to 32-bit color.\n"
-                                "Alternately, if you choose to run fullscreen, Second Life\n"
-                                "will automatically adjust the screen each time it runs.",
-                                "Error",
-                                OSMB_OK);
-                        return;
-                }
-                if (pfd.cAlphaBits < 8)
-                {
-                        close();
-                        OSMessageBox(
-                                "Second Life is unable to run because it can't get an 8 bit alpha\n"
-                                "channel.  Usually this is due to video card driver issues.\n"
-                                "Please make sure you have the latest video card drivers installed.\n"
-                                "Also be sure your monitor is set to True Color (32-bit) in\n"
-                                "Control Panels -> Display -> Settings.\n"
-                                "If you continue to receive this message, contact customer service.",
-                                "Error",
-                                OSMB_OK);
-                        return;
-                }
-                if (!(mhRC = wglCreateContext(mhDC)))
-                {
-                        close();
-                        OSMessageBox("Can't create GL rendering context", "Error", OSMB_OK);
-                        return;
-                }
-                if (!wglMakeCurrent(mhDC, mhRC))
-                {
-                        close();
-                        OSMessageBox("Can't activate GL rendering context", "Error", OSMB_OK);
-                        return;
-                }
-                if (!gGLManager.initGL())
-                {
-                        close();
-                        OSMessageBox(
-                                "Second Life is unable to run because your video card drivers\n"
-                                "are out of date or unsupported. Please make sure you have\n"
-                                "the latest video card drivers installed.\n\n"
-                                "If you continue to receive this message, contact customer service.",
-                                "Error",
-                                OSMB_OK);
-                        return;
-                }
-                // Disable vertical sync for swap
-                if (disable_vsync && wglSwapIntervalEXT)
-                {
-                        llinfos << "Disabling vertical sync" << llendl;
-                        wglSwapIntervalEXT(0);
-                }
-                else
-                {
-                        llinfos << "Keeping vertical sync" << llendl;
-                }
-                // OK, let's get the current gamma information and store it off.
-                mCurrentGamma = 0.f; // Not set, default;
-                if (!GetDeviceGammaRamp(mhDC, mPrevGammaRamp))
-                {
-                        llwarns << "Unable to get device gamma ramp" << llendl;
-                }
-                // Calculate what the current gamma is.  From a posting by Garrett T. Bass, Get/SetDeviceGammaRamp Demystified
-                // http://apollo.iwt.uni-bielefeld.de/~ml_robot/OpenGL-04-2000/0058.html
-                // We're going to assume that gamma's the same for all 3 channels, because I don't feel like doing it otherwise.
-                // Using the red channel.
-                F32 Csum = 0.0;
-                S32 Ccount = 0;
-                for (i = 0; i < 256; i++)
-                {
-                        if (i != 0 && mPrevGammaRamp[i] != 0 && mPrevGammaRamp[i] != 65536)
-                        {
-                                F64 B = (i % 256) / 256.0;
-                                F64 A = mPrevGammaRamp[i] / 65536.0;
-                                F32 C = (F32) ( log(A) / log(B) );
-                                Csum += C;
-                                Ccount++;
-                        }
-                }
-                mCurrentGamma = Csum / Ccount;
-                llinfos << "Previous gamma: " << mCurrentGamma << llendl;
-        }
-        //store this pointer for wndProc callback
-        SetWindowLong(mWindowHandle, GWL_USERDATA, (U32)this);
        //start with arrow cursor
        initCursors();
        setCursor( UI_CURSOR_ARROW );
@@ -1019,40 +608,6 @@ LLWindowWin32::LLWindowWin32(char *title, char *name, S32 x, S32 y, S32 width,
        // based on the system's (or user's) default settings.
        allowLanguageTextInput(NULL, FALSE);
-        initInputDevices();
-}
-void LLWindowWin32::initInputDevices()
-{
-        // Direct Input
-        HRESULT hr;
-        if( FAILED( hr = DirectInput8Create( GetModuleHandle(NULL), DIRECTINPUT_VERSION,
-                IID_IDirectInput8, (VOID**)&g_pDI, NULL ) ) )
-        {
-                llwarns << "Direct8InputCreate failed!" << llendl;
-        }
-        else
-        {
-                while(1)
-                {
-                        // Look for a simple joystick we can use for this sample program.
-                        if (FAILED( hr = g_pDI->EnumDevices( DI8DEVCLASS_GAMECTRL,
-                                EnumJoysticksCallback,
-                                NULL, DIEDFL_ATTACHEDONLY ) ) )
-                                break;
-                        if (!g_pJoystick)
-                                break;
-                        if( FAILED( hr = g_pJoystick->SetDataFormat( &c_dfDIJoystick ) ) )
-                                break;
-                        if( FAILED( hr = g_pJoystick->EnumObjects( EnumObjectsCallback,
-                                (VOID*)mWindowHandle, DIDFT_ALL ) ) )
-                                break;
-                        g_pJoystick->Acquire();
-                        break;
-                }
-        }
        SetTimer( mWindowHandle, 0, 1000 / 30, NULL ); // 30 fps timer
 }
@@ -1149,7 +704,7 @@ void LLWindowWin32::close()
        }
        llinfos << "Destroying Window" << llendl;
+        
        // Don't process events in our mainWindowProc any longer.
        SetWindowLong(mWindowHandle, GWL_USERDATA, NULL);
@@ -1283,7 +838,7 @@ BOOL LLWindowWin32::setSize(const LLCoordScreen size)
 }
 // changing fullscreen resolution
-BOOL LLWindowWin32::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync)
+BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp)
 {
        GLuint  pixel_format;
        DEVMODE dev_mode;
@@ -1360,7 +915,7 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disa
                        success = setDisplayResolution(width, height, BITS_PER_PIXEL, closest_refresh);
                }
-                // Keep a copy of the actual current device mode in case we minimize
+                // Keep a copy of the actual current device mode in case we minimize 
                // and change the screen resolution.   JC
                EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dev_mode);
@@ -1405,10 +960,10 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disa
        else
        {
                mFullscreen = FALSE;
-                window_rect.left = (long) 0;
+                window_rect.left = (long) (posp ? posp->mX : 0);
-                window_rect.right = (long) width;                       // Windows GDI rects don't include rightmost pixel
+                window_rect.right = (long) width + window_rect.left;                    // Windows GDI rects don't include rightmost pixel
-                window_rect.top = (long) 0;
+                window_rect.top = (long) (posp ? posp->mY : 0);
-                window_rect.bottom = (long) height;
+                window_rect.bottom = (long) height + window_rect.top;
                // Window with an edge
                dw_ex_style = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE;
                dw_style = WS_OVERLAPPEDWINDOW;
@@ -1437,9 +992,9 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disa
        //-----------------------------------------------------------------------
        static PIXELFORMATDESCRIPTOR pfd =
        {
-                sizeof(PIXELFORMATDESCRIPTOR),
+                sizeof(PIXELFORMATDESCRIPTOR), 
                        1,
-                        PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER,
+                        PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, 
                        PFD_TYPE_RGBA,
                        BITS_PER_PIXEL,
                        0, 0, 0, 0, 0, 0,       // RGB bits and shift, unused
@@ -1558,17 +1113,19 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disa
                attrib_list[cur_attrib++] = WGL_COLOR_BITS_ARB;
                attrib_list[cur_attrib++] = 24;
-                attrib_list[cur_attrib++] = WGL_RED_BITS_ARB;
+                attrib_list[cur_attrib++] = WGL_ALPHA_BITS_ARB;
-                attrib_list[cur_attrib++] = 8;
-                attrib_list[cur_attrib++] = WGL_GREEN_BITS_ARB;
                attrib_list[cur_attrib++] = 8;
-                attrib_list[cur_attrib++] = WGL_BLUE_BITS_ARB;
+                U32 end_attrib = 0;
-                attrib_list[cur_attrib++] = 8;
+                if (mFSAASamples > 0)
+                {
+                        end_attrib = cur_attrib;
+                        attrib_list[cur_attrib++] = WGL_SAMPLE_BUFFERS_ARB;
+                        attrib_list[cur_attrib++] = GL_TRUE;
-                attrib_list[cur_attrib++] = WGL_ALPHA_BITS_ARB;
+                        attrib_list[cur_attrib++] = WGL_SAMPLES_ARB;
-                attrib_list[cur_attrib++] = 8;
+                        attrib_list[cur_attrib++] = mFSAASamples;
+                }
                // End the list
                attrib_list[cur_attrib++] = 0;
@@ -1587,36 +1144,67 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disa
                if (!num_formats)
                {
-                        llinfos << "No 32 bit z-buffer, trying 24 bits instead" << llendl;
+                        if (end_attrib > 0)
-                        // Try 24-bit format
-                        attrib_list[1] = 24;
-                        BOOL result = wglChoosePixelFormatARB(mhDC, attrib_list, NULL, 256, pixel_formats, &num_formats);
-                        if (!result)
                        {
-                                close();
+                                llinfos << "No valid pixel format for " << mFSAASamples << "x anti-aliasing." << llendl;
-                                show_window_creation_error("Error after wglChoosePixelFormatARB 24-bit");
+                                attrib_list[end_attrib] = 0;
-                                return FALSE;
+                                BOOL result = wglChoosePixelFormatARB(mhDC, attrib_list, NULL, 256, pixel_formats, &num_formats);
+                                if (!result)
+                                {
+                                        close();
+                                        show_window_creation_error("Error after wglChoosePixelFormatARB 32-bit no AA");
+                                        return FALSE;
+                                }
                        }
                        if (!num_formats)
                        {
-                                llwarns << "Couldn't get 24 bit z-buffer,trying 16 bits instead!" << llendl;
+                                llinfos << "No 32 bit z-buffer, trying 24 bits instead" << llendl;
-                                attrib_list[1] = 16;
+                                // Try 24-bit format
+                                attrib_list[1] = 24;
                                BOOL result = wglChoosePixelFormatARB(mhDC, attrib_list, NULL, 256, pixel_formats, &num_formats);
-                                if (!result || !num_formats)
+                                if (!result)
                                {
                                        close();
-                                        show_window_creation_error("Error after wglChoosePixelFormatARB 16-bit");
+                                        show_window_creation_error("Error after wglChoosePixelFormatARB 24-bit");
                                        return FALSE;
                                }
+                                if (!num_formats)
+                                {
+                                        llwarns << "Couldn't get 24 bit z-buffer,trying 16 bits instead!" << llendl;
+                                        attrib_list[1] = 16;
+                                        BOOL result = wglChoosePixelFormatARB(mhDC, attrib_list, NULL, 256, pixel_formats, &num_formats);
+                                        if (!result || !num_formats)
+                                        {
+                                                close();
+                                                show_window_creation_error("Error after wglChoosePixelFormatARB 16-bit");
+                                                return FALSE;
+                                        }
+                                }
                        }
                        llinfos << "Choosing pixel formats: " << num_formats << " pixel formats returned" << llendl;
+                }
+                pixel_format = pixel_formats[0];
-                        pixel_format = pixel_formats[0];
+                if (mhDC != 0)                                                                                  // Does The Window Have A Device Context?
+                {
+                        wglMakeCurrent(mhDC, 0);                                                        // Set The Current Active Rendering Context To Zero
+                        if (mhRC != 0)                                                                          // Does The Window Have A Rendering Context?
+                        {
+                                wglDeleteContext (mhRC);                                                        // Release The Rendering Context
+                                mhRC = 0;                                                                               // Zero The Rendering Context
+                        }
+                        ReleaseDC (mWindowHandle, mhDC);                                                // Release The Device Context
+                        mhDC = 0;                                                                                       // Zero The Device Context
                }
+                DestroyWindow (mWindowHandle);                                                                  // Destroy The Window
+                
-                DestroyWindow(mWindowHandle);
                mWindowHandle = CreateWindowEx(dw_ex_style,
                        mWindowClassName,
                        mWindowTitle,
@@ -1668,7 +1256,7 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disa
                                llinfos << "Swap Method: Unknown" << llendl;
                                break;
                        }
-                }
+                }               
        }
        else
        {
@@ -1684,12 +1272,13 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disa
                return FALSE;
        }
-        llinfos << "GL buffer: Color Bits " << S32(pfd.cColorBits)
+        llinfos << "GL buffer: Color Bits " << S32(pfd.cColorBits) 
                << " Alpha Bits " << S32(pfd.cAlphaBits)
-                << " Depth Bits " << S32(pfd.cDepthBits)
+                << " Depth Bits " << S32(pfd.cDepthBits) 
                << llendl;
-        if (pfd.cColorBits < 32)
+        // make sure we have 32 bits per pixel
+        if (pfd.cColorBits < 32 || GetDeviceCaps(mhDC, BITSPIXEL) < 32)
        {
                close();
                OSMessageBox(
@@ -1759,7 +1348,9 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disa
        SetWindowLong(mWindowHandle, GWL_USERDATA, (U32)this);
        show();
-        initInputDevices();
+        //make sure multi sampling is disabled by default
+        glDisable(GL_MULTISAMPLE_ARB);
        // ok to post quit messages now
        mPostQuit = TRUE;
@@ -1884,10 +1475,10 @@ void LLWindowWin32::initCursors()
        mCursor[ UI_CURSOR_CROSS ]              = LoadCursor(NULL, IDC_CROSS);
        mCursor[ UI_CURSOR_SIZENWSE ]   = LoadCursor(NULL, IDC_SIZENWSE);
        mCursor[ UI_CURSOR_SIZENESW ]   = LoadCursor(NULL, IDC_SIZENESW);
-        mCursor[ UI_CURSOR_SIZEWE ]             = LoadCursor(NULL, IDC_SIZEWE);
+        mCursor[ UI_CURSOR_SIZEWE ]             = LoadCursor(NULL, IDC_SIZEWE);  
-        mCursor[ UI_CURSOR_SIZENS ]             = LoadCursor(NULL, IDC_SIZENS);
+        mCursor[ UI_CURSOR_SIZENS ]             = LoadCursor(NULL, IDC_SIZENS);  
        mCursor[ UI_CURSOR_NO ]                 = LoadCursor(NULL, IDC_NO);
-        mCursor[ UI_CURSOR_WORKING ]    = LoadCursor(NULL, IDC_APPSTARTING);
+        mCursor[ UI_CURSOR_WORKING ]    = LoadCursor(NULL, IDC_APPSTARTING); 
        HMODULE module = GetModuleHandle(NULL);
        mCursor[ UI_CURSOR_TOOLGRAB ]   = LoadCursor(module, TEXT("TOOLGRAB"));
@@ -1902,7 +1493,7 @@ void LLWindowWin32::initCursors()
        mCursor[ UI_CURSOR_ARROWLOCKED ]= LoadCursor(module, TEXT("ARROWLOCKED"));
        mCursor[ UI_CURSOR_GRABLOCKED ] = LoadCursor(module, TEXT("GRABLOCKED"));
        mCursor[ UI_CURSOR_TOOLTRANSLATE ]      = LoadCursor(module, TEXT("TOOLTRANSLATE"));
-        mCursor[ UI_CURSOR_TOOLROTATE ] = LoadCursor(module, TEXT("TOOLROTATE"));
+        mCursor[ UI_CURSOR_TOOLROTATE ] = LoadCursor(module, TEXT("TOOLROTATE")); 
        mCursor[ UI_CURSOR_TOOLSCALE ]  = LoadCursor(module, TEXT("TOOLSCALE"));
        mCursor[ UI_CURSOR_TOOLCAMERA ] = LoadCursor(module, TEXT("TOOLCAMERA"));
        mCursor[ UI_CURSOR_TOOLPAN ]    = LoadCursor(module, TEXT("TOOLPAN"));
@@ -2051,7 +1642,22 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                        S32             update_height;
                case WM_TIMER:
-                        window_imp->updateJoystick( );
+                        window_imp->mCallbacks->handleTimerEvent(window_imp);
+                        break;
+                case WM_DEVICECHANGE:
+                        if (gDebugWindowProc)
+                        {
+                                llinfos << "  WM_DEVICECHANGE: wParam=" << w_param 
+                                                << "; lParam=" << l_param << llendl;
+                        }
+                        if (w_param == DBT_DEVNODES_CHANGED || w_param == DBT_DEVICEARRIVAL)
+                        {
+                                if (window_imp->mCallbacks->handleDeviceChange(window_imp))
+                                {
+                                        return 0;
+                                }
+                        }
                        break;
                case WM_PAINT:
@@ -2103,7 +1709,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                                if (window_imp->mFullscreen)
                                {
-                                        // When we run fullscreen, restoring or minimizing the app needs
+                                        // When we run fullscreen, restoring or minimizing the app needs 
                                        // to switch the screen resolution
                                        if (activating)
                                        {
@@ -2116,6 +1722,9 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                                                window_imp->resetDisplayResolution();
                                        }
                                }
+                                window_imp->mCallbacks->handleActivateApp(window_imp, activating);
                                break;
                        }
@@ -2131,13 +1740,13 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                                        window_imp->interruptLanguageTextInput();
                                }
-                                // JC - I'm not sure why, but if we don't report that we handled the
+                                // JC - I'm not sure why, but if we don't report that we handled the 
-                                // WM_ACTIVATE message, the WM_ACTIVATEAPP messages don't work
+                                // WM_ACTIVATE message, the WM_ACTIVATEAPP messages don't work 
                                // properly when we run fullscreen.
                                if (gDebugWindowProc)
                                {
                                        llinfos << "WINDOWPROC Activate "
-                                                << " activating " << S32(activating)
+                                                << " activating " << S32(activating) 
                                                << " minimized " << S32(minimized)
                                                << llendl;
                                }
@@ -2153,9 +1762,9 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                case WM_SYSCOMMAND:
                        switch(w_param)
                        {
-                        case SC_KEYMENU:
+                        case SC_KEYMENU: 
                                // Disallow the ALT key from triggering the default system menu.
-                                return 0;
+                                return 0;               
                        case SC_SCREENSAVE:
                        case SC_MONITORPOWER:
@@ -2196,7 +1805,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                                if (gDebugWindowProc)
                                {
                                        llinfos << "Debug WindowProc WM_KEYDOWN "
-                                                << " key " << S32(w_param)
+                                                << " key " << S32(w_param) 
                                                << llendl;
                                }
                                if(gKeyboard->handleKeyDown(w_param, mask) && eat_keystroke)
@@ -2215,7 +1824,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                        if (gDebugWindowProc)
                        {
                                llinfos << "Debug WindowProc WM_KEYUP "
-                                        << " key " << S32(w_param)
+                                        << " key " << S32(w_param) 
                                        << llendl;
                        }
                        if (gKeyboard->handleKeyUp(w_param, mask) && eat_keystroke)
@@ -2284,7 +1893,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                        if (gDebugWindowProc)
                        {
                                llinfos << "Debug WindowProc WM_CHAR "
-                                        << " key " << S32(w_param)
+                                        << " key " << S32(w_param) 
                                        << llendl;
                        }
                        // Even if LLWindowCallbacks::handleUnicodeChar(llwchar, BOOL) returned FALSE,
@@ -2527,7 +2136,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                        //                              track_mouse_event.dwFlags = TME_LEAVE;
                        //                              track_mouse_event.hwndTrack = h_wnd;
                        //                              track_mouse_event.dwHoverTime = HOVER_DEFAULT;
-                        //                              TrackMouseEvent( &track_mouse_event );
+                        //                              TrackMouseEvent( &track_mouse_event ); 
                        return 0;
                        }
                        */
@@ -2559,12 +2168,12 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                                                << llendl;
                                }
-                                // There's an odd behavior with WM_SIZE that I would call a bug. If
+                                // There's an odd behavior with WM_SIZE that I would call a bug. If 
                                // the window is maximized, and you call MoveWindow() with a size smaller
-                                // than a maximized window, it ends up sending WM_SIZE with w_param set
+                                // than a maximized window, it ends up sending WM_SIZE with w_param set 
                                // to SIZE_MAXIMIZED -- which isn't true. So the logic below doesn't work.
-                                // (SL-44655). Fixed it by calling ShowWindow(SW_RESTORE) first (see
+                                // (SL-44655). Fixed it by calling ShowWindow(SW_RESTORE) first (see 
-                                // LLWindowWin32::moveWindow in this file).
+                                // LLWindowWin32::moveWindow in this file). 
                                // If we are now restored, but we weren't before, this
                                // means that the window was un-minimized.
@@ -2589,8 +2198,8 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                                if (w_param != SIZE_MINIMIZED)
                                {
                                        // Ignore updates for minimizing and minimized "windows"
-                                        window_imp->mCallbacks->handleResize(   window_imp,
+                                        window_imp->mCallbacks->handleResize(   window_imp, 
-                                                LOWORD(l_param),
+                                                LOWORD(l_param), 
                                                HIWORD(l_param) );
                                }
@@ -2619,7 +2228,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                        // received a URL
                        PCOPYDATASTRUCT myCDS = (PCOPYDATASTRUCT) l_param;
                        window_imp->mCallbacks->handleDataCopy(window_imp, myCDS->dwData, myCDS->lpData);
-                        return 0;
+                        return 0;                       
                }
        }
@@ -2667,7 +2276,7 @@ BOOL LLWindowWin32::convertCoords(LLCoordWindow from, LLCoordGL* to)
 }
 BOOL LLWindowWin32::convertCoords(LLCoordScreen from, LLCoordWindow* to)
-{
+{       
        POINT mouse_point;
        mouse_point.x = from.mX;
@@ -2778,7 +2387,7 @@ BOOL LLWindowWin32::copyTextToClipboard(const LLWString& wstr)
                const size_t size_utf16 = (out_utf16.length() + 1) * sizeof(WCHAR);
                // Memory is allocated and then ownership of it is transfered to the system.
-                HGLOBAL hglobal_copy_utf16 = GlobalAlloc(GMEM_MOVEABLE, size_utf16);
+                HGLOBAL hglobal_copy_utf16 = GlobalAlloc(GMEM_MOVEABLE, size_utf16); 
                if (hglobal_copy_utf16)
                {
                        WCHAR* copy_utf16 = (WCHAR*) GlobalLock(hglobal_copy_utf16);
@@ -2841,12 +2450,12 @@ BOOL LLWindowWin32::getClientRectInScreenSpace( RECT* rectp )
                POINT top_left;
                top_left.x = client_rect.left;
                top_left.y = client_rect.top;
-                ClientToScreen(mWindowHandle, &top_left);
+                ClientToScreen(mWindowHandle, &top_left); 
                POINT bottom_right;
                bottom_right.x = client_rect.right;
                bottom_right.y = client_rect.bottom;
-                ClientToScreen(mWindowHandle, &bottom_right);
+                ClientToScreen(mWindowHandle, &bottom_right); 
                SetRect( rectp,
                        top_left.x,
@@ -2977,14 +2586,24 @@ BOOL LLWindowWin32::setGamma(const F32 gamma)
                if ( value > 0xffff )
                        value = 0xffff;
-                mCurrentGammaRamp [ 0 * 256 + i ] =
+                mCurrentGammaRamp [ 0 * 256 + i ] = 
-                        mCurrentGammaRamp [ 1 * 256 + i ] =
+                        mCurrentGammaRamp [ 1 * 256 + i ] = 
                                mCurrentGammaRamp [ 2 * 256 + i ] = ( WORD )value;
        };
        return SetDeviceGammaRamp ( mhDC, mCurrentGammaRamp );
 }
+void LLWindowWin32::setFSAASamples(const U32 fsaa_samples)
+{
+        mFSAASamples = fsaa_samples;
+}
+U32 LLWindowWin32::getFSAASamples()
+{
+        return mFSAASamples;
+}
 LLWindow::LLWindowResolution* LLWindowWin32::getSupportedResolutions(S32 &num_resolutions)
 {
        if (!mSupportedResolutions)
@@ -3142,81 +2761,6 @@ void LLWindowWin32::swapBuffers()
 }
-BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance,
-                                                                        VOID* pContext )
-{
-        HRESULT hr;
-        // Obtain an interface to the enumerated joystick.
-        hr = g_pDI->CreateDevice( pdidInstance->guidInstance, &g_pJoystick, NULL );
-        // If it failed, then we can't use this joystick. (Maybe the user unplugged
-        // it while we were in the middle of enumerating it.)
-        if( FAILED(hr) )
-                return DIENUM_CONTINUE;
-        // Stop enumeration. Note: we're just taking the first joystick we get. You
-        // could store all the enumerated joysticks and let the user pick.
-        return DIENUM_STOP;
-}
-BOOL CALLBACK EnumObjectsCallback( const DIDEVICEOBJECTINSTANCE* pdidoi,
-                                                                  VOID* pContext )
-{
-        if( pdidoi->dwType & DIDFT_AXIS )
-        {
-                DIPROPRANGE diprg;
-                diprg.diph.dwSize       = sizeof(DIPROPRANGE);
-                diprg.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-                diprg.diph.dwHow        = DIPH_BYID;
-                diprg.diph.dwObj        = pdidoi->dwType; // Specify the enumerated axis
-                diprg.lMin              = -1000;
-                diprg.lMax              = +1000;
-                // Set the range for the axis
-                if( FAILED( g_pJoystick->SetProperty( DIPROP_RANGE, &diprg.diph ) ) )
-                        return DIENUM_STOP;
-        }
-        return DIENUM_CONTINUE;
-}
-void LLWindowWin32::updateJoystick( )
-{
-        HRESULT hr;
-        DIJOYSTATE js;           // DInput joystick state
-        if (!g_pJoystick)
-                return;
-        hr = g_pJoystick->Poll();
-        if ( hr == DIERR_INPUTLOST )
-        {
-                hr = g_pJoystick->Acquire();
-                return;
-        }
-        else if ( FAILED(hr) )
-                return;
-        // Get the input's device state
-        if( FAILED( hr = g_pJoystick->GetDeviceState( sizeof(DIJOYSTATE), &js ) ) )
-                return; // The device should have been acquired during the Poll()
-        mJoyAxis[0] = js.lX/1000.f;
-        mJoyAxis[1] = js.lY/1000.f;
-        mJoyAxis[2] = js.lZ/1000.f;
-        mJoyAxis[3] = js.lRx/1000.f;
-        mJoyAxis[4] = js.lRy/1000.f;
-        mJoyAxis[5] = js.lRz/1000.f;
-        mJoyAxis[6] = js.rglSlider[0]/1000.f;
-        mJoyAxis[7] = js.rglSlider[1]/1000.f;
-        for (U32 i = 0; i < 16; i++)
-        {
-                mJoyButtonState[i] = js.rgbButtons[i];
-        }
-}
 //
 // LLSplashScreenImp
 //
@@ -3234,10 +2778,10 @@ void LLSplashScreenWin32::showImpl()
        // This appears to work.  ???
        HINSTANCE hinst = GetModuleHandle(NULL);
-        mWindow = CreateDialog(hinst,
+        mWindow = CreateDialog(hinst, 
-                TEXT("SPLASHSCREEN"),
+                TEXT("SPLASHSCREEN"), 
                NULL,   // no parent
-                (DLGPROC) LLSplashScreenWin32::windowProc);
+                (DLGPROC) LLSplashScreenWin32::windowProc); 
        ShowWindow(mWindow, SW_SHOW);
 }
@@ -3262,7 +2806,7 @@ void LLSplashScreenWin32::hideImpl()
        if (mWindow)
        {
                DestroyWindow(mWindow);
-                mWindow = NULL;
+                mWindow = NULL; 
        }
 }
@@ -3364,77 +2908,79 @@ void spawn_web_browser(const char* escaped_url )
        sei.lpFile = url_utf16.c_str();
        ShellExecuteEx( &sei );
-        ////// TODO: LEAVING OLD CODE HERE SO I DON'T BONE OTHER MERGES
+        //// TODO: LEAVING OLD CODE HERE SO I DON'T BONE OTHER MERGES
-        ////// DELETE THIS ONCE THE MERGES ARE DONE
+        //// DELETE THIS ONCE THE MERGES ARE DONE
-        //// Figure out the user's default web browser
+        // Figure out the user's default web browser
-        //// HKEY_CLASSES_ROOT\http\shell\open\command
+        // HKEY_CLASSES_ROOT\http\shell\open\command
-        //char reg_path_str[256];       /* Flawfinder: ignore */
+        /*
-        //snprintf(reg_path_str, sizeof(reg_path_str), "%s\\shell\\open\\command", gURLProtocolWhitelistHandler[i]);    /* Flawfinder: ignore */
+        char reg_path_str[256]; // Flawfinder: ignore
-        //WCHAR reg_path_wstr[256];
+        snprintf(reg_path_str, sizeof(reg_path_str), "%s\\shell\\open\\command", gURLProtocolWhitelistHandler[i]);      // Flawfinder: ignore
-        //mbstowcs(reg_path_wstr, reg_path_str, sizeof(reg_path_wstr)/sizeof(reg_path_wstr[0]));
+        WCHAR reg_path_wstr[256];
+        mbstowcs(reg_path_wstr, reg_path_str, sizeof(reg_path_wstr)/sizeof(reg_path_wstr[0]));
-        //HKEY key;
-        //WCHAR browser_open_wstr[1024];
+        HKEY key;
-        //DWORD buffer_length = 1024;
+        WCHAR browser_open_wstr[1024];
-        //RegOpenKeyEx(HKEY_CLASSES_ROOT, reg_path_wstr, 0, KEY_QUERY_VALUE, &key);
+        DWORD buffer_length = 1024;
-        //RegQueryValueEx(key, NULL, NULL, NULL, (LPBYTE)browser_open_wstr, &buffer_length);
+        RegOpenKeyEx(HKEY_CLASSES_ROOT, reg_path_wstr, 0, KEY_QUERY_VALUE, &key);
-        //RegCloseKey(key);
+        RegQueryValueEx(key, NULL, NULL, NULL, (LPBYTE)browser_open_wstr, &buffer_length);
+        RegCloseKey(key);
-        //// Convert to STL string
-        //LLWString browser_open_wstring = utf16str_to_wstring(browser_open_wstr);
+        // Convert to STL string
+        LLWString browser_open_wstring = utf16str_to_wstring(browser_open_wstr);
-        //if (browser_open_wstring.length() < 2)
-        //{
+        if (browser_open_wstring.length() < 2)
-        //      llwarns << "Invalid browser executable in registry " << browser_open_wstring << llendl;
+        {
-        //      return;
+                llwarns << "Invalid browser executable in registry " << browser_open_wstring << llendl;
-        //}
+                return;
+        }
-        //// Extract the process that's supposed to be launched
-        //LLWString browser_executable;
+        // Extract the process that's supposed to be launched
-        //if (browser_open_wstring[0] == '"')
+        LLWString browser_executable;
-        //{
+        if (browser_open_wstring[0] == '"')
-        //      // executable is quoted, find the matching quote
+        {
-        //      size_t quote_pos = browser_open_wstring.find('"', 1);
+                // executable is quoted, find the matching quote
-        //      // copy out the string including both quotes
+                size_t quote_pos = browser_open_wstring.find('"', 1);
-        //      browser_executable = browser_open_wstring.substr(0, quote_pos+1);
+                // copy out the string including both quotes
-        //}
+                browser_executable = browser_open_wstring.substr(0, quote_pos+1);
-        //else
+        }
-        //{
+        else
-        //      // executable not quoted, find a space
+        {
-        //      size_t space_pos = browser_open_wstring.find(' ', 1);
+                // executable not quoted, find a space
-        //      browser_executable = browser_open_wstring.substr(0, space_pos);
+                size_t space_pos = browser_open_wstring.find(' ', 1);
-        //}
+                browser_executable = browser_open_wstring.substr(0, space_pos);
+        }
-        //llinfos << "Browser reg key: " << wstring_to_utf8str(browser_open_wstring) << llendl;
-        //llinfos << "Browser executable: " << wstring_to_utf8str(browser_executable) << llendl;
+        llinfos << "Browser reg key: " << wstring_to_utf8str(browser_open_wstring) << llendl;
+        llinfos << "Browser executable: " << wstring_to_utf8str(browser_executable) << llendl;
-        //// Convert URL to wide string for Windows API
-        //// Assume URL is UTF8, as can come from scripts
+        // Convert URL to wide string for Windows API
-        //LLWString url_wstring = utf8str_to_wstring(escaped_url);
+        // Assume URL is UTF8, as can come from scripts
-        //llutf16string url_utf16 = wstring_to_utf16str(url_wstring);
+        LLWString url_wstring = utf8str_to_wstring(escaped_url);
+        llutf16string url_utf16 = wstring_to_utf16str(url_wstring);
-        //// Convert executable and path to wide string for Windows API
-        //llutf16string browser_exec_utf16 = wstring_to_utf16str(browser_executable);
+        // Convert executable and path to wide string for Windows API
+        llutf16string browser_exec_utf16 = wstring_to_utf16str(browser_executable);
-        //// ShellExecute returns HINSTANCE for backwards compatiblity.
-        //// MS docs say to cast to int and compare to 32.
+        // ShellExecute returns HINSTANCE for backwards compatiblity.
-        //HWND our_window = NULL;
+        // MS docs say to cast to int and compare to 32.
-        //LPCWSTR directory_wstr = NULL;
+        HWND our_window = NULL;
-        //int retval = (int) ShellExecute(our_window,   /* Flawfinder: ignore */
+        LPCWSTR directory_wstr = NULL;
-        //                                                              L"open",
+        int retval = (int) ShellExecute(our_window,     // Flawfinder: ignore
-        //                                                              browser_exec_utf16.c_str(),
+                                                                        L"open", 
-        //                                                              url_utf16.c_str(),
+                                                                        browser_exec_utf16.c_str(), 
-        //                                                              directory_wstr,
+                                                                        url_utf16.c_str(), 
-        //                                                              SW_SHOWNORMAL);
+                                                                        directory_wstr,
-        //if (retval > 32)
+                                                                        SW_SHOWNORMAL);
-        //{
+        if (retval > 32)
-        //      llinfos << "load_url success with " << retval << llendl;
+        {
-        //}
+                llinfos << "load_url success with " << retval << llendl;
-        //else
+        }
-        //{
+        else
-        //      llinfos << "load_url failure with " << retval << llendl;
+        {
-        //}
+                llinfos << "load_url failure with " << retval << llendl;
+        }
+        */
 }
@@ -3448,13 +2994,13 @@ BOOL LLWindowWin32::dialog_color_picker ( F32 *r, F32 *g, F32 *b )
        cc.hwndOwner = mWindowHandle;
        cc.hInstance = NULL;
        cc.rgbResult = RGB ((*r * 255.f),(*g *255.f),(*b * 255.f));
-        //cc.rgbResult = RGB (0x80,0x80,0x80);
+        //cc.rgbResult = RGB (0x80,0x80,0x80); 
        cc.lpCustColors = crCustColors;
        cc.Flags = CC_RGBINIT | CC_FULLOPEN;
        cc.lCustData = 0;
        cc.lpfnHook = NULL;
        cc.lpTemplateName = NULL;
+ 
        // This call is modal, so pause agent
        //send_agent_pause();   // this is in newview and we don't want to set up a dependency
        {
@@ -3465,7 +3011,7 @@ BOOL LLWindowWin32::dialog_color_picker ( F32 *r, F32 *g, F32 *b )
        *b = ((F32)((cc.rgbResult >> 16) & 0xff)) / 255.f;
        *g = ((F32)((cc.rgbResult >> 8) & 0xff)) / 255.f;
+        
        *r = ((F32)(cc.rgbResult & 0xff)) / 255.f;
        return (retval);
@@ -3519,8 +3065,8 @@ void LLWindowWin32::allowLanguageTextInput(LLPreeditor *preeditor, BOOL b)
        if ( sLanguageTextInputAllowed )
        {
-                // Allowing: Restore the previous IME status, so that the user has a feeling that the previous
+                // Allowing: Restore the previous IME status, so that the user has a feeling that the previous 
-                // text input continues naturally.  Be careful, however, the IME status is meaningful only during the user keeps
+                // text input continues naturally.  Be careful, however, the IME status is meaningful only during the user keeps 
                // using same Input Locale (aka Keyboard Layout).
                if (sWinIMEOpened && GetKeyboardLayout(0) == sWinInputLocale)
                {
@@ -3545,7 +3091,7 @@ void LLWindowWin32::allowLanguageTextInput(LLPreeditor *preeditor, BOOL b)
                        {
                                LLWinImm::getConversionStatus(himc, &sWinIMEConversionMode, &sWinIMESentenceMode);
-                                // We need both ImmSetConversionStatus and ImmSetOpenStatus here to surely disable IME's
+                                // We need both ImmSetConversionStatus and ImmSetOpenStatus here to surely disable IME's 
                                // keyboard hooking, because Some IME reacts only on the former and some other on the latter...
                                LLWinImm::setConversionStatus(himc, IME_CMODE_NOCONVERSION, sWinIMESentenceMode);
                                LLWinImm::setOpenStatus(himc, FALSE);
@@ -3555,7 +3101,7 @@ void LLWindowWin32::allowLanguageTextInput(LLPreeditor *preeditor, BOOL b)
        }
 }
-void LLWindowWin32::fillCandidateForm(const LLCoordGL& caret, const LLRect& bounds,
+void LLWindowWin32::fillCandidateForm(const LLCoordGL& caret, const LLRect& bounds, 
                CANDIDATEFORM *form)
 {
        LLCoordWindow caret_coord, top_left, bottom_right;
@@ -3584,7 +3130,7 @@ void LLWindowWin32::setLanguageTextInput( const LLCoordGL & position )
                LLCoordWindow win_pos;
                convertCoords( position, &win_pos );
-                if ( win_pos.mX >= 0 && win_pos.mY >= 0 &&
+                if ( win_pos.mX >= 0 && win_pos.mY >= 0 && 
                        (win_pos.mX != sWinIMEWindowPosition.mX) || (win_pos.mY != sWinIMEWindowPosition.mY) )
                {
                        COMPOSITIONFORM ime_form;
@@ -3649,13 +3195,13 @@ void LLWindowWin32::fillCompositionLogfont(LOGFONT *logfont)
                default:
                        logfont->lfCharSet = CHINESEBIG5_CHARSET;
                        lstrcpy(logfont->lfFaceName, TEXT("MingLiU"));
-                        break;
+                        break;                  
                }
                break;
        case LANG_JAPANESE:
                logfont->lfCharSet = SHIFTJIS_CHARSET;
                lstrcpy(logfont->lfFaceName, TEXT("MS Gothic"));
-                break;
+                break;          
        case LANG_KOREAN:
                logfont->lfCharSet = HANGUL_CHARSET;
                lstrcpy(logfont->lfFaceName, TEXT("Gulim"));
@@ -3665,10 +3211,10 @@ void LLWindowWin32::fillCompositionLogfont(LOGFONT *logfont)
                lstrcpy(logfont->lfFaceName, TEXT("Tahoma"));
                break;
        }
+                                                        
        logfont->lfHeight = mPreeditor->getPreeditFontSize();
        logfont->lfWeight = FW_NORMAL;
-}
+}       
 U32 LLWindowWin32::fillReconvertString(const LLWString &text,
        S32 focus, S32 focus_length, RECONVERTSTRING *reconvert_string)
@@ -3782,7 +3328,7 @@ void LLWindowWin32::handleCompositionMessage(const U32 indexes)
                        needs_update = TRUE;
                }
        }
+        
        if (indexes & GCS_COMPSTR)
        {
                LONG size = LLWinImm::getCompositionString(himc, GCS_COMPSTR, NULL, 0);
@@ -3877,7 +3423,7 @@ void LLWindowWin32::handleCompositionMessage(const U32 indexes)
                {
                        for (LLWString::const_iterator i = result_string.begin(); i != result_string.end(); i++)
                        {
-                                mPreeditor->handleUnicodeCharHere(*i, FALSE);
+                                mPreeditor->handleUnicodeCharHere(*i);
                        }
                }
@@ -3948,7 +3494,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
                                LLCoordGL caret_coord;
                                LLRect preedit_bounds;
                                mPreeditor->getPreeditLocation(-1, &caret_coord, &preedit_bounds, NULL);
+                                
                                CANDIDATEFORM *const form = (CANDIDATEFORM *)param;
                                DWORD const dwIndex = form->dwIndex;
                                fillCandidateForm(caret_coord, preedit_bounds, form);
@@ -3963,7 +3509,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
                                // char_position->dwCharPos counts in number of
                                // WCHARs, i.e., UTF-16 encoding units, so we can't simply pass the
-                                // number to getPreeditLocation.
+                                // number to getPreeditLocation.  
                                const LLWString & wtext = mPreeditor->getWText();
                                S32 preedit, preedit_length;
@@ -4037,7 +3583,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
                                const LLWString & wtext = mPreeditor->getWText();
                                S32 preedit, preedit_length;
                                mPreeditor->getPreeditRange(&preedit, &preedit_length);
+                                
                                S32 context_offset;
                                LLWString context = find_context(wtext, preedit, preedit_length, &context_offset);
                                preedit -= context_offset;
@@ -4048,7 +3594,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
                                        // Otherwise, some IME are confused.
                                        context.erase(preedit, preedit_length);
                                }
+                                
                                RECONVERTSTRING *reconvert_string = (RECONVERTSTRING *)param;
                                *result = fillReconvertString(context, preedit, 0, reconvert_string);
                                return TRUE;
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index f159d30..5535af4 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -59,7 +59,7 @@ public:
        /*virtual*/ BOOL getSize(LLCoordWindow *size);
        /*virtual*/ BOOL setPosition(LLCoordScreen position);
        /*virtual*/ BOOL setSize(LLCoordScreen size);
-        /*virtual*/ BOOL switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync);
+        /*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL);
        /*virtual*/ BOOL setCursorPosition(LLCoordWindow position);
        /*virtual*/ BOOL getCursorPosition(LLCoordWindow *position);
        /*virtual*/ void showCursor();
@@ -78,6 +78,8 @@ public:
        /*virtual*/ void flashIcon(F32 seconds);
        /*virtual*/ F32 getGamma();
        /*virtual*/ BOOL setGamma(const F32 gamma); // Set the gamma
+        /*virtual*/ void setFSAASamples(const U32 fsaa_samples);
+        /*virtual*/ U32 getFSAASamples();
        /*virtual*/ BOOL restoreGamma();                        // Restore original gamma table (before updating gamma)
        /*virtual*/ ESwapMethod getSwapMethod() { return mSwapMethod; }
        /*virtual*/ void gatherInput();
@@ -118,7 +120,7 @@ protected:
        LLWindowWin32(
                char *title, char *name, int x, int y, int width, int height, U32 flags, 
                BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
-                BOOL ignore_pixel_depth);
+                BOOL ignore_pixel_depth, U32 fsaa_samples);
        ~LLWindowWin32();
        void    initCursors();
@@ -184,6 +186,7 @@ protected:
        static BOOL sIsClassRegistered; // has the window class been registered?
        F32                     mCurrentGamma;
+        U32                     mFSAASamples;
        WORD            mPrevGammaRamp[256*3];
        WORD            mCurrentGammaRamp[256*3];
diff --git a/linden/indra/llxml/llcontrol.cpp b/linden/indra/llxml/llcontrol.cpp
index 5504a10..18292d2 100644
--- a/linden/indra/llxml/llcontrol.cpp
+++ b/linden/indra/llxml/llcontrol.cpp
@@ -39,7 +39,6 @@
 #include "llstl.h"
-#include "linked_lists.h"
 #include "llstring.h"
 #include "v3math.h"
 #include "v3dmath.h"
@@ -57,19 +56,9 @@
 #endif
 //this defines the current version of the settings file
-U32     LLControlBase::sMaxControlNameLength = 0;
-//These lists are used to store the ID's of registered event listeners.
-std::list<S32>                          LLControlBase::mFreeIDs;
-std::list<S32>                          LLControlBase::mUsedIDs;
-S32                                                     LLControlBase::mTopID;
-std::set<LLControlBase*>        LLControlBase::mChangedControls;
 const S32 CURRENT_VERSION = 101;
-BOOL LLControl::llsd_compare(const LLSD& a, const LLSD & b)
+BOOL LLControlVariable::llsd_compare(const LLSD& a, const LLSD & b)
 {
        switch (mType)
        {
@@ -101,58 +90,154 @@ BOOL LLControl::llsd_compare(const LLSD& a, const LLSD & b)
        return FALSE;
 }
-LLControlBase::~LLControlBase()
+LLControlVariable::LLControlVariable(const LLString& name, eControlType type,
+                                                         LLSD initial, const LLString& comment,
+                                                         BOOL persist)
+        : mName(name),
+          mComment(comment),
+          mType(type),
+          mPersist(persist)
+{
+        if (mPersist && mComment.empty())
+        {
+                llerrs << "Must supply a comment for control " << mName << llendl;
+        }
+        //Push back versus setValue'ing here, since we don't want to call a signal yet
+        mValues.push_back(initial);
+}
+LLControlVariable::~LLControlVariable()
+{
+}
+void LLControlVariable::setValue(const LLSD& value, bool saved_value)
 {
+    bool value_changed = llsd_compare(getValue(), value) == FALSE;
+        if(saved_value)
+        {
+        // If we're going to save this value, return to default but don't fire
+                resetToDefault(false);
+            if (llsd_compare(mValues.back(), value) == FALSE)
+            {
+                    mValues.push_back(value);
+            }
+        }
+    else
+    {
+        // This is a unsaved value. Its needs to reside at
+        // mValues[2] (or greater). It must not affect 
+        // the result of getSaveValue()
+            if (llsd_compare(mValues.back(), value) == FALSE)
+            {
+            while(mValues.size() > 2)
+            {
+                // Remove any unsaved values.
+                mValues.pop_back();
+            }
+            if(mValues.size() < 2)
+            {
+                // Add the default to the 'save' value.
+                mValues.push_back(mValues[0]);
+            }
+            // Add the 'un-save' value.
+            mValues.push_back(value);
+            }
+    }
+    if(value_changed)
+    {
+        mSignal(value); 
+    }
 }
-// virtual
+void LLControlVariable::resetToDefault(bool fire_signal)
-void LLControlBase::resetToDefault()
 {
+        //The first setting is always the default
+        //Pop to it and fire off the listener
+        while(mValues.size() > 1) mValues.pop_back();
+        if(fire_signal) firePropertyChanged();
+}
+bool LLControlVariable::isSaveValueDefault()
+{ 
+    return (mValues.size() ==  1) 
+        || ((mValues.size() > 1) && llsd_compare(mValues[1], mValues[0]));
 }
-LLControlGroup::LLControlGroup():       mNameTable()
+LLSD LLControlVariable::getSaveValue() const
 {
-        //mFreeStringOffset = 0;
+        //The first level of the stack is default
+        //We assume that the second level is user preferences that should be saved
+        if(mValues.size() > 1) return mValues[1];
+        return mValues[0];
 }
-LLControlGroup::~LLControlGroup()
+LLControlVariable*      LLControlGroup::getControl(const LLString& name)
+{
+        ctrl_name_table_t::iterator iter = mNameTable.find(name);
+        return iter == mNameTable.end() ? NULL : iter->second;
+}
+////////////////////////////////////////////////////////////////////////////
+LLControlGroup::LLControlGroup()
 {
+        mTypeString[TYPE_U32] = "U32";
+        mTypeString[TYPE_S32] = "S32";
+        mTypeString[TYPE_F32] = "F32";
+        mTypeString[TYPE_BOOLEAN] = "Boolean";
+        mTypeString[TYPE_STRING] = "String";
+        mTypeString[TYPE_VEC3] = "Vector3";
+    mTypeString[TYPE_VEC3D] = "Vector3D";
+        mTypeString[TYPE_RECT] = "Rect";
+        mTypeString[TYPE_COL4] = "Color4";
+        mTypeString[TYPE_COL3] = "Color3";
+        mTypeString[TYPE_COL4U] = "Color4u";
+        mTypeString[TYPE_LLSD] = "LLSD";
 }
-LLSD LLControlBase::registerListener(LLSimpleListenerObservable *listener, LLSD userdata)
+LLControlGroup::~LLControlGroup()
 {
-        // Symmetric listener relationship
+        cleanup();
-        addListener(listener, "", userdata);
-        listener->addListener(this, "", userdata);
-        return getValue();
 }
 void LLControlGroup::cleanup()
 {
+        for_each(mNameTable.begin(), mNameTable.end(), DeletePairedPointer());
        mNameTable.clear();
 }
-LLControlBase*  LLControlGroup::getControl(const LLString& name)
+eControlType LLControlGroup::typeStringToEnum(const LLString& typestr)
 {
-        ctrl_name_table_t::iterator iter = mNameTable.find(name);
+        for(int i = 0; i < (int)TYPE_COUNT; ++i)
-        return iter == mNameTable.end() ? NULL : (LLControlBase*)iter->second;
+        {
+                if(mTypeString[i] == typestr) return (eControlType)i;
+        }
+        return (eControlType)-1;
+}
+LLString LLControlGroup::typeEnumToString(eControlType typeenum)
+{
+        return mTypeString[typeenum];
 }
 BOOL LLControlGroup::declareControl(const LLString& name, eControlType type, const LLSD initial_val, const LLString& comment, BOOL persist)
 {
-        if(!mNameTable[name])
+        if(mNameTable.find(name) != mNameTable.end())
-        {
-                // if not, create the control and add it to the name table
-                LLControl* control = new LLControl(name, type, initial_val, comment, persist);
-                mNameTable[name] = control;
-                return TRUE;
-        }
-        else
        {
                llwarns << "LLControlGroup::declareControl: Control named " << name << " already exists." << llendl;
-                mNameTable.erase(name);
+                mNameTable[name]->setValue(initial_val);
-                return FALSE;
+                return TRUE;
        }
+        // if not, create the control and add it to the name table
+        LLControlVariable* control = new LLControlVariable(name, type, initial_val, comment, persist);
+        mNameTable[name] = control;     
+        return TRUE;
 }
 BOOL LLControlGroup::declareU32(const LLString& name, const U32 initial_val, const LLString& comment, BOOL persist)
@@ -210,19 +295,14 @@ BOOL LLControlGroup::declareColor3(const LLString& name, const LLColor3 &initial
        return declareControl(name, TYPE_COL3, initial_val.getValue(), comment, persist);
 }
-LLSD LLControlGroup::registerListener(const LLString& name, LLSimpleListenerObservable *listener)
+BOOL LLControlGroup::declareLLSD(const LLString& name, const LLSD &initial_val, const LLString& comment, BOOL persist )
 {
-        LLControlBase *control = getControl(name);
+        return declareControl(name, TYPE_LLSD, initial_val, comment, persist);
-        if (control)
-        {
-                return control->registerListener(listener);
-        }
-        return LLSD();
 }
 BOOL LLControlGroup::getBOOL(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_BOOLEAN))
                return control->get().asBoolean();
@@ -235,7 +315,7 @@ BOOL LLControlGroup::getBOOL(const LLString& name)
 S32 LLControlGroup::getS32(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_S32))
                return control->get().asInteger();
@@ -248,7 +328,7 @@ S32 LLControlGroup::getS32(const LLString& name)
 U32 LLControlGroup::getU32(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_U32))               
                return control->get().asInteger();
@@ -261,7 +341,7 @@ U32 LLControlGroup::getU32(const LLString& name)
 F32 LLControlGroup::getF32(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_F32))
                return (F32) control->get().asReal();
@@ -274,7 +354,7 @@ F32 LLControlGroup::getF32(const LLString& name)
 LLString LLControlGroup::findString(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_STRING))
                return control->get().asString();
@@ -283,7 +363,7 @@ LLString LLControlGroup::findString(const LLString& name)
 LLString LLControlGroup::getString(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_STRING))
                return control->get().asString();
@@ -309,7 +389,7 @@ LLString LLControlGroup::getText(const LLString& name)
 LLVector3 LLControlGroup::getVector3(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_VEC3))
                return control->get();
@@ -322,7 +402,7 @@ LLVector3 LLControlGroup::getVector3(const LLString& name)
 LLVector3d LLControlGroup::getVector3d(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_VEC3D))
                return control->get();
@@ -335,7 +415,7 @@ LLVector3d LLControlGroup::getVector3d(const LLString& name)
 LLRect LLControlGroup::getRect(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_RECT))
                return control->get();
@@ -353,7 +433,7 @@ LLColor4 LLControlGroup::getColor(const LLString& name)
        if (i != mNameTable.end())
        {
-                LLControlBase* control = i->second;
+                LLControlVariable* control = i->second;
                switch(control->mType)
                {
@@ -381,7 +461,7 @@ LLColor4 LLControlGroup::getColor(const LLString& name)
 LLColor4U LLControlGroup::getColor4U(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_COL4U))
                return control->get();
@@ -394,7 +474,7 @@ LLColor4U LLControlGroup::getColor4U(const LLString& name)
 LLColor4 LLControlGroup::getColor4(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_COL4))
                return control->get();
@@ -407,7 +487,7 @@ LLColor4 LLControlGroup::getColor4(const LLString& name)
 LLColor3 LLControlGroup::getColor3(const LLString& name)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_COL3))
                return control->get();
@@ -418,6 +498,16 @@ LLColor3 LLControlGroup::getColor3(const LLString& name)
        }
 }
+LLSD LLControlGroup::getLLSD(const LLString& name)
+{
+        LLControlVariable* control = getControl(name);
+        
+        if (control && control->isType(TYPE_LLSD))
+                return control->getValue();
+        CONTROL_ERRS << "Invalid LLSD control " << name << llendl;
+        return LLSD();
+}
 BOOL LLControlGroup::controlExists(const LLString& name)
 {
        ctrl_name_table_t::iterator iter = mNameTable.find(name);
@@ -430,7 +520,7 @@ BOOL LLControlGroup::controlExists(const LLString& name)
 void LLControlGroup::setBOOL(const LLString& name, BOOL val)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_BOOLEAN))
        {
@@ -445,7 +535,7 @@ void LLControlGroup::setBOOL(const LLString& name, BOOL val)
 void LLControlGroup::setS32(const LLString& name, S32 val)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_S32))
        {
@@ -460,7 +550,7 @@ void LLControlGroup::setS32(const LLString& name, S32 val)
 void LLControlGroup::setF32(const LLString& name, F32 val)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_F32))
        {
@@ -475,7 +565,7 @@ void LLControlGroup::setF32(const LLString& name, F32 val)
 void LLControlGroup::setU32(const LLString& name, U32 val)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_U32))
        {
@@ -490,7 +580,7 @@ void LLControlGroup::setU32(const LLString& name, U32 val)
 void LLControlGroup::setString(const LLString& name, const LLString &val)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_STRING))
        {
@@ -505,7 +595,7 @@ void LLControlGroup::setString(const LLString& name, const LLString &val)
 void LLControlGroup::setVector3(const LLString& name, const LLVector3 &val)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_VEC3))
        {
@@ -519,7 +609,7 @@ void LLControlGroup::setVector3(const LLString& name, const LLVector3 &val)
 void LLControlGroup::setVector3d(const LLString& name, const LLVector3d &val)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_VEC3D))
        {
@@ -533,7 +623,7 @@ void LLControlGroup::setVector3d(const LLString& name, const LLVector3d &val)
 void LLControlGroup::setRect(const LLString& name, const LLRect &val)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        if (control && control->isType(TYPE_RECT))
        {
@@ -547,7 +637,7 @@ void LLControlGroup::setRect(const LLString& name, const LLRect &val)
 void LLControlGroup::setColor4U(const LLString& name, const LLColor4U &val)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_COL4U))
        {
@@ -561,7 +651,7 @@ void LLControlGroup::setColor4U(const LLString& name, const LLColor4U &val)
 void LLControlGroup::setColor4(const LLString& name, const LLColor4 &val)
 {
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control && control->isType(TYPE_COL4))
        {
@@ -573,6 +663,20 @@ void LLControlGroup::setColor4(const LLString& name, const LLColor4 &val)
        }
 }
+void LLControlGroup::setLLSD(const LLString& name, const LLSD& val)
+{
+        LLControlVariable* control = getControl(name);
+        
+        if (control && control->isType(TYPE_LLSD))
+        {
+                setValue(name, val);
+        }
+        else
+        {
+                CONTROL_ERRS << "Invalid LLSD control " << name << llendl;
+        }
+}
 void LLControlGroup::setValue(const LLString& name, const LLSD& val)
 {
        if (name.empty())
@@ -580,7 +684,7 @@ void LLControlGroup::setValue(const LLString& name, const LLSD& val)
                return;
        }
-        LLControlBase* control = getControl(name);
+        LLControlVariable* control = getControl(name);
        
        if (control)
        {
@@ -596,238 +700,8 @@ void LLControlGroup::setValue(const LLString& name, const LLSD& val)
 // Load and save
 //---------------------------------------------------------------
-U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_declaration, eControlType declare_as)
-{
-        U32             item = 0;
-        U32             validitems = 0;
-        llifstream file;
-        S32 version;
-        
-        file.open(filename.c_str());            /*Flawfinder: ignore*/ 
-        if (!file)
-        {
-                llinfos << "LLControlGroup::loadFromFile unable to open." << llendl;
-                return 0;
-        }
-        // Check file version
-        LLString name;
-        file >> name;
-        file >> version;
-        if (name != "version" || version != CURRENT_VERSION)
-        {
-                llinfos << filename << " does not appear to be a version " << CURRENT_VERSION << " controls file" << llendl;
-                return 0;
-        }
-        while (!file.eof())
-        {
-                file >> name;
-                
-                if (name.empty())
-                {
-                        continue;
-                }
-                if (name.substr(0,2) == "//")
-                {
-                        // This is a comment.
-                        char buffer[MAX_STRING];                /*Flawfinder: ignore*/
-                        file.getline(buffer, MAX_STRING);
-                        continue;
-                }
-                BOOL declared = mNameTable.find(name) != mNameTable.end();
-                if (require_declaration && !declared)
-                {
-                        // Declaration required, but this name not declared.
-                        // Complain about non-empty names.
-                        if (!name.empty())
-                        {
-                                //read in to end of line
-                                char buffer[MAX_STRING];                /*Flawfinder: ignore*/
-                                file.getline(buffer, MAX_STRING);
-                                llwarns << "LLControlGroup::loadFromFile() : Trying to set \"" << name << "\", setting doesn't exist." << llendl;
-                        }
-                        continue;
-                }
-                // Got an item.  Load it up.
-                item++;
-                // If not declared, assume it's a string
-                if (!declared)
-                {
-                        switch(declare_as)
-                        {
-                        case TYPE_COL4:
-                                declareColor4(name, LLColor4::white, LLString::null, NO_PERSIST);
-                                break;
-                        case TYPE_COL4U:
-                                declareColor4U(name, LLColor4U::white, LLString::null, NO_PERSIST);
-                                break;
-                        case TYPE_STRING:
-                        default:
-                                declareString(name, LLString::null, LLString::null, NO_PERSIST);
-                                break;
-                        }
-                }
-                // Control name has been declared in code.
-                LLControlBase *control = getControl(name);
-                llassert(control);
-                mLoadedSettings.insert(name);
-                
-                switch(control->mType)
-                {
-                case TYPE_F32:
-                        {
-                                F32 initial;
-                                file >> initial;
-                                control->set(initial);
-                                validitems++;
-                        }
-                        break;
-                case TYPE_S32:
-                        {
-                                S32 initial;
-                                file >> initial;
-                                control->set(initial);
-                                validitems++;
-                        }
-                        break;
-                case TYPE_U32:
-                        {
-                                U32 initial;
-                                file >> initial;
-                                control->set((LLSD::Integer) initial);
-                                validitems++;
-                        }
-                        break;
-                case TYPE_BOOLEAN:
-                        {
-                                char boolstring[256];           /*Flawfinder: ignore*/
-                                BOOL valid = FALSE;
-                                BOOL initial = FALSE;
-                                file >> boolstring;
-                                if (!strcmp("TRUE", boolstring))
-                                {
-                                        initial = TRUE;
-                                        valid = TRUE;
-                                }
-                                else if (!strcmp("FALSE", boolstring))
-                                {
-                                        initial = FALSE;
-                                        valid = TRUE;
-                                }
-                                if (valid)
-                                {
-                                        control->set(initial);
-                                }
-                                else
-                                {
-                                        llinfos << filename << "Item " << item << ": Invalid BOOL control " << name << ", " << boolstring << llendl; 
-                                }
-                                validitems++;
-                        }
-                        break;
-                case TYPE_STRING:
-                        {
-                                LLString string;
-                                
-                                file >> string;
-                                
-                                control->set(string);
-                                validitems++;
-                        }
-                        break;
-                case TYPE_VEC3:
-                        {
-                                F32 x, y, z;
-                                file >> x >> y >> z;
-                                LLVector3 vector(x, y, z);
-                                control->set(vector.getValue());
-                                validitems++;
-                        }
-                        break;
-                case TYPE_VEC3D:
-                        {
-                                F64 x, y, z;
-                                file >> x >> y >> z;
-                                LLVector3d vector(x, y, z);
-                                control->set(vector.getValue());
-                                validitems++;
-                        }
-                        break;
-                case TYPE_RECT:
-                        {
-                                S32 left, bottom, width, height;
-                                file >> left >> bottom >> width >> height;
-                                LLRect rect;
-                                rect.setOriginAndSize(left, bottom, width, height);
-                                control->set(rect.getValue());
-                                validitems++;
-                        }
-                        break;
-                case TYPE_COL4U:
-                        {
-                                S32 red, green, blue, alpha;
-                                LLColor4U color;
-                                file >> red >> green >> blue >> alpha;
-                                color.setVec(red, green, blue, alpha);
-                                control->set(color.getValue());
-                                validitems++;
-                        }
-                        break;
-                case TYPE_COL4:
-                        {
-                                LLColor4 color;
-                                file >> color.mV[VRED] >> color.mV[VGREEN]
-                                         >> color.mV[VBLUE] >> color.mV[VALPHA];
-                                control->set(color.getValue());
-                                validitems++;
-                        }
-                        break;
-                case TYPE_COL3:
-                        {
-                                LLColor3 color;
-                                file >> color.mV[VRED] >> color.mV[VGREEN]
-                                         >> color.mV[VBLUE];
-                                control->set(color.getValue());
-                                validitems++;
-                        }
-                        break;
-                }
-        }
-        file.close();
-        return validitems;
-}
 // Returns number of controls loaded, so 0 if failure
-U32 LLControlGroup::loadFromFile(const LLString& filename, BOOL require_declaration, eControlType declare_as)
+U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_declaration, eControlType declare_as)
 {
        LLString name;
@@ -901,11 +775,9 @@ U32 LLControlGroup::loadFromFile(const LLString& filename, BOOL require_declarat
                }
                // Control name has been declared in code.
-                LLControlBase *control = getControl(name);
+                LLControlVariable *control = getControl(name);
                llassert(control);
-                mLoadedSettings.insert(name);
                
                switch(control->mType)
                {
@@ -1019,59 +891,43 @@ U32 LLControlGroup::loadFromFile(const LLString& filename, BOOL require_declarat
                                LLVector3 color;
                                
                                child_nodep->getAttributeVector3("value", color);
-                control->set(LLColor3(color.mV).getValue());
+                                control->set(LLColor3(color.mV).getValue());
                                validitems++;
                        }
                        break;
-                }
+                default:
+                  break;
+                }
+        
                child_nodep = rootp->getNextChild();
        }
        return validitems;
 }
-struct compare_controls
-{
-        bool operator() (const LLControlBase* const a, const LLControlBase* const b) const
-        {
-                return a->getName() < b->getName();
-        }
-};
 U32 LLControlGroup::saveToFile(const LLString& filename, BOOL nondefault_only)
 {
-        const char ENDL = '\n';
+        LLSD settings;
+        int num_saved = 0;
-        llinfos << "Saving settings to file: " << filename << llendl;
-        // place the objects in a temporary container that enforces a sort
-        // order to ease manual editing of the file
-        typedef std::set< LLControlBase*, compare_controls > control_list_t;
-        control_list_t controls;
        for (ctrl_name_table_t::iterator iter = mNameTable.begin();
                 iter != mNameTable.end(); iter++)
        {
-                LLString name = iter->first;
+                LLControlVariable* control = iter->second;
-                if (name.empty())
-                {
-                        CONTROL_ERRS << "Control with no name found!!!" << llendl;
-                        break;
-                }
-                LLControlBase* control = (LLControlBase *)iter->second;
                if (!control)
                {
-                        llwarns << "Tried to save invalid control: " << name << llendl;
+                        llwarns << "Tried to save invalid control: " << iter->first << llendl;
                }
-                if( control && control->mPersist )
+                if( control && control->isPersisted() )
                {
-                        if (!(nondefault_only && (control->mIsDefault)))
+                        if (!(nondefault_only && (control->isSaveValueDefault())))
                        {
-                                controls.insert( control );
+                                settings[iter->first]["Type"] = typeEnumToString(control->type());
+                                settings[iter->first]["Comment"] = control->getComment();
+                                settings[iter->first]["Value"] = control->getSaveValue();
+                                ++num_saved;
                        }
                        else
                        {
@@ -1080,156 +936,58 @@ U32 LLControlGroup::saveToFile(const LLString& filename, BOOL nondefault_only)
                        }
                }
        }
        llofstream file;
-        file.open(filename.c_str());            /*Flawfinder: ignore*/
+        file.open(filename.c_str());
+        if (file.is_open())
-        if (!file.is_open())
        {
-                // This is a warning because sometime we want to use settings files which can't be written...
+                LLSDSerialize::toPrettyXML(settings, file);
-                llwarns << "LLControlGroup::saveToFile unable to open file for writing" << llendl;
+                file.close();
-                return 0;
+                llinfos << "Saved to " << filename << llendl;
        }
+        else
-        // Write file version
-        file << "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>\n";
-        file << "<settings version = \"" << CURRENT_VERSION << "\">\n";
-        for (control_list_t::iterator iter = controls.begin();
-                 iter != controls.end(); ++iter)
        {
-                LLControlBase* control = *iter;
+        // This is a warning because sometime we want to use settings files which can't be written...
-                file << "\t<!--" << control->comment() << "-->" << ENDL;
+                llwarns << "Unable to open settings file: " << filename << llendl;
-                LLString name = control->getName();
+                return 0;
-                switch (control->type())
+        }
-                {
+        return num_saved;
-                        case TYPE_U32:
-                        {
-                                file << "\t<" << name << " value=\"" << (U32) control->get().asInteger() << "\"/>\n";
-                                break;
-                        }
-                        case TYPE_S32:
-                        {
-                                file << "\t<" << name << " value=\"" << (S32) control->get().asInteger() << "\"/>\n";
-                                break;
-                        }
-                        case TYPE_F32:
-                        {
-                                file << "\t<" << name << " value=\"" << (F32) control->get().asReal() << "\"/>\n";
-                                break;
-                        }
-                        case TYPE_VEC3:
-                        {
-                                LLVector3 vector(control->get());
-                                file << "\t<" << name << " value=\"" << vector.mV[VX] << " " << vector.mV[VY] << " " << vector.mV[VZ] << "\"/>\n";
-                                break;
-                        }
-                        case TYPE_VEC3D:
-                        {
-                                LLVector3d vector(control->get());
-                                file << "\t<" << name << " value=\"" << vector.mdV[VX] << " " << vector.mdV[VY] << " " << vector.mdV[VZ] << "\"/>\n";
-                                break;
-                        }
-                        case TYPE_RECT:
-                        {
-                                LLRect rect(control->get());
-                                file << "\t<" << name << " value=\"" << rect.mLeft << " " << rect.mBottom << " " << rect.getWidth() << " " << rect.getHeight() << "\"/>\n";
-                                break;
-                        }
-                        case TYPE_COL4:
-                        {
-                                LLColor4 color(control->get());
-                                file << "\t<" << name << " value=\"" << color.mV[VRED] << ", " << color.mV[VGREEN] << ", " << color.mV[VBLUE] << ", " << color.mV[VALPHA] << "\"/>\n";
-                                break;
-                        }
-                        case TYPE_COL3:
-                        {
-                                LLColor3 color(control->get());
-                                file << "\t<" << name << " value=\"" << color.mV[VRED] << ", " << color.mV[VGREEN] << ", " << color.mV[VBLUE] << "\"/>\n";
-                                break;
-                        }
-                        case TYPE_BOOLEAN:
-                        {
-                                file << "\t<" << name << " value=\"" << (control->get().asBoolean() ? "TRUE" : "FALSE") << "\"/>\n";                    
-                                break;
-                        }
-                        case TYPE_STRING:
-                        {
-                                file << "\t<" << name << " value=\"" << LLSDXMLFormatter::escapeString(control->get().asString()) << "\"/>\n";
-                                break;
-                        }
-                        default:
-                        {
-                                CONTROL_ERRS << "LLControlGroup::saveToFile - unknown control type!" << llendl;
-                                break;
-                        }
-                }
-                // Debug spam
-                // llinfos << name << " " << control->getValue().asString() << llendl;
-        }// next
-        file << "</settings>\n";
-        file.close();
-        return controls.size();
 }
-void LLControlGroup::applyOverrides(const std::map<std::string, std::string>& overrides)
+U32 LLControlGroup::loadFromFile(const LLString& filename, BOOL require_declaration, eControlType declare_as)
 {
-        for (std::map<std::string, std::string>::const_iterator iter = overrides.begin();
+        LLString name;
-                 iter != overrides.end(); ++iter)
+        LLSD settings;
+        LLSD control_map;
+        llifstream infile;
+        infile.open(filename.c_str());
+        if(!infile.is_open())
        {
-                const std::string& command = iter->first;
+                llwarns << "Cannot find file " << filename << " to load." << llendl;
-                const std::string& value = iter->second;
+                return 0;
-                LLControlBase* control = (LLControlBase *)mNameTable[command];
+        }
-                if (control)
+        S32 ret = LLSDSerialize::fromXML(settings, infile);
-                {
+        if (ret <= 0)
-                        switch(control->mType)
+        {
-                        {
+                infile.close();
-                        case TYPE_U32:
+                llwarns << "Unable to open LLSD control file " << filename << ". Trying Legacy Method." << llendl;              
-                                control->set((LLSD::Integer)atof(value.c_str()));
+                return loadFromFileLegacy(filename, require_declaration, declare_as);
-                                break;
+        }
-                        case TYPE_S32:
-                                control->set((S32)atof(value.c_str()));
+        U32             validitems = 0;
-                                break;
+        int persist = 1;
-                        case TYPE_F32:
+        for(LLSD::map_const_iterator itr = settings.beginMap(); itr != settings.endMap(); ++itr)
-                                control->set((F32)atof(value.c_str()));
+        {
-                                break;
+                name = (*itr).first;
-                        case TYPE_BOOLEAN:
+                control_map = (*itr).second;
-                                if (!LLString::compareInsensitive(value.c_str(), "TRUE"))
+                
-                                {
+                if(control_map.has("Persist")) persist = control_map["Persist"].asInteger();
-                                        control->set(TRUE);
+                
-                                } 
+                declareControl(name, typeStringToEnum(control_map["Type"].asString()), control_map["Value"], control_map["Comment"].asString(), persist);
-                                else if (!LLString::compareInsensitive(value.c_str(), "FALSE"))
+                
-                                {
+                ++validitems;
-                                        control->set(FALSE);
-                                }
-                                else
-                                {
-                                        control->set((BOOL)atof(value.c_str()));
-                                }
-                                break;
-                        case TYPE_STRING:
-                                control->set(value);
-                                break;
-//                      // *FIX: implement this given time and need.
-//                      case TYPE_UUID:
-//                              break;
-                        // we don't support command line overrides of vec3 or col4
-                        // yet - requires parsing of multiple values
-                        case TYPE_VEC3:
-                        case TYPE_VEC3D:
-                        case TYPE_COL4:
-                        case TYPE_COL3:
-                        default:
-                                break;
-                        }
-                }
-                else
-                {
-                        llinfos << "There is no control variable " << command << llendl;
-                }
        }
+        return validitems;
 }
 void LLControlGroup::resetToDefaults()
@@ -1239,11 +997,20 @@ void LLControlGroup::resetToDefaults()
                control_iter != mNameTable.end();
                ++control_iter)
        {
-                LLControlBase* control = (*control_iter).second;
+                LLControlVariable* control = (*control_iter).second;
                control->resetToDefault();
        }
 }
+void LLControlGroup::applyToAll(ApplyFunctor* func)
+{
+        for (ctrl_name_table_t::iterator iter = mNameTable.begin();
+                 iter != mNameTable.end(); iter++)
+        {
+                func->apply(iter->first, iter->second);
+        }
+}
 //============================================================================
 // First-use
@@ -1264,7 +1031,7 @@ static LLString get_warn_name(const LLString& name)
 void LLControlGroup::addWarning(const LLString& name)
 {
        LLString warnname = get_warn_name(name);
-        if(!mNameTable[warnname])
+        if(mNameTable.find(warnname) == mNameTable.end())
        {
                LLString comment = LLString("Enables ") + name + LLString(" warning dialog");
                declareBOOL(warnname, TRUE, comment);
@@ -1293,91 +1060,6 @@ void LLControlGroup::resetWarnings()
        }
 }
-//=============================================================================
-// Listener ID generator/management
-void    LLControlBase::releaseListenerID(S32    id)
-{       
-        mFreeIDs.push_back(id);
-}
-S32     LLControlBase::allocateListenerID()
-{       
-        if(mFreeIDs.size() == 0)
-        {       //Out of IDs so generate some new ones.
-                for(int t=0;t<32;t++)
-                {
-                        mFreeIDs.push_back(mTopID++);
-                }
-        }
-        S32     rtn = mFreeIDs.front();
-        mFreeIDs.pop_front();
-        mUsedIDs.push_back(rtn);
-        return rtn;
-}
-bool LLControlBase::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-{
-        if (event->desc() == "value_changed")
-        {
-                setValue(((LLValueChangedEvent*)(LLEvent*)event)->mValue);
-                return TRUE;
-        }
-        return TRUE;
-}
-void LLControlBase::firePropertyChanged()
-{
-        LLValueChangedEvent *evt = new LLValueChangedEvent(this, getValue());
-        fireEvent(evt, "");
-}
-//============================================================================
-// Used to add a listener callback that will be called on the frame that the controls value changes
-S32 LLControl::addListener(LLControl::tListenerCallback* cbfn)
-{
-        S32     id = allocateListenerID();
-        mListeners.push_back(cbfn);
-        mListenerIDs.push_back( id );
-        return id;
-}
-void LLControl::updateListeners() {
-        LLControl::tPropertyChangedListIter iter = mChangeEvents.begin();
-        while(iter!=mChangeEvents.end()){
-                LLControl::tPropertyChangedEvent&       evt = *iter;
-                (*evt.mCBFN)(evt.mNewValue,evt.mID,*this);
-                iter++;
-        }
-        mChangeEvents.clear();
-}
-//static
-void    LLControlBase::updateAllListeners()
-{
-        std::set< LLControlBase* >::iterator iter = mChangedControls.begin();
-        while(iter != mChangedControls.end()){
-                (*iter)->updateListeners();
-                iter++;
-        }
-        mChangedControls.clear();
-}
-LLControl::LLControl(
-        const LLString& name,
-        eControlType type,
-        LLSD initial,
-        const LLString& comment,
-        BOOL persist) :
-        LLControlBase(name, type, comment, persist),
-        mCurrent(initial),
-        mDefault(initial)
-{
-}
 //============================================================================
 #ifdef TEST_HARNESS
@@ -1393,17 +1075,17 @@ void main()
        llinfos << "Loaded " << count << " controls" << llendl;
        // test insertion
-        foo = new LLControl<F32>("gFoo", 5.f, 1.f, 20.f);
+        foo = new LLControlVariable<F32>("gFoo", 5.f, 1.f, 20.f);
        gGlobals.addEntry("gFoo", foo);
-        bar = new LLControl<S32>("gBar", 10, 2, 22);
+        bar = new LLControlVariable<S32>("gBar", 10, 2, 22);
        gGlobals.addEntry("gBar", bar);
-        baz = new LLControl<BOOL>("gBaz", FALSE);
+        baz = new LLControlVariable<BOOL>("gBaz", FALSE);
        gGlobals.addEntry("gBaz", baz);
        // test retrieval
-        getfoo = (LLControl<F32>*) gGlobals.resolveName("gFoo");
+        getfoo = (LLControlVariable<F32>*) gGlobals.resolveName("gFoo");
        getfoo->dump();
        getbar = (S32_CONTROL) gGlobals.resolveName("gBar");
@@ -1416,10 +1098,10 @@ void main()
        // Failure modes
        // ...min > max
-        // badfoo = new LLControl<F32>("gFoo2", 100.f, 20.f, 5.f);
+        // badfoo = new LLControlVariable<F32>("gFoo2", 100.f, 20.f, 5.f);
        // ...initial > max
-        // badbar = new LLControl<S32>("gBar2", 10, 20, 100000);
+        // badbar = new LLControlVariable<S32>("gBar2", 10, 20, 100000);
        // ...misspelled name
        // getfoo = (F32_CONTROL) gGlobals.resolveName("fooMisspelled");
@@ -1441,3 +1123,4 @@ void main()
 }
 #endif
diff --git a/linden/indra/llxml/llcontrol.h b/linden/indra/llxml/llcontrol.h
index e717bf1..9e11628 100644
--- a/linden/indra/llxml/llcontrol.h
+++ b/linden/indra/llxml/llcontrol.h
@@ -38,6 +38,26 @@
 #include "llstring.h"
 #include "llrect.h"
+#include <vector>
+// *NOTE: boost::visit_each<> generates warning 4675 on .net 2003
+// Disable the warning for the boost includes.
+#if LL_WINDOWS
+# if (_MSC_VER >= 1300 && _MSC_VER < 1400)
+#   pragma warning(push)
+#   pragma warning( disable : 4675 )
+# endif
+#endif
+#include <boost/bind.hpp>
+#include <boost/signal.hpp>
+#if LL_WINDOWS
+# if (_MSC_VER >= 1300 && _MSC_VER < 1400)
+#   pragma warning(pop)
+# endif
+#endif
 class LLVector3;
 class LLVector3d;
 class LLColor4;
@@ -48,7 +68,7 @@ const BOOL NO_PERSIST = FALSE;
 typedef enum e_control_type
 {
-        TYPE_U32,
+        TYPE_U32 = 0,
        TYPE_S32,
        TYPE_F32,
        TYPE_BOOLEAN,
@@ -58,159 +78,82 @@ typedef enum e_control_type
        TYPE_RECT,
        TYPE_COL4,
        TYPE_COL3,
-        TYPE_COL4U
+        TYPE_COL4U,
+        TYPE_LLSD,
+        TYPE_COUNT
 } eControlType;
-class LLControlBase : public LLSimpleListenerObservable
+class LLControlVariable
 {
-friend class LLControlGroup;
+        friend class LLControlGroup;
-protected:
+        typedef boost::signal<void(const LLSD&)> signal_t;
+private:
        LLString                mName;
        LLString                mComment;
        eControlType    mType;
-        BOOL                    mHasRange;
        BOOL                    mPersist;
-        BOOL            mIsDefault;
+        std::vector<LLSD> mValues;
+        
-        static  std::set<LLControlBase*>        mChangedControls;
+        signal_t mSignal;
-        static  std::list<S32>                          mFreeIDs;//These lists are used to store the ID's of registered event listeners.
+        
-        static  std::list<S32>                          mUsedIDs;
-        static  S32                                                     mTopID;//This is the index of the highest ID event listener ID. When the free pool is exhausted, new IDs are allocated from here.
 public:
-        static  void                                            releaseListenerID(S32   id);
+        LLControlVariable(const LLString& name, eControlType type,
-        static  S32                                                     allocateListenerID();
+                                          LLSD initial, const LLString& comment,
-        static  void                                            updateAllListeners();
+                                          BOOL persist = TRUE);
-        virtual void updateListeners() = 0;
-        LLControlBase(const LLString& name, eControlType type, const LLString& comment, BOOL persist)
-                : mName(name),
-                mComment(comment),
-                mType(type),
-                mHasRange(FALSE),
-                mPersist(persist),
-                mIsDefault(TRUE)
-        { 
-                if (mPersist && mComment.empty())
-                {
-                        llerrs << "Must supply a comment for control " << mName << llendl;
-                }
-                sMaxControlNameLength = llmax((U32)mName.size(), sMaxControlNameLength);
-        }
-        virtual ~LLControlBase();
+        virtual ~LLControlVariable();
+        
        const LLString& getName() const { return mName; }
        const LLString& getComment() const { return mComment; }
        eControlType type()             { return mType; }
-        BOOL    isType(eControlType tp) { return tp == mType; }
+        BOOL isType(eControlType tp) { return tp == mType; }
-        // Defaults to no-op
+        void resetToDefault(bool fire_signal = TRUE);
-        virtual void resetToDefault();
+        signal_t* getSignal() { return &mSignal; }
-        LLSD registerListener(LLSimpleListenerObservable *listener, LLSD userdata = "");
+        bool isDefault() { return (mValues.size() == 1); }
-        virtual LLSD get() const = 0;
+        bool isSaveValueDefault();
-        virtual LLSD getValue() const = 0;
+        bool isPersisted() { return mPersist; }
-        virtual void setValue(LLSD value) = 0;
+        void set(const LLSD& val)       { setValue(val); }
-        virtual void set(LLSD value) = 0;
+        LLSD get()                      const   { return getValue(); }
+        LLSD getDefault()       const   { return mValues.front(); }
-        // From LLSimpleListener
+        LLSD getValue()         const   { return mValues.back(); }
-        virtual bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        LLSD getSaveValue() const;
+        void setValue(const LLSD& value, bool saved_value = TRUE);
-        void firePropertyChanged();
+        void firePropertyChanged()
-        static U32      sMaxControlNameLength;
-protected:
-        const char* name()                      { return mName.c_str(); }
-        const char* comment()           { return mComment.c_str(); }
-};
-class LLControl
-: public LLControlBase
-{
-friend class LLControlGroup;
-protected:
-        LLSD mCurrent;
-        LLSD mDefault;
-public: 
-        typedef void    tListenerCallback(const LLSD&   newValue,S32    listenerID, LLControl& control);
-        typedef struct{
-                S32                                     mID;
-                LLSD                    mNewValue;
-                tListenerCallback*      mCBFN;
-        }tPropertyChangedEvent;
-        typedef std::list<tPropertyChangedEvent>::iterator tPropertyChangedListIter;
-        std::list<tPropertyChangedEvent>        mChangeEvents;
-        std::list< tListenerCallback* >         mListeners;
-        std::list< S32 >                                        mListenerIDs;
-        virtual void                                            updateListeners();
-        S32                                                                     addListener(tListenerCallback*  cbfn);
-        
-        LLControl(
-                const LLString& name,
-                eControlType type,
-                LLSD initial, const
-                LLString& comment,
-                BOOL persist = TRUE);
-        void set(LLSD val)                      { setValue(val); }
-        LLSD get()                      const   { return getValue(); } 
-        LLSD getdefault()       const   { return mDefault; }
-        LLSD getValue()         const   { return mCurrent; }
-        BOOL llsd_compare(const LLSD& a, const LLSD& b);
-        void setValue(LLSD value)                       
-        { 
-                if (llsd_compare(mCurrent, value) == FALSE)
-                {
-                        mCurrent = value; 
-                        mIsDefault = llsd_compare(mCurrent, mDefault); 
-                        firePropertyChanged(); 
-                }
-        }
-        /*virtual*/ void resetToDefault() 
-        { 
-                setValue(mDefault);
-        }
-        virtual ~LLControl()
        {
-                //Remove and deregister all listeners..
+                mSignal(mValues.back());
-                while(mListenerIDs.size())
-                {
-                        S32     id = mListenerIDs.front();
-                        mListenerIDs.pop_front();
-                        releaseListenerID(id);
-                }
        }
+        BOOL llsd_compare(const LLSD& a, const LLSD& b);
 };
 //const U32 STRING_CACHE_SIZE = 10000;
 class LLControlGroup
 {
-public:
+protected:
-        typedef std::map<LLString, LLPointer<LLControlBase> > ctrl_name_table_t;
+        typedef std::map<LLString, LLControlVariable* > ctrl_name_table_t;
        ctrl_name_table_t mNameTable;
        std::set<LLString> mWarnings;
-        std::set<LLString> mLoadedSettings;     // Filled in with names loaded from settings.xml
+        LLString mTypeString[TYPE_COUNT];
+        eControlType typeStringToEnum(const LLString& typestr);
+        LLString typeEnumToString(eControlType typeenum);       
 public:
        LLControlGroup();
        ~LLControlGroup();
        void cleanup();
-        bool hasLoaded(const LLString& name) { return mLoadedSettings.find(name) != mLoadedSettings.end(); }
-        void clearLoaded() { mLoadedSettings.clear(); } // Call once we've done any settings tweaks which may need this data
        
-        LLControlBase*  getControl(const LLString& name);
+        LLControlVariable*      getControl(const LLString& name);
-        LLSD registerListener(const LLString& name, LLSimpleListenerObservable *listener);
+        struct ApplyFunctor
+        {
+                virtual ~ApplyFunctor() {};
+                virtual void apply(const LLString& name, LLControlVariable* control) = 0;
+        };
+        void applyToAll(ApplyFunctor* func);
        
        BOOL declareControl(const LLString& name, eControlType type, const LLSD initial_val, const LLString& comment, BOOL persist);
        BOOL declareU32(const LLString& name, U32 initial_val, const LLString& comment, BOOL persist = TRUE);
@@ -224,6 +167,7 @@ public:
        BOOL declareColor4U(const LLString& name, const LLColor4U &initial_val, const LLString& comment, BOOL persist = TRUE);
        BOOL declareColor4(const LLString& name, const LLColor4 &initial_val, const LLString& comment, BOOL persist = TRUE);
        BOOL declareColor3(const LLString& name, const LLColor3 &initial_val, const LLString& comment, BOOL persist = TRUE);
+        BOOL declareLLSD(const LLString& name, const LLSD &initial_val, const LLString& comment, BOOL persist = TRUE);
        
        LLString        findString(const LLString& name);
@@ -237,7 +181,7 @@ public:
        S32                     getS32(const LLString& name);
        F32                     getF32(const LLString& name);
        U32                     getU32(const LLString& name);
-        LLSD            getValue(const LLString& name);
+        LLSD        getLLSD(const LLString& name);
        // Note: If an LLColor4U control exists, it will cast it to the correct
@@ -258,19 +202,21 @@ public:
        void    setColor4U(const LLString& name, const LLColor4U &val);
        void    setColor4(const LLString& name, const LLColor4 &val);
        void    setColor3(const LLString& name, const LLColor3 &val);
+        void    setLLSD(const LLString& name, const LLSD& val);
        void    setValue(const LLString& name, const LLSD& val);
+        
+        
        BOOL    controlExists(const LLString& name);
        // Returns number of controls loaded, 0 if failed
        // If require_declaration is false, will auto-declare controls it finds
        // as the given type.
-        U32             loadFromFileLegacy(const LLString& filename, BOOL require_declaration = TRUE, eControlType declare_as = TYPE_STRING);
+        U32     loadFromFileLegacy(const LLString& filename, BOOL require_declaration = TRUE, eControlType declare_as = TYPE_STRING);
-        U32             loadFromFile(const LLString& filename, BOOL require_declaration = TRUE, eControlType declare_as = TYPE_STRING);
+        U32 saveToFile(const LLString& filename, BOOL nondefault_only);
-        U32             saveToFile(const LLString& filename, BOOL skip_if_default);
+        U32     loadFromFile(const LLString& filename, BOOL require_declaration = TRUE, eControlType declare_as = TYPE_STRING);
-        void    applyOverrides(const std::map<std::string, std::string>& overrides);
        void    resetToDefaults();
+        
        // Ignorable Warnings
        
        // Add a config variable to be reset on resetWarnings()
diff --git a/linden/indra/lscript/lscript_byteconvert.h b/linden/indra/lscript/lscript_byteconvert.h
index a9b0094..e17f3fc 100644
--- a/linden/indra/lscript/lscript_byteconvert.h
+++ b/linden/indra/lscript/lscript_byteconvert.h
@@ -166,8 +166,15 @@ inline void bytestream_int2float(U8 *stream, S32 &offset)
 inline bool bytestream2char(char *buffer, const U8 *stream, S32 &offset, S32 buffsize)
 {
        S32 source_len = strlen( (const char *)stream+offset );
-        strncpy( buffer, (const char *)stream+offset, buffsize-1 );
+        S32 copy_len = buffsize - 1;
-        buffer[buffsize-1] = 0;
+        if( copy_len > source_len )
+        {
+                copy_len = source_len;
+        }
+        // strncpy without \0 padding overhead
+        memcpy( buffer, stream+offset, copy_len );
+        buffer[copy_len] = 0;
        offset += source_len + 1; // advance past source string, include terminating '\0'
@@ -1073,28 +1080,20 @@ inline void safe_instruction_float2bytestream(U8 *stream, S32 &offset, F32 value
 inline void safe_instruction_bytestream2char(char *buffer, U8 *stream, S32 &offset, S32 buffsize)
 {
-        bool safe;
+        // This varies from the old method. Previously, we would copy up until we got an error,
-        while (  (safe = safe_instruction_check_address(stream, offset, 1))
+        // then halt the script via safe_isntruction_check_address. Now we don't bother
-                   && buffsize--
+        // copying a thing if there's an error.
-                   &&(*buffer++ = *(stream + offset++)))
-                ;
-        // Return if it ended in a null (success) or if script error handling is taking over
+        if( safe_instruction_check_address(stream, offset, strlen( (const char *)stream + offset ) + 1 ) )
-        if( !safe || (0 == *(buffer-1)) )
        {
-                return; // Yep. Success.
+                // Takes the same parms as this function. Won't overread, per above check.
+                bytestream2char( buffer, stream, offset, buffsize );
+        }
+        else
+        {
+                // Truncate - no point in copying
+                *buffer = 0;
        }
-        // Defensive mode. We copied at least one char and ran out of space before
-        // null termination. Add the terminator...
-        *(buffer-1) = 0;
-        // ...and advance offset past the end of the data as if we copied the rest. If we
-        // violate the safety check, script error handling will protect us. No need to
-        // keep advancing.
-        while( safe_instruction_check_address(stream, offset, 1)
-                        && *( stream + offset++ ) )
-                ;
 }
 inline void safe_instruction_bytestream_count_char(U8 *stream, S32 &offset)
diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index c8458a3..8bb26ab 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -445,6 +445,7 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "PRIM_BUMP_SHINY"               { count(); yylval.ival = LSL_PRIM_BUMP_SHINY; return(INTEGER_CONSTANT); }
 "PRIM_FULLBRIGHT"               { count(); yylval.ival = LSL_PRIM_FULLBRIGHT; return(INTEGER_CONSTANT); }
 "PRIM_TEXGEN"                   { count(); yylval.ival = LSL_PRIM_TEXGEN; return(INTEGER_CONSTANT); }
+"PRIM_GLOW"                     { count(); yylval.ival = LSL_PRIM_GLOW; return(INTEGER_CONSTANT); }
 "PRIM_TYPE_BOX"                 { count(); yylval.ival = LSL_PRIM_TYPE_BOX; return(INTEGER_CONSTANT); }
 "PRIM_TYPE_CYLINDER"    { count(); yylval.ival = LSL_PRIM_TYPE_CYLINDER; return(INTEGER_CONSTANT); }
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index 623db1f..b7773e2 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -416,6 +416,7 @@ int main(int argc, char **argv)
        if(err == noErr)
        {
                ShowWindow(gWindow);
+                SelectWindow(gWindow);
        }
                
        if(err == noErr)
diff --git a/linden/indra/newview/app_settings/cmd_line.xml b/linden/indra/newview/app_settings/cmd_line.xml
new file mode 100644
index 0000000..3e6fa21
--- /dev/null
+++ b/linden/indra/newview/app_settings/cmd_line.xml
@@ -0,0 +1,335 @@
+<?xml version="1.0"?>
+<llsd>
+  <map>
+    <key>help</key>
+    <map>
+      <key>desc</key>
+      <string>display this help message</string>
+      <key>short</key>
+      <string>h</string>
+    </map>
+    <key>port</key>
+    <map>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>UserConnectionPort</string>
+    </map>
+    <key>drop</key>
+    <map>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>PacketDropPercentage</string>
+    </map>
+    <key>inbw</key>
+    <map>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>InBandwidth</string>
+    </map>
+    <key>outbw</key>
+    <map>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>OutBandwidth</string>
+    </map>
+    <key>grid</key>
+    <map>
+      <key>desc</key>
+      <string>Specify the name of the grid, local, or an IP address to connect to.</string>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>GridChoice</string>
+    </map>
+    <key>loginuri</key>
+    <map>
+      <key>desc</key>
+      <string>login server and CGI script to use</string>
+      <key>count</key>
+      <integer>1</integer>
+      <key>compose</key>
+      <boolean>true</boolean>
+      <key>map-to</key>
+      <string>LoginURI</string>
+    </map>
+    <key>helperuri</key>
+    <map>
+      <key>desc</key>
+      <string>helper web CGI prefix to use</string>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>HelperURI</string>
+    </map>
+    <key>debugviews</key>
+    <map>
+      <key>map-to</key>
+      <string>DebugViews</string>
+    </map>
+    <key>skin</key>
+    <map>
+      <key>desc</key>
+      <string>ui/branding skin folder to use</string>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>SkinFolder</string>
+    </map>
+    <key>autologin</key>
+    <map>
+      <key>desc</key>
+      <string>log in as last saved user</string>
+      <key>map-to</key>
+      <string>AutoLogin</string>
+    </map>
+    <key>quitafter</key>
+    <map>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>QuitAfterSeconds</string>
+    </map>
+    <key>rotate</key>
+    <map>
+      <key>map-to</key>
+      <string>RotateRight</string>
+    </map>
+    <key>noaudio</key>
+    <map>
+      <key>map-to</key>
+      <string>NoAudio</string>
+    </map>
+    <key>nosound</key>
+    <map>
+      <key>map-to</key>
+      <string>NoAudio</string>
+    </map>
+    <key>noprobe</key>
+    <map>
+      <key>map-to</key>
+      <string>NoHardwareProbe</string>
+    </map>
+    <key>noquicktime</key>
+    <map>
+      <key>map-to</key>
+      <string>NoQuickTime</string>
+    </map>
+    <key>nopreload</key>
+    <map>
+      <key>map-to</key>
+      <string>NoPreload</string>
+    </map>
+    <key>purge</key>
+    <map>
+      <key>desc</key>
+      <string>Delete files in the cache.</string>
+      <key>map-to</key>
+      <string>PurgeCacheOnNextStartup</string>
+    </map>
+    <key>noinvlib</key>
+    <map>
+      <key>desc</key>
+      <string>Do not request the inventory library.</string>
+      <key>map-to</key>
+      <string>NoInventoryLibrary</string>
+    </map>
+    <key>logfile</key>
+    <map>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>UserLogFile</string>
+    </map>
+    <key>setdefault</key>
+    <map>
+      <key>desc</key>
+      <string> specify the value of a particular
+               configuration variable which can be
+               overridden by settings.xml
+      </string>
+      <key>count</key>
+      <integer>2</integer>
+      <!-- Special case. Mapped to settings procedurally. -->
+    </map>
+    <key>set</key>
+    <map>
+      <key>desc</key>
+      <string> specify the value of a particular
+               configuration variable that
+               overrides all other settings
+      </string>
+      <key>count</key>
+      <integer>2</integer>
+      <!-- Special case. Mapped to settings procedurally. -->
+    </map>
+    <key>settings</key>
+    <map>
+      <key>desc</key>
+      <string>Specify the filename of a configuration file.</string>
+      <key>count</key>
+      <integer>1</integer>
+      <!-- Special case. Mapped to settings procedurally. -->
+    </map>
+    <key>login</key>
+    <map>
+      <key>desc</key>
+      <string>3 tokens: first, last and password</string>
+      <key>count</key>
+      <integer>3</integer>
+      <key>map-to</key>
+      <string>UserLoginInfo</string>
+    </map>
+    <key>god</key>
+    <map>
+      <key>desc</key>
+      <string>Log in a god if you have god access.</string>
+      <key>map-to</key>
+      <string>ConnectAsGod</string>
+    </map>
+    <key>console</key>
+    <map>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>ShowConsoleWindow</string>
+    </map>
+    <key>safe</key>
+    <map>
+      <key>desc</key>
+      <string>Reset preferences, run in safe mode.</string>
+      <key>map-to</key>
+      <string>SafeMode</string>
+    </map>
+    <key>multiple</key>           
+    <map>
+      <key>desc</key>
+      <string>Allow multple viewers.</string>
+      <key>map-to</key>
+      <string>AllowMultipleViewers</string>
+    </map>
+    <key>novoice</key>
+    <map>
+      <key>desc</key>
+      <string>Disable voice.</string>
+      <key>map-to</key>
+      <string>CmdLineDisableVoice</string>
+    </map>
+    <key>url</key>
+    <map>
+      <key>desc</key>
+      <string>Startup location</string>            
+      <key>count</key>
+      <integer>1</integer>
+      <key>last_option</key>
+      <boolean>true</boolean>
+      <!-- Special case. Not mapped to a setting. -->
+    </map>
+    <key>slurl</key>
+    <map>
+      <key>desc</key>
+      <string>Startup SLurl</string>
+      <key>count</key>
+      <integer>1</integer>
+      <key>positional</key>
+      <boolean>true</boolean>
+      <key>last_option</key>
+      <boolean>true</boolean>
+      <!-- Special case. Not mapped to a setting. -->
+    </map>
+    <key>ignorepixeldepth</key>
+    <map>
+      <key>desc</key>
+      <string>Ignore pixel depth settings.</string>
+      <key>map-to</key>
+      <string>IgnorePixelDepth</string>
+    </map>
+    <key>cooperative</key>
+    <map>
+      <key>desc</key>
+      <string>Yield some idle time to local host.</string>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>YieldTime</string>
+    </map>
+    <key>no-verify-ssl-cert</key>
+    <map>
+      <key>map-to</key>
+      <string>NoVerifySSLCert</string>
+    </map>
+    <key>channel</key>
+    <map>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>VersionChannelName</string>
+    </map>
+    <key>loginpage</key>
+    <map>
+      <key>desc</key>
+      <string>Login authentication page to use.</string>
+      <key>count</key>
+      <integer>1</integer>
+      <key>map-to</key>
+      <string>LoginPage</string>
+    </map>
+    <key>qa</key>
+    <map>
+      <key>desc</key>
+      <string>Activated debugging menu in Advanced Settings.</string>
+      <key>map-to</key>
+      <string>QAMode</string>
+    </map>
+    <key>crashonstartup</key>
+    <map>
+      <key>desc</key>
+      <string>Crashes on startup. For QA use.</string>
+      <key>map-to</key>
+      <string>CrashOnStartup</string>
+    </map>
+  </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/colors.ini b/linden/indra/newview/app_settings/colors.ini
deleted file mode 100644
index b4d1e85..0000000
--- a/linden/indra/newview/app_settings/colors.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-version 101
-// colors.ini
-// Use this file to provide your own custom colors for the 
-// Second Life user interface.
-//
-// Copy lines here from colors_base.ini and modify them
-// to your heart's content.
-//
-// The colors are in the format: <red> <green> <blue> <alpha>
-// 0    0       0       255 = black, fully opaque
-// 255  255     255     255 = white, fully opaque
-// 0    0       0       128 = black, half transparent
-//
-// The file version must appear before any comments.
-// Comments must start at the beginning of a line.
-// Set tab stops to 4 for best alignment.
-//
-// Example:
-// Make avatar names bright green:
-// AvatarNameColor                              0       255     0       255
diff --git a/linden/indra/newview/app_settings/colors_base.xml b/linden/indra/newview/app_settings/colors_base.xml
index ded1eb2..d793116 100644
--- a/linden/indra/newview/app_settings/colors_base.xml
+++ b/linden/indra/newview/app_settings/colors_base.xml
@@ -1,160 +1,180 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings version = "101">
-<!--  Color of the names over avatar heads -->
+<!-- WINDOWS -->
-<AvatarNameColor value="251, 175, 93, 255"/>
+<TitleBarFocusColor value="50, 115, 185, 120" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="50, 115, 185, 75" />
-<BalanceTextColor value="0, 255, 0, 255"/>
+<FloaterUnfocusBorderColor value="110, 110, 110, 60" />
+<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused floaters -->
-<!--  These are "blended" with the button graphics, and hence should  -->
+<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused floaters -->
-<!--  usually be left as opaque white. -->
+<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
-<ButtonColor value="255, 255, 255, 255"/>
+<DefaultHighlightDark value="50, 115, 185, 255" />
-<ButtonImageColor value="255, 255, 255, 255"/>
+<DefaultHighlightLight value="50, 115, 185, 255" />
-<!--  Match the caution dialog buttons to the default -->
+<DefaultShadowDark value="50, 115, 185, 255" />
-<ButtonCautionImageColor value="255, 255,  255, 255"/>
+<DefaultShadowLight value="50, 115, 185, 255" />
-<!--  Text labels for buttons, like the "OK" text -->
+<!-- LABELS -->
-<ButtonLabelColor value="220, 220, 220, 255"/>
+<LabelDisabledColor value="0, 30, 60, 128" />
-<ButtonLabelSelectedColor value="220, 220, 220, 255"/>
+<LabelSelectedColor value="255, 255, 255, 255" />
-<ButtonLabelDisabledColor value="147, 169, 213, 200"/>
+<LabelSelectedDisabledColor value="164, 190, 237, 128" />
-<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200"/>
+<LabelTextColor value="0, 30, 60, 255" />
-<ButtonSelectedBgColor value="62, 62, 62, 255"/>
+<!-- LOGIN -->
-<ButtonSelectedColor value="255, 255, 255, 255"/>
+<LoginProgressBarBgColor value="255, 255, 255, 255" />
-<ButtonUnselectedBgColor value="62, 62, 62, 255"/>
+<LoginProgressBarFgColor value="255, 255, 255, 255" />
-<ButtonUnselectedFgColor value="255, 255, 255, 255"/>
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
-<ButtonBorderColor value="238, 156, 0, 255"/>
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
-<!--  Chat History dialog -->
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
-<ChatHistoryBgColor value="0, 0, 0, 0"/>
-<ChatHistoryTextColor value="255, 255, 255, 255"/>
+<!-- BUTTONS -->
+<ButtonLabelColor value="0, 30, 60, 255" />             <!-- Text labels for buttons, like the "OK" text -->
-<!--  The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonLabelSelectedColor value="255, 255, 255, 255" />
-<FloaterButtonImageColor value="239, 156, 0, 255"/>
+<ButtonLabelDisabledColor value="0, 30, 60, 128" />
+<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" />
-<!--  The drop shadow behind windows and menus.   -->
+<ButtonSelectedBgColor value="62, 62, 62, 255" />
-<!--  The button one is baked into the graphic. -->
+<ButtonSelectedColor value="255, 255, 255, 255" />
-<ColorDropShadow value="0, 0, 0, 200"/>
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />
-<!--  Background color for unfocused floaters -->
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />
-<DefaultBackgroundColor value="62, 62, 62, 140"/>
+<ButtonBorderColor value="239, 156, 0, 255" />
-<DefaultHighlightDark value="26, 26, 26, 255"/>
+<ButtonColor value="255, 255, 255, 255" />              <!-- Blended with button art, usually left as opaque white -->
-<DefaultHighlightLight value="115, 132, 155, 255"/>
+<ButtonImageColor value="255, 255, 255, 255" />         <!-- Blended with button art, usually left as opaque white -->
-<DefaultShadowDark value="26, 26, 26, 255"/>
-<DefaultShadowLight value="0, 0, 0, 255"/>
+<!-- SLIDERS -->
+<SliderDisabledThumbColor value="0, 0, 0, 255" />
-<!--  Color of the rectangle around entry fields with keyboard focus. -->
+<SliderThumbCenterColor value="255, 255, 255, 255" />
-<FocusColor value="238, 156, 0, 255"/>
+<SliderThumbOutlineColor value="37, 64, 99, 255" />
-<FloaterFocusBorderColor value="0, 0, 0, 80"/>
+<SliderTrackColor value="37, 64, 99, 255" />
-<FloaterUnfocusBorderColor value="0, 0, 0, 80"/>
-<TitleBarFocusColor value="255, 255, 255, 30" />
+<!-- TEXTFIELDS -->
+<TextBgFocusColor value="255, 255, 255, 255" />         <!-- Text field background when receiving input (focused) -->
-<!--  Edit mode grid -->
+<TextBgReadOnlyColor value="210, 220, 230, 255" />      <!-- Text field background when read-only -->
-<GridFocusPointColor value="255, 255, 255, 128"/>
+<TextBgWriteableColor value="255, 255, 255, 255" />     <!-- Text field background when not receiving input (unfocused) -->
-<GridlineColor value="255, 255, 255, 255"/>
+<TextCursorColor value="0, 0, 0, 255" />
-<GridlineBGColor value="235, 235, 255, 200"/>
+<TextFgColor value="45, 48, 45, 255" />
-<GridlineShadowColor value="0, 0, 0, 80"/>
+<TextFgReadOnlyColor value="0, 0, 0, 200" />
+<TextFgTentativeColor value="0, 0, 0, 128" />
-<HealthTextColor value="255, 255, 255, 255"/>
+<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" />     <!-- i.e. About Land name that you don't own -->
+<TextEmbeddedItemColor value="0, 0, 128, 255" />
-<HelpBgColor value="200, 209, 204, 255"/>
+<TextDefaultColor value="0, 20, 0, 255"/>
-<HelpFgColor value="0, 0, 0, 255"/>
+  
+<!-- LISTBOXES -->
-<HelpScrollTrackColor value="183, 184, 188, 255"/>
+<ScrollBgReadOnlyColor value="255, 255, 255, 140" />
-<HelpScrollThumbColor value="80, 96, 124, 255"/>
+<ScrollBgWriteableColor value="255, 255, 255, 140" />
-<HelpScrollHighlightColor value="115, 132, 155, 255"/>
+<ScrollBGStripeColor value="145, 180, 220, 60" />
-<HelpScrollShadowColor value="0, 0, 0, 255"/>
+<ScrollDisabledColor value="128, 128, 128, 204" />
+<ScrollSelectedBGColor value="50, 115, 185, 150" />
+<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->
+<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->
+<ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->
+<ScrollbarThumbColor value="120, 160, 200, 255" />
+<ScrollbarTrackColor value="183, 202, 220, 255" />
+<!-- MENUS -->
+<MenuBarBgColor value="185, 200, 220, 230" />
+<MenuBarGodBgColor value="100, 200, 130, 230" />
+<MenuNonProductionGodBgColor value="100, 200, 130, 230" />
+<MenuNonProductionBgColor value="230, 70, 70, 230" />
+<MenuDefaultBgColor value="210, 220, 230, 245" />
+<MenuItemDisabledColor value="0, 30, 60, 128" />        <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemEnabledColor value="0, 30, 60, 255" />         <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemHighlightBgColor value="50, 115, 185, 100" />
+<MenuItemHighlightFgColor value="0, 30, 60, 255" />     <!-- Highlighted menu text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="197, 217, 234, 240" />
+<!--  PIE MENUS -->
+<PieMenuBgColor value="118, 156, 201, 230" />
+<PieMenuLineColor value="255, 255, 255, 60" />
+<PieMenuSelectedColor value="185, 200, 220, 120" />
+<!-- TOOLTIPS -->
+<ToolTipBgColor value="250, 255, 225, 230" />
+<ToolTipBorderColor value="171, 212, 245, 255" />
+<ToolTipTextColor value="0, 0, 0, 255" />
+<!-- NOTIFICATION POP-UPS -->
+<NotifyBoxColor value="170, 210, 255, 240" />
+<NotifyTextColor value="0, 30, 60, 255" />
+<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- the background color of caution permissions prompts -->
+<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- the foreground color of the special title text in caution permissions prompts -->
+<GroupNotifyBoxColor value="170, 210, 255, 240" />
+<GroupNotifyTextColor value="0, 30, 60, 255" />
+<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
+<ChatHistoryBgColor value="0, 30, 80, 200" />
+<ChatHistoryTextColor value="255, 255, 255, 255" />
+<IMHistoryBgColor value="0, 30, 80, 200" />
+<IMHistoryTextColor value="255, 255, 255, 255" />
+<!-- IN-WORLD SELECTION -->
+<SilhouetteParentColor value="255, 255, 0, 255" />
+<SilhouetteChildColor value="32, 106, 196, 255" />
+<HighlightParentColor value="171, 212, 245, 255" />
+<HighlightChildColor value="171, 212, 245, 255" />
+<HighlightInspectColor value="255, 0, 255, 255" />
+<!-- EDIT MODE GRID -->
+<GridFocusPointColor value="255, 255, 255, 128" />
+<GridlineColor value="255, 255, 255, 255" />
+<GridlineBGColor value="235, 235, 255, 200" />
+<GridlineShadowColor value="0, 0, 0, 80" />
+<!-- PROPERTY LINES -->
+<PropertyColorAvail value="0, 0, 0, 0" />
+<PropertyColorGroup value="0, 184, 184, 102" />
+<PropertyColorOther value="255, 0, 0, 102" />
+<PropertyColorSelf value="0, 255, 0, 102" />
+<PropertyColorForSale value="255, 128, 0, 102" />
+<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
 <!-- Icon Enable/Disable -->
 <IconEnabledColor value="255, 255, 255, 255"/>
 <IconDisabledColor value="147, 169, 213, 200"/>
-<LabelDisabledColor value="147, 169, 213, 77"/>
+<!-- MINI-MAP -->
-<LabelSelectedColor value="255, 255, 255, 255"/>
+<NetMapBackgroundColor value="0, 0, 0, 77" />
-<LabelSelectedDisabledColor value="164, 190, 237, 128"/>
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
-<LabelTextColor value="147, 169, 213, 255"/>
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
-<MapAutopilotColor value="255, 128, 0, 255"/>
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
-<!--  Menus on the top of the screen -->
+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
-<MenuBarBgColor value="62, 62, 62, 255"/>
-<MenuBarGodBgColor value="62, 128, 62, 255"/>
+<!-- HELP WINDOW -->
-<MenuNonProductionBgColor value="128, 0, 0, 255"/>
+<HelpBgColor value="200, 209, 204, 255" />
-<MenuNonProductionGodBgColor value="0,128,0,255"/>
+<HelpFgColor value="0, 0, 0, 255" />
-<MenuDefaultBgColor value="0, 0, 0, 255"/>
+<HelpScrollTrackColor value="0, 0, 0, 255" />
-<MenuItemDisabledColor value="133, 133, 164, 128"/>
+<HelpScrollThumbColor value="255, 255, 255, 255" />
-<MenuItemEnabledColor value="255, 255, 255, 255"/>
+<HelpScrollHighlightColor value="115, 132, 155, 255" />
-<MenuItemHighlightBgColor value="183, 184, 188, 100"/>
+<HelpScrollShadowColor value="0, 0, 0, 255" />
-<MenuItemHighlightFgColor value="255, 255, 255, 255"/>
-<MenuPopupBgColor value="0, 0, 0, 255"/>
+<!-- MISC -->
+<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
-<!--  Colors for the Mini-Map -->
+<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
-<NetMapBackgroundColor value="0, 0, 0, 77"/>
+<FloaterButtonImageColor value="255, 255, 255, 255" />  <!-- The floater buttons (like the close box) are white images that receive this color. -->
-<NetMapYouOwnAboveWater value="0, 255, 255, 255"/>
+<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
-<NetMapYouOwnBelowWater value="0, 200, 200, 255"/>
+<HealthTextColor value="255, 255, 255, 255" />
-<NetMapGroupOwnAboveWater value="255, 0, 255, 255"/>
+<MapAutopilotColor value="255, 128, 0, 255" />
-<NetMapGroupOwnBelowWater value="200, 0, 200, 255"/>
+<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
-<NetMapOtherOwnAboveWater value="60, 60, 60, 255"/>
+<ScriptBgReadOnlyColor value="180, 180, 180, 255" />
-<NetMapOtherOwnBelowWater value="30, 30, 30, 255"/>
+<ParcelTextColor value="40, 40, 90, 255" />             <!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="70, 70, 100, 255" />           <!-- Parcel name on menu bar, hover state -->
-<!--  Notify boxes are the slide-down notifications at the  -->
+<TimeTextColor value="0, 30, 60, 255" />                <!-- SL Time on menu bar -->
-<!--  top-right of the screen. -->
+<BalanceTextColor value="0, 100, 40, 255" />            <!-- Linden dollar balance on menu bar -->
-<NotifyBoxColor value="58, 147, 242, 255"/>
+<HealthTextColor value="110, 15, 15, 255" />            <!-- Damage meter text on menu bar -->
-<NotifyTextColor value="0, 0, 0, 255"/>
+<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
-<!-- the background color of caution permissions prompts -->
+<FilterBackgroundColor value="75, 75, 150, 180" /> <!-- Matching region of Inventory search text -->
-<NotifyCautionBoxColor value="254, 209, 118, 255"/>
+<FilterTextColor value="255, 200, 70, 255" />
-<!-- the foreground color of the special title text in caution permissions prompts -->
+<InventoryItemSuffixColor value="120, 70, 55, 255"/>
-<NotifyCautionWarnColor value="0, 0, 0, 255"/>
+<InventorySearchStatusColor value="0, 0, 0, 255" />
-<!--  Background color of focused floaters -->
+<ConsoleBackground value="0, 0, 0, 255" />
-<FocusBackgroundColor value="62, 62, 62, 255"/>
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
-<GroupNotifyBoxColor value="70, 170, 255, 255"/>
+ <!-- Alert box colors -->
-<!-- Alert box colors -->
+<AlertBoxColor value="165, 180, 200, 245"/>
-<AlertBoxColor value="62, 62, 62, 255"/>
+<AlertTextColor value="0, 30, 60, 255"/>
-<AlertTextColor value="147, 169, 213, 255"/>
+<AlertCautionBoxColor value="254, 209, 118, 255"/>      <!-- Background color of caution alerts -->
-<!-- the background color of caution alerts -->
+<AlertCautionTextColor value="0, 0, 0, 255"/>           <!-- Foreground color of the special title text in caution alerts -->
-<AlertCautionBoxColor value="254, 209, 118, 255"/>
-<!-- the foreground color of the special title text in caution alerts -->
-<AlertCautionTextColor value="0, 0, 0, 255"/>
-<!--  Menu that spawns on right-click -->
-<PieMenuBgColor value="62, 62, 62, 150"/>
-<PieMenuLineColor value="0, 0, 0, 128"/>
-<PieMenuSelectedColor value="183, 184, 188, 77"/>
-<!--  Colors for property lines and land ownership overlay -->
-<PropertyColorAvail value="0, 0, 0, 0"/>
-<PropertyColorGroup value="0, 184, 184, 102"/>
-<PropertyColorOther value="255, 0, 0, 102"/>
-<PropertyColorSelf value="0, 255, 0, 102"/>
-<PropertyColorForSale value="255, 128, 0, 102"/>
-<!--  match the color on the world map -->
-<PropertyColorAuction value="128, 0, 255, 102"/>
-<ScrollBgReadOnlyColor value="200, 209, 204, 255"/>
-<ScrollBgWriteableColor value="200, 209, 204, 255"/>
-<ScrollBGStripeColor value="100, 100, 100, 40"/>
-<ScrollDisabledColor value="128, 128, 128, 204"/>
-<ScrollSelectedBGColor value="100, 100, 188, 150"/>
-<ScrollSelectedFGColor value="0, 0, 0, 204"/>
-<ScrollUnselectedColor value="0, 0, 0, 204"/>
-<ScrollHighlightedColor value="183, 184, 188, 128"/>
-<ScrollbarThumbColor value="60, 76, 124, 255"/>
-<ScrollbarTrackColor value="153, 154, 158, 255"/>
-<!--  Outline for selected objects in world -->
-<SilhouetteParentColor value="255, 255, 0, 255"/>
-<SilhouetteChildColor value="32, 106, 196, 255"/>
-<HighlightParentColor value="171, 212, 245, 255"/>
-<HighlightChildColor value="171, 212, 245, 255"/>
-<HighlightInspectColor value="255, 0, 255, 255"/>
-<!--  For "context" highlighting, i.e. pie menu  -->
-<ContextSilhouetteColor value="239, 156, 0, 255"/>
-<!--  Horizontal sliders, as in the audio preferences -->
-<SliderThumbCenterColor value="200, 200, 200, 255"/>
-<SliderThumbOutlineColor value="255, 255, 255, 255"/>
-<SliderTrackColor value="255, 255, 255, 255"/>
 <!--  Multi sliders, as in the sky animation setting -->
 <MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
@@ -163,30 +183,4 @@
 <MultiSliderTrackColor value="30, 30, 30, 255"/>
 <MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
 <MultiSliderTriangleColor value="255, 255, 50, 255"/>
-        
-<!--  Text field background when receiving input (focused) -->
-<TextBgFocusColor value="200, 209, 204, 255"/>
-<!--  Text field background when read-only -->
-<TextBgReadOnlyColor value="62, 62, 62, 160"/>
-<!--  Text field background when not receiving input (unfocused) -->
-<TextBgWriteableColor value="200, 209, 204, 230"/>
-<TextCursorColor value="0, 0, 0, 255"/>
-<TextFgColor value="0, 0, 0, 255"/>
-<TextFgReadOnlyColor value="255, 255, 255, 200"/>
-<TextFgTentativeColor value="0, 0, 0, 255"/>
-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255"/>
-<TextEmbeddedItemColor value="0, 0, 128, 255"/>
-<TextDefaultColor value="0, 20, 0, 255"/>
-<ScriptBgReadOnlyColor value="100, 100, 100, 255"/>
-<!--  Pop-up tips on UI elements and in-world objects -->
-<ToolTipBgColor value="183, 184, 188, 200"/>
-<ToolTipBorderColor value="171, 212, 245, 255"/>
-<ToolTipTextColor value="0, 0, 0, 255"/>
-<FilterBackgroundColor value="0, 0, 20, 255"/>
-<FilterTextColor value="255, 200, 70, 255"/>
-<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
 </settings>
diff --git a/linden/indra/newview/app_settings/grass.xml b/linden/indra/newview/app_settings/grass.xml
index 7cc29fa..4fc3b79 100644
--- a/linden/indra/newview/app_settings/grass.xml
+++ b/linden/indra/newview/app_settings/grass.xml
@@ -3,35 +3,35 @@
  <grass
    name="Grass 0"
        species_id="0"
-        texture_name="grass_texture_2.tga"
+        texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"
        blade_size_x="1.35"
        blade_size_y="1.35"
     />
  <grass
    name="Grass 1"
        species_id="1"
-        texture_name="grass_texture_1.tga"
+        texture_id="79504bf5-c3ec-0763-6563-d843de66d0a1"
        blade_size_x="1.0"
        blade_size_y="0.66"
     />
  <grass
    name="Grass 2"
        species_id="2"
-        texture_name="grass_texture_2.tga"
+        texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"
        blade_size_x="1.8"
        blade_size_y="1.8"
     />
  <grass
    name="Grass 3"
        species_id="3"
-        texture_name="grass_texture_3.tga"
+        texture_id="99bd60a2-3250-efc9-2e39-2fbcadefbecc"
        blade_size_x="1.0"
        blade_size_y="1.0"
     />
  <grass
    name="Grass 4"
        species_id="4"
-        texture_name="grass_texture_4.tga"
+        texture_id="7a2b3a4a-53c2-53ac-5716-aac7d743c020"
        blade_size_x="2.25"
        blade_size_y="2.25"
     />
@@ -44,4 +44,4 @@
     />
-</grass_defs>
+</grass_defs>
+\ No newline at end of file
diff --git a/linden/indra/newview/app_settings/keys.ini b/linden/indra/newview/app_settings/keys.ini
index 3a1e9ea..b79e5bf 100644
--- a/linden/indra/newview/app_settings/keys.ini
+++ b/linden/indra/newview/app_settings/keys.ini
@@ -40,6 +40,7 @@ FIRST_PERSON	PAD_PGDN	NONE		push_down
 FIRST_PERSON    PAD_HOME        NONE            toggle_fly
 FIRST_PERSON    PAD_CENTER      NONE            stop_moving
 FIRST_PERSON    PAD_ENTER       NONE            start_chat
+FIRST_PERSON    PAD_DIVIDE      NONE            start_gesture
 FIRST_PERSON    A               SHIFT           slide_left
 FIRST_PERSON    D               SHIFT           slide_right
@@ -51,6 +52,7 @@ FIRST_PERSON	F		SHIFT		toggle_fly
 FIRST_PERSON    SPACE   NONE            stop_moving
 FIRST_PERSON    ENTER   NONE            start_chat
+FIRST_PERSON    DIVIDE  NONE            start_gesture
 FIRST_PERSON    LEFT    SHIFT           slide_left
 FIRST_PERSON    RIGHT   SHIFT           slide_right
@@ -67,6 +69,7 @@ FIRST_PERSON	PAD_PGUP	SHIFT		jump
 FIRST_PERSON    PAD_PGDN        SHIFT           push_down
 FIRST_PERSON    PAD_HOME        SHIFT           toggle_fly
 FIRST_PERSON    PAD_ENTER       SHIFT           start_chat
+FIRST_PERSON    PAD_DIVIDE      SHIFT           start_gesture
 THIRD_PERSON    A               NONE            turn_left
 THIRD_PERSON    D               NONE            turn_right
@@ -86,6 +89,7 @@ THIRD_PERSON	F		SHIFT		toggle_fly
 THIRD_PERSON    SPACE   NONE            stop_moving
 THIRD_PERSON    ENTER   NONE            start_chat
+THIRD_PERSON    DIVIDE  NONE            start_gesture
 THIRD_PERSON    LEFT    NONE            turn_left
 THIRD_PERSON    LEFT    SHIFT           slide_left
@@ -120,6 +124,8 @@ THIRD_PERSON	PAD_CENTER	NONE		stop_moving
 THIRD_PERSON    PAD_CENTER      SHIFT           stop_moving
 THIRD_PERSON    PAD_ENTER       NONE            start_chat
 THIRD_PERSON    PAD_ENTER       SHIFT           start_chat
+THIRD_PERSON    PAD_DIVIDE      NONE            start_gesture
+THIRD_PERSON    PAD_DIVIDE      SHIFT           start_gesture
 # Camera controls in third person on Alt
 THIRD_PERSON    LEFT    ALT                     spin_around_cw
@@ -143,6 +149,7 @@ THIRD_PERSON	PAD_DOWN	ALT			move_backward
 THIRD_PERSON    PAD_PGUP        ALT                     spin_over
 THIRD_PERSON    PAD_PGDN        ALT                     spin_under
 THIRD_PERSON    PAD_ENTER       ALT                     start_chat
+THIRD_PERSON    PAD_DIVIDE      ALT                     start_gesture
 # mimic alt zoom behavior with keyboard only
 THIRD_PERSON    A               CTL_ALT                 spin_around_cw
@@ -166,6 +173,7 @@ THIRD_PERSON	PAD_DOWN	CTL_ALT			spin_under
 THIRD_PERSON    PAD_PGUP        CTL_ALT                 spin_over
 THIRD_PERSON    PAD_PGDN        CTL_ALT                 spin_under
 THIRD_PERSON    PAD_ENTER       CTL_ALT                 start_chat
+THIRD_PERSON    PAD_DIVIDE      CTL_ALT                 start_gesture
 # Therefore pan on Alt-Shift
 THIRD_PERSON    A               CTL_ALT_SHIFT   pan_left
@@ -183,6 +191,7 @@ THIRD_PERSON	PAD_RIGHT	CTL_ALT_SHIFT	pan_right
 THIRD_PERSON    PAD_UP          CTL_ALT_SHIFT   pan_up
 THIRD_PERSON    PAD_DOWN        CTL_ALT_SHIFT   pan_down
 THIRD_PERSON    PAD_ENTER       CTL_ALT_SHIFT   start_chat
+THIRD_PERSON    PAD_DIVIDE      CTL_ALT_SHIFT   start_gesture
 # Basic editing camera control
 EDIT                    A               NONE            spin_around_cw
@@ -192,7 +201,9 @@ EDIT			S		NONE		move_backward
 EDIT                    E               NONE            spin_over
 EDIT                    C               NONE            spin_under
 EDIT                    ENTER   NONE            start_chat
+EDIT                    DIVIDE  NONE            start_gesture
 EDIT                    PAD_ENTER       NONE    start_chat
+EDIT                    PAD_DIVIDE      NONE    start_gesture
 EDIT                    LEFT    NONE            spin_around_cw
 EDIT                    RIGHT   NONE            spin_around_ccw
@@ -234,6 +245,7 @@ EDIT			PAD_DOWN	ALT			push_backward
 EDIT                    PAD_PGUP        ALT                     jump
 EDIT                    PAD_PGDN        ALT                     push_down
 EDIT                    PAD_ENTER       ALT                     start_chat
+EDIT                    PAD_DIVIDE      ALT                     start_gesture
 SITTING                 A       ALT                     spin_around_cw
 SITTING                 D       ALT                     spin_around_ccw
@@ -286,6 +298,7 @@ SITTING			PAD_PGUP	NONE		spin_over_sitting
 SITTING                 PAD_PGDN        NONE            spin_under_sitting
 SITTING                 PAD_CENTER      NONE            stop_moving
 SITTING                 PAD_ENTER       NONE            start_chat
+SITTING                 PAD_DIVIDE      NONE            start_gesture
 # these are for passing controls when sitting on vehicles
 SITTING                 A               SHIFT           slide_left
@@ -296,6 +309,7 @@ SITTING			RIGHT	SHIFT		slide_right
 SITTING                 PAD_LEFT        SHIFT           slide_left
 SITTING                 PAD_RIGHT       SHIFT           slide_right
 SITTING                 PAD_ENTER       SHIFT           start_chat
+SITTING                 PAD_DIVIDE      SHIFT           start_gesture
 # pan on Alt-Shift
 SITTING                 A               CTL_ALT_SHIFT   pan_left
@@ -313,8 +327,10 @@ SITTING			PAD_RIGHT	CTL_ALT_SHIFT	pan_right
 SITTING                 PAD_UP          CTL_ALT_SHIFT   pan_up
 SITTING                 PAD_DOWN        CTL_ALT_SHIFT   pan_down
 SITTING                 PAD_ENTER       CTL_ALT_SHIFT   start_chat
+SITTING                 PAD_DIVIDE      CTL_ALT_SHIFT   start_gesture
 SITTING                 ENTER   NONE            start_chat
+SITTING                 DIVIDE  NONE            start_gesture
 # Avatar editing camera controls
 EDIT_AVATAR             A               NONE            edit_avatar_spin_cw
@@ -330,6 +346,7 @@ EDIT_AVATAR		DOWN	NONE		edit_avatar_move_backward
 EDIT_AVATAR             PGUP    NONE            edit_avatar_spin_over
 EDIT_AVATAR             PGDN    NONE            edit_avatar_spin_under
 EDIT_AVATAR             ENTER   NONE            start_chat
+EDIT_AVATAR             DIVIDE  NONE            start_gesture
 EDIT_AVATAR             PAD_LEFT        NONE    edit_avatar_spin_cw
 EDIT_AVATAR             PAD_RIGHT       NONE    edit_avatar_spin_ccw
 EDIT_AVATAR             PAD_UP          NONE    edit_avatar_move_forward
@@ -337,3 +354,4 @@ EDIT_AVATAR		PAD_DOWN	NONE	edit_avatar_move_backward
 EDIT_AVATAR             PAD_PGUP        NONE    edit_avatar_spin_over
 EDIT_AVATAR             PAD_PGDN        NONE    edit_avatar_spin_under
 EDIT_AVATAR             PAD_ENTER       NONE    start_chat
+EDIT_AVATAR             PAD_DIVIDE      NONE    start_gesture
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 0800647..9a8b1f7 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -339,7 +339,7 @@ PRIM_FLEXIBLE		Sets primitive flexibility to TRUE or FALSE
 PRIM_POINT_LIGHT        Sets light emission to TRUE or FALSE
 PRIM_TEMP_ON_REZ        Sets temporay on rez to TRUE or FALSE
 PRIM_PHANTOM            Sets phantom to TRUE or FALSE
-PRIM_CAST_SHADOWS       Enables or disables shadow casting for the primitive
+PRIM_CAST_SHADOWS       DEPRECATED. Takes 1 parameter, an integer, but has no effect when set and always returns 0 if used in llGetPrimitiveParams.
 PRIM_POSITION           Sets primitive position to a vector position
 PRIM_SIZE                       Sets primitive size to a vector size
 PRIM_ROTATION           Sets primitive rotation
@@ -348,6 +348,7 @@ PRIM_COLOR			Followed by an integer face, vector color, and float alpha
 PRIM_BUMP_SHINY         Followed by an integer face, one of PRIM_SHINY_NONE, PRIM_SHINY_LOW,:PRIM_SHINY_MEDIUM, or PRIM_SHINY_HIGH,:and one of PRIM_BUMP_NONE, PRIM_BUMP_BRIGHT, PRIM_BUMP_DARK, etc
 PRIM_FULLBRIGHT         Followed by an integer face, and TRUE or FALSE
 PRIM_TEXGEN                     Followed by an integer face, and one of PRIM_TEXGEN_DEFAULT or PRIM_TEXGEN_PLANAR
+PRIM_GLOW                       Followed by an integer face, and a float from 0.0 to 1.0 specifying glow amount
 PRIM_TYPE_BOX           Followed by integer hole shape, vector cut, float hollow, vector twist,:vector top size, and vector top shear
 PRIM_TYPE_CYLINDER      Followed by integer hole shape, vector cut, float hollow, vector twist,:vector top size, and vector top shear
@@ -457,8 +458,6 @@ PARCEL_FLAG_USE_BAN_LIST			Used with llGetParcelFlags to find if a parcel uses a
 PARCEL_FLAG_USE_LAND_PASS_LIST          Used with llGetParcelFlags to find if a parcel allows passes to be purchased
 PARCEL_FLAG_LOCAL_SOUND_ONLY            Used with llGetParcelFlags to find if a parcel restricts spacialized sound to the parcel
 PARCEL_FLAG_RESTRICT_PUSHOBJECT         Used with llGetParcelFlags to find if a parcel restricts llPushObject() calls
-PARCEL_FLAG_LOCAL_SOUND_ONLY            Used with llGetParcelFlags to find if a parcel restricts spacialized sound to the parcel
-PARCEL_FLAG_RESTRICT_PUSHOBJECT         Used with llGetParcelFlags to find if a parcel restricts llPushObject() calls
 PARCEL_FLAG_ALLOW_ALL_OBJECT_ENTRY              Used with llGetParcelFlags to find if a parcel allows all objects to enter
 PARCEL_FLAG_ALLOW_GROUP_OBJECT_ENTRY    Used with llGetParcelFlags to find if a parcel only allows group (and owner) objects to enter
diff --git a/linden/indra/newview/app_settings/role_actions.xml b/linden/indra/newview/app_settings/role_actions.xml
deleted file mode 100644
index 02e484e..0000000
--- a/linden/indra/newview/app_settings/role_actions.xml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
-<role_actions>
-        <action_set
-                name="Membership"
-                description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation."
-                >
-                <action
-                        name="member invite"
-                        description="Invite People to this Group"
-                        longdescription="Invite People to this Group using the 'Invite New Person...' button in the Members &amp; Roles tab > Members sub-tab."
-                        value="1"
-                />
-                <action
-                        name="member eject"
-                        description="Eject Members from this Group"
-                        longdescription="Eject Members from this Group using the 'Eject From Group' button in the Members &amp; Roles tab > Members sub-tab. An Owner can eject anyone except another Owner. If you're not an Owner, a Member can be ejected from a group if, and only if, they're only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the 'Remove Members from Roles' Ability."
-                        value="2"
-                />
-                <action
-                        name="member options"
-                        description="Toggle 'Open Enrollment' and change 'Signup Fee'"
-                        longdescription="Toggle 'Open Enrollment' to let new Members join without an invitation, and change 'Signup Fee' in the Group Preferences section of the General tab."
-                        value="3"
-                />
-        </action_set>
-        <action_set
-                name="Roles"
-                description="These Abilities include powers to add, remove, and change group Roles, add and remove Members in Roles, and assign Abilities to Roles."
-                >
-                <action
-                        name="role create"
-                        description="Create new Roles"
-                        longdescription="Create new Roles in the Members &amp; Roles tab > Roles sub-tab."
-                        value="4"
-                />
-                <action
-                        name="role delete"
-                        description="Delete Roles"
-                        longdescription="Delete Roles in the Members &amp; Roles tab > Roles sub-tab."
-                        value="5"
-                />
-                <action
-                        name="role properties"
-                        description="Change Role names, titles, and descriptions"
-                        longdescription="Change Role names, titles, and descriptions at the bottom of the the Members &amp; Roles tab > Roles sub-tab after selecting a Role."
-                        value="6"
-                />
-                <action name="role assign member limited" description="Assign Members to Assigner'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." value="7"/>
-                <action name="role assign member" 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're doing before assigning this Ability." value="8"/>
-                <action
-                        name="role remove member"
-                        description="Remove Members from Roles"
-                        longdescription="Remove Members from Roles in the Assigned Roles section of the Members &amp; Roles tab > Members sub-tab. Owners can't be removed."
-                        value="9"
-                />
-                <action name="role change actions" description="Assign and Remove Abilities in Roles" 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're doing before assigning this Ability." value="10"/>
-        </action_set>
-        <action_set
-                name="Group Identity"
-                description="These Abilities include powers to modify this group's identity, such as changing public visibility, charter, and insignia."
-                >
-                <action
-                        name="group change identity"
-                        description="Change Charter, Insignia, 'Publish on the Web', and which members are publicly visible in Group Information."
-                        longdescription="Change Charter, Insignia, 'Publish on the Web', and which members are publicly visible in Group Information. This is done in the General tab."
-                        value="11"
-                />
-        </action_set>
-        <action_set
-                name="Parcel Management"
-                description="These Abilities include powers to deed, modify, and sell land in this group's land holdings. To get to the About Land window, right-click the ground and select 'About Land...', or click the parcel info in the menu bar."
-                >
-                
-                <action
-                        name="land deed"
-                        description="Deed land and buy land for group"
-                        longdescription="Deed land and buy land for group. This is done in About Land > General tab."
-                        value="12"
-                />
-                <action name="land release" description="Abandon land to 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're doing before assigning this Ability." value="13"/>
-                <action name="land set sale info" description="Set land for sale info" 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're doing before assigning this Ability." value="14"/>
-                <action
-                        name="land divide join"
-                        description="Subdivide and join parcels"
-                        longdescription="Subdivide and join parcels. This is done by right-clicking the ground, 'Edit Terrain', and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click 'Subdivide...'. To join, select two or more contiguous parcels and click 'Join...'. "
-                        value="15"
-                />
-        </action_set>
-        <action_set
-                name="Parcel Identity"
-                description="These Abilities include powers to change the parcel name and publish settings, Find directory visibility, and landing point &amp; TP routing options."
-                >
-                
-                <action
-                        name="land find places"
-                        description="Toggle 'Show in Find Places' and set category"
-                        longdescription="Toggle 'Show in Find Places' and setting a parcel's category in About Land > Options tab."
-                        value="17"
-                />
-                <action
-                        name="land change identity"
-                        description="Change parcel name, description, and 'Publish on the Web' settings"
-                        longdescription="Change parcel name, description, and 'Publish on the Web' settings. This is done in About Land > Options tab."
-                        value="18"
-                />
-                <action
-                        name="land set landing point"
-                        description="Set landing point and set teleport routing"
-                        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 > Options tab."
-                        value="19"
-                />
-        </action_set>
-        <action_set
-                name="Parcel Settings"
-                description="These Abilities include powers which affect parcel options, such as 'Create Objects', 'Edit Terrain', and music &amp; media settings."
-                >
-                
-                <action
-                        name="land change media"
-                        description="Change music &amp; media settings"
-                        longdescription="Change streaming music and movie settings in About Land > Media tab."
-                        value="20"
-                />
-                <action name="land edit" description="Toggle 'Edit Terrain'" longdescription="Toggle 'Edit Terrain'. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land's shape, and place and move Linden plants. Be sure you know what you're doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab." value="21"/>
-                <action
-                        name="land options"
-                        description="Toggle various About Land > Options settings"
-                        longdescription="Toggle 'Safe (no damage)', 'Fly', and allow other Residents to: 'Create Objects', 'Edit Terrain', 'Create Landmarks', and 'Run Scripts' on group-owned land in About Land > Options tab."
-                        value="22"
-                />
-        </action_set>
-        <action_set
-                name="Parcel Powers"
-                description="These Abilities include powers which allow Members to bypass restrictions on group-owned parcels."
-                >
-                
-                <action
-                        name="land allow edit land"
-                        description="Always allow 'Edit Terrain'"
-                        longdescription="Members in a Role with this Ability can edit terrain on a group-owned parcel, even if it's turned off in About Land > Options tab."
-                        value="23"
-                />
-                <action
-                        name="land allow fly"
-                        description="Always allow 'Fly'"
-                        longdescription="Members in a Role with this Ability can fly on a group-owned parcel, even if it's turned off in About Land > Options tab."
-                        value="24"
-                />
-                <action
-                        name="land allow create"
-                        description="Always allow 'Create Objects'"
-                        longdescription="Members in a Role with this Ability can create objects on a group-owned parcel, even if it's turned off in About Land > Options tab."
-                        value="25"
-                />
-                <action
-                        name="land allow landmark"
-                        description="Always allow 'Create Landmark'"
-                        longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it's turned off in About Land > Options tab."
-                        value="26"
-                />
-                <action
-                        name="land allow set home"
-                        description="Allow 'Set Home to Here' on group land"
-                        longdescription="Members in a Role with this Ability can use World menu > Set Home to Here on a group parcel (either land set or deeded to this group)."
-                        value="28"
-                />
-        </action_set>
-        <action_set
-                name="Parcel Access"
-                description="These Abilities include powers to allow or restrict access to group-owned parcels, including freezing and ejecting Residents."
-                >
-                
-                <action
-                        name="land manage allowed"
-                        description="Manage parcel Access lists"
-                        longdescription="Manage parcel Access lists in About Land > Access tab."
-                        value="29"
-                />
-                <action
-                        name="land manage banned"
-                        description="Manage parcel Ban lists"
-                        longdescription="Manage parcel Ban lists in About Land > Ban tab."
-                        value="30"
-                />
-                <action
-                        name="land manage passes"
-                        description="Change parcel 'Sell passes...' settings"
-                        longdescription="Change parcel 'Sell passes...' settings in About Land > Access tab."
-                        value="31"
-                />
-                <action
-                        name="land admin"
-                        description="Eject and freeze Residents on parcels"
-                        longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, More >, and selecting 'Eject...' or 'Freeze...'."
-                        value="32"
-                />
-        </action_set>
-        <action_set
-                name="Parcel Content"
-                description="These Abilities include powers to allow members to return objects and place and move Linden plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there's no undo for returning objects."
-                >
-                
-                <action
-                        name="land return group owned"
-                        description="Return objects owned by group"
-                        longdescription="Return objects on group-owned parcels that are owned by the group in About Land > Objects tab."
-                        value="48"
-                />
-                <action
-                        name="land return group set"
-                        description="Return objects set to group"
-                        longdescription="Return objects on group-owned parcels that are set to the group in About Land > Objects tab."
-                        value="33"
-                />
-                <action
-                        name="land return non group"
-                        description="Return non-group objects"
-                        longdescription="Return objects on group-owned parcels that are non-group in About Land > Objects tab."
-                        value="34"
-                />
-                <action
-                        name="land gardening"
-                        description="Landscaping using Linden plants"
-                        longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory's Library > Objects folder or they can be created via the Build button."
-                        value="35"
-                />
-        </action_set>
-        <action_set
-                name="Object Management"
-                description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools > General Tab. Right-click an object and Edit to see its settings. "
-                >
-                
-                <action
-                        name="object deed"
-                        description="Deed objects to group"
-                        longdescription="Deed objects to group in the Edit Tools > General Tab."
-                        value="36"
-                />
-                <action
-                        name="object manipulate"
-                        description="Manipulate (move, copy, modify) group-owned objects"
-                        longdescription="Manipulate (move, copy, modify) group-owned objects in the Edit Tools > General Tab."
-                        value="38"
-                />
-                <action
-                        name="object set sale"
-                        description="Set group-owned objects for sale"
-                        longdescription="Set group-owned objects for sale in the Edit Tools > General tab."
-                        value="39"
-                />
-        </action_set>
-        <action_set
-                name="Accounting"
-                description="These Abilities include powers which require Members to pay group liabilities and receive group dividends, and restrict access to group account history."
-                >
-                
-                <action
-                        name="accounting accountable"
-                        description="Pay group liabilities and receive group dividends"
-                        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. "
-                        value="40"
-                />
-        </action_set>
-        <action_set
-                name="Notices"
-                description="These Abilities include powers to allow Members to send, receive, and view group Notices."
-                >
-                
-                <action
-                        name="notices send"
-                        description="Send Notices"
-                        longdescription="Members in a Role with this Ability can send Notices in Group Information > Notices tab."
-                        value="42"
-                />
-                <action
-                        name="notices receive"
-                        description="Receive Notices and view past Notices"
-                        longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group Information > Notices tab."
-                        value="43"
-                />
-        </action_set>
-        <action_set
-                name="Proposals"
-                description="These Abilities include powers to allow Members to set up Proposals, vote on Proposals, and view voting history."
-                >
-                
-                <action
-                        name="proposal start"
-                        description="Create Proposals"
-                        longdescription="Members in a Role with this Ability can create proposals to be voted on in Group Information > Proposals tab."
-                        value="44"
-                />
-                <action
-                        name="proposal vote"
-                        description="Vote on Proposals"
-                        longdescription="Members in a Role with this Ability can vote on proposals in Group Information > Proposals tab."
-                        value="45"
-                />
-        </action_set>
-</role_actions>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
new file mode 100644
index 0000000..63d429f
--- /dev/null
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -0,0 +1,10129 @@
+<llsd>
+    <map>
+    <key>AdvanceSnapshot</key>
+        <map>
+        <key>Comment</key>
+            <string>Display advanced parameter settings in snaphot interface</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AFKTimeout</key>
+        <map>
+        <key>Comment</key>
+            <string>Time before automatically setting AFK (away from keyboard) mode (seconds)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>300</real>
+        </map>
+    <key>AgentChatColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of chat messages from other residents</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>IMChatColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of instant messages from other residents</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>AllowIdleAFK</key>
+        <map>
+        <key>Comment</key>
+            <string>Automatically set AFK (away from keyboard) mode when idle</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>AllowMultipleViewers</key>
+        <map>
+        <key>Comment</key>
+            <string>Allow multiple viewers.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AllowTapTapHoldRun</key>
+        <map>
+        <key>Comment</key>
+            <string>Tapping a direction key twice and holding it down makes avatar run</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>AnimateTextures</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable texture animation (debug)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>AnimationDebug</key>
+        <map>
+        <key>Comment</key>
+            <string>Show active animations in a bubble above avatars head</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AppearanceCameraMovement</key>
+        <map>
+        <key>Comment</key>
+            <string>When entering appearance editing mode, camera zooms in on currently selected portion of avatar</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ApplyColorImmediately</key>
+        <map>
+        <key>Comment</key>
+            <string>Preview selections in color picker immediately</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ApplyTextureImmediately</key>
+        <map>
+        <key>Comment</key>
+            <string>Preview selections in texture picker immediately</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ArrowKeysMoveAvatar</key>
+        <map>
+        <key>Comment</key>
+            <string>While cursor is in chat entry box, arrow keys still control your avatar</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>AskedAboutCrashReports</key>
+        <map>
+        <key>Comment</key>
+            <string>Turns off dialog asking if you want to enable crash reporting</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AsyncKeyboard</key>
+        <map>
+        <key>Comment</key>
+            <string>Improves responsiveness to keyboard input when at low framerates</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>AuctionShowFence</key>
+        <map>
+        <key>Comment</key>
+            <string>When auctioning land, include parcel boundary marker in snapshot</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>AudioLevelAmbient</key>
+        <map>
+        <key>Comment</key>
+            <string>Audio level of environment sounds</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.5</real>
+        </map>
+    <key>AudioLevelDistance</key>
+        <map>
+        <key>Comment</key>
+            <string>Scale factor for audio engine (multiple of world scale, 2.0 = audio falls off twice as fast)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AudioLevelDoppler</key>
+        <map>
+        <key>Comment</key>
+            <string>Scale of doppler effect on moving audio sources (1.0 = normal, &lt;1.0 = diminished doppler effect, &gt;1.0 = enhanced doppler effect)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AudioLevelMaster</key>
+        <map>
+        <key>Comment</key>
+            <string>Master audio level, or overall volume</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AudioLevelMedia</key>
+        <map>
+        <key>Comment</key>
+            <string>Audio level of Quicktime movies</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AudioLevelMic</key>
+        <map>
+        <key>Comment</key>
+            <string>Audio level of microphone input</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AudioLevelMusic</key>
+        <map>
+        <key>Comment</key>
+            <string>Audio level of streaming music</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AudioLevelRolloff</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls the distance-based dropoff of audio volume (fraction or multiple of default audio rolloff)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AudioLevelSFX</key>
+        <map>
+        <key>Comment</key>
+            <string>Audio level of in-world sound effects</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AudioLevelUI</key>
+        <map>
+        <key>Comment</key>
+            <string>Audio level of UI sound effects</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.5</real>
+        </map>
+    <key>AudioLevelVoice</key>
+        <map>
+        <key>Comment</key>
+            <string>Audio level of voice chat</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.5</real>
+        </map>
+    <key>AudioStreamingMusic</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable streaming audio</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AudioStreamingVideo</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable streaming video</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AutoAcceptNewInventory</key>
+        <map>
+        <key>Comment</key>
+            <string>Automatically accept new notecards/textures/landmarks</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AutoLoadWebProfiles</key>
+        <map>
+        <key>Comment</key>
+            <string>Automatically load ALL profile webpages without asking first.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AutoLogin</key>
+        <map>
+        <key>Comment</key>
+            <string>Login automatically using last username/password combination</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AutoMimeDiscovery</key>
+        <map>
+          <key>Comment</key>
+              <string>Enable viewer mime type discovery of media URLs</string>
+          <key>Persist</key>
+              <integer>1</integer>
+          <key>Type</key>
+              <string>Boolean</string>
+          <key>Value</key>
+              <integer>0</integer>
+        </map>
+    <key>AutoPilotLocksCamera</key>
+        <map>
+        <key>Comment</key>
+            <string>Keep camera position locked when avatar walks to selected position</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AutoSnapshot</key>
+        <map>
+        <key>Comment</key>
+            <string>Update snapshot when camera stops moving, or any parameter changes</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AutomaticFly</key>
+        <map>
+        <key>Comment</key>
+            <string>Fly by holding jump key or using &quot;Fly&quot; command (FALSE = fly by using &quot;Fly&quot; command only)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>AvatarBacklight</key>
+        <map>
+        <key>Comment</key>
+            <string>Add rim lighting to avatar rendering to approximate shininess of skin</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>AvatarCompositeLimit</key>
+        <map>
+        <key>Comment</key>
+            <string>Maximum number of avatars to display appearance changes on the fly</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>5</integer>
+        </map>
+    <key>AvatarPickerSortOrder</key>
+        <map>
+        <key>Comment</key>
+            <string>Specifies sort key for textures in avatar picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>2</integer>
+        </map>
+    <key>AvatarSex</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>BackgroundChatColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of chat bubble background</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>0</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>BackgroundYieldTime</key>
+        <map>
+        <key>Comment</key>
+            <string>Amount of time to yield every frame to other applications when SL is not the foreground window (milliseconds)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>40</integer>
+        </map>
+    <key>BackwardBtnRect</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>45</integer>
+                <integer>29</integer>
+                <integer>66</integer>
+                <integer>4</integer>
+            </array>
+        </map>
+    <key>BasicHelpRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for help window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>404</integer>
+                <integer>467</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>BeaconAlwaysOn</key>
+        <map>
+        <key>Comment</key>
+            <string>Beacons / highlighting always on</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>BrowserHomePage</key>
+        <map>
+        <key>Comment</key>
+            <string>[NOT USED]</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>http://www.secondlife.com</string>
+        </map>
+    <key>BrowserProxyAddress</key>
+        <map>
+        <key>Comment</key>
+            <string>Address for the Web Proxy]</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>BrowserProxyEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Use Web Proxy</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>BrowserProxyExclusions</key>
+        <map>
+        <key>Comment</key>
+            <string>[NOT USED]</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>BrowserProxyPort</key>
+        <map>
+        <key>Comment</key>
+            <string>Port for Web Proxy</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>3128</integer>
+        </map>
+    <key>BrowserProxySocks45</key>
+        <map>
+        <key>Comment</key>
+            <string>[NOT USED]</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>5</integer>
+        </map>
+    <key>BuildBtnState</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ButtonFlashCount</key>
+        <map>
+        <key>Comment</key>
+            <string>Number of flashes after which flashing buttons stay lit up</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>3</integer>
+        </map>
+    <key>ButtonFlashRate</key>
+        <map>
+        <key>Comment</key>
+            <string>Frequency at which buttons flash (hz)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>2</real>
+        </map>
+    <key>ButtonHPad</key>
+        <map>
+        <key>Comment</key>
+            <string>Default horizontal spacing between buttons (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>10</integer>
+        </map>
+    <key>ButtonHeight</key>
+        <map>
+        <key>Comment</key>
+            <string>Default height for normal buttons (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>20</integer>
+        </map>
+    <key>ButtonHeightSmall</key>
+        <map>
+        <key>Comment</key>
+            <string>Default height for small buttons (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>16</integer>
+        </map>
+    <key>ButtonVPad</key>
+        <map>
+        <key>Comment</key>
+            <string>Default vertical spacing between buttons (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>CacheLocation</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls the location of the local disk cache</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>CacheSize</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls amount of hard drive space reserved for local file caching in MB</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>500</integer>
+        </map>
+    <key>CacheValidateCounter</key>
+        <map>
+        <key>Comment</key>
+            <string>Used to distribute cache validation</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>CameraOffset</key>
+        <map>
+        <key>Comment</key>
+            <string>Render with camera offset from view frustum (rendering debug)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>CameraOffsetBuild</key>
+        <map>
+        <key>Comment</key>
+            <string>Default camera position relative to focus point when entering build mode</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Vector3</string>
+        <key>Value</key>
+            <array>
+                <real>-6</real>
+                <real>0</real>
+                <real>6</real>
+            </array>
+        </map>
+    <key>CameraOffsetDefault</key>
+        <map>
+        <key>Comment</key>
+            <string>Default camera offset from avatar</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Vector3</string>
+        <key>Value</key>
+            <array>
+                <real>-3</real>
+                <real>0</real>
+                <real>0.75</real>
+            </array>
+        </map>
+    <key>CameraPositionSmoothing</key>
+        <map>
+        <key>Comment</key>
+            <string>Smooths camera position over time</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1.0</real>
+        </map>
+    <key>CameraPosOnLogout</key>
+        <map>
+        <key>Comment</key>
+            <string>Camera position when last logged out (global coordinates)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Vector3D</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>0</real>
+                <real>0</real>
+            </array>
+        </map>
+    <key>CameraMouseWheelZoom</key>
+        <map>
+        <key>Comment</key>
+            <string>Camera zooms in and out with mousewheel</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ChatBarStealsFocus</key>
+        <map>
+        <key>Comment</key>
+            <string>Whenever keyboard focus is removed from the UI, and the chat bar is visible, the chat bar takes focus</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ChatBubbleOpacity</key>
+        <map>
+        <key>Comment</key>
+            <string>Opacity of chat bubble background (0.0 = completely transparent, 1.0 = completely opaque)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.5</real>
+        </map>
+    <key>ChatFontSize</key>
+        <map>
+        <key>Comment</key>
+            <string>Size of chat text in chat console (0 = small, 1 = big)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ChatFullWidth</key>
+        <map>
+        <key>Comment</key>
+            <string>Chat console takes up full width of SL window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ChatHistoryTornOff</key>
+        <map>
+        <key>Comment</key>
+            <string>Show chat history window separately from Communicate window.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ChatOnlineNotification</key>
+        <map>
+        <key>Comment</key>
+            <string>Provide notifications for when friend log on and off of SL</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ChatPersistTime</key>
+        <map>
+        <key>Comment</key>
+            <string>Time for which chat stays visible in console (seconds)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>15</real>
+        </map>
+    <key>ChatShowTimestamps</key>
+        <map>
+        <key>Comment</key>
+            <string>Show timestamps in chat</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ChatVisible</key>
+        <map>
+        <key>Comment</key>
+            <string>Chat bar is visible</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ChatterboxRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for chatterbox window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>400</integer>
+                <integer>350</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>CheesyBeacon</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable cheesy beacon effects</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ClientSettingsFile</key>
+        <map>
+        <key>Comment</key>
+            <string>Persisted client settings file name (per install).</string>
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>CloseChatOnReturn</key>
+        <map>
+        <key>Comment</key>
+            <string>Close chat after hitting return</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>CloseSnapshotOnKeep</key>
+        <map>
+        <key>Comment</key>
+            <string>Close snapshot window after saving snapshot</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ClothingBtnState</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>CmdLineDisableVoice</key>
+        <map>
+        <key>Comment</key>
+            <string>Disable Voice.</string>
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ColorPaletteEntry01</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>0</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry02</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.5</real>
+                <real>0.5</real>
+                <real>0.5</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry03</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.5</real>
+                <real>0</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry04</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.5</real>
+                <real>0.5</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry05</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>0.5</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry06</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>0.5</real>
+                <real>0.5</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry07</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>0</real>
+                <real>0.5</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry08</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.5</real>
+                <real>0</real>
+                <real>0.5</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry09</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.5</real>
+                <real>0.5</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry10</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>0.25</real>
+                <real>0.25</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry11</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>0.5</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry12</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>0.25</real>
+                <real>0.5</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry13</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.5</real>
+                <real>0</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry14</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.5</real>
+                <real>0.25</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry15</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry16</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry17</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry18</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.75</real>
+                <real>0.75</real>
+                <real>0.75</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry19</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>0</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry20</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>1</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry21</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>1</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry22</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry23</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>0</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry24</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>0</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry25</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>1</real>
+                <real>0.5</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry26</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>1</real>
+                <real>0.5</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry27</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.5</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry28</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.5</real>
+                <real>0.5</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry29</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>0</real>
+                <real>0.5</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry30</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>0.5</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry31</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColorPaletteEntry32</key>
+        <map>
+        <key>Comment</key>
+            <string>Color picker palette entry</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ColumnHeaderDropDownDelay</key>
+        <map>
+        <key>Comment</key>
+            <string>Time in seconds of mouse click before column header shows sort options list</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.300000011920928955078125</real>
+        </map>
+    <key>CompileOutputRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for script Recompile Everything output window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>400</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>CompressSnapshotsToDisk</key>
+        <map>
+        <key>Comment</key>
+            <string>Compress snapshots saved to disk (Using JPEG 2000)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ConnectAsGod</key>
+        <map>
+        <key>Comment</key>
+            <string>Log in a god if you have god access.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ConnectionPort</key>
+        <map>
+        <key>Comment</key>
+            <string>Custom connection port number</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>13000</integer>
+        </map>
+    <key>ConnectionPortEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Use the custom connection port?</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ConsoleBackgroundOpacity</key>
+        <map>
+        <key>Comment</key>
+            <string>Opacity of chat console (0.0 = completely transparent, 1.0 = completely opaque)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.4000000059604644775390625</real>
+        </map>
+    <key>ConsoleBufferSize</key>
+        <map>
+        <key>Comment</key>
+            <string>Size of chat console history (lines of chat)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>40</integer>
+        </map>
+    <key>ConsoleMaxLines</key>
+        <map>
+        <key>Comment</key>
+            <string>Max number of lines of chat text visible in console.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>40</integer>
+        </map>
+    <key>ContactsTornOff</key>
+        <map>
+        <key>Comment</key>
+            <string>Show contacts window separately from Communicate window.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>CookiesEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Accept cookies from Web sites?</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>CrashLogBehavior</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls behavior when viewer (0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)</string>
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>CreateToolCopyCenters</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>CreateToolCopyRotates</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>CreateToolCopySelection</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>CreateToolKeepSelected</key>
+        <map>
+        <key>Comment</key>
+            <string>After using create tool, keep the create tool active</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>CustomServer</key>
+        <map>
+        <key>Comment</key>
+            <string>Specifies IP address or hostname of grid to which you connect</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>DebugBeaconLineWidth</key>
+        <map>
+        <key>Comment</key>
+            <string>Size of lines for Debug Beacons</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>DebugInventoryFilters</key>
+        <map>
+        <key>Comment</key>
+            <string>Turn on debugging display for inventory filtering</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>DebugPermissions</key>
+        <map>
+        <key>Comment</key>
+            <string>Log permissions for selected inventory items</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>DebugShowColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Show color under cursor</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>DebugShowRenderInfo</key>
+        <map>
+        <key>Comment</key>
+            <string>Show depth buffer contents</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>DebugShowTime</key>
+        <map>
+        <key>Comment</key>
+            <string>Show depth buffer contents</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>DebugViews</key>
+        <map>
+        <key>Comment</key>
+            <string>Display debugging info for views.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>DebugWindowProc</key>
+        <map>
+        <key>Comment</key>
+            <string>Log windows messages</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>DefaultObjectTexture</key>
+        <map>
+        <key>Comment</key>
+            <string>Texture used as &apos;Default&apos; in texture picker. (UUID texture reference)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>89556747-24cb-43ed-920b-47caed15465f</string>
+        </map>
+    <key>DisableCameraConstraints</key>
+        <map>
+        <key>Comment</key>
+            <string>Disable the normal bounds put on the camera by avatar position</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>DisableRendering</key>
+        <map>
+        <key>Comment</key>
+            <string>Disable GL rendering and GUI (load testing)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>DisableVerticalSync</key>
+        <map>
+        <key>Comment</key>
+            <string>Update frames as fast as possible (FALSE = update frames between display scans)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>DisplayAvatarAgentTarget</key>
+        <map>
+        <key>Comment</key>
+            <string>Show avatar positioning locators (animation debug)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>DisplayChat</key>
+        <map>
+        <key>Comment</key>
+            <string>Display Latest Chat message on LCD</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>DisplayDebug</key>
+        <map>
+        <key>Comment</key>
+            <string>Display Network Information on LCD</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>DisplayDebugConsole</key>
+        <map>
+        <key>Comment</key>
+            <string>Display Console Debug Information on LCD</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>DisplayIM</key>
+        <map>
+        <key>Comment</key>
+            <string>Display Latest IM message on LCD</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>DisplayLinden</key>
+        <map>
+        <key>Comment</key>
+            <string>Display Account Information on LCD</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>DisplayRegion</key>
+        <map>
+        <key>Comment</key>
+            <string>Display Location information on LCD</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>DisplayTimecode</key>
+        <map>
+        <key>Comment</key>
+            <string>Display timecode on screen</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>Disregard128DefaultDrawDistance</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether to use the auto default to 128 draw distance</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>Disregard96DefaultDrawDistance</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether to use the auto default to 96 draw distance</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>DoubleClickAutoPilot</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable double-click auto pilot</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>DragAndDropToolTipDelay</key>
+        <map>
+        <key>Comment</key>
+            <string>Seconds before displaying tooltip when performing drag and drop operation</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1000000014901161193847656</real>
+        </map>
+    <key>DropShadowButton</key>
+        <map>
+        <key>Comment</key>
+            <string>Drop shadow width for buttons (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>2</integer>
+        </map>
+    <key>DropShadowFloater</key>
+        <map>
+        <key>Comment</key>
+            <string>Drop shadow width for floaters (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>5</integer>
+        </map>
+    <key>DropShadowSlider</key>
+        <map>
+        <key>Comment</key>
+            <string>Drop shadow width for sliders (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>3</integer>
+        </map>
+    <key>DropShadowTooltip</key>
+        <map>
+        <key>Comment</key>
+            <string>Drop shadow width for tooltips (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>4</integer>
+        </map>
+    <key>DynamicCameraStrength</key>
+        <map>
+        <key>Comment</key>
+            <string>Amount camera lags behind avatar motion (0 = none, 30 = avatar velocity)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>2</real>
+        </map>
+    <key>EditCameraMovement</key>
+        <map>
+        <key>Comment</key>
+            <string>When entering build mode, camera moves up above avatar</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>EditLinkedParts</key>
+        <map>
+        <key>Comment</key>
+            <string>Select individual parts of linked objects</string>
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>EffectColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Particle effects color</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>EnablePushToTalk</key>
+        <map>
+        <key>Comment</key>
+            <string>Must hold down a key or moouse button when talking into your microphone</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>EnableVoiceChat</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable talking to other residents with a microphone</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>EnergyFromTop</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>20</integer>
+        </map>
+    <key>EnergyHeight</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>40</integer>
+        </map>
+    <key>EnergyWidth</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>175</integer>
+        </map>
+    <key>FilterItemsPerFrame</key>
+        <map>
+        <key>Comment</key>
+            <string>Maximum number of inventory items to match against search filter every frame (lower to increase framerate while searching, higher to improve search speed)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>500</integer>
+        </map>
+    <key>FindLandArea</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables filtering of land search results by area</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>FindLandPrice</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables filtering of land search results by price</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>FindLandType</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls which type of land you are searching for in Find Land interface (&quot;All&quot;, &quot;Auction&quot;, &quot;For Sale&quot;)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>All</string>
+        </map>
+    <key>FindPeopleOnline</key>
+        <map>
+        <key>Comment</key>
+            <string>Limits people search to only users who are logged on</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>FindPlacesPictures</key>
+        <map>
+        <key>Comment</key>
+            <string>Display only results of find places that have pictures</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>FirstLoginThisInstall</key>
+        <map>
+        <key>Comment</key>
+            <string>Specifies that you have not successfully logged in since you installed the latest update</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>FirstName</key>
+        <map>
+        <key>Comment</key>
+            <string>Login first name</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>FirstPersonAvatarVisible</key>
+        <map>
+        <key>Comment</key>
+            <string>Display avatar and attachments below neck while in mouselook</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>FirstPersonBtnState</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>FirstRunThisInstall</key>
+        <map>
+        <key>Comment</key>
+            <string>Specifies that you have not run the viewer since you installed the latest update</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>FixedWeather</key>
+        <map>
+        <key>Comment</key>
+            <string>Weather effects do not change over time</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>FloaterAboutRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for About window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>440</integer>
+                <integer>470</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterActiveSpeakersRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for active speakers window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>300</integer>
+                <integer>250</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterActiveSpeakersSortColumn</key>
+        <map>
+        <key>Comment</key>
+            <string>Column name to sort on</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>speaker_name</string>
+        </map>
+    <key>FloaterActiveSpeakersSortAscending</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether to sort up or down</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>FloaterAudioVolumeRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for Audio Volume window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>440</integer>
+                <integer>470</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterBuildOptionsRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for build options window.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterBumpRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for Bumps/Hits window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>180</integer>
+                <integer>400</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterBuyContentsRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for Buy Contents window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>250</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterBuyRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for buy window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>250</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterCameraRect3</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for camera control window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>64</integer>
+                <integer>176</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterChatRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for chat history</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>172</integer>
+                <integer>500</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterClothingRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for clothing window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>480</integer>
+                <integer>320</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterContactsRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for chat history</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>390</integer>
+                <integer>395</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterCustomizeAppearanceRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for avatar customization window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>540</integer>
+                <integer>494</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterFindRect2</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for Find window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>570</integer>
+                <integer>780</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterFriendsRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for friends window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>400</integer>
+                <integer>250</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterGestureRect2</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for gestures window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>465</integer>
+                <integer>350</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterHtmlRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for HTML window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>100</integer>
+                <integer>460</integer>
+                <integer>370</integer>
+                <integer>100</integer>
+            </array>
+        </map>
+    <key>FloaterHUDRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for HUD Floater window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>282</integer>
+                <integer>342</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterIMRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for IM window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>160</integer>
+                <integer>500</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterInspectRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for Object Inspect window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>400</integer>
+                <integer>400</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterInventoryRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for inventory window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>400</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterJoystickRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for joystick controls window.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterLagMeter</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for lag meter</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>142</integer>
+                <integer>350</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterLandRect5</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for About Land window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>370</integer>
+                <integer>460</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterLandmarkRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for landmark picker</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>290</integer>
+                <integer>310</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterMediaRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for media browser window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>16</integer>
+                <integer>650</integer>
+                <integer>600</integer>
+                <integer>128</integer>
+            </array>
+        </map>
+    <key>FloaterMiniMapRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for world map</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>225</integer>
+                <integer>200</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterMoveRect2</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for avatar control window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>58</integer>
+                <integer>135</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterMuteRect3</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for mute window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>300</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterOpenObjectRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for Open Object window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>350</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterPayRectB</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for pay window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>150</integer>
+                <integer>400</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterRegionInfo</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for region info window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>512</integer>
+                <integer>480</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterScriptDebugRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for Script Error/Debug window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>130</integer>
+                <integer>450</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FloaterSnapshotRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for snapshot window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>200</integer>
+                <integer>200</integer>
+                <integer>400</integer>
+            </array>
+        </map>
+    <key>FloaterViewBottom</key>
+        <map>
+        <key>Comment</key>
+            <string>[DO NOT MODIFY] Controls layout of floating windows within SL window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>-1</integer>
+        </map>
+    <key>FloaterWorldMapRect2</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for world map window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>FlyBtnState</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>FlycamAbsolute</key>
+        <map>
+        <key>Comment</key>
+            <string>Treat Flycam values as absolute positions (not deltas).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>AutoLeveling</key>
+        <map>
+        <key>Comment</key>
+            <string>Keep Flycam level.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>Cursor3D</key>
+        <map>
+        <key>Comment</key>
+            <string>Tread Joystick values as absolute positions (not deltas).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ZoomDirect</key>
+        <map>
+        <key>Comment</key>
+            <string>Map Joystick zoom axis directly to camera zoom.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>JoystickInitialized</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether or not a joystick has been detected and initiailized.</string>
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string></string>
+        </map>
+    <key>JoystickEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables Joystick Input.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <string>0</string>
+        </map>
+    <key>JoystickFlycamEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables the Joystick to control the flycam.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <string>1</string>
+        </map>
+    <key>JoystickAvatarEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables the Joystick to control Avatar movmement.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <string>1</string>
+        </map>
+    <key>JoystickBuildEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables the Joystick to move edited objects.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <string>1</string>
+        </map>
+    <key>JoystickAxis0</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam hardware axis mapping for internal axis 0 ([0, 5]).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>JoystickAxis1</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam hardware axis mapping for internal axis 1 ([0, 5]).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>JoystickAxis2</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam hardware axis mapping for internal axis 2 ([0, 5]).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>2</integer>
+        </map>
+    <key>JoystickAxis3</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam hardware axis mapping for internal axis 3 ([0, 5]).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>4</integer>
+        </map>
+    <key>JoystickAxis4</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam hardware axis mapping for internal axis 4 ([0, 5]).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>3</integer>
+        </map>
+    <key>JoystickAxis5</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam hardware axis mapping for internal axis 5 ([0, 5]).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>5</integer>
+        </map>
+    <key>JoystickAxis6</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam hardware axis mapping for internal axis 6 ([0, 5]).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>-1</integer>
+        </map>
+    <key>FlycamAxisDeadZone0</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 0 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>FlycamAxisDeadZone1</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 1 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>FlycamAxisDeadZone2</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 2 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>FlycamAxisDeadZone3</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 3 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>FlycamAxisDeadZone4</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 4 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>FlycamAxisDeadZone5</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 5 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>FlycamAxisDeadZone6</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 6 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>FlycamAxisScale0</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 0 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>FlycamAxisScale1</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 1 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>FlycamAxisScale2</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 2 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>FlycamAxisScale3</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 3 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>FlycamAxisScale4</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 4 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>FlycamAxisScale5</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 5 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>FlycamAxisScale6</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam axis 6 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>FlycamFeathering</key>
+        <map>
+        <key>Comment</key>
+            <string>Flycam feathering (less is softer)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>16</real>
+        </map>
+    <key>FlycamZoomDirect</key>
+        <map>
+        <key>Comment</key>
+            <string>Map flycam zoom axis directly to camera zoom.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>FlyingAtExit</key>
+        <map>
+        <key>Comment</key>
+            <string>Was flying when last logged out, so fly when logging in</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>FocusOffsetDefault</key>
+        <map>
+        <key>Comment</key>
+            <string>Default focus point offset relative to avatar (x-axis is forward)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Vector3</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>FocusPosOnLogout</key>
+        <map>
+        <key>Comment</key>
+            <string>Camera focus point when last logged out (global coordinates)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Vector3D</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>0</real>
+                <real>0</real>
+            </array>
+        </map>
+    <key>FolderAutoOpenDelay</key>
+        <map>
+        <key>Comment</key>
+            <string>Seconds before automatically expanding the folder under the mouse when performing inventory drag and drop</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.75</real>
+        </map>
+    <key>FolderLoadingMessageWaitTime</key>
+        <map>
+        <key>Comment</key>
+            <string>Seconds to wait before showing the LOADING... text in folder views</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.5</real>
+        </map>
+    <key>FontMonospace</key>
+        <map>
+        <key>Comment</key>
+            <string>Name of monospace font (Truetype file name)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>profontwindows.ttf</string>
+        </map>
+    <key>FontSansSerif</key>
+        <map>
+        <key>Comment</key>
+            <string>Name of san-serif font (Truetype file name)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>MtBkLfRg.ttf</string>
+        </map>
+    <key>FontSansSerifBold</key>
+        <map>
+        <key>Comment</key>
+            <string>Name of bold font (Truetype file name)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>MtBdLfRg.ttf</string>
+        </map>
+    <key>FontSansSerifFallback</key>
+        <map>
+        <key>Comment</key>
+            <string>Name of san-serif font (Truetype file name)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string></string>
+        </map>
+    <key>FontSansSerifFallbackScale</key>
+        <map>
+        <key>Comment</key>
+            <string>Scale of fallback font relative to huge font (fraction of huge font size)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>FontScreenDPI</key>
+        <map>
+        <key>Comment</key>
+            <string>Font resolution, higher is bigger (pixels per inch)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>96</real>
+        </map>
+    <key>FontSizeHuge</key>
+        <map>
+        <key>Comment</key>
+            <string>Size of huge font (points, or 1/72 of an inch)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>16</real>
+        </map>
+    <key>FontSizeLarge</key>
+        <map>
+        <key>Comment</key>
+            <string>Size of large font (points, or 1/72 of an inch)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>12</real>
+        </map>
+    <key>FontSizeMedium</key>
+        <map>
+        <key>Comment</key>
+            <string>Size of medium font (points, or 1/72 of an inch)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>10</real>
+        </map>
+    <key>FontSizeMonospace</key>
+        <map>
+        <key>Comment</key>
+            <string>Size of monospaced font (points, or 1/72 of an inch)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>9</real>
+        </map>
+    <key>FontSizeSmall</key>
+        <map>
+        <key>Comment</key>
+            <string>Size of small font (points, or 1/72 of an inch)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>9</real>
+        </map>
+    <key>ForceShowGrid</key>
+        <map>
+        <key>Comment</key>
+            <string>Always show grid dropdown on login screen</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ForwardBtnRect</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>45</integer>
+                <integer>54</integer>
+                <integer>66</integer>
+                <integer>29</integer>
+            </array>
+        </map>
+    <key>FreezeTime</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>FullScreen</key>
+        <map>
+        <key>Comment</key>
+            <string>Run SL in fullscreen mode</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>FullScreenAspectRatio</key>
+        <map>
+        <key>Comment</key>
+            <string>Aspect ratio of fullscreen display (width / height)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1.33329999446868896484375</real>
+        </map>
+    <key>FullScreenAutoDetectAspectRatio</key>
+        <map>
+        <key>Comment</key>
+            <string>Automatically detect proper aspect ratio for fullscreen display</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>FullScreenHeight</key>
+        <map>
+        <key>Comment</key>
+            <string>Fullscreen resolution in height</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>768</integer>
+        </map>
+    <key>FullScreenWidth</key>
+        <map>
+        <key>Comment</key>
+            <string>Fullscreen resolution in width</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>1024</integer>
+        </map>
+    <key>GridChoice</key>
+        <map>
+        <key>Comment</key>
+            <string>The user&apos;s grid choice or ip address.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>GridCrossSections</key>
+        <map>
+        <key>Comment</key>
+            <string>Highlight cross sections of prims with grid manipulation plane.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>GridDrawSize</key>
+        <map>
+        <key>Comment</key>
+            <string>Visible extent of 2D snap grid (meters)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>12</real>
+        </map>
+    <key>GridMode</key>
+        <map>
+        <key>Comment</key>
+            <string>Snap grid reference frame (0 = world, 1 = local, 2 = reference object)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>GridOpacity</key>
+        <map>
+        <key>Comment</key>
+            <string>Grid line opacity (0.0 = completely transparent, 1.0 = completely opaque)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.699999988079071044921875</real>
+        </map>
+    <key>GridResolution</key>
+        <map>
+        <key>Comment</key>
+            <string>Size of single grid step (meters)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.5</real>
+        </map>
+    <key>GridSubUnit</key>
+        <map>
+        <key>Comment</key>
+            <string>Display fractional grid steps, relative to grid size</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>GridSubdivision</key>
+        <map>
+        <key>Comment</key>
+            <string>Maximum number of times to divide single snap grid unit when GridSubUnit is true</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>32</integer>
+        </map>
+    <key>GroupNotifyBoxHeight</key>
+        <map>
+        <key>Comment</key>
+            <string>Height of group notice messages</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>260</integer>
+        </map>
+    <key>GroupNotifyBoxWidth</key>
+        <map>
+        <key>Comment</key>
+            <string>Width of group notice messages</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>400</integer>
+        </map>
+    <key>HTMLLinkColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of hyperlinks</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.60000002384185791015625</real>
+                <real>0.60000002384185791015625</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>HelpHomeURL</key>
+        <map>
+        <key>Comment</key>
+            <string>URL of initial help page</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>help/index.html</string>
+        </map>
+    <key>HelpLastVisitedURL</key>
+        <map>
+        <key>Comment</key>
+            <string>URL of last help page, will be shown next time help is accessed</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>help/index.html</string>
+        </map>
+    <key>HelperURI</key>
+        <map>
+        <key>Comment</key>
+            <string>helper web CGI prefix to use</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>HighResSnapshot</key>
+        <map>
+        <key>Comment</key>
+            <string>Double resolution of snapshot from current window resolution</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>HtmlFindRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for HTML find window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>16</integer>
+                <integer>650</integer>
+                <integer>600</integer>
+                <integer>128</integer>
+            </array>
+        </map>
+    <key>HtmlHelpLastPage</key>
+        <map>
+        <key>Comment</key>
+            <string>Last URL visited via help system</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>HtmlHelpRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for HTML help window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>16</integer>
+                <integer>650</integer>
+                <integer>600</integer>
+                <integer>128</integer>
+            </array>
+        </map>
+    <key>HtmlReleaseMessage</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for HTML Release Message Floater window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>46</integer>
+                <integer>520</integer>
+                <integer>400</integer>
+                <integer>128</integer>
+            </array>
+        </map>
+    <key>IMInChatHistory</key>
+        <map>
+        <key>Comment</key>
+            <string>Copy IM into chat history</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>IMShowTimestamps</key>
+        <map>
+        <key>Comment</key>
+            <string>Show timestamps in IM</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>IgnorePixelDepth</key>
+        <map>
+        <key>Comment</key>
+            <string>Ignore pixel depth settings.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ImagePipelineUseHTTP</key>
+        <map>
+        <key>Comment</key>
+            <string>If TRUE use HTTP GET to fetch textures from the server</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>InBandwidth</key>
+        <map>
+        <key>Comment</key>
+            <string>Incoming bandwidth throttle (bps)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0</real>
+        </map>
+    <key>InventoryAutoOpenDelay</key>
+        <map>
+        <key>Comment</key>
+            <string>Seconds before automatically opening inventory when mouse is over inventory button when performing inventory drag and drop</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>InventorySortOrder</key>
+        <map>
+        <key>Comment</key>
+            <string>Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>7</integer>
+        </map>
+    <key>InvertMouse</key>
+        <map>
+        <key>Comment</key>
+            <string>When in mouselook, moving mouse up looks down and vice verse (FALSE = moving up looks up)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>KeepAspectForSnapshot</key>
+        <map>
+        <key>Comment</key>
+            <string>Use full window when taking snapshot, regardless of requested image size</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>LCDDestination</key>
+        <map>
+        <key>Comment</key>
+            <string>Which LCD to use</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LSLHelpRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for LSL help window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>400</integer>
+                <integer>400</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>LSLHelpURL</key>
+        <map>
+        <key>Comment</key>
+            <string>URL that points to LSL help files, with [LSL_STRING] corresponding to the referenced LSL function or keyword</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>https://wiki.secondlife.com/wiki/[LSL_STRING]</string>
+        </map>
+    <key>LagMeterShrunk</key>
+        <map>
+        <key>Comment</key>
+            <string>Last large/small state for lag meter</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>Language</key>
+        <map>
+        <key>Comment</key>
+            <string>Language specifier (for XUI)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>default</string>
+        </map>
+    <key>LastFeatureVersion</key>
+        <map>
+        <key>Comment</key>
+            <string>[DO NOT MODIFY] Version number for tracking hardware changes</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LastFindPanel</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls which find operation appears by default when clicking &quot;Find&quot; button </string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>find_all_panel</string>
+        </map>
+    <key>LastName</key>
+        <map>
+        <key>Comment</key>
+            <string>Login last name</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>LastPrefTab</key>
+        <map>
+        <key>Comment</key>
+            <string>Last selected tab in preferences window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LastRunVersion</key>
+        <map>
+        <key>Comment</key>
+            <string>Version number of last instance of the viewer that you ran</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>0.0.0</string>
+        </map>
+    <key>LastSnapshotHeight</key>
+        <map>
+        <key>Comment</key>
+            <string>The height of the last snapshot, in px</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>768</integer>
+        </map>
+    <key>LastSnapshotType</key>
+        <map>
+        <key>Comment</key>
+            <string>Select this as next type of snapshot to take (0 = postcard, 1 = texture, 2 = local image)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LastSnapshotWidth</key>
+        <map>
+        <key>Comment</key>
+            <string>The width of the last snapshot, in px</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>1024</integer>
+        </map>
+    <key>LeftClickShowMenu</key>
+        <map>
+        <key>Comment</key>
+            <string>Left click opens pie menu (FALSE = left click touches or grabs object)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LimitDragDistance</key>
+        <map>
+        <key>Comment</key>
+            <string>Limit translation of object via translate tool</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>LimitSelectDistance</key>
+        <map>
+        <key>Comment</key>
+            <string>Disallow selection of objects beyond max select distance</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>LocalCacheVersion</key>
+        <map>
+        <key>Comment</key>
+            <string>Version number of cache</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LogMessages</key>
+        <map>
+        <key>Comment</key>
+            <string>Log network traffic</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LoginAsGod</key>
+        <map>
+        <key>Comment</key>
+            <string>Attempt to login with god powers (Linden accounts only)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LoginLastLocation</key>
+        <map>
+        <key>Comment</key>
+            <string>Login at same location you last logged out</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>LoginPage</key>
+        <map>
+        <key>Comment</key>
+            <string>Login authentication page.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>LoginURI</key>
+        <map>
+        <key>Comment</key>
+            <string>login server and CGI prefix to use</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>LosslessJ2CUpload</key>
+        <map>
+        <key>Comment</key>
+            <string>Use lossless compression for small image uploads</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MapOverlayIndex</key>
+        <map>
+        <key>Comment</key>
+            <string>Currently selected world map type</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MapScale</key>
+        <map>
+        <key>Comment</key>
+            <string>World map zoom level (pixels per region)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>128</real>
+        </map>
+    <key>MapShowClassifieds</key>
+        <map>
+        <key>Comment</key>
+            <string>Show locations associated with classified ads on world map</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>MapShowEvents</key>
+        <map>
+        <key>Comment</key>
+            <string>Show events on world map</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>MapShowInfohubs</key>
+        <map>
+        <key>Comment</key>
+            <string>Show infohubs on the world map</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>MapShowLandForSale</key>
+        <map>
+        <key>Comment</key>
+            <string>Show land for sale on world map</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MapShowPeople</key>
+        <map>
+        <key>Comment</key>
+            <string>Show other users on world map</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>MapShowPopular</key>
+        <map>
+        <key>Comment</key>
+            <string>Show popular places on world map</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>MapShowTelehubs</key>
+        <map>
+        <key>Comment</key>
+            <string>Show telehubs on world map</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>Marker</key>
+        <map>
+        <key>Comment</key>
+            <string>[NOT USED]</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>MaxDragDistance</key>
+        <map>
+        <key>Comment</key>
+            <string>Maximum allowed translation distance in a single operation of translate tool (meters from start point)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>48</real>
+        </map>
+    <key>MaxSelectDistance</key>
+        <map>
+        <key>Comment</key>
+            <string>Maximum allowed selection distance (meters from avatar)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>64</real>
+        </map>
+    <key>MeanCollisionBump</key>
+        <map>
+        <key>Comment</key>
+            <string>You have experienced an abuse of being bumped by an object or avatar</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MeanCollisionPhysical</key>
+        <map>
+        <key>Comment</key>
+            <string>You have experienced an abuse from a physical object</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MeanCollisionPushObject</key>
+        <map>
+        <key>Comment</key>
+            <string>You have experienced an abuse of being pushed by a scripted object</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MeanCollisionScripted</key>
+        <map>
+        <key>Comment</key>
+            <string>You have experienced an abuse from a scripted object</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MeanCollisionSelected</key>
+        <map>
+        <key>Comment</key>
+            <string>You have experienced an abuse of being pushed via a selected object</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MenuAccessKeyTime</key>
+        <map>
+        <key>Comment</key>
+            <string>Time (seconds) in which the menu key must be tapped to move focus to the menu bar</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.25</real>
+        </map>
+    <key>MenuBarHeight</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>18</integer>
+        </map>
+    <key>MenuBarWidth</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>410</integer>
+        </map>
+    <key>MiniMapRotate</key>
+        <map>
+        <key>Comment</key>
+            <string>Rotate miniature world map to avatar direction</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>MiniMapScale</key>
+        <map>
+        <key>Comment</key>
+            <string>Miniature world map zoom levle (pixels per region)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>128</real>
+        </map>
+    <key>MouseSensitivity</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls responsiveness of mouse when in mouselook mode (fraction or multiple of default mouse sensitivity)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>3</real>
+        </map>
+    <key>MouseSmooth</key>
+        <map>
+        <key>Comment</key>
+            <string>Smooths out motion of mouse when in mouselook mode.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MouseSun</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MouselookBtnState</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MoveDownBtnRect</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>91</integer>
+                <integer>29</integer>
+                <integer>116</integer>
+                <integer>4</integer>
+            </array>
+        </map>
+    <key>MoveUpBtnRect</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>91</integer>
+                <integer>54</integer>
+                <integer>116</integer>
+                <integer>29</integer>
+            </array>
+        </map>
+    <key>MuteAmbient</key>
+        <map>
+        <key>Comment</key>
+            <string>Ambient sound effects, such as wind noise, play at 0 volume</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MuteAudio</key>
+        <map>
+        <key>Comment</key>
+            <string>All audio plays at 0 volume (streaming audio still takes up bandwidth, for example)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MuteMedia</key>
+        <map>
+        <key>Comment</key>
+            <string>Media plays at 0 volume (streaming audio still takes up bandwidth)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MuteMusic</key>
+        <map>
+        <key>Comment</key>
+            <string>Music plays at 0 volume (streaming audio still takes up bandwidth)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MuteSounds</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound effects play at 0 volume</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MuteUI</key>
+        <map>
+        <key>Comment</key>
+            <string>UI sound effects play at 0 volume</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MuteVoice</key>
+        <map>
+        <key>Comment</key>
+            <string>Voice plays at 0 volume (streaming audio still takes up bandwidth)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>MuteWhenMinimized</key>
+        <map>
+        <key>Comment</key>
+            <string>Mute audio when SL window is minimized</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>NewCacheLocation</key>
+        <map>
+        <key>Comment</key>
+            <string>Change the location of the local disk cache to this</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>NextLoginLocation</key>
+        <map>
+        <key>Comment</key>
+            <string>Location to log into by default.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>NoAudio</key>
+        <map>
+        <key>Comment</key>
+            <string>Disable audio playback.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>NoHardwareProbe</key>
+        <map>
+        <key>Comment</key>
+            <string>Disable hardware probe.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>NoInventoryLibrary</key>
+        <map>
+        <key>Comment</key>
+            <string>Do not request inventory library.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>NoPreload</key>
+        <map>
+        <key>Comment</key>
+            <string>Disable sound and image preload.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>NoQuickTime</key>
+        <map>
+        <key>Comment</key>
+            <string>Disable quicktime playback.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>NoVerifySSLCert</key>
+        <map>
+        <key>Comment</key>
+            <string>Do not verify SSL peers.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>NotecardEditorRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for notecard editor</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>400</integer>
+                <integer>400</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>NotifyBoxHeight</key>
+        <map>
+        <key>Comment</key>
+            <string>Height of notification messages</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>200</integer>
+        </map>
+    <key>NotifyBoxWidth</key>
+        <map>
+        <key>Comment</key>
+            <string>Width of notification messages</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>350</integer>
+        </map>
+    <key>NotifyMoneyChange</key>
+        <map>
+        <key>Comment</key>
+            <string>Pop up notifications for all L$ transactions</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>NotifyTipDuration</key>
+        <map>
+        <key>Comment</key>
+            <string>Length of time that notification tips stay on screen (seconds)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>4</real>
+        </map>
+    <key>NumSessions</key>
+        <map>
+        <key>Comment</key>
+            <string>Number of successful logins to Second Life</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>NumpadControl</key>
+        <map>
+        <key>Comment</key>
+            <string>How numpad keys control your avatar. 0 = Like the normal arrow keys, 1 = Numpad moves avatar when numlock is off, 2 = Numpad moves avatar regardless of numlock (use this if you have no numlock)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ObjectChatColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of chat messages from objects</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.699999988079071044921875</real>
+                <real>0.89999997615814208984375</real>
+                <real>0.699999988079071044921875</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>OpenDebugStatAdvanced</key>
+        <map>
+        <key>Comment</key>
+            <string>Expand advanced performance stats display</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>OpenDebugStatBasic</key>
+        <map>
+        <key>Comment</key>
+            <string>Expand basic performance stats display</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>OpenDebugStatNet</key>
+        <map>
+        <key>Comment</key>
+            <string>Expand network stats display</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>OpenDebugStatRender</key>
+        <map>
+        <key>Comment</key>
+            <string>Expand render stats display</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>OpenDebugStatSim</key>
+        <map>
+        <key>Comment</key>
+            <string>Expand simulator performance stats display</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>OutBandwidth</key>
+        <map>
+        <key>Comment</key>
+            <string>Outgoing bandwidth throttle (bps)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0</real>
+        </map>
+    <key>OverdrivenColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of various indicators when resident is speaking too loud.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>0</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>OverlayTitle</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls watermark text message displayed on screen when &quot;ShowOverlayTitle&quot; is enabled (one word, underscores become spaces)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>Set_via_OverlayTitle_in_settings.xml</string>
+        </map>
+    <key>PTTCurrentlyEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>PacketDropPercentage</key>
+        <map>
+        <key>Comment</key>
+            <string>Percentage of packets dropped by the client.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0</real>
+        </map>
+    <key>PerAccountSettingsFile</key>
+        <map>
+        <key>Comment</key>
+            <string>Persisted client settings file name (per user).</string>
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>PermissionsCautionEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>When enabled, changes the handling of script permission requests to help avoid accidental granting of certain permissions, such as the debit permission</string>
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>PermissionsCautionNotifyBoxHeight</key>
+        <map>
+        <key>Comment</key>
+            <string>Height of caution-style notification messages</string>
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>344</integer>
+        </map>
+    <key>PermissionsManagerRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for permissions manager window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>85</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>PickerContextOpacity</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls overall opacity of context frustrum connecting color and texture pickers with their swatches</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.3499999940395355224609375</real>
+        </map>
+    <key>PieMenuLineWidth</key>
+        <map>
+        <key>Comment</key>
+            <string>Width of lines in pie menu display (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>2.5</real>
+        </map>
+    <key>PinTalkViewOpen</key>
+        <map>
+        <key>Comment</key>
+            <string>Stay in IM after hitting return</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>PingInterpolate</key>
+        <map>
+        <key>Comment</key>
+            <string>Extrapolate object position along velocity vector based on ping delay</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>PitchFromMousePosition</key>
+        <map>
+        <key>Comment</key>
+            <string>Vertical range over which avatar head tracks mouse position (degrees of head rotation from top of window to bottom)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>90</real>
+        </map>
+    <key>PlayTypingAnim</key>
+        <map>
+        <key>Comment</key>
+            <string>Your avatar plays the typing animation whenever you type in the chat bar</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>PrecachingDelay</key>
+        <map>
+        <key>Comment</key>
+            <string>Delay when logging in to load world before showing it (seconds)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>6</real>
+        </map>
+    <key>PreviewAnimRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for animation preview window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>85</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>PreviewClassifiedRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for URL preview window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>530</integer>
+                <integer>420</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>PreviewEventRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for Event preview window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>530</integer>
+                <integer>420</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>PreviewLandmarkRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for landmark preview window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>90</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>PreviewObjectRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for object preview window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>85</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>PreviewScriptRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for script preview window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>550</integer>
+                <integer>500</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>PreviewSoundRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for sound preview window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>85</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>PreviewTextureRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for texture preview window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>400</integer>
+                <integer>400</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>PreviewURLRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for URL preview window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>90</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>PreviewWearableRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for wearable preview window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>85</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>ProbeHardwareOnStartup</key>
+        <map>
+        <key>Comment</key>
+            <string>Query current hardware configuration on application startup</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>PropertiesRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for inventory item properties window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>320</integer>
+                <integer>350</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>PurgeCacheOnNextStartup</key>
+        <map>
+        <key>Comment</key>
+            <string>Clear local file cache next time viewer is run</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>PurgeCacheOnStartup</key>
+        <map>
+        <key>Comment</key>
+            <string>Clear local file cache every time viewer is run</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>PushToTalkButton</key>
+        <map>
+        <key>Comment</key>
+            <string>Which button or keyboard key is used for push-to-talk</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>MiddleMouse</string>
+        </map>
+    <key>PushToTalkToggle</key>
+        <map>
+        <key>Comment</key>
+            <string>Should the push-to-talk button behave as a toggle</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>QAMode</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable Testing Features.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>QuietSnapshotsToDisk</key>
+        <map>
+        <key>Comment</key>
+            <string>Take snapshots to disk without playing animation or sound</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>QuitAfterSeconds</key>
+        <map>
+        <key>Comment</key>
+            <string>The duration allowed before quitting.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0</real>
+        </map>
+    <key>RadioLandBrushAction</key>
+        <map>
+        <key>Comment</key>
+            <string>Last selected land modification operation (0 = flatten, 1 = raise, 2 = lower, 3 = smooth, 4 = roughen, 5 = revert)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RadioLandBrushSize</key>
+        <map>
+        <key>Comment</key>
+            <string>Size of land modification brush (0 = small, 1 = medium, 2 = large)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RecentItemsSortOrder</key>
+        <map>
+        <key>Comment</key>
+            <string>Specifies sort key for recent inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RectangleSelectInclusive</key>
+        <map>
+        <key>Comment</key>
+            <string>Select objects that have at least one vertex inside selection rectangle</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RegionTextureSize</key>
+        <map>
+        <key>Comment</key>
+            <string>Terrain texture dimensions (power of 2)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>256</integer>
+        </map>
+    <key>RememberPassword</key>
+        <map>
+        <key>Comment</key>
+            <string>Keep password (in encrypted form) for next login</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderAnisotropic</key>
+        <map>
+        <key>Comment</key>
+            <string>Render textures using anisotropic filtering</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderAppleUseMultGL</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether we want to use multi-threaded OpenGL on Apple hardware (requires restart of SL).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderAvatarCloth</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls if avatars use wavy cloth</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderAvatarLODFactor</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls level of detail of avatars (multiplier for current screen area when calculated level of detail)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.5</real>
+        </map>
+    <key>RenderAvatarMaxVisible</key>
+        <map>
+        <key>Comment</key>
+            <string>Maximum number of avatars to display at any one time</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>35</integer>
+        </map>
+    <key>RenderAvatarVP</key>
+        <map>
+        <key>Comment</key>
+            <string>Use vertex programs to perform hardware skinning of avatar</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderBumpmapMinDistanceSquared</key>
+        <map>
+        <key>Comment</key>
+            <string>Maximum distance at which to render bumpmapped primitives (distance in meters, squared)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>100</real>
+        </map>
+    <key>RenderCubeMap</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether we can render the cube map or not</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderCustomSettings</key>
+        <map>
+        <key>Comment</key>
+            <string>Do you want to set the graphics settings yourself</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderDebugTextureBind</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable texture bind performance test.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderDynamicLOD</key>
+        <map>
+        <key>Comment</key>
+            <string>Dynamically adjust level of detail.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderDynamicReflections</key>
+        <map>
+        <key>Comment</key>
+            <string>Generate a dynamic cube map for reflections (objects reflect their environment, experimental).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderFarClip</key>
+        <map>
+        <key>Comment</key>
+            <string>Distance of far clip plane from camera (meters)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>256</real>
+        </map>
+    <key>RenderFastUI</key>
+        <map>
+        <key>Comment</key>
+            <string>[NOT USED]</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderFlexTimeFactor</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls level of detail of flexible objects (multiplier for amount of time spent processing flex objects)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>RenderFogRatio</key>
+        <map>
+        <key>Comment</key>
+            <string>Distance from camera where fog reaches maximum density (fraction or multiple of far clip distance)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>4.0</real>
+        </map>
+    <key>RenderGamma</key>
+        <map>
+        <key>Comment</key>
+            <string>Sets gamma exponent for renderer</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0</real>
+        </map>
+    <key>RenderGammaFull</key>
+        <map>
+        <key>Comment</key>
+            <string>Use fully controllable gamma correction, instead of faster, hard-coded gamma correction of 2.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>RenderGlow</key>
+        <map>
+        <key>Comment</key>
+            <string>Render bloom post effect.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderGlowIterations</key>
+        <map>
+        <key>Comment</key>
+            <string>Number of times to iterate the glow (higher = wider and smoother but slower)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>2</integer>
+        </map>
+    <key>RenderGlowLumWeights</key>
+        <map>
+        <key>Comment</key>
+            <string>Weights for each color channel to be used in calculating luminance (should add up to 1.0)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Vector3</string>
+        <key>Value</key>
+            <array>
+                <real>0.299</real>
+                <real>0.587</real>
+                <real>0.114</real>
+            </array>
+        </map>
+    <key>RenderGlowMaxExtractAlpha</key>
+        <map>
+        <key>Comment</key>
+            <string>Max glow alpha value for brightness extraction to auto-glow.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.065</real>
+        </map>
+    <key>RenderGlowMinLuminance</key>
+        <map>
+        <key>Comment</key>
+            <string>Min luminance intensity necessary to consider an object bright enough to automatically glow. (Gets clamped to 0 - 1.0 range)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1.0</real>
+        </map>
+    <key>RenderGlowResolutionPow</key>
+        <map>
+        <key>Comment</key>
+            <string>Glow map resolution power of two.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>9</integer>
+        </map>
+    <key>RenderGlowStrength</key>
+        <map>
+        <key>Comment</key>
+            <string>Additive strength of glow.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.35</real>
+        </map>
+    <key>RenderGlowWarmthAmount</key>
+        <map>
+        <key>Comment</key>
+            <string>Amount of warmth extraction to use (versus luminance extraction). 0 = lum, 1.0 = warmth</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0</real>
+        </map>
+    <key>RenderGlowWarmthWeights</key>
+        <map>
+        <key>Comment</key>
+            <string>Weight of each color channel used before finding the max warmth</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Vector3</string>
+        <key>Value</key>
+            <array>
+                <real>1.0</real>
+                <real>0.5</real>
+                <real>0.7</real>
+            </array>
+        </map>
+    <key>RenderGlowWidth</key>
+        <map>
+        <key>Comment</key>
+            <string>Glow sample size (higher = wider and softer but eventually more pixelated)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1.3</real>
+        </map>
+    <key>RenderHUDInSnapshot</key>
+        <map>
+        <key>Comment</key>
+            <string>Display HUD attachments in snapshot</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderHiddenSelections</key>
+        <map>
+        <key>Comment</key>
+            <string>Show selection lines on objects that are behind other objects</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderHideGroupTitle</key>
+        <map>
+        <key>Comment</key>
+            <string>Don&apos;t show my group title in my name label</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderHideGroupTitleAll</key>
+        <map>
+        <key>Comment</key>
+            <string>Show group titles in name labels</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderInitError</key>
+        <map>
+        <key>Comment</key>
+            <string>Error occured while initializing GL</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderLightRadius</key>
+        <map>
+        <key>Comment</key>
+            <string>Render the radius of selected lights</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderLightingDetail</key>
+        <map>
+        <key>Comment</key>
+            <string>Amount of detail for lighting objects/avatars/terrain (0=sun/moon only, 1=enable local lights)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderMaxPartCount</key>
+        <map>
+        <key>Comment</key>
+            <string>Maximum number of particles to display on screen</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>4096</integer>
+        </map>
+    <key>RenderMaxVBOSize</key>
+        <map>
+        <key>Comment</key>
+            <string>Maximum size of a vertex buffer (in KB).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>32</integer>
+        </map>
+    <key>RenderName</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls display of names above avatars (0 = never, 1 = fade, 2 = always)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>2</integer>
+        </map>
+    <key>RenderNameFadeDuration</key>
+        <map>
+        <key>Comment</key>
+            <string>Time interval over which to fade avatar names (seconds)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>RenderNameHideSelf</key>
+        <map>
+        <key>Comment</key>
+            <string>Don&apos;t display own name above avatar</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderNameShowTime</key>
+        <map>
+        <key>Comment</key>
+            <string>Fade avatar names after specified time (seconds)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>10</real>
+        </map>
+    <key>RenderObjectBump</key>
+        <map>
+        <key>Comment</key>
+            <string>Show bumpmapping on primitives</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderQualityPerformance</key>
+        <map>
+        <key>Comment</key>
+            <string>Which graphics settings you've chosen</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderReflectionDetail</key>
+        <map>
+        <key>Comment</key>
+            <string>Detail of reflection render pass.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>2</integer>
+        </map>
+    <key>RenderReflectionRes</key>
+        <map>
+        <key>Comment</key>
+            <string>Reflection map resolution.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>64</integer>
+        </map>
+    <key>RenderResolutionDivisor</key>
+        <map>
+        <key>Comment</key>
+            <string>Divisor for rendering 3D scene at reduced resolution.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderShaderLODThreshold</key>
+        <map>
+        <key>Comment</key>
+            <string>Fraction of draw distance defining the switch to a different shader LOD</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <integer>1.0</integer>
+        </map>
+    <key>RenderSunDynamicRange</key>
+        <map>
+        <key>Comment</key>
+            <string>Defines what percent brighter the sun is than local point lights (1.0 = 100% brighter. Value should not be less than 0. ).</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <integer>1.0</integer>
+        </map>
+    <key>RenderTerrainDetail</key>
+        <map>
+        <key>Comment</key>
+            <string>Detail applied to terrain texturing (0 = none, 1 or 2 = full)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>2</integer>
+        </map>
+    <key>RenderTerrainLODFactor</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls level of detail of terrain (multiplier for current screen area when calculated level of detail)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1.0</real>
+        </map>
+    <key>RenderTerrainScale</key>
+        <map>
+        <key>Comment</key>
+            <string>Terrain detail texture scale</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>12</real>
+        </map>
+    <key>RenderTreeLODFactor</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls level of detail of vegetation (multiplier for current screen area when calculated level of detail)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.5</real>
+        </map>
+    <key>RenderUIInSnapshot</key>
+        <map>
+        <key>Comment</key>
+            <string>Display user interface in snapshot</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderUseCleverUI</key>
+        <map>
+        <key>Comment</key>
+            <string>Turns on the \"clever\" UI rendering optimization.  It's a known performace gain (and enabled by default) on apple.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderUseFarClip</key>
+        <map>
+        <key>Comment</key>
+            <string>If false, frustum culling will ignore far clip plane.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderUseFBO</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether we want to use GL_EXT_framebuffer_objects.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderUseImpostors</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether we want to use impostors for far away avatars.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderUseShaderLOD</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether we want to have different shaders for LOD</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderUseShaderNearParticles</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether we want to use shaders on near particles</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderShaderParticleThreshold</key>
+        <map>
+        <key>Comment</key>
+            <string>Fraction of draw distance to not use shader on particles</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.25</real>
+        </map>
+    <key>RenderVBOEnable</key>
+        <map>
+        <key>Comment</key>
+            <string>Use GL Vertex Buffer Objects</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderVolumeLODFactor</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls level of detail of primitives (multiplier for current screen area when calculated level of detail)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>RenderWater</key>
+        <map>
+        <key>Comment</key>
+            <string>Display water</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderWaterMipNormal</key>
+        <map>
+        <key>Comment</key>
+            <string>Use mip maps for water normal map.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>RenderWaterReflections</key>
+        <map>
+        <key>Comment</key>
+            <string>Reflect the environment in the water.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RenderWaterRefResolution</key>
+        <map>
+        <key>Comment</key>
+            <string>Water planar reflection resolution.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>512</integer>
+        </map>
+    <key>RotateRight</key>
+        <map>
+        <key>Comment</key>
+            <string>Make the agent rotate to its right.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RotationStep</key>
+        <map>
+        <key>Comment</key>
+            <string>All rotations via rotation tool are constrained to multiples of this unit (degrees)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>RunBtnState</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>RunMultipleThreads</key>
+        <map>
+        <key>Comment</key>
+            <string>If TRUE keep background threads active during render</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SafeMode</key>
+        <map>
+        <key>Comment</key>
+            <string>Reset preferences, run in safe mode.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SaveMinidump</key>
+        <map>
+        <key>Comment</key>
+            <string>Save minidump for developer debugging on crash</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ScaleShowAxes</key>
+        <map>
+        <key>Comment</key>
+            <string>Show indicator of selected scale axis when scaling</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ScaleStretchTextures</key>
+        <map>
+        <key>Comment</key>
+            <string>Stretch textures along with object when scaling</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ScaleUniform</key>
+        <map>
+        <key>Comment</key>
+            <string>Scale selected objects evenly about center of selection</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ScriptErrorColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of script error messages</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.819999992847442626953125</real>
+                <real>0.819999992847442626953125</real>
+                <real>0.9900000095367431640625</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ScriptErrorsAsChat</key>
+        <map>
+        <key>Comment</key>
+            <string>Display script errors and warning in chat history</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ScriptHelpFollowsCursor</key>
+        <map>
+        <key>Comment</key>
+            <string>Scripting help window updates contents based on script editor contents under text cursor</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SearchURLDefault</key>
+        <map>
+        <key>Comment</key>
+            <string>URL to load for empty searches</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>http://secondlife.com/app/search/index.php?</string>
+        </map>
+    <key>SearchURLQuery</key>
+        <map>
+        <key>Comment</key>
+            <string>URL to use for searches</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>http://secondlife.com/app/search/search_proxy.php?q=[QUERY]&amp;s=[COLLECTION]&amp;</string>
+        </map>
+    <key>SearchURLSuffix2</key>
+        <map>
+        <key>Comment</key>
+            <string>Parameters added to end of search queries</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>lang=[LANG]&amp;m=[MATURE]&amp;t=[TEEN]&amp;region=[REGION]&amp;x=[X]&amp;y=[Y]&amp;z=[Z]&amp;session=[SESSION]</string>
+        </map>
+    <key>SelectMovableOnly</key>
+        <map>
+        <key>Comment</key>
+            <string>Select only objects you can move</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SelectOwnedOnly</key>
+        <map>
+        <key>Comment</key>
+            <string>Select only objects you own</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SelectionHighlightAlpha</key>
+        <map>
+        <key>Comment</key>
+            <string>Opacity of selection highlight (0.0 = completely transparent, 1.0 = completely opaque)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.4000000059604644775390625</real>
+        </map>
+    <key>SelectionHighlightAlphaTest</key>
+        <map>
+        <key>Comment</key>
+            <string>Alpha value below which pixels are displayed on selection highlight line (0.0 = show all pixels, 1.0 = show now pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>SelectionHighlightThickness</key>
+        <map>
+        <key>Comment</key>
+            <string>Thickness of selection highlight line (fraction of view distance)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.009999999776482582092285156</real>
+        </map>
+    <key>SelectionHighlightUAnim</key>
+        <map>
+        <key>Comment</key>
+            <string>Rate at which texture animates along U direction in selection highlight line (fraction of texture per second)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0</real>
+        </map>
+    <key>SelectionHighlightUScale</key>
+        <map>
+        <key>Comment</key>
+            <string>Scale of texture display on selection highlight line (fraction of texture size)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>SelectionHighlightVAnim</key>
+        <map>
+        <key>Comment</key>
+            <string>Rate at which texture animates along V direction in selection highlight line (fraction of texture per second)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.5</real>
+        </map>
+    <key>SelectionHighlightVScale</key>
+        <map>
+        <key>Comment</key>
+            <string>Scale of texture display on selection highlight line (fraction of texture size)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>ServerChoice</key>
+        <map>
+        <key>Comment</key>
+            <string>[DO NOT MODIFY] Controls which grid you connect to</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowAllObjectHoverTip</key>
+        <map>
+        <key>Comment</key>
+            <string>Show descriptive tooltip when mouse hovers over non-interactive and interactive objects.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowActiveSpeakers</key>
+        <map>
+        <key>Comment</key>
+            <string>Display active speakers list on login</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowAxes</key>
+        <map>
+        <key>Comment</key>
+            <string>Render coordinate frame at your position</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowCameraControls</key>
+        <map>
+        <key>Comment</key>
+            <string>Display camera controls on login</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ShowChatHistory</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowCommunicate</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowConsoleWindow</key>
+        <map>
+        <key>Comment</key>
+            <string>Show log in separate OS window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowCrosshairs</key>
+        <map>
+        <key>Comment</key>
+            <string>Display crosshairs when in mouselook mode</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ShowDebugConsole</key>
+        <map>
+        <key>Comment</key>
+            <string>Show log in SL window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowDebugStats</key>
+        <map>
+        <key>Comment</key>
+            <string>Show performance stats display</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowDepthBuffer</key>
+        <map>
+        <key>Comment</key>
+            <string>Show depth buffer contents</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowDirectory</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowEmptyFoldersWhenSearching</key>
+        <map>
+        <key>Comment</key>
+            <string>Shows folders that do not have any visible contents when applying a filter to inventory</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowHoverTips</key>
+        <map>
+        <key>Comment</key>
+            <string>Show descriptive tooltip when mouse hovers over items in world</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ShowInventory</key>
+        <map>
+        <key>Comment</key>
+            <string>Open inventory window on login</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowLandHoverTip</key>
+        <map>
+        <key>Comment</key>
+            <string>Show descriptive tooltip when mouse hovers over land</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowLeaders</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowMatureClassifieds</key>
+        <map>
+        <key>Comment</key>
+            <string>Display results of find classifieds that are flagged as mature</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowMatureEvents</key>
+        <map>
+        <key>Comment</key>
+            <string>Display results of find events that are flagged as mature</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowMatureFindAll</key>
+        <map>
+        <key>Comment</key>
+            <string>Display results of find all that are in mature sims</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowMatureGroups</key>
+        <map>
+        <key>Comment</key>
+            <string>Display results of find groups that are in flagged as mature</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ShowMatureSims</key>
+        <map>
+        <key>Comment</key>
+            <string>Display results of find places or find popular that are in mature sims</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowMiniMap</key>
+        <map>
+        <key>Comment</key>
+            <string>Display mini map on login</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ShowMovementControls</key>
+        <map>
+        <key>Comment</key>
+            <string>Display movement controls on login</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ShowNearClip</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowNewInventory</key>
+        <map>
+        <key>Comment</key>
+            <string>Automatically views new notecards/textures/landmarks</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ShowObjectUpdates</key>
+        <map>
+        <key>Comment</key>
+            <string>Show when update messages are received for individual objects</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowOverlayTitle</key>
+        <map>
+        <key>Comment</key>
+            <string>Prints watermark text message on screen</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowParcelOwners</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowPermissions</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowPropertyLines</key>
+        <map>
+        <key>Comment</key>
+            <string>Show line overlay demarking property boundaries</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowSearchBar</key>
+        <map>
+        <key>Comment</key>
+            <string>Show the Search Bar in the Status Overlay</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ShowSelectionBeam</key>
+        <map>
+        <key>Comment</key>
+            <string>Show selection particle beam when selecting or interacting with objects.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ShowStartLocation</key>
+        <map>
+        <key>Comment</key>
+            <string>Display starting location menu on login screen</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowTangentBasis</key>
+        <map>
+        <key>Comment</key>
+            <string>Render normal and binormal (debugging bump mapping)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowToolBar</key>
+        <map>
+        <key>Comment</key>
+            <string>Show toolbar at bottom of screen</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ShowTools</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowVoiceChannelPopup</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls visibility of the current voice channel popup above the voice tab</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowVolumeSettingsPopup</key>
+        <map>
+        <key>Comment</key>
+            <string>Show individual volume slider for voice, sound effects, etc</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowWorldMap</key>
+        <map>
+        <key>Comment</key>
+            <string>Display world map on login</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ShowXUINames</key>
+        <map>
+        <key>Comment</key>
+            <string>Display XUI Names as Tooltips</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SitBtnState</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SkinFolder</key>
+        <map>
+        <key>Comment</key>
+            <string>The skin folder to use.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>SkyAmbientScale</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls strength of ambient, or non-directional light from the sun and moon (fraction or multiple of default ambient level)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.300000011920928955078125</real>
+        </map>
+    <key>SkyNightColorShift</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls moonlight color (base color applied to moon as light source)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color3</string>
+        <key>Value</key>
+            <array>
+                <real>0.699999988079071044921875</real>
+                <real>0.699999988079071044921875</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>SkyOverrideSimSunPosition</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SkySunDefaultPosition</key>
+        <map>
+        <key>Comment</key>
+            <string>Default position of sun in sky (direction in world coordinates)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Vector3</string>
+        <key>Value</key>
+            <array>
+                <real>1</real>
+                <real>0</real>
+                <real>0.1</real>
+            </array>
+        </map>
+        <key>SkyUseClassicClouds</key>
+                <map>
+                <key>Comment</key>
+                        <string>Whether to use the old Second Life particle clouds or not</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>Boolean</string>
+                <key>Value</key>
+                        <integer>1</integer>
+                </map>
+    <key>SlideLeftBtnRect</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>20</integer>
+                <integer>54</integer>
+                <integer>45</integer>
+                <integer>29</integer>
+            </array>
+        </map>
+    <key>SlideRightBtnRect</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>66</integer>
+                <integer>54</integer>
+                <integer>91</integer>
+                <integer>29</integer>
+            </array>
+        </map>
+    <key>SmallAvatarNames</key>
+        <map>
+        <key>Comment</key>
+            <string>Display avatar name text in smaller font</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>SnapEnabled</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable snapping to grid</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>SnapMargin</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls maximum distance between windows before they auto-snap together (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>10</integer>
+        </map>
+    <key>SnapToMouseCursor</key>
+        <map>
+        <key>Comment</key>
+            <string>When snapping to grid, center object on nearest grid point to mouse cursor</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SnapshotLocalLastResolution</key>
+        <map>
+        <key>Comment</key>
+            <string>Take next local snapshot at this resolution</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SnapshotPostcardLastResolution</key>
+        <map>
+        <key>Comment</key>
+            <string>Take next postcard snapshot at this resolution</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SnapshotQuality</key>
+        <map>
+        <key>Comment</key>
+            <string>Quality setting of postcard JPEGs (0 = worst, 100 = best)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>75</integer>
+        </map>
+    <key>SnapshotTextureLastResolution</key>
+        <map>
+        <key>Comment</key>
+            <string>Take next texture snapshot at this resolution</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>SpeakingColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of various indicators when resident is speaking on a voice channel.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0</real>
+                <real>1</real>
+                <real>0</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>SpeedTest</key>
+        <map>
+        <key>Comment</key>
+            <string>Performance testing mode, no network</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>StatsAutoRun</key>
+        <map>
+        <key>Comment</key>
+            <string>Play back autopilot</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>StatsFile</key>
+        <map>
+        <key>Comment</key>
+            <string>Filename for stats logging output</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>fs.txt</string>
+        </map>
+    <key>StatsNumRuns</key>
+        <map>
+        <key>Comment</key>
+            <string>Loop autopilot playback this number of times</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>-1</integer>
+        </map>
+    <key>StatsPilotFile</key>
+        <map>
+        <key>Comment</key>
+            <string>Filename for stats logging autopilot path</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>pilot.txt</string>
+        </map>
+    <key>StatsQuitAfterRuns</key>
+        <map>
+        <key>Comment</key>
+            <string>Quit application after this number of autopilot playback runs</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>StatsSessionTrackFrameStats</key>
+        <map>
+        <key>Comment</key>
+            <string>Track rendering and network statistics</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>StatsSummaryFile</key>
+        <map>
+        <key>Comment</key>
+            <string>Filename for stats logging summary</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>fss.txt</string>
+        </map>
+    <key>StatusBarHeight</key>
+        <map>
+        <key>Comment</key>
+            <string>Height of menu/status bar at top of screen (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>26</integer>
+        </map>
+    <key>StatusBarPad</key>
+        <map>
+        <key>Comment</key>
+            <string>Spacing between popup buttons at bottom of screen (Stand up, Release Controls)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>10</integer>
+        </map>
+    <key>SystemChatColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of chat messages from SL System</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.800000011920928955078125</real>
+                <real>1</real>
+                <real>1</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>SystemLanguage</key>
+        <map>
+        <key>Comment</key>
+            <string>Language indicated by system settings (for XUI)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>en-us</string>
+        </map>
+    <key>TabToTextFieldsOnly</key>
+        <map>
+        <key>Comment</key>
+            <string>TAB key takes you to next text entry field, instead of next widget</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>TerrainColorHeightRange</key>
+        <map>
+        <key>Comment</key>
+            <string>Altitude range over which a given terrain texture has effect (meters)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>60</real>
+        </map>
+    <key>TerrainColorStartHeight</key>
+        <map>
+        <key>Comment</key>
+            <string>Starting altitude for terrain texturing (meters)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>20</real>
+        </map>
+    <key>TextureMemory</key>
+        <map>
+        <key>Comment</key>
+            <string>Amount of memory to use for textures in MB (0 = autodetect)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>TexturePickerRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for texture picker</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>290</integer>
+                <integer>350</integer>
+                <integer>0</integer>
+            </array>
+        </map>
+    <key>TexturePickerShowFolders</key>
+        <map>
+        <key>Comment</key>
+            <string>Show folders with no texures in texture picker</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>TexturePickerSortOrder</key>
+        <map>
+        <key>Comment</key>
+            <string>Specifies sort key for textures in texture picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>2</integer>
+        </map>
+    <key>ThirdPersonBtnState</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>ThrottleBandwidthKBPS</key>
+        <map>
+        <key>Comment</key>
+            <string>Maximum allowable downstream bandwidth (kilo bits per second)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>500</real>
+        </map>
+    <key>ToolHelpRect</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>8</integer>
+                <integer>178</integer>
+                <integer>75</integer>
+                <integer>162</integer>
+            </array>
+        </map>
+    <key>ToolTipDelay</key>
+        <map>
+        <key>Comment</key>
+            <string>Seconds before displaying tooltip when mouse stops over UI element</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.699999988079071044921875</real>
+        </map>
+    <key>ToolboxAutoMove</key>
+        <map>
+        <key>Comment</key>
+            <string>[NOT USED]</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>ToolboxRect</key>
+        <map>
+        <key>Comment</key>
+            <string>Rectangle for tools window</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>0</integer>
+                <integer>100</integer>
+                <integer>100</integer>
+                <integer>100</integer>
+            </array>
+        </map>
+    <key>ToolboxShowMore</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether to show additional build tool controls</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>TrackFocusObject</key>
+        <map>
+        <key>Comment</key>
+            <string>Camera tracks last object zoomed on</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>TurnLeftBtnRect</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>20</integer>
+                <integer>29</integer>
+                <integer>45</integer>
+                <integer>4</integer>
+            </array>
+        </map>
+    <key>TurnRightBtnRect</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Rect</string>
+        <key>Value</key>
+            <array>
+                <integer>66</integer>
+                <integer>29</integer>
+                <integer>91</integer>
+                <integer>4</integer>
+            </array>
+        </map>
+    <key>TypeAheadTimeout</key>
+        <map>
+        <key>Comment</key>
+            <string>Time delay before clearing type-ahead buffer in lists (seconds)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1.5</real>
+        </map>
+    <key>UIAutoScale</key>
+        <map>
+        <key>Comment</key>
+            <string>Keep UI scale consistent across different resolutions</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>UIFloaterTestBool</key>
+        <map>
+        <key>Comment</key>
+            <string>Example saved setting for the test floater</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>UIImgBtnCloseActiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>47a8c844-cd2a-4b1a-be01-df8b1612fe5d</string>
+        </map>
+    <key>UIImgBtnCloseInactiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>779e4fa3-9b13-f74a-fba9-3886fe9c86ba</string>
+        </map>
+    <key>UIImgBtnClosePressedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>e5821134-23c0-4bd0-af06-7fa95b9fb01a</string>
+        </map>
+    <key>UIImgBtnForwardInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>54197a61-f5d1-4c29-95d2-c071d08849cb</string>
+        </map>
+    <key>UIImgBtnForwardOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>a0eb4021-1b20-4a53-892d-8faa9265a6f5</string>
+        </map>
+    <key>UIImgBtnJumpLeftInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1</string>
+        </map>
+    <key>UIImgBtnJumpLeftOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>3c18c87e-5f50-14e2-e744-f44734aa365f</string>
+        </map>
+    <key>UIImgBtnJumpRightInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>7dabc040-ec13-2309-ddf7-4f161f6de2f4</string>
+        </map>
+    <key>UIImgBtnJumpRightOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>ff9a71eb-7414-4cf8-866e-a701deb7c3cf</string>
+        </map>
+    <key>UIImgBtnLeftInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>95463c78-aaa6-464d-892d-3a805b6bb7bf</string>
+        </map>
+    <key>UIImgBtnLeftOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>13a93910-6b44-45eb-ad3a-4d1324c59bac</string>
+        </map>
+    <key>UIImgBtnMinimizeActiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>34c9398d-bb78-4643-9633-46a2fa3e9637</string>
+        </map>
+    <key>UIImgBtnMinimizeInactiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>6e72abba-1378-437f-bf7a-f0c15f3e99a3</string>
+        </map>
+    <key>UIImgBtnMinimizePressedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>39801651-26cb-4926-af57-7af9352c273c</string>
+        </map>
+    <key>UIImgBtnMoveDownInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>b92a70b9-c841-4c94-b4b3-cee9eb460d48</string>
+        </map>
+    <key>UIImgBtnMoveDownOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>b5abc9fa-9e62-4e03-bc33-82c4c1b6b689</string>
+        </map>
+    <key>UIImgBtnMoveUpInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>49b4b357-e430-4b56-b9e0-05b8759c3c82</string>
+        </map>
+    <key>UIImgBtnMoveUpOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>f887146d-829f-4e39-9211-cf872b78f97c</string>
+        </map>
+    <key>UIImgBtnPanDownInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>e5821134-23c0-4bd0-af06-7fa95b9fb01a</string>
+        </map>
+    <key>UIImgBtnPanDownOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>47a8c844-cd2a-4b1a-be01-df8b1612fe5d</string>
+        </map>
+    <key>UIImgBtnPanLeftInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>e5821134-23c0-4bd0-af06-7fa95b9fb01a</string>
+        </map>
+    <key>UIImgBtnPanLeftOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>47a8c844-cd2a-4b1a-be01-df8b1612fe5d</string>
+        </map>
+    <key>UIImgBtnPanRightInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>e5821134-23c0-4bd0-af06-7fa95b9fb01a</string>
+        </map>
+    <key>UIImgBtnPanRightOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>47a8c844-cd2a-4b1a-be01-df8b1612fe5d</string>
+        </map>
+    <key>UIImgBtnPanUpInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>e5821134-23c0-4bd0-af06-7fa95b9fb01a</string>
+        </map>
+    <key>UIImgBtnPanUpOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>47a8c844-cd2a-4b1a-be01-df8b1612fe5d</string>
+        </map>
+    <key>UIImgBtnRestoreActiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>111b39de-8928-4690-b7b2-e17d5c960277</string>
+        </map>
+    <key>UIImgBtnRestoreInactiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>0eafa471-70af-4882-b8c1-40a310929744</string>
+        </map>
+    <key>UIImgBtnRestorePressedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>90a0ed5c-2e7b-4845-9958-a64a1b30f312</string>
+        </map>
+    <key>UIImgBtnRightInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5e616d0d-4335-476f-9977-560bccd009da</string>
+        </map>
+    <key>UIImgBtnRightOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5a44fd04-f52b-4c30-8b00-4a31e27614bd</string>
+        </map>
+    <key>UIImgBtnScrollDownInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>d2421bab-2eaf-4863-b8f6-5e4c52519247</string>
+        </map>
+    <key>UIImgBtnScrollDownOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>b4ecdecf-5c8d-44e7-b882-17a77e88ed55</string>
+        </map>
+    <key>UIImgBtnScrollLeftInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>ea137a32-6718-4d05-9c22-7d570d27b2cd</string>
+        </map>
+    <key>UIImgBtnScrollLeftOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>43773e8d-49aa-48e0-80f3-a04715f4677a</string>
+        </map>
+    <key>UIImgBtnScrollRightInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>b749de64-e903-4c3c-ac0b-25fb6fa39cb5</string>
+        </map>
+    <key>UIImgBtnScrollRightOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>3d700d19-e708-465d-87f2-46c8c0ee7938</string>
+        </map>
+    <key>UIImgBtnScrollUpInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>a93abdf3-27b5-4e22-a8fa-c48216cd2e3a</string>
+        </map>
+    <key>UIImgBtnScrollUpOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>dad084d7-9a46-452a-b0ff-4b9f1cefdde9</string>
+        </map>
+    <key>UIImgBtnSlideLeftInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>724996f5-b956-46f6-9844-4fcfce1d5e83</string>
+        </map>
+    <key>UIImgBtnSlideLeftOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>82476321-0374-4c26-9567-521535ab4cd7</string>
+        </map>
+    <key>UIImgBtnSlideRightInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>7eeb57d2-3f37-454d-a729-8b217b8be443</string>
+        </map>
+    <key>UIImgBtnSlideRightOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>1fbe4e60-0607-44d1-a50a-032eff56ae75</string>
+        </map>
+    <key>UIImgBtnSpinDownInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>a985ac71-052f-48e6-9c33-d931c813ac92</string>
+        </map>
+    <key>UIImgBtnSpinDownOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>b6d240dd-5602-426f-b606-bbb49a30726d</string>
+        </map>
+    <key>UIImgBtnSpinUpInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>c8450082-96a0-4319-8090-d3ff900b4954</string>
+        </map>
+    <key>UIImgBtnSpinUpOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>56576e6e-6710-4e66-89f9-471b59122794</string>
+        </map>
+    <key>UIImgBtnTabBottomInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>c001d8fd-a869-4b6f-86a1-fdcb106df9c7</string>
+        </map>
+    <key>UIImgBtnTabBottomOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>bf0a8779-689b-48c3-bb9a-6af546366ef4</string>
+        </map>
+    <key>UIImgBtnTabBottomPartialInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>eb0b0904-8c91-4f24-b500-1180b91140de</string>
+        </map>
+    <key>UIImgBtnTabBottomPartialOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>8dca716c-b29c-403a-9886-91c028357d6e</string>
+        </map>
+    <key>UIImgBtnTabTopInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>16d032e8-817b-4368-8a4e-b7b947ae3889</string>
+        </map>
+    <key>UIImgBtnTabTopOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>1ed83f57-41cf-4052-a3b4-2e8bb78d8191</string>
+        </map>
+    <key>UIImgBtnTabTopPartialInUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>7c6c6c26-0e25-4438-89bd-30d8b8e9d704</string>
+        </map>
+    <key>UIImgBtnTabTopPartialOutUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>932ad585-0e45-4a57-aa23-4cf81beeb7b0</string>
+        </map>
+    <key>UIImgBtnTearOffActiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>74e1a96f-4833-a24d-a1bb-1bce1468b0e7</string>
+        </map>
+    <key>UIImgBtnTearOffInactiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>74e1a96f-4833-a24d-a1bb-1bce1468b0e7</string>
+        </map>
+    <key>UIImgBtnTearOffPressedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>d2524c13-4ba6-af7c-e305-8ac6cc18d86a</string>
+        </map>
+    <key>UIImgCheckboxActiveSelectedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>cf4a2ed7-1533-4686-9dde-df9a37ddca55</string>
+        </map>
+    <key>UIImgCheckboxActiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>05bb64ee-96fd-4243-b74e-f40a41bc53ba</string>
+        </map>
+    <key>UIImgCheckboxInactiveSelectedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>c817c642-9abd-4236-9287-ae0513fe7d2b</string>
+        </map>
+    <key>UIImgCheckboxInactiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>7d94cb59-32a2-49bf-a516-9e5a2045f9d9</string>
+        </map>
+    <key>UIImgCreateSelectedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>0098b015-3daf-4cfe-a72f-915369ea97c2</string>
+        </map>
+    <key>UIImgCreateUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b</string>
+        </map>
+    <key>UIImgCrosshairsUUID</key>
+        <map>
+        <key>Comment</key>
+            <string>Image to use for crosshair display (UUID texture reference)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>6e1a3980-bf2d-4274-8970-91e60d85fb52</string>
+        </map>
+    <key>UIImgDefaultEyesUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>6522e74d-1660-4e7f-b601-6f48c1659a77</string>
+        </map>
+    <key>UIImgDefaultGlovesUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
+        </map>
+    <key>UIImgDefaultHairUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>7ca39b4c-bd19-4699-aff7-f93fd03d3e7b</string>
+        </map>
+    <key>UIImgDefaultJacketUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
+        </map>
+    <key>UIImgDefaultPantsUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
+        </map>
+    <key>UIImgDefaultShirtUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
+        </map>
+    <key>UIImgDefaultShoesUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
+        </map>
+    <key>UIImgDefaultSkirtUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
+        </map>
+    <key>UIImgDefaultSocksUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
+        </map>
+    <key>UIImgDefaultUnderwearUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
+        </map>
+    <key>UIImgDirectionArrowUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>586383e8-4d9b-4fba-9196-2b5938e79c2c</string>
+        </map>
+    <key>UIImgFaceSelectedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>b4870163-6208-42a9-9801-93133bf9a6cd</string>
+        </map>
+    <key>UIImgFaceUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>ce15fd63-b0b6-463c-a37d-ea6393208b3e</string>
+        </map>
+    <key>UIImgFocusSelectedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>ab6a730e-ddfd-4982-9a32-c6de3de6d31d</string>
+        </map>
+    <key>UIImgFocusUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>57bc39d1-288c-4519-aea6-6d1786a5c274</string>
+        </map>
+    <key>UIImgGrabSelectedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>c1e21504-f136-451d-b8e9-929037812f1d</string>
+        </map>
+    <key>UIImgGrabUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>c63f124c-6340-4fbf-b59e-0869a44adb64</string>
+        </map>
+    <key>UIImgMoveSelectedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>46f17c7b-8381-48c3-b628-6a406e060dd6</string>
+        </map>
+    <key>UIImgMoveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>2fa5dc06-bcdd-4e09-a426-f9f262d4fa65</string>
+        </map>
+    <key>UIImgRadioActiveSelectedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>52f09e07-5816-4052-953c-94c6c10479b7</string>
+        </map>
+    <key>UIImgRadioActiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>7a1ba9b8-1047-4d1e-9cfc-bc478c80b63f</string>
+        </map>
+    <key>UIImgRadioInactiveSelectedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>1975db39-aa29-4251-aea0-409ac09d414d</string>
+        </map>
+    <key>UIImgRadioInactiveUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>90688481-67ff-4af0-be69-4aa084bcad1e</string>
+        </map>
+    <key>UIImgResizeBottomRightUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>e3690e25-9690-4f6c-a745-e7dcd885285a</string>
+        </map>
+    <key>UIImgRotateSelectedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>cdfb7fde-0d13-418a-9d89-2bd91019fc95</string>
+        </map>
+    <key>UIImgRotateUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>c34b1eaa-aae3-4351-b082-e26c0b636779</string>
+        </map>
+    <key>UIImgScaleSelectedUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>55aa57ef-508a-47f7-8867-85d21c5a810d</string>
+        </map>
+    <key>UIImgScaleUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>88a90fef-b448-4883-9344-ecf378a60433</string>
+        </map>
+    <key>UIImgWhiteUUID</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
+        </map>
+    <key>UIScaleFactor</key>
+        <map>
+        <key>Comment</key>
+            <string>Size of UI relative to default layout on 1024x768 screen</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>UISndAlert</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for alerts (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>ed124764-705d-d497-167a-182cd9fa2e6c</string>
+        </map>
+    <key>UISndBadKeystroke</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for invalid keystroke (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>2ca849ba-2885-4bc3-90ef-d4987a5b983a</string>
+        </map>
+    <key>UISndClick</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for mouse click (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>4c8c3c77-de8d-bde2-b9b8-32635e0fd4a6</string>
+        </map>
+    <key>UISndClickRelease</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for mouse button release (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>4c8c3c77-de8d-bde2-b9b8-32635e0fd4a6</string>
+        </map>
+    <key>UISndDebugSpamToggle</key>
+        <map>
+        <key>Comment</key>
+            <string>Log UI sound effects as they are played</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>UISndHealthReductionF</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for female pain (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>219c5d93-6c09-31c5-fb3f-c5fe7495c115</string>
+        </map>
+    <key>UISndHealthReductionM</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for male pain (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>e057c244-5768-1056-c37e-1537454eeb62</string>
+        </map>
+    <key>UISndHealthReductionThreshold</key>
+        <map>
+        <key>Comment</key>
+            <string>Amount of health reduction required to trigger &quot;pain&quot; sound</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>10</real>
+        </map>
+    <key>UISndInvalidOp</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for invalid operations (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>4174f859-0d3d-c517-c424-72923dc21f65</string>
+        </map>
+    <key>UISndMoneyChangeDown</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for L$ balance increase (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>104974e3-dfda-428b-99ee-b0d4e748d3a3</string>
+        </map>
+    <key>UISndMoneyChangeThreshold</key>
+        <map>
+        <key>Comment</key>
+            <string>Amount of change in L$ balance required to trigger &quot;money&quot; sound</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>50</real>
+        </map>
+    <key>UISndMoneyChangeUp</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for L$ balance decrease(uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>77a018af-098e-c037-51a6-178f05877c6f</string>
+        </map>
+    <key>UISndNewIncomingIMSession</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for new instant message session(uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>67cc2844-00f3-2b3c-b991-6418d01e1bb7</string>
+        </map>
+    <key>UISndObjectCreate</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for object creation (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>f4a0660f-5446-dea2-80b7-6482a082803c</string>
+        </map>
+    <key>UISndObjectDelete</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for object deletion (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>0cb7b00a-4c10-6948-84de-a93c09af2ba9</string>
+        </map>
+    <key>UISndObjectRezIn</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for rezzing objects (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>3c8fc726-1fd6-862d-fa01-16c5b2568db6</string>
+        </map>
+    <key>UISndObjectRezOut</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for derezzing objects (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>00000000-0000-0000-0000-000000000000</string>
+        </map>
+    <key>UISndPieMenuAppear</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for opening pie menu (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>8eaed61f-92ff-6485-de83-4dcc938a478e</string>
+        </map>
+    <key>UISndPieMenuHide</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for closing pie menu (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>00000000-0000-0000-0000-000000000000</string>
+        </map>
+    <key>UISndPieMenuSliceHighlight0</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for selecting pie menu item 0 (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>d9f73cf8-17b4-6f7a-1565-7951226c305d</string>
+        </map>
+    <key>UISndPieMenuSliceHighlight1</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for selecting pie menu item 1 (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>f6ba9816-dcaf-f755-7b67-51b31b6233e5</string>
+        </map>
+    <key>UISndPieMenuSliceHighlight2</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for selecting pie menu item 2 (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>7aff2265-d05b-8b72-63c7-dbf96dc2f21f</string>
+        </map>
+    <key>UISndPieMenuSliceHighlight3</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for selecting pie menu item 3 (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>09b2184e-8601-44e2-afbb-ce37434b8ba1</string>
+        </map>
+    <key>UISndPieMenuSliceHighlight4</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for selecting pie menu item 4 (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>bbe4c7fc-7044-b05e-7b89-36924a67593c</string>
+        </map>
+    <key>UISndPieMenuSliceHighlight5</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for selecting pie menu item 5 (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>d166039b-b4f5-c2ec-4911-c85c727b016c</string>
+        </map>
+    <key>UISndPieMenuSliceHighlight6</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for selecting pie menu item 6 (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>242af82b-43c2-9a3b-e108-3b0c7e384981</string>
+        </map>
+    <key>UISndPieMenuSliceHighlight7</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for selecting pie menu item 7 (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>c1f334fb-a5be-8fe7-22b3-29631c21cf0b</string>
+        </map>
+    <key>UISndSnapshot</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for taking a snapshot (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>3d09f582-3851-c0e0-f5ba-277ac5c73fb4</string>
+        </map>
+    <key>UISndStartIM</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for starting a new IM session (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>c825dfbc-9827-7e02-6507-3713d18916c1</string>
+        </map>
+    <key>UISndTeleportOut</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for teleporting (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>d7a9a565-a013-2a69-797d-5332baa1a947</string>
+        </map>
+    <key>UISndTyping</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for starting to type a chat message (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>5e191c7b-8996-9ced-a177-b2ac32bfea06</string>
+        </map>
+    <key>UISndWindowClose</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for closing a window (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>2c346eda-b60c-ab33-1119-b8941916a499</string>
+        </map>
+    <key>UISndWindowOpen</key>
+        <map>
+        <key>Comment</key>
+            <string>Sound file for opening a window (uuid for sound asset)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>c80260ba-41fd-8a46-768a-6bf236360e3a</string>
+        </map>
+    <key>UseAltKeyForMenus</key>
+        <map>
+        <key>Comment</key>
+            <string>Access menus via keyboard by tapping Alt</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>UseChatBubbles</key>
+        <map>
+        <key>Comment</key>
+            <string>Show chat above avatars head in chat bubbles</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>UseDebugLogin</key>
+        <map>
+        <key>Comment</key>
+            <string>Provides extra control over which grid to connect to</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>UseDebugMenus</key>
+        <map>
+        <key>Comment</key>
+            <string>Turns on &quot;Debug&quot; menu</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>UseDefaultColorPicker</key>
+        <map>
+        <key>Comment</key>
+            <string>Use color picker supplied by operating system</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>UseEnergy</key>
+        <map>
+        <key>Comment</key>
+            <string />
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>UseExternalBrowser</key>
+        <map>
+        <key>Comment</key>
+            <string>Use default browser when opening web pages instead of in-world browser.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>UseFreezeFrame</key>
+        <map>
+        <key>Comment</key>
+            <string>Freeze time when taking snapshots.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>UseOcclusion</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable object culling based on occlusion (coverage) by other objects</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>UseWebPagesOnPrims</key>
+        <map>
+        <key>Comment</key>
+            <string>[NOT USED]</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>UserConnectionPort</key>
+        <map>
+        <key>Comment</key>
+            <string>Port that this client transmits on.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>UserLogFile</key>
+        <map>
+        <key>Comment</key>
+            <string>User specified log file name.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>UserLoginInfo</key>
+        <map>
+        <key>Comment</key>
+            <string>Users loging data.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>LLSD</string>
+        <key>Value</key>
+            <map />
+        </map>
+    <key>UseStartScreen</key>
+        <map>
+        <key>Comment</key>
+            <string>Whether to load a start screen image or not.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>VFSOldSize</key>
+        <map>
+        <key>Comment</key>
+            <string>[DO NOT MODIFY] Controls resizing of local file cache</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>VFSSalt</key>
+        <map>
+        <key>Comment</key>
+            <string>[DO NOT MODIFY] Controls local file caching behavior</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>VectorizeEnable</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable general vector operations and data alignment.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>VectorizePerfTest</key>
+        <map>
+        <key>Comment</key>
+            <string>Test SSE/vectorization performance and choose fastest version.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>VectorizeProcessor</key>
+        <map>
+        <key>Comment</key>
+            <string>0=Compiler Default, 1=SSE, 2=SSE2, autodetected</string>
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>VectorizeSkin</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable vector operations for avatar skinning.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>VelocityInterpolate</key>
+        <map>
+        <key>Comment</key>
+            <string>Extrapolate object motion from last packet based on received velocity</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>VerboseLogs</key>
+        <map>
+        <key>Comment</key>
+            <string>Display source file and line number for each log item for debugging purposes</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>VersionChannelName</key>
+        <map>
+        <key>Comment</key>
+            <string>Versioning Channel Name.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>Second Life Release</string>
+        </map>
+    <key>VertexShaderEnable</key>
+        <map>
+        <key>Comment</key>
+            <string>Enable/disable all GLSL shaders (debug)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>VivoxDebugLevel</key>
+        <map>
+        <key>Comment</key>
+            <string>Logging level to use when launching the vivox daemon</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>-1</string>
+        </map>
+    <key>VivoxDebugServerName</key>
+        <map>
+        <key>Comment</key>
+            <string>Hostname of the vivox account server to use for voice when not connected to Agni.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>bhd.vivox.com</string>
+        </map>
+    <key>VoiceCallsFriendsOnly</key>
+        <map>
+        <key>Comment</key>
+            <string>Only accept voice calls from residents on your friends list</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>VoiceEarLocation</key>
+        <map>
+        <key>Comment</key>
+            <string>Location of the virtual ear for voice</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>VoiceHost</key>
+        <map>
+        <key>Comment</key>
+            <string>Client SLVoice host to connect to</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>127.0.0.1</string>
+        </map>
+    <key>VoiceImageLevel0</key>
+        <map>
+        <key>Comment</key>
+            <string>Texture UUID for voice image level 0</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>041ee5a0-cb6a-9ac5-6e49-41e9320507d5</string>
+        </map>
+    <key>VoiceImageLevel1</key>
+        <map>
+        <key>Comment</key>
+            <string>Texture UUID for voice image level 1</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+        </map>
+    <key>VoiceImageLevel2</key>
+        <map>
+        <key>Comment</key>
+            <string>Texture UUID for voice image level 2</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+        </map>
+    <key>VoiceImageLevel3</key>
+        <map>
+        <key>Comment</key>
+            <string>Texture UUID for voice image level 3</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+        </map>
+    <key>VoiceImageLevel4</key>
+        <map>
+        <key>Comment</key>
+            <string>Texture UUID for voice image level 4</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+        </map>
+    <key>VoiceImageLevel5</key>
+        <map>
+        <key>Comment</key>
+            <string>Texture UUID for voice image level 5</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+        </map>
+    <key>VoiceImageLevel6</key>
+        <map>
+        <key>Comment</key>
+            <string>Texture UUID for voice image level 6</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+        </map>
+    <key>VoiceInputAudioDevice</key>
+        <map>
+        <key>Comment</key>
+            <string>Audio input device to use for voice</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>Default</string>
+        </map>
+    <key>VoiceOutputAudioDevice</key>
+        <map>
+        <key>Comment</key>
+            <string>Audio output device to use for voice</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>Default</string>
+        </map>
+    <key>VoicePort</key>
+        <map>
+        <key>Comment</key>
+            <string>Client SLVoice port to connect to</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>44124</integer>
+        </map>
+    <key>WarnAboutBadPCI</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables AboutBadPCI warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnAboutDirectX9</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables AboutDirectX9 warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnAboutOldGraphicsDriver</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables AboutOldGraphicsDriver warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnAboutPCIGraphics</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables AboutPCIGraphics warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnBrowserLaunch</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables BrowserLaunch warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnDeedObject</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables DeedObject warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstAppearance</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstAppearance warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstMedia</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstMedia warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstAttach</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstAttach warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstBalanceDecrease</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstBalanceDecrease warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstBalanceIncrease</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstBalanceIncrease warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstBuild</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstBuild warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstDebugMenus</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstDebugMenus warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstFlexible</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstFlexible warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstGoTo</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstGoTo warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstInventory</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstInventory warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstLeftClickNoHit</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstLeftClickNoHit warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstMap</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstMap warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstMedia</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstMedia warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstOverrideKeys</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstOverrideKeys warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstSandbox</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstSandbox warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstSculptedPrim</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstSculptedPrim warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstSit</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstSit warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstStreamingMusic</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstStreamingMusic warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstStreamingVideo</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstStreamingVideo warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstTeleport</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstTeleport warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnFirstVoice</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables FirstVoice warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnNewClassified</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables NewClassified warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnQuickTimeInstalled</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables QuickTimeInstalled warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WarnReturnToOwner</key>
+        <map>
+        <key>Comment</key>
+            <string>Enables ReturnToOwner warning dialog</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+        <key>WindLightUseAtmosShaders</key>
+                <map>
+                <key>Comment</key>
+                        <string>Whether to enable or disable WindLight atmospheric shaders.</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>Boolean</string>
+                <key>Value</key>
+                        <integer>1</integer>
+                </map>
+    <key>WindowHeight</key>
+        <map>
+        <key>Comment</key>
+            <string>SL viewer window height</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>700</integer>
+        </map>
+    <key>WindowMaximized</key>
+        <map>
+        <key>Comment</key>
+            <string>SL viewer window maximized on login</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>WindowWidth</key>
+        <map>
+        <key>Comment</key>
+            <string>SL viewer window width</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>1000</integer>
+        </map>
+    <key>WindowX</key>
+        <map>
+        <key>Comment</key>
+            <string>X coordinate of lower left corner of SL viewer window, relative to primary display (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>10</integer>
+        </map>
+    <key>WindowY</key>
+        <map>
+        <key>Comment</key>
+            <string>Y coordinate of lower left corner of SL viewer window, relative to primary display (pixels)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>10</integer>
+        </map>
+    <key>WLSkyDetail</key>
+                <map>
+                <key>Comment</key>
+                        <string>Controls vertex detail on the WindLight sky.  Lower numbers will give better performance and uglier skies.</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>U32</string>
+                <key>Value</key>
+                        <integer>64</integer>
+                </map>
+    <key>XferThrottle</key>
+        <map>
+        <key>Comment</key>
+            <string>Maximum allowable downstream bandwidth for asset transfers (bits per second)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>150000</real>
+        </map>
+    <key>YawFromMousePosition</key>
+        <map>
+        <key>Comment</key>
+            <string>Horizontal range over which avatar head tracks mouse position (degrees of head rotation from left of window to right)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>90</real>
+        </map>
+    <key>YieldTime</key>
+        <map>
+        <key>Comment</key>
+            <string>Yield some time to the local host.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>-1</integer>
+        </map>
+    <key>ZoomTime</key>
+        <map>
+        <key>Comment</key>
+            <string>Time of transition between different camera modes (seconds)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.4000000059604644775390625</real>
+        </map>
+    <key>llOwnerSayChatColor</key>
+        <map>
+        <key>Comment</key>
+            <string>Color of chat messages from objects only visible to the owner</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Color4</string>
+        <key>Value</key>
+            <array>
+                <real>0.9900000095367431640625</real>
+                <real>0.9900000095367431640625</real>
+                <real>0.689999997615814208984375</real>
+                <real>1</real>
+            </array>
+        </map>
+    <key>ParcelMediaAutoPlayEnable</key>
+        <map>
+        <key>Comment</key>
+            <string>Auto play parcel media when available</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>particlesbeacon</key>
+        <map>
+        <key>Comment</key>
+            <string>Beacon / Highlight particle generators</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>physicalbeacon</key>
+        <map>
+        <key>Comment</key>
+            <string>Beacon / Highlight physical objects</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>renderbeacons</key>
+        <map>
+        <key>Comment</key>
+            <string>Beacon / Highlight particle generators</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>renderhighlights</key>
+        <map>
+        <key>Comment</key>
+            <string>Beacon / Highlight scripted objects with touch function</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>scriptsbeacon</key>
+        <map>
+        <key>Comment</key>
+            <string>Beacon / Highlight scripted objects</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>scripttouchbeacon</key>
+        <map>
+        <key>Comment</key>
+            <string>Beacon / Highlight scripted objects with touch function</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>soundsbeacon</key>
+        <map>
+        <key>Comment</key>
+            <string>Beacon / Highlight sound generators</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+        <key>SkyEditPresets</key>
+                <map>
+                <key>Comment</key>
+                        <string>Whether to be able to edit the sky defaults or not</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>Boolean</string>
+                <key>Value</key>
+                        <integer>0</integer>
+                </map>
+        <key>WaterGLFogDepthFloor</key>
+                <map>
+                <key>Comment</key>
+                        <string>Controls how dark water gl fog can get</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>F32</string>
+                <key>Value</key>
+                        <real>0.25</real>
+                </map>
+        <key>WaterGLFogDepthScale</key>
+                <map>
+                <key>Comment</key>
+                        <string>Controls how quickly gl fog gets dark under water</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>F32</string>
+                <key>Value</key>
+                        <real>50.0</real>
+                </map>
+        <key>WaterGLFogDensityScale</key>
+                <map>
+                <key>Comment</key>
+                        <string>Maps shader water fog density to gl fog density</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>F32</string>
+                <key>Value</key>
+                        <real>0.02</real>
+                </map>
+        <key>EnableRippleWater</key>
+                <map>
+                <key>Comment</key>
+                        <string>Whether to use ripple water shader or not</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>Boolean</string>
+                <key>Value</key>
+                        <integer>1</integer>
+                </map>
+        <key>WaterEditPresets</key>
+            <map>
+            <key>Comment</key>
+                    <string>Whether to be able to edit the water defaults or not</string>
+            <key>Persist</key>
+                    <integer>1</integer>
+            <key>Type</key>
+                    <string>Boolean</string>
+            <key>Value</key>
+                    <integer>0</integer>
+            </map>
+    <key>FloaterEnvRect</key>
+            <map>
+            <key>Comment</key>
+                    <string>Rectangle for Environment Editor</string>
+            <key>Persist</key>
+                    <integer>1</integer>
+            <key>Type</key>
+                    <string>Rect</string>
+            <key>Value</key>
+            <array>
+                <integer>50</integer>
+                <integer>150</integer>
+                <integer>650</integer>
+                <integer>0</integer>
+            </array>
+            </map>
+    <key>FloaterAdvancedSkyRect</key>
+            <map>
+            <key>Comment</key>
+                    <string>Rectangle for Advanced Sky Editor</string>
+            <key>Persist</key>
+                    <integer>1</integer>
+            <key>Type</key>
+                    <string>Rect</string>
+            <key>Value</key>
+            <array>
+                <integer>50</integer>
+                <integer>220</integer>
+                <integer>450</integer>
+                <integer>0</integer>
+            </array>
+            </map>
+    <key>FloaterDayCycleRect</key>
+            <map>
+            <key>Comment</key>
+                    <string>Rectangle for Day Cycle Editor</string>
+            <key>Persist</key>
+                    <integer>1</integer>
+            <key>Type</key>
+                    <string>Rect</string>
+            <key>Value</key>
+            <array>
+                <integer>50</integer>
+                <integer>450</integer>
+                <integer>300</integer>
+                <integer>0</integer>
+            </array>
+            </map>
+    <key>FloaterAdvancedWaterRect</key>
+            <map>
+            <key>Comment</key>
+                    <string>Rectangle for Advanced Water Editor</string>
+            <key>Persist</key>
+                    <integer>1</integer>
+            <key>Type</key>
+                    <string>Rect</string>
+            <key>Value</key>
+            <array>
+                <integer>50</integer>
+                <integer>220</integer>
+                <integer>450</integer>
+                <integer>0</integer>
+            </array>
+            </map>
+    <key>AlertedUnsupportedHardware</key>
+                <map>
+                <key>Comment</key>
+                        <string>Toggle that lets us tell the user he's on old hardware only once</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>Boolean</string>
+                <key>Value</key>
+                        <integer>0</integer>
+                </map>
+    <key>RenderFastAlpha</key>
+                <map>
+                <key>Comment</key>
+                        <string>Use lossy alpha rendering optimization (opaque/nonexistent small alpha faces).</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>Boolean</string>
+                <key>Value</key>
+                        <integer>0</integer>
+                </map>
+    <key>RenderDeferred</key>
+                <map>
+                <key>Comment</key>
+                        <string>Use deferred rendering pipeline.</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>Boolean</string>
+                <key>Value</key>
+                        <integer>0</integer>
+                </map>
+    <key>RenderFSAASamples</key>
+                <map>
+                <key>Comment</key>
+                        <string>Number of samples to use for FSAA (0 = no AA).</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>U32</string>
+                <key>Value</key>
+                        <integer>0</integer>
+                </map>
+    <key>RenderTextureMemoryMultiple</key>
+                <map>
+                <key>Comment</key>
+                        <string>Multiple of texture memory value to use (should fit: 0 &lt; value &lt;= 1.0)</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>F32</string>
+                <key>Value</key>
+                        <real>1.0</real>
+                </map>
+    <key>Disregard128DefaultDrawDistance</key>
+                <map>
+                <key>Comment</key>
+                        <string>Whether to use the auto default to 128 draw distance</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>Boolean</string>
+                <key>Value</key>
+                        <real>1</real>
+                </map>
+    <key>Disregard96DefaultDrawDistance</key>
+                <map>
+                <key>Comment</key>
+                        <string>Whether to use the auto default to 96 draw distance</string>
+                <key>Persist</key>
+                        <integer>1</integer>
+                <key>Type</key>
+                        <string>Boolean</string>
+                <key>Value</key>
+                        <real>1</real>
+                </map>
+    <key>AvatarAxisDeadZone0</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 0 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>AvatarAxisDeadZone1</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 1 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>AvatarAxisDeadZone2</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 2 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>AvatarAxisDeadZone3</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 3 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>AvatarAxisDeadZone4</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 4 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>AvatarAxisDeadZone5</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 5 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>AvatarAxisScale0</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 0 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AvatarAxisScale1</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 1 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AvatarAxisScale2</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 2 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AvatarAxisScale3</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 3 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AvatarAxisScale4</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 4 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AvatarAxisScale5</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar axis 5 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>AvatarFeathering</key>
+        <map>
+        <key>Comment</key>
+            <string>Avatar feathering (less is softer)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>16</real>
+        </map>
+    <key>BuildAxisDeadZone0</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 0 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>BuildAxisDeadZone1</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 1 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>BuildAxisDeadZone2</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 2 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>BuildAxisDeadZone3</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 3 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>BuildAxisDeadZone4</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 4 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>BuildAxisDeadZone5</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 5 dead zone.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>0.1</real>
+        </map>
+    <key>BuildAxisScale0</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 0 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>BuildAxisScale1</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 1 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>BuildAxisScale2</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 2 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>BuildAxisScale3</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 3 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>BuildAxisScale4</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 4 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>BuildAxisScale5</key>
+        <map>
+        <key>Comment</key>
+            <string>Build axis 5 scaler.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>1</real>
+        </map>
+    <key>BuildFeathering</key>
+        <map>
+        <key>Comment</key>
+            <string>Build feathering (less is softer)</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>F32</string>
+        <key>Value</key>
+            <real>16</real>
+        </map>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/settings_crash_behavior.xml b/linden/indra/newview/app_settings/settings_crash_behavior.xml
new file mode 100644
index 0000000..cc7f5ac
--- /dev/null
+++ b/linden/indra/newview/app_settings/settings_crash_behavior.xml
@@ -0,0 +1,15 @@
+<llsd>
+    <map>
+    <key>CrashSubmitBehavior</key>
+        <map>
+        <key>Comment</key>
+            <string>Controls behavior when viewer crashes (0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)</string>
+                <key>Persist</key>
+                    <integer>1</integer>
+        <key>Type</key>
+            <string>S32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/settings_files.xml b/linden/indra/newview/app_settings/settings_files.xml
new file mode 100644
index 0000000..997bb0c
--- /dev/null
+++ b/linden/indra/newview/app_settings/settings_files.xml
@@ -0,0 +1,22 @@
+<llsd>
+  <map>
+    <key>Files</key>
+        <map>
+        <key>Comment</key>
+            <string>List of settings files to load. Key is the identifier, value is the filename</string>
+        <key>Persist</key>
+            <integer>0</integer>
+        <key>Type</key>
+            <string>LLSD</string>
+        <key>Value</key>
+                <map>
+                  <key>Global</key>
+                  <string>settings.xml</string>
+                  <key>PerAccount</key>
+                  <string>settings_per_account.xml</string>
+                  <key>CrashSettings</key>
+                  <string>settings_crash_behavior.xml</string>
+                </map>
+                </map>
+  </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/settings_per_account.xml b/linden/indra/newview/app_settings/settings_per_account.xml
new file mode 100644
index 0000000..90c7b11
--- /dev/null
+++ b/linden/indra/newview/app_settings/settings_per_account.xml
@@ -0,0 +1,114 @@
+<llsd>
+    <map>
+    <key>BusyModeResponse</key>
+        <map>
+        <key>Comment</key>
+            <string>Auto response to instant messages while in busy mode.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string>The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
+        </map>
+    <key>IMLogTimestamp</key>
+        <map>
+        <key>Comment</key>
+            <string>Log Timestamp of Instant Messages</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>InstantMessageLogPath</key>
+        <map>
+        <key>Comment</key>
+            <string>Path to your log files.</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>String</string>
+        <key>Value</key>
+            <string />
+        </map>
+    <key>LastLogoff</key>
+        <map>
+        <key>Comment</key>
+            <string>Last logoff</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>U32</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LogChat</key>
+        <map>
+        <key>Comment</key>
+            <string>Log Chat</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LogChatIM</key>
+        <map>
+        <key>Comment</key>
+            <string>Log Incoming Instant Messages with Chat</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LogChatTimestamp</key>
+        <map>
+        <key>Comment</key>
+            <string>Log Timestamp of Chat</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>0</integer>
+        </map>
+    <key>LogInstantMessages</key>
+        <map>
+        <key>Comment</key>
+            <string>Log Instant Messages</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>LogShowHistory</key>
+        <map>
+        <key>Comment</key>
+            <string>Log Show History</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    <key>LogTimestampDate</key>
+        <map>
+        <key>Comment</key>
+            <string>Include Date with Timestamp</string>
+        <key>Persist</key>
+            <integer>1</integer>
+        <key>Type</key>
+            <string>Boolean</string>
+        <key>Value</key>
+            <integer>1</integer>
+        </map>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl b/linden/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
new file mode 100644
index 0000000..14e6361
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
@@ -0,0 +1,16 @@
+/** 
+ * @file diffuseF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+uniform sampler2D diffuseMap;
+varying vec3 vary_normal;
+void main() 
+{
+        gl_FragColor = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy);
+        gl_FragColor.rgb = vary_normal*0.5+0.5;
+}
diff --git a/linden/indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl b/linden/indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl
new file mode 100644
index 0000000..8e90693
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/deferred/diffuseV.glsl
@@ -0,0 +1,22 @@
+/** 
+ * @file diffuseV.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+varying vec3 vary_normal;
+varying vec3 vary_position;
+void main()
+{
+        //transform vertex
+        gl_Position = ftransform(); 
+        gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+        
+        vary_position = (gl_ModelViewMatrix * gl_Vertex).xyz;
+        
+        vary_normal = normalize(gl_NormalMatrix * gl_Normal);
+        gl_FrontColor = gl_Color;
+}
diff --git a/linden/indra/newview/app_settings/shaders/class1/environment/waterF.glsl b/linden/indra/newview/app_settings/shaders/class1/environment/waterF.glsl
index 1c14381..bd9b30a 100644
--- a/linden/indra/newview/app_settings/shaders/class1/environment/waterF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/environment/waterF.glsl
@@ -86,7 +86,7 @@ void main()
        color.rgb = mix(mix(fogCol.rgb, fb.rgb, fogCol.a), refcol.rgb, df);
        color.rgb += spec * specular;
        
-        color.rgb = atmosTransport(color.rgb);
+        //color.rgb = applyWaterFog(color);//atmosTransport(color.rgb);
        color.rgb = scaleSoftClip(color.rgb);
        color.a = spec * sunAngle2;
diff --git a/linden/indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl b/linden/indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl
index 59e44fa..7ee4199 100644
--- a/linden/indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/environment/waterFogF.glsl
@@ -8,11 +8,11 @@
 vec4 applyWaterFog(vec4 color)
 {
        // GL_EXP2 Fog
-        float fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);
+        //float fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);
        // GL_EXP Fog
        // float fog = exp(-gl_Fog.density * gl_FogFragCoord);
        // GL_LINEAR Fog
-        // float fog = (gl_Fog.end - gl_FogFragCoord) * gl_Fog.scale;
+        float fog = (gl_Fog.end - gl_FogFragCoord) * gl_Fog.scale;
        fog = clamp(fog, 0.0, 1.0);
        color.rgb = mix(gl_Fog.color.rgb, color.rgb, fog);
        return color;
diff --git a/linden/indra/newview/app_settings/shaders/class1/environment/waterV.glsl b/linden/indra/newview/app_settings/shaders/class1/environment/waterV.glsl
index d332798..48ac87e 100644
--- a/linden/indra/newview/app_settings/shaders/class1/environment/waterV.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/environment/waterV.glsl
@@ -63,9 +63,8 @@ void main()
        //pass wave parameters to pixel shader
        vec2 bigWave =  (v.xy) * vec2(0.04,0.04)  + d1 * time * 0.055;
        //get two normal map (detail map) texture coordinates
-        littleWave.xy = (v.xy) * vec2(0.6, 1.2)   + d2 * time * 0.05;
+        littleWave.xy = (v.xy) * vec2(0.45, 0.9)   + d2 * time * 0.13;
-        // littleWave.zw = (v.xy) * vec2(0.07, 0.15) - d1 * time * 0.043;
+        littleWave.zw = (v.xy) * vec2(0.1, 0.2) + d1 * time * 0.1;
-        littleWave.zw = (v.xy) * vec2(0.3, 0.6) + d1 * time * 0.1;
        view.w = bigWave.y;
        refCoord.w = bigWave.x;
        
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 9ab986b..071489b 100644
--- a/linden/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
@@ -9,7 +9,7 @@ uniform sampler2D diffuseMap;
 void default_lighting() 
 {
-        color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy);
+        vec4 color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy);
        gl_FragColor = color;
 }
diff --git a/linden/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl b/linden/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl
index c6f7f8b..89785c4 100644
--- a/linden/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/lighting/lightShinyF.glsl
@@ -11,7 +11,7 @@ uniform samplerCube environmentMap;
 void shiny_lighting() 
 {
-        color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy);
+        vec4 color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy);
        gl_FragColor = color;
 }
diff --git a/linden/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl b/linden/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl
index 75f61cc..7ac3c35 100644
--- a/linden/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/lighting/lightShinyWaterF.glsl
@@ -11,7 +11,7 @@ uniform samplerCube environmentMap;
 void shiny_lighting_water() 
 {
-        color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy);
+        vec4 color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy);
        gl_FragColor = color;
 }
diff --git a/linden/indra/newview/app_settings/std_bump.ini b/linden/indra/newview/app_settings/std_bump.ini
index 9509c35..f34e21c 100644
--- a/linden/indra/newview/app_settings/std_bump.ini
+++ b/linden/indra/newview/app_settings/std_bump.ini
@@ -1,18 +1,18 @@
 LLStandardBumpmap version 1
-woodgrain               bump_woodgrain.tga              
+woodgrain               058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c                
-bark                    bump_bark.tga                   
+bark                    6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c                
-bricks                  bump_bricks.tga                 
+bricks                  b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c                
-checker                 bump_checker.tga                
+checker                 9deab416-9c63-78d6-d558-9a156f12044c.j2c        
-concrete                bump_concrete.tga               
+concrete                db9d39ec-a896-c287-1ced-64566217021e.j2c        
-crustytile              bump_crustytile.tga             
+crustytile              f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c
-cutstone                bump_cutstone.tga               
+cutstone                d9258671-868f-7511-c321-7baef9e948a4.j2c        
-discs                   bump_discs.tga                  
+discs                   d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c                
-gravel                  bump_gravel.tga                 
+gravel                  4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c                
-petridish               bump_petridish.tga              
+petridish               e569711a-27c2-aad4-9246-0c910239a179.j2c        
-siding                  bump_siding.tga                 
+siding                  073c9723-540c-5449-cdd4-0e87fdc159e3.j2c                
-stonetile               bump_stonetile.tga              
+stonetile               ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c        
-stucco                  bump_stucco.tga                 
+stucco                  92e66e00-f56f-598a-7997-048aa64cde18.j2c                
-suction                 bump_suction.tga                
+suction                 83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c
-weave                   bump_weave.tga                  
+weave                   735198cf-6ea0-2550-e222-21d3c6a341ae.j2c
diff --git a/linden/indra/newview/fakevoicesoundsignal.cpp b/linden/indra/newview/fakevoicesoundsignal.cpp
deleted file mode 100644
index 25cb412..0000000
--- a/linden/indra/newview/fakevoicesoundsignal.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/** 
- * @file fakevoicesoundsignal.cpp
- * @brief Fake Voice Sound Signal
- * author: JJ Ventrella
- * THIS IS A TEMPORARY FILE FOR DEVELOPMENT PURPOSES ONLY
- *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
- * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-#include "llviewerprecompiledheaders.h"
-#include "fakevoicesoundsignal.h"
-//-----------------------------------------------
-// constructor
-//-----------------------------------------------
-FakeVoiceSoundSignal::FakeVoiceSoundSignal()
-{
-}//---------------------------------------------------
-//-----------------------------------------------
-// destructor
-//-----------------------------------------------
-FakeVoiceSoundSignal::~FakeVoiceSoundSignal()
-{
-}//---------------------------------------------------
-//---------------------------------------------------
-F32 FakeVoiceSoundSignal::getAmplitude()
-{
-        return 0.0;
-}//---------------------------------------------------
-//---------------------------------------------------
-bool FakeVoiceSoundSignal::getActive()
-{
-        return false;
-}//---------------------------------------------------
-//---------------------------------------------------
-void FakeVoiceSoundSignal::update()
-{       
-        
-}//---------------------------------------------------
diff --git a/linden/indra/newview/featuretable.txt b/linden/indra/newview/featuretable.txt
index 6491275..032d9bf 100644
--- a/linden/indra/newview/featuretable.txt
+++ b/linden/indra/newview/featuretable.txt
@@ -52,6 +52,7 @@ WindLightUseAtmosShaders	1	1
 WLSkyDetail                                     1       128
 Disregard128DefaultDrawDistance 1       1
 Disregard96DefaultDrawDistance  1       1
+RenderTextureMemoryMultiple             1       1.0
 //
 // Low Graphics Settings
@@ -249,6 +250,9 @@ RenderMaxPartCount			1	2048
 RenderTerrainDetail                     1       0
 RenderVBOEnable                         1       1
+list SiS
+UseOcclusion                            0       0
 list Intel_830M
 RenderTerrainDetail                     1       0
@@ -319,10 +323,25 @@ list Intel_Springdale
 RenderTerrainDetail                     1       0
 RenderVBOEnable                         1       0
 list ATI_FireGL_5200
 RenderVBOEnable                         1       0
 WindLightUseAtmosShaders        0       0
+list ATI_Mobility_Radeon_7xxx
+RenderVBOEnable                         0       0
+list ATI_Radeon_7xxx
+RenderVBOEnable                         0       0
+list ATI_All-in-Wonder_Radeon
+RenderVBOEnable                         0       0
+list ATI_All-in-Wonder_7500
+RenderVBOEnable                         0       0
 list ATI_Mobility_Radeon_9800
 RenderAvatarCloth                       0       0
 VertexShaderEnable                      0       0
diff --git a/linden/indra/newview/featuretable_linux.txt b/linden/indra/newview/featuretable_linux.txt
index bafda09..88570e3 100644
--- a/linden/indra/newview/featuretable_linux.txt
+++ b/linden/indra/newview/featuretable_linux.txt
@@ -51,6 +51,7 @@ WindLightUseAtmosShaders	1	1
 WLSkyDetail                                     1       128
 Disregard128DefaultDrawDistance 1       1
 Disregard96DefaultDrawDistance  1       1
+RenderTextureMemoryMultiple             1       1.0
 //
 // Low Graphics Settings
diff --git a/linden/indra/newview/featuretable_mac.txt b/linden/indra/newview/featuretable_mac.txt
index be3507f..d19e4ed 100644
--- a/linden/indra/newview/featuretable_mac.txt
+++ b/linden/indra/newview/featuretable_mac.txt
@@ -23,33 +23,36 @@ version 16
 // NOTE: All settings are set to the MIN of applied values, including 'all'!
 //
 list all
-RenderAnisotropic                       1       0
+RenderAnisotropic                               1       0
-RenderAvatarCloth                       0       0
+RenderAvatarCloth                               0       0
-RenderAvatarLODFactor           1       1.0
+RenderAvatarLODFactor                   1       1.0
-RenderAvatarVP                          1       0
+RenderAvatarVP                                  1       0
-RenderCubeMap                           1       1
+RenderCubeMap                                   1       1
-RenderFarClip                           1       256
+RenderFarClip                                   1       256
-RenderFlexTimeFactor            1       1.0
+RenderFlexTimeFactor                    1       1.0
-RenderFogRatio                          1       4.0
+RenderFogRatio                                  1       4.0
-RenderGamma                                     1       0
+RenderGamma                                             1       0
-RenderGlowResolutionPow         1       9
+RenderGlowResolutionPow                 1       9
-RenderLightingDetail            1       1
+RenderLightingDetail                    1       1
-RenderMaxPartCount                      1       8192
+RenderMaxPartCount                              1       8192
-RenderNightBrightness           1       1.0
+RenderNightBrightness                   1       1.0
-RenderObjectBump                        1       1
+RenderObjectBump                                1       1
-RenderReflectionDetail          1       3
+RenderReflectionDetail                  1       3
-RenderTerrainDetail                     1       1
+RenderTerrainDetail                             1       1
-RenderTerrainLODFactor          1       2.0
+RenderTerrainLODFactor                  1       2.0
-RenderTreeLODFactor                     1       1.0
+RenderTreeLODFactor                             1       1.0
-RenderUseImpostors                      1       1
+RenderUseImpostors                              1       1
-RenderVBOEnable                         1       1
+RenderVBOEnable                                 1       1
-RenderVolumeLODFactor           1       2.0
+RenderVolumeLODFactor                   1       2.0
-RenderWaterReflections          1       1
+RenderWaterReflections                  1       1
-UseOcclusion                            1       1
+UseOcclusion                                    1       1
-VertexShaderEnable                      1       1
+VertexShaderEnable                              1       1
-WindLightUseAtmosShaders        1       1
+WindLightUseAtmosShaders                1       1
-WLSkyDetail                                     1       128
+WLSkyDetail                                             1       128
-RenderUseCleverUI                       1       1
+RenderUseCleverUI                               1       1
+Disregard128DefaultDrawDistance 1       1
+Disregard96DefaultDrawDistance  1       1
+RenderTextureMemoryMultiple             1       0.5
 Disregard128DefaultDrawDistance 1       1
 Disregard96DefaultDrawDistance  1       1
@@ -337,6 +340,8 @@ VertexShaderEnable			0	0
 WindLightUseAtmosShaders        0       0
 Disregard96DefaultDrawDistance  1       0
+list NVIDIA_GeForce_8600
+RenderTextureMemoryMultiple                     1       0.375   
 /// tweaked ATI to 96 Draw distance
diff --git a/linden/indra/newview/featuretable_solaris.txt b/linden/indra/newview/featuretable_solaris.txt
index 7dd7c22..2a514ea 100644
--- a/linden/indra/newview/featuretable_solaris.txt
+++ b/linden/indra/newview/featuretable_solaris.txt
@@ -34,6 +34,7 @@ RenderParticleCount	1	4096
 RenderRippleWater       1       1
 RenderTerrainDetail     1       2
 VertexShaderEnable      1       1
+RenderTextureMemoryMultiple             1       1.0
 //
 // Class 0 Hardware (Unknown or just old)
diff --git a/linden/indra/newview/files.lst b/linden/indra/newview/files.lst
index 0f07254..f2603d8 100644
--- a/linden/indra/newview/files.lst
+++ b/linden/indra/newview/files.lst
@@ -1,4 +1,3 @@
-newview/head.cpp
 newview/llagent.cpp
 newview/llagentdata.cpp
 newview/llagentpilot.cpp
@@ -10,7 +9,6 @@ newview/llbbox.cpp
 newview/llbox.cpp
 newview/llcallbacklist.cpp
 newview/llcallingcard.cpp
-newview/llcameraview.cpp
 newview/llcaphttpsender.cpp
 newview/llchatbar.cpp
 newview/llclassifiedinfo.cpp
@@ -19,23 +17,24 @@ newview/llcloud.cpp
 newview/llcolorscheme.cpp
 newview/llcolorswatch.cpp
 newview/llcommandhandler.cpp
+newview/llcommandlineparser.cpp
 newview/llcompass.cpp
 newview/llcompilequeue.cpp
 newview/llconfirmationmanager.cpp
 newview/llconsole.cpp
 newview/llcontainerview.cpp
-newview/llcontroldef.cpp
 newview/llcubemap.cpp
 newview/llcurrencyuimanager.cpp
 newview/llcylinder.cpp
 newview/lldebugmessagebox.cpp
 newview/lldebugview.cpp
+newview/lldelayedgestureerror.cpp
 newview/lldirpicker.cpp
 newview/lldrawable.cpp
+newview/lldrawpool.cpp
 newview/lldrawpoolalpha.cpp
 newview/lldrawpoolavatar.cpp
 newview/lldrawpoolbump.cpp
-newview/lldrawpool.cpp
 newview/lldrawpoolground.cpp
 newview/lldrawpoolsimple.cpp
 newview/lldrawpoolsky.cpp
@@ -64,10 +63,11 @@ newview/llfloateravatarpicker.cpp
 newview/llfloateravatartextures.cpp
 newview/llfloaterbuildoptions.cpp
 newview/llfloaterbump.cpp
-newview/llfloaterbuycontents.cpp
 newview/llfloaterbuy.cpp
+newview/llfloaterbuycontents.cpp
 newview/llfloaterbuycurrency.cpp
 newview/llfloaterbuyland.cpp
+newview/llfloatercamera.cpp
 newview/llfloaterchat.cpp
 newview/llfloaterchatterbox.cpp
 newview/llfloaterclassified.cpp
@@ -88,8 +88,10 @@ newview/llfloatergroups.cpp
 newview/llfloaterhardwaresettings.cpp
 newview/llfloaterhtml.cpp
 newview/llfloaterhtmlhelp.cpp
+newview/llfloaterhud.cpp
 newview/llfloaterimagepreview.cpp
 newview/llfloaterinspect.cpp
+newview/llfloaterjoystick.cpp
 newview/llfloaterlagmeter.cpp
 newview/llfloaterland.cpp
 newview/llfloaterlandholdings.cpp
@@ -109,8 +111,10 @@ newview/llfloaterregioninfo.cpp
 newview/llfloaterreleasemsg.cpp
 newview/llfloaterreporter.cpp
 newview/llfloaterscriptdebug.cpp
+newview/llfloatersettingsdebug.cpp
 newview/llfloatersellland.cpp
 newview/llfloatersnapshot.cpp
+newview/llfloaterstats.cpp
 newview/llfloatertelehub.cpp
 newview/llfloatertest.cpp
 newview/llfloatertools.cpp
@@ -118,7 +122,7 @@ newview/llfloatertopobjects.cpp
 newview/llfloatertos.cpp
 newview/llfloaterurldisplay.cpp
 newview/llfloaterurlentry.cpp
-newview/llfloatervoicewizard.cpp
+newview/llfloatervoicedevicesettings.cpp
 newview/llfloaterwater.cpp
 newview/llfloaterwindlight.cpp
 newview/llfloaterworldmap.cpp
@@ -135,8 +139,8 @@ newview/llgroupmgr.cpp
 newview/llgroupnotify.cpp
 newview/llhippo.cpp
 newview/llhoverview.cpp
-newview/llhudeffectbeam.cpp
 newview/llhudeffect.cpp
+newview/llhudeffectbeam.cpp
 newview/llhudeffectlookat.cpp
 newview/llhudeffectpointat.cpp
 newview/llhudeffecttrail.cpp
@@ -224,8 +228,8 @@ newview/llpostprocess.cpp
 newview/llprefschat.cpp
 newview/llprefsim.cpp
 newview/llprefsvoice.cpp
-newview/llpreviewanim.cpp
 newview/llpreview.cpp
+newview/llpreviewanim.cpp
 newview/llpreviewgesture.cpp
 newview/llpreviewlandmark.cpp
 newview/llpreviewnotecard.cpp
@@ -239,7 +243,7 @@ newview/llsavedsettingsglue.cpp
 newview/llselectmgr.cpp
 newview/llsky.cpp
 newview/llspatialpartition.cpp
-newview/llsphere.cpp
+newview/llrendersphere.cpp
 newview/llsprite.cpp
 newview/llsrv.cpp
 newview/llstartup.cpp
@@ -254,10 +258,10 @@ newview/lltexturecache.cpp
 newview/lltexturectrl.cpp
 newview/lltexturefetch.cpp
 newview/lltextureview.cpp
+newview/lltool.cpp
 newview/lltoolbar.cpp
 newview/lltoolbrush.cpp
 newview/lltoolcomp.cpp
-newview/lltool.cpp
 newview/lltooldraganddrop.cpp
 newview/lltoolface.cpp
 newview/lltoolfocus.cpp
@@ -295,11 +299,11 @@ newview/llviewergesture.cpp
 newview/llviewerimage.cpp
 newview/llviewerimagelist.cpp
 newview/llviewerinventory.cpp
-newview/llviewerjointattachment.cpp
 newview/llviewerjoint.cpp
+newview/llviewerjointattachment.cpp
 newview/llviewerjointmesh.cpp
-newview/llviewerjointmesh_sse2.cpp
 newview/llviewerjointmesh_sse.cpp
+newview/llviewerjointmesh_sse2.cpp
 newview/llviewerjointmesh_vec.cpp
 newview/llviewerjoystick.cpp
 newview/llviewerkeyboard.cpp
@@ -323,7 +327,6 @@ newview/llviewerstats.cpp
 newview/llviewertexteditor.cpp
 newview/llviewertextureanim.cpp
 newview/llviewerthrottle.cpp
-newview/llvieweruictrlfactory.cpp
 newview/llviewervisualparam.cpp
 newview/llviewerwindow.cpp
 newview/llvlcomposition.cpp
@@ -349,8 +352,8 @@ newview/llwaterparammanager.cpp
 newview/llwaterparamset.cpp
 newview/llwearable.cpp
 newview/llwearablelist.cpp
-newview/llwebbrowserctrl.cpp
 newview/llweb.cpp
+newview/llwebbrowserctrl.cpp
 newview/llwind.cpp
 newview/llwindebug.cpp
 newview/llwlanimator.cpp
@@ -361,6 +364,5 @@ newview/llworld.cpp
 newview/llworldmap.cpp
 newview/llworldmapview.cpp
 newview/llxmlrpctransaction.cpp
-newview/moviemaker.cpp
 newview/noise.cpp
 newview/pipeline.cpp
diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt
index c75edc8..842e1af 100644
--- a/linden/indra/newview/gpu_table.txt
+++ b/linden/indra/newview/gpu_table.txt
@@ -22,12 +22,16 @@
 3Dfx                                                    .*3Dfx.*                                                        0               0
 3Dlabs                                                  .*3Dlabs.*                                                      0               0
 ATI 3D-Analyze                                  .*ATI.*3D-Analyze.*                                     0               0
-ATI All-in-Wonder PCI-E                 .*ATI.*All-in-Wonder.*PCI-E.*           1               1
+ATI All-in-Wonder 7500                  .*ATI.*All-in-Wonder 75.*                       0               1
+ATI All-in-Wonder 8500                  .*ATI.*All-in-Wonder 85.*                       0               1
+ATI All-in-Wonder 9200                  .*ATI.*All-in-Wonder 92.*                       0               1
 ATI All-in-Wonder 9xxx                  .*ATI.*All-in-Wonder 9.*                        1               1
 ATI All-in-Wonder X600                  .*ATI.*All-in-Wonder X6.*                       1               1
 ATI All-in-Wonder X800                  .*ATI.*All-in-Wonder X8.*                       2               1
 ATI All-in-Wonder X1800                 .*ATI.*All-in-Wonder X18.*                      3               1
 ATI All-in-Wonder X1900                 .*ATI.*All-in-Wonder X19.*                      3               1
+ATI All-in-Wonder PCI-E                 .*ATI.*All-in-Wonder.*PCI-E.*           1               1
+ATI All-in-Wonder Radeon                .*ATI.*All-in-Wonder Radeon.*           0               1
 ATI ASUS A9xxx                                  .*ATI.*ASUS.*A9.*                                       1               1
 ATI ASUS AH24xx                                 .*ATI.*ASUS.*AH24.*                                     1               1
 ATI ASUS AH26xx                                 .*ATI.*ASUS.*AH26.*                                     3               1
@@ -52,6 +56,8 @@ ATI M52							.*ATI.*M52.*						1		1
 ATI M54                                                 .*ATI.*M54.*                                            1               1
 ATI M56                                                 .*ATI.*M56.*                                            1               1
 ATI M76                                                 .*ATI.*M76.*                                            3               1
+ATI Mobility Radeon 7xxx                .*ATI.*Mobility.*Radeon 7.*                     0               1
+ATI Mobility Radeon 8xxx                .*ATI.*Mobility.*Radeon 8.*                     0               1
 ATI Mobility Radeon 9800                .*ATI.*Mobility.*98.*                           1               1
 ATI Mobility Radeon 9700                .*ATI.*Mobility.*97.*                           1               1
 ATI Mobility Radeon 9600                .*ATI.*Mobility.*96.*                           0               1
@@ -70,8 +76,8 @@ ATI Radeon HD 3400				.*ATI.*Radeon HD 34.*				1		1
 ATI Radeon HD 3600                              .*ATI.*Radeon HD 36.*                           3               1
 ATI Radeon HD 3800                              .*ATI.*Radeon HD 38.*                           3               1
 ATI Radeon OpenGL                               .*ATI.*Radeon OpenGL.*                          0               0
-ATI Radeon 7000                                 .*ATI.*Radeon 7.*                                       0               1
+ATI Radeon 7xxx                                 .*ATI.*Radeon 7.*                                       0               1
-ATI Radeon 8000                                 .*ATI.*Radeon 8.*                                       0               1
+ATI Radeon 8xxx                                 .*ATI.*Radeon 8.*                                       0               1
 ATI Radeon 9000                                 .*ATI.*Radeon 90.*                                      0               1
 ATI Radeon 9100                                 .*ATI.*Radeon 91.*                                      0               1
 ATI Radeon 9200                                 .*ATI.*Radeon 92.*                                      0               1
diff --git a/linden/indra/newview/head.cpp b/linden/indra/newview/head.cpp
deleted file mode 100644
index 54047cb..0000000
--- a/linden/indra/newview/head.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/** 
- * @file head.cpp
- * @brief Head class implementation
- *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
- * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-// implementation of a class that models the motion of a human head.
-// The physics aren't quite right, but it will suffice for right now.
-#include "llviewerprecompiledheaders.h"
-#include "head.h"
-#ifndef PI
-  #define PI ((F32) 3.14159265358979323846264338327)
-#endif
-// The friction force of the neck is modeled as:
-//   friction = -E*phi_dot - F*phi_dot  (for positive phi_dot)
-#define E1 0.75
-#define F1 0.0
-// TODO -- use the other PI defined in the math libs somewhere.
-// --------------------------------------------------
-// Misc. function delclarations...
-// --------------------------------------------------
-F32 phi_spring(F32 phi, F32 theta);
-F32 theta_spring(F32 theta, F32 phi);
-// --------------------------------------------------
-// Class Head member functions...
-// --------------------------------------------------
-Head::Head() {
-  mass = 1.0f;
-  radius = 1.0f;
-  inertia = 2.0f * mass * radius * radius / 5.0f;
-  phi = 0.0f;
-  theta = 0.0f;
-  //gettimeofday(&t, &tz);
-}
-Head::Head(F32 m, F32 r) {
-  mass = m;
-  radius = r;
-  inertia = 2.0f * mass * radius * radius / 5.0f;
-  phi = 0.0f;
-  theta = 0.0f;
-  //gettimeofday(&t, &tz);
-}
-F32 Head::setMass(F32 m) { 
-  mass = m; 
-  inertia = 2.0f * mass * radius * radius / 5.0f;
-  return mass;
-}
-F32 Head::setRadius(F32 r) { 
-  radius = r; 
-  inertia = 2.0f * mass * radius * radius / 5.0f;
-  return radius;
-}
-F32 Head::getMass()    { return mass;    }
-F32 Head::getRadius()  { return radius;  }
-F32 Head::getInertia() { return inertia; }
-void Head::propagate(F32 horizontal_force, F32 vertical_force, F32 dt) {
-  //struct timeval t1;
-  //F32 dt, temp;
-  F32 phi_torque, theta_torque;
-  F32 phi_dot, theta_dot;
-  //gettimeofday(&t1, &tz);
-  //dt = ((t1.tv_sec - t.tv_sec) * 1000000.0  + (t1.tv_usec - t.tv_usec)) / 1000000.0;
-  //dt = 0.033;  // This is a kluge to prevent instabilities when using a stepper
-  // Calculate the return forces...
-  // Note: horizontal_force is positive toward right, so it's resultant torque
-  // is negative, since the phi spin angle is out the top of the head (using 
-  // right-hand rule).
-  phi_torque   = radius * (phi_spring(phi, theta)   - horizontal_force); 
-  theta_torque = radius * (theta_spring(phi, theta) + vertical_force);
-  // Propagate phi...
-  phi_dot = dt * phi_torque / inertia;
- 
-  phi += dt * phi_dot;
-  if (phi >= PI/2.0f) {
-    phi = PI/2.0f;
-  }
-  else if (phi <= -PI/2.0f) {
-    phi = -PI/2.0f;
-  }
-  // Propagate theta...
-  theta_dot = dt * theta_torque / inertia;
-  theta += dt * theta_dot;
-  if (theta >= PI/2.0f) {
-    theta = PI/2.0f;
-  }
-  else if (theta <= -PI/2.0f) {
-    theta = -PI/2.0f;
-  }
-  //t = t1;
-  return;
-}
-F32 phi_spring(F32 phi, F32 theta) {
-// The srping force is linear with -phi and the magnitude of theta.
-  F32 phi_force;
-  phi_force = - 30 * phi;
-  phi_force = phi_force * (1.0f + (F32)fabs(theta) / PI);
-  return phi_force;
-}
-F32 theta_spring(F32 phi, F32 theta) {
-  return phi_spring(theta, phi);
-}
diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
index 0566b7e..8db336f 100644
--- a/linden/indra/newview/installers/windows/installer_template.nsi
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -61,14 +61,6 @@ ShowInstDetails nevershow				; no details, no "show" button
 SetOverwrite on                                                 ; stomp files by default
 AutoCloseWindow true                                    ; after all files install, close window
-!ifdef UPDATE
-LicenseText $(LicenseDescUpdate) $(LicenseDescNext)
-!else
-LicenseText $(LicenseDescSetup) $(LicenseDescNext)
-!endif
-LicenseData "releasenotes.txt"
 InstallDir "$PROGRAMFILES\${INSTNAME}"
 InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""
 !ifdef UPDATE
@@ -944,19 +936,19 @@ Function .onInit
        
        ; generate language ID that will be used as a command line arg  
        StrCmp $LANGUAGE "1042" 0 +3
-        StrCpy $LANGFLAGS " -set SystemLanguage ko"
+        StrCpy $LANGFLAGS " --set SystemLanguage ko"
        Goto EndOfFunc
        StrCmp $LANGUAGE "1041" 0 +3
-        StrCpy $LANGFLAGS " -set SystemLanguage ja"
+        StrCpy $LANGFLAGS " --set SystemLanguage ja"
        Goto EndOfFunc
        StrCmp $LANGUAGE "1031" 0 +3
-        StrCpy $LANGFLAGS " -set SystemLanguage de"
+        StrCpy $LANGFLAGS " --set SystemLanguage de"
        Goto EndOfFunc
        StrCmp $LANGUAGE "1033" 0 +3
-        StrCpy $LANGFLAGS " -set SystemLanguage en-us"
+        StrCpy $LANGFLAGS " --set SystemLanguage en-us"
        Goto EndOfFunc
        
        EndOfFunc:
diff --git a/linden/indra/newview/installers/windows/lang_de.nsi b/linden/indra/newview/installers/windows/lang_de.nsi
index abb0c63..c410128 100644
--- a/linden/indra/newview/installers/windows/lang_de.nsi
+++ b/linden/indra/newview/installers/windows/lang_de.nsi
@@ -1,57 +1,57 @@
-; First is default
+; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
-; subtitle on license text caption (setup new version or update current one
+; subtitle on license text caption (setup new version or update current one
-LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update"
+LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update"
-LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup"
+LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup"
-; description on license page
+; description on license page
-LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Second Life mit Version ${VERSION_LONG}. ersetzen."
+LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Second Life mit Version ${VERSION_LONG}. ersetzen."
-LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Second Life auf Ihrem Computer installieren."
+LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Second Life auf Ihrem Computer installieren."
-LangString LicenseDescNext ${LANG_GERMAN} "Weiter"
+LangString LicenseDescNext ${LANG_GERMAN} "Weiter"
-; installation directory text
+; installation directory text
-LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner"
+LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner"
-LangString DirectoryChooseUpdate ${LANG_GERMAN} "W�hlen Sie den Second Life Ordner f�r dieses Update:"
+LangString DirectoryChooseUpdate ${LANG_GERMAN} "W�hlen Sie den Second Life Ordner f�r dieses Update:"
-LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Second Life installieren werden soll:"
+LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Second Life installieren werden soll:"
-; CheckStartupParams message box
+; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen."
+LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen."
-; installation success dialog
+; installation success dialog
-LangString InstSuccesssQuestion ${LANG_GERMAN} "Second Life starten?"
+LangString InstSuccesssQuestion ${LANG_GERMAN} "Second Life starten?"
-; remove old NSIS version
+; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_GERMAN} "�berpr�fe alte Version ..."
+LangString RemoveOldNSISVersion ${LANG_GERMAN} "�berpr�fe alte Version ..."
-; check windows version
+; check windows version
-LangString CheckWindowsVersionDP ${LANG_GERMAN} "�berpr�fung der Windows Version ..."
+LangString CheckWindowsVersionDP ${LANG_GERMAN} "�berpr�fung der Windows Version ..."
-LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Second Life unterst�tzt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, k�nnte zu unvorhersehbaren Abst�rzen und Datenverlust f�hren.$\n$\nTrotzdem installieren?'
+LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Second Life unterst�tzt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, k�nnte zu unvorhersehbaren Abst�rzen und Datenverlust f�hren.$\n$\nTrotzdem installieren?'
-; checkifadministrator function (install)
+; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_GERMAN} "�berpr�fung der Installations-Berechtigungen ..."
+LangString CheckAdministratorInstDP ${LANG_GERMAN} "�berpr�fung der Installations-Berechtigungen ..."
-LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungen�gende Berechtigungen.$\nSie m�ssen ein "administrator" sein, um Second Life installieren zu k�nnen.'
+LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungen�gende Berechtigungen.$\nSie m�ssen ein "administrator" sein, um Second Life installieren zu k�nnen.'
-; checkifadministrator function (uninstall)
+; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "�berpr�fung der Entfernungs-Berechtigungen ..."
+LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "�berpr�fung der Entfernungs-Berechtigungen ..."
-LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungen�gende Berechtigungen.$\nSie m�ssen ein "administrator" sein, um Second Life entfernen zu k�nnen..'
+LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungen�gende Berechtigungen.$\nSie m�ssen ein "administrator" sein, um Second Life entfernen zu k�nnen..'
-; checkifalreadycurrent
+; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Second Life ${VERSION_LONG} bereits installiert.$\n$\nW�rden Sie es gerne erneut installieren?"
+LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Second Life ${VERSION_LONG} bereits installiert.$\n$\nW�rden Sie es gerne erneut installieren?"
-; closesecondlife function (install)
+; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
+LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
-LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Second Life kann nicht installiert oder ersetzt werden, wenn es bereits l�uft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen."
+LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Second Life kann nicht installiert oder ersetzt werden, wenn es bereits l�uft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen."
-; closesecondlife function (uninstall)
+; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
+LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Second Life ..."
-LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Second Life kann nicht entfernt werden, wenn es bereits l�uft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um abzubrechen."
+LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Second Life kann nicht entfernt werden, wenn es bereits l�uft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Second Life zu beenden.$\nKlicken Sie CANCEL, um abzubrechen."
-; removecachefiles
+; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_GERMAN} "L�schung aller Cache Dateien in Dokumente und Einstellungen."
+LangString RemoveCacheFilesDP ${LANG_GERMAN} "L�schung aller Cache Dateien in Dokumente und Einstellungen."
-; delete program files
+; delete program files
-LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem SecondLife Programm Ordner.$\n$\nDies sind m�glicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nM�chten Sie diese ebenfalls l�schen?"
+LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem SecondLife Programm Ordner.$\n$\nDies sind m�glicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nM�chten Sie diese ebenfalls l�schen?"
-; uninstall text
+; uninstall text
-LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Second Life ${VERSION_LONG} von Ihrem System entfernen."
+LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Second Life ${VERSION_LONG} von Ihrem System entfernen."
diff --git a/linden/indra/newview/installers/windows/lang_en-us.nsi b/linden/indra/newview/installers/windows/lang_en-us.nsi
index c26af12..218f1c6 100644
--- a/linden/indra/newview/installers/windows/lang_en-us.nsi
+++ b/linden/indra/newview/installers/windows/lang_en-us.nsi
@@ -1,57 +1,52 @@
-; First is default
+; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
-; subtitle on license text caption
+; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_ENGLISH} " Update"
+LangString LicenseSubTitleUpdate ${LANG_ENGLISH} " Update"
-LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup"
+LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup"
-; description on license page
+; installation directory text
-LangString LicenseDescUpdate ${LANG_ENGLISH} "This package will update Second Life to version ${VERSION_LONG}.(XXX)"
+LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" 
-LangString LicenseDescSetup ${LANG_ENGLISH} "This package will install Second Life on your computer." 
+LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Second Life directory to update to version ${VERSION_LONG}.(XXX):"
-LangString LicenseDescNext ${LANG_ENGLISH} "Next" 
+LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Second Life in:"
-; installation directory text
+; CheckStartupParams message box
-LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" 
+LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed."
-LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Second Life directory to update:"
-LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Second Life in:"
+; installation success dialog
+LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Second Life now?"
-; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed."
+; remove old NSIS version
+LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..."
-; installation success dialog
-LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Second Life now?"
+; check windows version
+LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..."
-; remove old NSIS version
+LangString CheckWindowsVersionMB ${LANG_ENGLISH} '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?'
-LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..."
+; checkifadministrator function (install)
-; check windows version
+LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..."
-LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..."
+LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Second Life.'
-LangString CheckWindowsVersionMB ${LANG_ENGLISH} '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?'
+; checkifadministrator function (uninstall)
-; checkifadministrator function (install)
+LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..."
-LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..."
+LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Second Life.'
-LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Second Life.'
+; checkifalreadycurrent
-; checkifadministrator function (uninstall)
+LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Second Life ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?"
-LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..."
-LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Second Life.'
+; closesecondlife function (install)
+LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
-; checkifalreadycurrent
+LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "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."
-LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Second Life ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?"
+; closesecondlife function (uninstall)
-; closesecondlife function (install)
+LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
-LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
+LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "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."
-LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "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."
+; removecachefiles
-; closesecondlife function (uninstall)
+LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder"
-LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Second Life to shut down..."
-LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "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."
+; delete program files
+LangString DeleteProgramFilesMB ${LANG_ENGLISH} "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?"
-; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder"
+; uninstall text
+LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall Second Life ${VERSION_LONG} from your system."
-; delete program files
-LangString DeleteProgramFilesMB ${LANG_ENGLISH} "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?"
-; uninstall text
-LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall Second Life ${VERSION_LONG} from your system."
diff --git a/linden/indra/newview/installers/windows/lang_ja.nsi b/linden/indra/newview/installers/windows/lang_ja.nsi
index 43cb492..5e0496e 100644
--- a/linden/indra/newview/installers/windows/lang_ja.nsi
+++ b/linden/indra/newview/installers/windows/lang_ja.nsi
@@ -1,57 +1,57 @@
-; First is default
+; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"
-; subtitle on license text caption
+; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_JAPANESE} " �A�b�v�f�[�g" 
+LangString LicenseSubTitleUpdate ${LANG_JAPANESE} " �A�b�v�f�[�g" 
-LangString LicenseSubTitleSetup ${LANG_JAPANESE} " �Z�b�g�A�b�v" 
+LangString LicenseSubTitleSetup ${LANG_JAPANESE} " �Z�b�g�A�b�v" 
-; description on license page
+; description on license page
-LangString LicenseDescUpdate ${LANG_JAPANESE} "���̃p�b�P�[�W�̓Z�J���h���C�t���o�[�W����${VERSION_LONG}.�ɃA�b�v�f�[�g���܂��B" 
+LangString LicenseDescUpdate ${LANG_JAPANESE} "���̃p�b�P�[�W�̓Z�J���h���C�t���o�[�W����${VERSION_LONG}.�ɃA�b�v�f�[�g���܂��B" 
-LangString LicenseDescSetup ${LANG_JAPANESE} "���̃p�b�P�[�W�͂��Ȃ��̃R���s���[�^�ɃZ�J���h���C�t���C���X�g�[�����܂��B" 
+LangString LicenseDescSetup ${LANG_JAPANESE} "���̃p�b�P�[�W�͂��Ȃ��̃R���s���[�^�ɃZ�J���h���C�t���C���X�g�[�����܂��B" 
-LangString LicenseDescNext ${LANG_JAPANESE} "��" 
+LangString LicenseDescNext ${LANG_JAPANESE} "��" 
-; installation directory text
+; installation directory text
-LangString DirectoryChooseTitle ${LANG_JAPANESE} "�C���X�g�[���E�f�B���N�g��" 
+LangString DirectoryChooseTitle ${LANG_JAPANESE} "�C���X�g�[���E�f�B���N�g��" 
-LangString DirectoryChooseUpdate ${LANG_JAPANESE} "�A�b�v�f�[�g����Z�J���h���C�t�̃f�B���N�g����I�����Ă��������B:" 
+LangString DirectoryChooseUpdate ${LANG_JAPANESE} "�A�b�v�f�[�g����Z�J���h���C�t�̃f�B���N�g����I�����Ă��������B:" 
-LangString DirectoryChooseSetup ${LANG_JAPANESE} "�Z�J���h���C�t���C���X�g�[������f�B���N�g����I�����Ă��������B: " 
+LangString DirectoryChooseSetup ${LANG_JAPANESE} "�Z�J���h���C�t���C���X�g�[������f�B���N�g����I�����Ă��������B: " 
-; CheckStartupParams message box
+; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_JAPANESE} "�v���O������'$INSTPROG'��������܂���B�T�C�����g�E�A�b�v�f�[�g�Ɏ��s���܂����B" 
+LangString CheckStartupParamsMB ${LANG_JAPANESE} "�v���O������'$INSTPROG'��������܂���B�T�C�����g�E�A�b�v�f�[�g�Ɏ��s���܂����B" 
-; installation success dialog
+; installation success dialog
-LangString InstSuccesssQuestion ${LANG_JAPANESE} "�����ɃZ�J���h���C�t���J�n���܂����H " 
+LangString InstSuccesssQuestion ${LANG_JAPANESE} "�����ɃZ�J���h���C�t���J�n���܂����H " 
-; remove old NSIS version
+; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_JAPANESE} "�Â��o�[�W���������`�F�b�N���ł��c" 
+LangString RemoveOldNSISVersion ${LANG_JAPANESE} "�Â��o�[�W���������`�F�b�N���ł��c" 
-; check windows version
+; check windows version
-LangString CheckWindowsVersionDP ${LANG_JAPANESE} "�E�B���h�E�Y�̃o�[�W���������`�F�b�N���ł�..." 
+LangString CheckWindowsVersionDP ${LANG_JAPANESE} "�E�B���h�E�Y�̃o�[�W���������`�F�b�N���ł�..." 
-LangString CheckWindowsVersionMB ${LANG_JAPANESE} "�Z�J���h���C�t��Windows XP�AWindows 2000�AMac OS X�݂̂��T�|�[�g���Ă��܂��BWindows $R0���C���X�g�[�����鎖�́A�f�[�^�̏�����N���b�V���̌����ɂȂ�\��������܂��B�C���X�g�[���𑱂��܂����H" 
+LangString CheckWindowsVersionMB ${LANG_JAPANESE} "�Z�J���h���C�t��Windows XP�AWindows 2000�AMac OS X�݂̂��T�|�[�g���Ă��܂��BWindows $R0���C���X�g�[�����鎖�́A�f�[�^�̏�����N���b�V���̌����ɂȂ�\��������܂��B�C���X�g�[���𑱂��܂����H" 
-; checkifadministrator function (install)
+; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_JAPANESE} "�C���X�g�[���̂��߂̌������`�F�b�N���ł�..." 
+LangString CheckAdministratorInstDP ${LANG_JAPANESE} "�C���X�g�[���̂��߂̌������`�F�b�N���ł�..." 
-LangString CheckAdministratorInstMB ${LANG_JAPANESE} "�Z�J���h���C�t���C���X�g�[������ɂ͊Ǘ��Ҍ������K�v�ł��B"
+LangString CheckAdministratorInstMB ${LANG_JAPANESE} "�Z�J���h���C�t���C���X�g�[������ɂ͊Ǘ��Ҍ������K�v�ł��B"
-; checkifadministrator function (uninstall)
+; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_JAPANESE} "�A���C���X�g�[���̂��߂̌������`�F�b�N���ł�..." 
+LangString CheckAdministratorUnInstDP ${LANG_JAPANESE} "�A���C���X�g�[���̂��߂̌������`�F�b�N���ł�..." 
-LangString CheckAdministratorUnInstMB ${LANG_JAPANESE} "�Z�J���h���C�t���A���C���X�g�[������ɂ͊Ǘ��Ҍ������K�v�ł��B" 
+LangString CheckAdministratorUnInstMB ${LANG_JAPANESE} "�Z�J���h���C�t���A���C���X�g�[������ɂ͊Ǘ��Ҍ������K�v�ł��B" 
-; checkifalreadycurrent
+; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_JAPANESE} "�Z�J���h���C�t${VERSION_LONG} �̓C���X�g�[���ς݂ł��B�ēx�C���X�g�[�����܂����H " 
+LangString CheckIfCurrentMB ${LANG_JAPANESE} "�Z�J���h���C�t${VERSION_LONG} �̓C���X�g�[���ς݂ł��B�ēx�C���X�g�[�����܂����H " 
-; closesecondlife function (install)
+; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_JAPANESE} "�Z�J���h���C�t���I�����ł�..." 
+LangString CloseSecondLifeInstDP ${LANG_JAPANESE} "�Z�J���h���C�t���I�����ł�..." 
-LangString CloseSecondLifeInstMB ${LANG_JAPANESE} "�Z�J���h���C�t�̋N�����ɃC���X�g�[���͏o���܂���B�����ɃZ�J���h���C�t���I�����ăC���X�g�[�����J�n����ꍇ��OK�{�^���������Ă��������BCANCEL�������ƒ��~���܂��B"
+LangString CloseSecondLifeInstMB ${LANG_JAPANESE} "�Z�J���h���C�t�̋N�����ɃC���X�g�[���͏o���܂���B�����ɃZ�J���h���C�t���I�����ăC���X�g�[�����J�n����ꍇ��OK�{�^���������Ă��������BCANCEL�������ƒ��~���܂��B"
-; closesecondlife function (uninstall)
+; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_JAPANESE} "�Z�J���h���C�t���I�����ł�..." 
+LangString CloseSecondLifeUnInstDP ${LANG_JAPANESE} "�Z�J���h���C�t���I�����ł�..." 
-LangString CloseSecondLifeUnInstMB ${LANG_JAPANESE} "�Z�J���h���C�t�̋N�����ɃA���C���X�g�[���͏o���܂���B�����ɃZ�J���h���C�t���I�����ăA���C���X�g�[�����J�n����ꍇ��OK�{�^���������Ă��������BCANCEL�������ƒ��~���܂��B" 
+LangString CloseSecondLifeUnInstMB ${LANG_JAPANESE} "�Z�J���h���C�t�̋N�����ɃA���C���X�g�[���͏o���܂���B�����ɃZ�J���h���C�t���I�����ăA���C���X�g�[�����J�n����ꍇ��OK�{�^���������Ă��������BCANCEL�������ƒ��~���܂��B" 
-; removecachefiles
+; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_JAPANESE} " Documents and Settings �t�H���_�̃L���b�V���t�@�C�����f���[�g���ł��B" 
+LangString RemoveCacheFilesDP ${LANG_JAPANESE} " Documents and Settings �t�H���_�̃L���b�V���t�@�C�����f���[�g���ł��B" 
-; delete program files
+; delete program files
-LangString DeleteProgramFilesMB ${LANG_JAPANESE} "�Z�J���h���C�t�̃f�B���N�g���ɂ́A�܂��t�@�C�����c����Ă��܂��B$\n$INSTDIR$\n�ɂ��Ȃ����쐬�A�܂��͈ړ��������t�@�C��������\��������܂��B�S�č폜���܂����H " 
+LangString DeleteProgramFilesMB ${LANG_JAPANESE} "�Z�J���h���C�t�̃f�B���N�g���ɂ́A�܂��t�@�C�����c����Ă��܂��B$\n$INSTDIR$\n�ɂ��Ȃ����쐬�A�܂��͈ړ��������t�@�C��������\��������܂��B�S�č폜���܂����H " 
-; uninstall text
+; uninstall text
-LangString UninstallTextMsg ${LANG_JAPANESE} "�Z�J���h���C�t${VERSION_LONG}���A���C���X�g�[�����܂��B"
+LangString UninstallTextMsg ${LANG_JAPANESE} "�Z�J���h���C�t${VERSION_LONG}���A���C���X�g�[�����܂��B"
diff --git a/linden/indra/newview/installers/windows/lang_ko.nsi b/linden/indra/newview/installers/windows/lang_ko.nsi
index 4e6b5ec..b570315 100644
--- a/linden/indra/newview/installers/windows/lang_ko.nsi
+++ b/linden/indra/newview/installers/windows/lang_ko.nsi
@@ -1,57 +1,57 @@
-; First is default
+; First is default
-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Korean.nlf"
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\Korean.nlf"
-; subtitle on license text caption
+; subtitle on license text caption
-LangString LicenseSubTitleUpdate ${LANG_KOREAN} "������Ʈ"
+LangString LicenseSubTitleUpdate ${LANG_KOREAN} "������Ʈ"
-LangString LicenseSubTitleSetup ${LANG_KOREAN} " ��ġ�ϱ�"
+LangString LicenseSubTitleSetup ${LANG_KOREAN} " ��ġ�ϱ�"
-; description on license page
+; description on license page
-LangString LicenseDescUpdate ${LANG_KOREAN} "�� ��Ű���� ������������� ����${VERSION_LONG}.���� ������Ʈ �մϴ�. "
+LangString LicenseDescUpdate ${LANG_KOREAN} "�� ��Ű���� ������������� ����${VERSION_LONG}.���� ������Ʈ �մϴ�. "
-LangString LicenseDescSetup ${LANG_KOREAN} "�� ��Ű���� ������������� ��ǻ�Ϳ� ��ġ�մϴ�."
+LangString LicenseDescSetup ${LANG_KOREAN} "�� ��Ű���� ������������� ��ǻ�Ϳ� ��ġ�մϴ�."
-LangString LicenseDescNext ${LANG_KOREAN} "����"
+LangString LicenseDescNext ${LANG_KOREAN} "����"
-; installation directory text
+; installation directory text
-LangString DirectoryChooseTitle ${LANG_KOREAN} "��ġ ���丮"
+LangString DirectoryChooseTitle ${LANG_KOREAN} "��ġ ���丮"
-LangString DirectoryChooseUpdate ${LANG_KOREAN} "������������� ������Ʈ�� ���丮�� �����ϼ���. "
+LangString DirectoryChooseUpdate ${LANG_KOREAN} "������������� ������Ʈ�� ���丮�� �����ϼ���. "
-LangString DirectoryChooseSetup ${LANG_KOREAN} "������������� ��ġ�� ���丮�� �����ϼ���:"
+LangString DirectoryChooseSetup ${LANG_KOREAN} "������������� ��ġ�� ���丮�� �����ϼ���:"
-; CheckStartupParams message box
+; CheckStartupParams message box
-LangString CheckStartupParamsMB ${LANG_KOREAN} " ��$INSTPROG�� ���α׷��� ã�� ���߽��ϴ�. �ڵ� ������Ʈ�� �����߽��ϴ�."
+LangString CheckStartupParamsMB ${LANG_KOREAN} " ��$INSTPROG�� ���α׷��� ã�� ���߽��ϴ�. �ڵ� ������Ʈ�� �����߽��ϴ�."
-; installation success dialog
+; installation success dialog
-LangString InstSuccesssQuestion ${LANG_KOREAN} "������������� �����ϰڽ��ϱ�?"
+LangString InstSuccesssQuestion ${LANG_KOREAN} "������������� �����ϰڽ��ϱ�?"
-; remove old NSIS version
+; remove old NSIS version
-LangString RemoveOldNSISVersion ${LANG_KOREAN} "���� ������ ã�� �ֽ��ϴ١� "
+LangString RemoveOldNSISVersion ${LANG_KOREAN} "���� ������ ã�� �ֽ��ϴ١� "
-; check windows version
+; check windows version
-LangString CheckWindowsVersionDP ${LANG_KOREAN} "������ ������ Ȯ���ϰ� �ֽ��ϴ�."
+LangString CheckWindowsVersionDP ${LANG_KOREAN} "������ ������ Ȯ���ϰ� �ֽ��ϴ�."
-LangString CheckWindowsVersionMB ${LANG_KOREAN} "������������� ������ XP, ������ 2000, �׸��� �� OS X�� �����մϴ�. ������ $R0�� ��ġ�� �õ��ϸ� ���۵��� ������ �н��� �Ͼ �� �ֽ��ϴ�. ��� ��ġ�ϰڽ��ϱ�? "
+LangString CheckWindowsVersionMB ${LANG_KOREAN} "������������� ������ XP, ������ 2000, �׸��� �� OS X�� �����մϴ�. ������ $R0�� ��ġ�� �õ��ϸ� ���۵��� ������ �н��� �Ͼ �� �ֽ��ϴ�. ��� ��ġ�ϰڽ��ϱ�? "
-; checkifadministrator function (install)
+; checkifadministrator function (install)
-LangString CheckAdministratorInstDP ${LANG_KOREAN} "��ġ ������ Ȯ�� ���Դϴ�... "
+LangString CheckAdministratorInstDP ${LANG_KOREAN} "��ġ ������ Ȯ�� ���Դϴ�... "
-LangString CheckAdministratorInstMB ${LANG_KOREAN} "���� ���մԡ������� ��� ���Դϴ�. ������������� ��ġ�ϱ� ���ؼ� ����ڡ� ������ ����ؾ� �մϴ�."
+LangString CheckAdministratorInstMB ${LANG_KOREAN} "���� ���մԡ������� ��� ���Դϴ�. ������������� ��ġ�ϱ� ���ؼ� ����ڡ� ������ ����ؾ� �մϴ�."
-; checkifadministrator function (uninstall)
+; checkifadministrator function (uninstall)
-LangString CheckAdministratorUnInstDP ${LANG_KOREAN} "���� ������ Ȯ�� ���Դϴ�. "
+LangString CheckAdministratorUnInstDP ${LANG_KOREAN} "���� ������ Ȯ�� ���Դϴ�. "
-LangString CheckAdministratorUnInstMB ${LANG_KOREAN} " ���� ���մԡ������� ��� ���Դϴ�. ������������� �����ϱ� ���ؼ� ����ڡ� ������ ����ؾ� �մϴ�. "
+LangString CheckAdministratorUnInstMB ${LANG_KOREAN} " ���� ���մԡ������� ��� ���Դϴ�. ������������� �����ϱ� ���ؼ� ����ڡ� ������ ����ؾ� �մϴ�. "
-; checkifalreadycurrent
+; checkifalreadycurrent
-LangString CheckIfCurrentMB ${LANG_KOREAN} "����������� ���� ${VERSION_LONG}�� �̹� ��ġ�Ǿ� �ֽ��ϴ�. �ٽ� ��ġ�Ͻðڽ��ϱ�? "
+LangString CheckIfCurrentMB ${LANG_KOREAN} "����������� ���� ${VERSION_LONG}�� �̹� ��ġ�Ǿ� �ֽ��ϴ�. �ٽ� ��ġ�Ͻðڽ��ϱ�? "
-; closesecondlife function (install)
+; closesecondlife function (install)
-LangString CloseSecondLifeInstDP ${LANG_KOREAN} "������������� ������ �� ���� ��� �ߡ� "
+LangString CloseSecondLifeInstDP ${LANG_KOREAN} "������������� ������ �� ���� ��� �ߡ� "
-LangString CloseSecondLifeInstMB ${LANG_KOREAN} "������������� �̹� �۵� ���� ��� ��ġ�� ��� �� �� �����ϴ�. ���� �۾��� ���߰� ��Ȯ�Ρ��� ���� ������������� ������ ���� �����ϱ� �ٶ��ϴ�. ��ġ�� ����Ϸ��� ����ҡ��� ��������." 
+LangString CloseSecondLifeInstMB ${LANG_KOREAN} "������������� �̹� �۵� ���� ��� ��ġ�� ��� �� �� �����ϴ�. ���� �۾��� ���߰� ��Ȯ�Ρ��� ���� ������������� ������ ���� �����ϱ� �ٶ��ϴ�. ��ġ�� ����Ϸ��� ����ҡ��� ��������." 
-; closesecondlife function (uninstall)
+; closesecondlife function (uninstall)
-LangString CloseSecondLifeUnInstDP ${LANG_KOREAN} "������������� ������ �� ���� ��� �ߡ���"
+LangString CloseSecondLifeUnInstDP ${LANG_KOREAN} "������������� ������ �� ���� ��� �ߡ���"
-LangString CloseSecondLifeUnInstMB ${LANG_KOREAN} " ������������� �̹� �۵� ���� ��� ���Ÿ� ��� �� �� �����ϴ�. ���� �۾��� ���߰� ��Ȯ�Ρ��� ���� ������������� ������ ���� �����ϱ� �ٶ��ϴ�. ��ġ�� ���Ϸ��� ����ҡ��� ��������. "
+LangString CloseSecondLifeUnInstMB ${LANG_KOREAN} " ������������� �̹� �۵� ���� ��� ���Ÿ� ��� �� �� �����ϴ�. ���� �۾��� ���߰� ��Ȯ�Ρ��� ���� ������������� ������ ���� �����ϱ� �ٶ��ϴ�. ��ġ�� ���Ϸ��� ����ҡ��� ��������. "
-; removecachefiles
+; removecachefiles
-LangString RemoveCacheFilesDP ${LANG_KOREAN} " Documents and Settings ���� ���� ĳ�� ���ϵ��� ����ϴ�."
+LangString RemoveCacheFilesDP ${LANG_KOREAN} " Documents and Settings ���� ���� ĳ�� ���ϵ��� ����ϴ�."
-; delete program files
+; delete program files
-LangString DeleteProgramFilesMB ${LANG_KOREAN} "����������� ���α׷� ���丮�� ���� ���ϵ��� ���� �ֽ��ϴ�. �� ���ϵ��� ����ڰ� ���� �͵��̰ų�$\n$INSTDIR$\n$\n�� �̵��� ���ϵ��� �� �ֽ��ϴ�. �� ���ϵ��� �����ϰڽ��ϱ�?" 
+LangString DeleteProgramFilesMB ${LANG_KOREAN} "����������� ���α׷� ���丮�� ���� ���ϵ��� ���� �ֽ��ϴ�. �� ���ϵ��� ����ڰ� ���� �͵��̰ų�$\n$INSTDIR$\n$\n�� �̵��� ���ϵ��� �� �ֽ��ϴ�. �� ���ϵ��� �����ϰڽ��ϱ�?" 
-; uninstall text
+; uninstall text
-LangString UninstallTextMsg ${LANG_KOREAN} "�����������${VERSION_LONG}�� �ý��ۿ��� �����մϴ�."
+LangString UninstallTextMsg ${LANG_KOREAN} "�����������${VERSION_LONG}�� �ý��ۿ��� �����մϴ�."
diff --git a/linden/indra/newview/linux_tools/client-readme.txt b/linden/indra/newview/linux_tools/client-readme.txt
index ff607b7..87087be 100644
--- a/linden/indra/newview/linux_tools/client-readme.txt
+++ b/linden/indra/newview/linux_tools/client-readme.txt
@@ -104,9 +104,8 @@ the Beta release of the Linux client.
  stability.  See PROBLEM 3 in the TROUBLESHOOTING section if you wish to
  turn these on to possibly enhance your experience.
-* MISC - The following features are known to not yet be fully operational on
+* MISC - The following features are not currently fully implemented on the
-  the Linux client:
+  Linux client and are therefore known not to work properly:
-  * Movie recording (soon to be deprecated)
  * Full Unicode font rendering
 * UPLOAD / SAVE / COLOR-PICKER DIALOGS - These only appear when the client
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 070d45a..1b7d6b8 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -17,8 +17,7 @@
 ##   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.
-## NOTE: This is 'off' for WindLight to help testing.  Hopefully it's not
+## NOTE: This is now disabled by default.
-##   really needed any more anyway.
 #export LL_GL_BASICEXT=x
 ## - Avoids *all* optional OpenGL extensions.  This is the safest and least-
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 2dab8ff..397a11e 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -51,13 +51,13 @@
 #include "llquaternion.h"
 #include "v3math.h"
 #include "v4math.h"
+#include "llsmoothstep.h"
 #include "llsdutil.h"
 //#include "vmath.h"
 #include "imageids.h"
 #include "llbox.h"
 #include "llbutton.h"
-#include "llcameraview.h"
 #include "llcallingcard.h"
 #include "llchatbar.h"
 #include "llconsole.h"
@@ -68,6 +68,7 @@
 #include "llfloateractivespeakers.h"
 #include "llfloateravatarinfo.h"
 #include "llfloaterbuildoptions.h"
+#include "llfloatercamera.h"
 #include "llfloaterchat.h"
 #include "llfloatercustomize.h"
 #include "llfloaterdirectory.h"
@@ -91,11 +92,10 @@
 #include "llquantize.h"
 #include "llselectmgr.h"
 #include "llsky.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llstatusbar.h"
 #include "llimview.h"
 #include "lltool.h"
-#include "lltoolcomp.h"         // for gToolGun
 #include "lltoolfocus.h"
 #include "lltoolgrab.h"
 #include "lltoolmgr.h"
@@ -176,6 +176,8 @@ const F32 AVATAR_ZOOM_MIN_Z_FACTOR = 1.15f;
 const F32 MAX_CAMERA_DISTANCE_FROM_AGENT = 50.f;
+const F32 MAX_CAMERA_SMOOTH_DISTANCE = 20.0f;
 const F32 HEAD_BUFFER_SIZE = 0.3f;
 const F32 CUSTOMIZE_AVATAR_CAMERA_ANIM_SLOP = 0.2f;
@@ -270,8 +272,14 @@ void LLAgentFriendObserver::changed(U32 mask)
 // LLAgent()
 //-----------------------------------------------------------------------------
 LLAgent::LLAgent()
-:       mViewerPort(NET_USE_OS_ASSIGNED_PORT),
+:       mDrawDistance( DEFAULT_FAR_PLANE ),
-        mDrawDistance( DEFAULT_FAR_PLANE ),
+        mDoubleTapRunTimer(),
+        mDoubleTapRunMode(DOUBLETAP_NONE),
+        mbAlwaysRun(false),
+        mbRunning(false),
        mAccess(SIM_ACCESS_PG),
        mGroupPowers(0),
        mGroupID(),
@@ -303,7 +311,6 @@ LLAgent::LLAgent()
        mLastCameraMode( CAMERA_MODE_THIRD_PERSON ),
        mViewsPushed(FALSE),
-        mbAlwaysRun(FALSE),
        mShowAvatar(TRUE),
        
        mCameraAnimating( FALSE ),
@@ -329,6 +336,8 @@ LLAgent::LLAgent()
        mFocusObjectOffset(),
        mFocusDotRadius( 0.1f ),                        // meters
        mTrackFocusObject(TRUE),
+        mCameraSmoothingLastPositionGlobal(),
+        mCameraSmoothingLastPositionAgent(),
        mFrameAgent(),
@@ -422,14 +431,14 @@ void LLAgent::init()
 {
        mDrawDistance = gSavedSettings.getF32("RenderFarClip");
-        gCamera = new LLViewerCamera();
+        // *Note: this is where LLViewerCamera::getInstance() used to be constructed.
-        gCamera->setView(DEFAULT_FIELD_OF_VIEW);
+        LLViewerCamera::getInstance()->setView(DEFAULT_FIELD_OF_VIEW);
        // Leave at 0.1 meters until we have real near clip management
-        gCamera->setNear(0.1f);
+        LLViewerCamera::getInstance()->setNear(0.1f);
-        gCamera->setFar(mDrawDistance);                 // if you want to change camera settings, do so in camera.h
+        LLViewerCamera::getInstance()->setFar(mDrawDistance);                   // if you want to change camera settings, do so in camera.h
-        gCamera->setAspect( gViewerWindow->getDisplayAspectRatio() );           // default, overridden in LLViewerWindow::reshape
+        LLViewerCamera::getInstance()->setAspect( gViewerWindow->getDisplayAspectRatio() );             // default, overridden in LLViewerWindow::reshape
-        gCamera->setViewHeightInPixels(768);                    // default, overridden in LLViewerWindow::reshape
+        LLViewerCamera::getInstance()->setViewHeightInPixels(768);                      // default, overridden in LLViewerWindow::reshape
        setFlying( gSavedSettings.getBOOL("FlyingAtExit") );
@@ -444,8 +453,6 @@ void LLAgent::init()
        mTrackFocusObject = gSavedSettings.getBOOL("TrackFocusObject");
 //      LLDebugVarMessageBox::show("Camera Lag", &CAMERA_FOCUS_HALF_LIFE, 0.5f, 0.01f);
-        gSavedSettings.getControl("RenderHideGroupTitle")->addListener(&mHideGroupTitleListener);
-        gSavedSettings.getControl("EffectColor")->addListener(&mEffectColorListener);
        mEffectColor = gSavedSettings.getColor4("EffectColor");
        
@@ -475,8 +482,7 @@ LLAgent::~LLAgent()
        delete [] mActiveCacheQueries;
        mActiveCacheQueries = NULL;
-        delete gCamera;
+        // *Note: this is where LLViewerCamera::getInstance() used to be deleted.
-        gCamera = NULL;
 }
 // Change camera back to third person, stop the autopilot,
@@ -493,16 +499,16 @@ void LLAgent::resetView(BOOL reset_camera)
        if (!gNoRender)
        {
-                gSelectMgr->unhighlightAll();
+                LLSelectMgr::getInstance()->unhighlightAll();
                // By popular request, keep land selection while walking around. JC
-                // gParcelMgr->deselectLand();
+                // LLViewerParcelMgr::getInstance()->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())
+                if (LLSelectMgr::getInstance()->getSelection()->isAttachment())
                {
-                        gSelectMgr->deselectAll();
+                        LLSelectMgr::getInstance()->deselectAll();
                }
                // Hide all popup menus
@@ -539,7 +545,7 @@ void LLAgent::onAppFocusGained()
        if (CAMERA_MODE_MOUSELOOK == mCameraMode)
        {
                changeCameraToDefault();
-                gToolMgr->clearSavedTool();
+                LLToolMgr::getInstance()->clearSavedTool();
        }
 }
@@ -575,7 +581,7 @@ void LLAgent::unlockView()
 //-----------------------------------------------------------------------------
 // moveAt()
 //-----------------------------------------------------------------------------
-void LLAgent::moveAt(S32 direction)
+void LLAgent::moveAt(S32 direction, bool reset)
 {
        // age chat timer so it fades more quickly when you are intentionally moving
        ageChat();
@@ -591,7 +597,10 @@ void LLAgent::moveAt(S32 direction)
                setControlFlags(AGENT_CONTROL_AT_NEG | AGENT_CONTROL_FAST_AT);
        }
-        resetView();
+        if (reset)
+        {
+                resetView();
+        }
 }
 //-----------------------------------------------------------------------------
@@ -685,7 +694,7 @@ void LLAgent::moveUp(S32 direction)
 //-----------------------------------------------------------------------------
 // moveYaw()
 //-----------------------------------------------------------------------------
-void LLAgent::moveYaw(F32 mag)
+void LLAgent::moveYaw(F32 mag, bool reset_view)
 {
        mYawKey = mag;
@@ -698,7 +707,10 @@ void LLAgent::moveYaw(F32 mag)
                setControlFlags(AGENT_CONTROL_YAW_NEG);
        }
-        resetView();
+    if (reset_view)
+        {
+        resetView();
+        }
 }
 //-----------------------------------------------------------------------------
@@ -724,12 +736,10 @@ BOOL LLAgent::canFly()
 {
        if (isGodlike()) return TRUE;
-        if (!gParcelMgr) return FALSE;
        LLViewerRegion* regionp = getRegion();
        if (regionp && regionp->getBlockFly()) return FALSE;
        
-        LLParcel* parcel = gParcelMgr->getAgentParcel();
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (!parcel) return FALSE;
        // Allow owners to fly on their own land.
@@ -764,20 +774,17 @@ void LLAgent::setFlying(BOOL fly)
        if (fly)
        {
                BOOL was_flying = getFlying();
-                if (gParcelMgr)
+                if (!canFly() && !was_flying)
                {
-                        if (!canFly() && !was_flying)
+                        // parcel doesn't let you start fly
-                        {
+                        // gods can always fly
-                                // parcel doesn't let you start fly
+                        // and it's OK if you're already flying
-                                // gods can always fly
+                        make_ui_sound("UISndBadKeystroke");
-                                // and it's OK if you're already flying
+                        return;
-                                make_ui_sound("UISndBadKeystroke");
-                                return;
-                        }
                }
                if( !was_flying )
                {
-                        gViewerStats->incStat(LLViewerStats::ST_FLY_COUNT);
+                        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_FLY_COUNT);
                }
                setControlFlags(AGENT_CONTROL_FLY);
                gSavedSettings.setBOOL("FlyBtnState", TRUE);
@@ -831,12 +838,12 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
                        delta.setVec(regionp->getOriginGlobal() - mRegionp->getOriginGlobal());
                        setPositionAgent(getPositionAgent() - delta);
-                        LLVector3 camera_position_agent = gCamera->getOrigin();
-                        
+                        LLVector3 camera_position_agent = LLViewerCamera::getInstance()->getOrigin();
-                        gCamera->setOrigin(camera_position_agent - delta);
+                        LLViewerCamera::getInstance()->setOrigin(camera_position_agent - delta);
                        // Update all of the regions.
-                        gWorldPointer->updateAgentOffset(agent_offset_global);
+                        LLWorld::getInstance()->updateAgentOffset(agent_offset_global);
                        // Hack to keep sky in the agent's region, otherwise it may get deleted - DJS 08/02/02
                        // *TODO: possibly refactor into gSky->setAgentRegion(regionp)? -Brad
@@ -860,18 +867,18 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
                        delta.setVec(regionp->getOriginGlobal());
                        setPositionAgent(getPositionAgent() - delta);
-                        LLVector3 camera_position_agent = gCamera->getOrigin();
+                        LLVector3 camera_position_agent = LLViewerCamera::getInstance()->getOrigin();
-                        gCamera->setOrigin(camera_position_agent - delta);
+                        LLViewerCamera::getInstance()->setOrigin(camera_position_agent - delta);
                        // Update all of the regions.
-                        gWorldPointer->updateAgentOffset(mAgentOriginGlobal);
+                        LLWorld::getInstance()->updateAgentOffset(mAgentOriginGlobal);
                }
        }
        mRegionp = regionp;
        // Must shift hole-covering water object locations because local
        // coordinate frame changed.
-        gWorldPointer->updateWaterObjects();
+        LLWorld::getInstance()->updateWaterObjects();
        // keep a list of regions we've been too
        // this is just an interesting stat, logged at the dataserver
@@ -879,7 +886,7 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
        U64 handle = regionp->getHandle();
        mRegionsVisited.insert(handle);
-        gSelectMgr->updateSelectionCenter();
+        LLSelectMgr::getInstance()->updateSelectionCenter();
 }
@@ -1215,7 +1222,16 @@ LLVector3 LLAgent::getReferenceUpVector()
 void LLAgent::pitch(F32 angle)
 {
        // don't let user pitch if pointed almost all the way down or up
-        
+        mFrameAgent.pitch(clampPitchToLimits(angle));
+}
+// Radians, positive is forward into ground
+//-----------------------------------------------------------------------------
+// clampPitchToLimits()
+//-----------------------------------------------------------------------------
+F32 LLAgent::clampPitchToLimits(F32 angle)
+{
        // A dot B = mag(A) * mag(B) * cos(angle between A and B)
        // so... cos(angle between A and B) = A dot B / mag(A) / mag(B)
        //                                  = A dot B for unit vectors
@@ -1245,8 +1261,8 @@ void LLAgent::pitch(F32 angle)
        {
                angle = look_up_limit - angle_from_skyward;
        }
+   
-        mFrameAgent.pitch(angle);
+    return angle;
 }
@@ -1293,7 +1309,7 @@ LLVector3d LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
        LLVector3 obj_pos = is_avatar ? ((LLVOAvatar*)object)->mPelvisp->getWorldPosition() : object->getRenderPosition();
        LLQuaternion inv_obj_rot = ~obj_rot;
-        LLVector3 obj_dir_abs = obj_pos - gCamera->getOrigin();
+        LLVector3 obj_dir_abs = obj_pos - LLViewerCamera::getInstance()->getOrigin();
        obj_dir_abs.rotVec(inv_obj_rot);
        obj_dir_abs.normVec();
        obj_dir_abs.abs();
@@ -1327,7 +1343,7 @@ LLVector3d LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
        gViewerWindow->mousePointOnPlaneGlobal(focus_pt_global, x, y, gAgent.getPosGlobalFromAgent(obj_pos), normal);
        LLVector3 focus_pt = gAgent.getPosAgentFromGlobal(focus_pt_global);
        // find vector from camera to focus point in object coordinates
-        LLVector3 camera_focus_vec = focus_pt - gCamera->getOrigin();
+        LLVector3 camera_focus_vec = focus_pt - LLViewerCamera::getInstance()->getOrigin();
        // convert to object-local space
        camera_focus_vec.rotVec(inv_obj_rot);
@@ -1387,7 +1403,6 @@ LLVector3d LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
        if (!is_avatar) 
        {
                //unproject relative clicked coordinate from window coordinate using GL
                GLint viewport[4];
                GLdouble modelview[16];
                GLdouble projection[16];
@@ -1395,14 +1410,14 @@ LLVector3d LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
                GLdouble posX, posY, posZ;
                // convert our matrices to something that has a multiply that works
-                glh::matrix4f newModel((F32*)gCamera->getModelview().mMatrix);
+                glh::matrix4f newModel((F32*)LLViewerCamera::getInstance()->getModelview().mMatrix);
                glh::matrix4f tmpObjMat((F32*)obj_matrix.mMatrix);
                newModel *= tmpObjMat;
                for(U32 i = 0; i < 16; ++i)
                {
                        modelview[i] = newModel.m[i];
-                        projection[i] = gCamera->getProjection().mMatrix[i/4][i%4];
+                        projection[i] = LLViewerCamera::getInstance()->getProjection().mMatrix[i/4][i%4];
                }
                glGetIntegerv( GL_VIEWPORT, viewport );
@@ -1421,8 +1436,8 @@ LLVector3d LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
                //now that we have the object relative position, we should bias toward the center of the object 
                //based on the distance of the camera to the focus point vs. the distance of the camera to the focus
-                F32 relDist = llabs(obj_rel * gCamera->getAtAxis());
+                F32 relDist = llabs(obj_rel * LLViewerCamera::getInstance()->getAtAxis());
-                F32 viewDist = dist_vec(obj_center + obj_rel, gCamera->getOrigin());
+                F32 viewDist = dist_vec(obj_center + obj_rel, LLViewerCamera::getInstance()->getOrigin());
                LLBBox obj_bbox = object->getBoundingBoxAgent();
@@ -1624,7 +1639,7 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
        // clamp obj distance to diagonal of 10 by 10 cube
        obj_min_distance = llmin(obj_min_distance, 10.f * F_SQRT3);
-        obj_min_distance += gCamera->getNear() + (soft_limit ? 0.1f : 0.2f);
+        obj_min_distance += LLViewerCamera::getInstance()->getNear() + (soft_limit ? 0.1f : 0.2f);
        
        return TRUE;
 }
@@ -1633,7 +1648,7 @@ F32 LLAgent::getCameraZoomFraction()
 {
        // 0.f -> camera zoomed all the way out
        // 1.f -> camera zoomed all the way in
-        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
        if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
        {
                // already [0,1]
@@ -1652,9 +1667,9 @@ F32 LLAgent::getCameraZoomFraction()
        {
                F32 min_zoom;
                const F32 DIST_FUDGE = 16.f; // meters
-                F32 max_zoom = gWorldPointer ? llmin(mDrawDistance - DIST_FUDGE, 
+                F32 max_zoom = llmin(mDrawDistance - DIST_FUDGE, 
-                                                                gWorldPointer->getRegionWidthInMeters() - DIST_FUDGE,
+                                                                LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE,
-                                                                MAX_CAMERA_DISTANCE_FROM_AGENT) : MAX_CAMERA_DISTANCE_FROM_AGENT;
+                                                                MAX_CAMERA_DISTANCE_FROM_AGENT);
                F32 distance = (F32)mCameraFocusOffsetTarget.magVec();
                if (mFocusObject.notNull())
@@ -1681,7 +1696,7 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
 {
        // 0.f -> camera zoomed all the way out
        // 1.f -> camera zoomed all the way in
-        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
        if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
        {
@@ -1702,7 +1717,7 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
                F32 min_zoom = LAND_MIN_ZOOM;
                const F32 DIST_FUDGE = 16.f; // meters
                F32 max_zoom = llmin(mDrawDistance - DIST_FUDGE, 
-                                                                gWorldPointer->getRegionWidthInMeters() - DIST_FUDGE,
+                                                                LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE,
                                                                MAX_CAMERA_DISTANCE_FROM_AGENT);
                if (mFocusObject.notNull())
@@ -1733,7 +1748,7 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
 //-----------------------------------------------------------------------------
 void LLAgent::cameraOrbitAround(const F32 radians)
 {
-        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
        if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
        {
                // do nothing for hud selection
@@ -1756,7 +1771,7 @@ void LLAgent::cameraOrbitAround(const F32 radians)
 //-----------------------------------------------------------------------------
 void LLAgent::cameraOrbitOver(const F32 angle)
 {
-        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
        if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
        {
                // do nothing for hud selection
@@ -1773,7 +1788,7 @@ void LLAgent::cameraOrbitOver(const F32 angle)
                F32 angle_from_up = acos( camera_offset_unit * getReferenceUpVector() );
                LLVector3d left_axis;
-                left_axis.setVec(gCamera->getLeftAxis());
+                left_axis.setVec(LLViewerCamera::getInstance()->getLeftAxis());
                F32 new_angle = llclamp(angle_from_up - angle, 1.f * DEG_TO_RAD, 179.f * DEG_TO_RAD);
                mCameraFocusOffsetTarget.rotVec(angle_from_up - new_angle, left_axis);
@@ -1791,7 +1806,7 @@ void LLAgent::cameraZoomIn(const F32 fraction)
                return;
        }
-        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
        if (selection->getObjectCount() && selection->getSelectType() == SELECT_TYPE_HUD)
        {
                // just update hud zoom level
@@ -1826,7 +1841,7 @@ void LLAgent::cameraZoomIn(const F32 fraction)
        // Don't zoom too far back
        const F32 DIST_FUDGE = 16.f; // meters
        F32 max_distance = llmin(mDrawDistance - DIST_FUDGE, 
-                                                         gWorldPointer->getRegionWidthInMeters() - DIST_FUDGE );
+                                                         LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE );
        if (new_distance > max_distance)
        {
@@ -1894,7 +1909,7 @@ void LLAgent::cameraOrbitIn(const F32 meters)
                // Don't zoom too far back
                const F32 DIST_FUDGE = 16.f; // meters
                F32 max_distance = llmin(mDrawDistance - DIST_FUDGE, 
-                                                                 gWorldPointer->getRegionWidthInMeters() - DIST_FUDGE );
+                                                                 LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE );
                if (new_distance > max_distance)
                {
@@ -1907,7 +1922,7 @@ void LLAgent::cameraOrbitIn(const F32 meters)
                if( CAMERA_MODE_CUSTOMIZE_AVATAR == getCameraMode() )
                {
-                        llclamp( new_distance, APPEARANCE_MIN_ZOOM, APPEARANCE_MAX_ZOOM );
+                        new_distance = llclamp( new_distance, APPEARANCE_MIN_ZOOM, APPEARANCE_MAX_ZOOM );
                }
                // Compute new camera offset
@@ -1923,7 +1938,7 @@ void LLAgent::cameraOrbitIn(const F32 meters)
 void LLAgent::cameraPanIn(F32 meters)
 {
        LLVector3d at_axis;
-        at_axis.setVec(gCamera->getAtAxis());
+        at_axis.setVec(LLViewerCamera::getInstance()->getAtAxis());
        mFocusTargetGlobal += meters * at_axis;
        mFocusGlobal = mFocusTargetGlobal;
@@ -1937,7 +1952,7 @@ void LLAgent::cameraPanIn(F32 meters)
 void LLAgent::cameraPanLeft(F32 meters)
 {
        LLVector3d left_axis;
-        left_axis.setVec(gCamera->getLeftAxis());
+        left_axis.setVec(LLViewerCamera::getInstance()->getLeftAxis());
        mFocusTargetGlobal += meters * left_axis;
        mFocusGlobal = mFocusTargetGlobal;
@@ -1951,7 +1966,7 @@ void LLAgent::cameraPanLeft(F32 meters)
 void LLAgent::cameraPanUp(F32 meters)
 {
        LLVector3d up_axis;
-        up_axis.setVec(gCamera->getUpAxis());
+        up_axis.setVec(LLViewerCamera::getInstance()->getUpAxis());
        mFocusTargetGlobal += meters * up_axis;
        mFocusGlobal = mFocusTargetGlobal;
@@ -2126,10 +2141,7 @@ void LLAgent::setBusy()
                //*TODO:Translate
                gBusyMenu->setLabel(LLString("Set Not Busy"));
        }
-        if (gFloaterMute)
+        LLFloaterMute::getInstance()->updateButtons();
-        {
-                gFloaterMute->updateButtons();
-        }
 }
 //-----------------------------------------------------------------------------
@@ -2144,10 +2156,7 @@ void LLAgent::clearBusy()
                //*TODO:Translate
                gBusyMenu->setLabel(LLString("Set Busy"));
        }
-        if (gFloaterMute)
+        LLFloaterMute::getInstance()->updateButtons();
-        {
-                gFloaterMute->updateButtons();
-        }
 }
 //-----------------------------------------------------------------------------
@@ -2164,7 +2173,7 @@ BOOL LLAgent::getBusy() const
 //-----------------------------------------------------------------------------
 void LLAgent::startAutoPilotGlobal(const LLVector3d &target_global, const std::string& behavior_name, const LLQuaternion *target_rotation, void (*finish_callback)(BOOL, void *),  void *callback_data, F32 stop_distance, F32 rot_threshold)
 {
-        if (!gAgent.getAvatarObject() || !gWorldPointer)
+        if (!gAgent.getAvatarObject())
        {
                return;
        }
@@ -2184,7 +2193,7 @@ void LLAgent::startAutoPilotGlobal(const LLVector3d &target_global, const std::s
        LLVector3d intersection;
        LLVector3 normal;
        LLViewerObject *hit_obj;
-        F32 heightDelta = gWorldPointer->resolveStepHeightGlobal(NULL, target_global, trace_target, intersection, normal, &hit_obj);
+        F32 heightDelta = LLWorld::getInstance()->resolveStepHeightGlobal(NULL, target_global, trace_target, intersection, normal, &hit_obj);
        if (stop_distance > 0.f)
        {
@@ -2224,7 +2233,7 @@ void LLAgent::startAutoPilotGlobal(const LLVector3d &target_global, const std::s
        LLVector3 groundNorm;
        LLViewerObject *obj;
-        gWorldPointer->resolveStepHeightGlobal(NULL, target_global, traceEndPt, targetOnGround, groundNorm, &obj);
+        LLWorld::getInstance()->resolveStepHeightGlobal(NULL, target_global, traceEndPt, targetOnGround, groundNorm, &obj);
        F64 target_height = llmax((F64)gAgent.getAvatarObject()->getPelvisToFoot(), target_global.mdV[VZ] - targetOnGround.mdV[VZ]);
        // clamp z value of target to minimum height above ground
@@ -2580,10 +2589,7 @@ void LLAgent::updateLookAt(const S32 mouse_x, const S32 mouse_y)
                // Move head based on cursor position
                ELookAtType lookAtType = LOOKAT_TARGET_NONE;
                LLVector3 headLookAxis;
-                LLCoordFrame frameCamera = *((LLCoordFrame*)gCamera);
+                LLCoordFrame frameCamera = *((LLCoordFrame*)LLViewerCamera::getInstance());
-                F32 x_from_center = ((F32) mouse_x / (F32) gViewerWindow->getWindowWidth() ) - 0.5f;
-                F32 y_from_center = ((F32) mouse_y / (F32) gViewerWindow->getWindowHeight() ) - 0.5f;
                if (cameraMouselook())
                {
@@ -2591,6 +2597,12 @@ void LLAgent::updateLookAt(const S32 mouse_x, const S32 mouse_y)
                }
                else if (cameraThirdPerson())
                {
+                        // range from -.5 to .5
+                        F32 x_from_center = 
+                                ((F32) mouse_x / (F32) gViewerWindow->getWindowWidth() ) - 0.5f;
+                        F32 y_from_center = 
+                                ((F32) mouse_y / (F32) gViewerWindow->getWindowHeight() ) - 0.5f;
                        frameCamera.yaw( - x_from_center * gSavedSettings.getF32("YawFromMousePosition") * DEG_TO_RAD);
                        frameCamera.pitch( - y_from_center * gSavedSettings.getF32("PitchFromMousePosition") * DEG_TO_RAD);
                        lookAtType = LOOKAT_TARGET_FREELOOK;
@@ -2636,11 +2648,11 @@ void LLAgent::setAvatarObject(LLVOAvatar *avatar)
        if (!mLookAt)
        {
-                mLookAt = (LLHUDEffectLookAt *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_LOOKAT);
+                mLookAt = (LLHUDEffectLookAt *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_LOOKAT);
        }
        if (!mPointAt)
        {
-                mPointAt = (LLHUDEffectPointAt *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINTAT);
+                mPointAt = (LLHUDEffectPointAt *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINTAT);
        }
        
        if (!mLookAt.isNull())
@@ -2741,7 +2753,7 @@ void LLAgent::clearRenderState(U8 clearstate)
 //-----------------------------------------------------------------------------
 U8 LLAgent::getRenderState()
 {
-        if (gNoRender || gToolMgr == NULL || gSelectMgr == NULL || gKeyboard == NULL)
+        if (gNoRender || gKeyboard == NULL)
        {
                return 0;
        }
@@ -2753,8 +2765,8 @@ U8 LLAgent::getRenderState()
                stopTyping();
        }
        
-        if ((!gSelectMgr->getSelection()->isEmpty() && gSelectMgr->shouldShowSelection())
+        if ((!LLSelectMgr::getInstance()->getSelection()->isEmpty() && LLSelectMgr::getInstance()->shouldShowSelection())
-                || gToolMgr->getCurrentTool()->isEditing() )
+                || LLToolMgr::getInstance()->getCurrentTool()->isEditing() )
        {
                setRenderState(AGENT_STATE_EDITING);
        }
@@ -2796,7 +2808,7 @@ void LLAgent::endAnimationUpdateUI()
                gMenuBarView->setVisible(TRUE);
                gStatusBar->setVisibleForMouselook(true);
-                gToolMgr->setCurrentToolset(gBasicToolset);
+                LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
                // Only pop if we have pushed...
                if (TRUE == mViewsPushed)
@@ -2844,7 +2856,7 @@ void LLAgent::endAnimationUpdateUI()
        {
                // make sure we ask to save changes
-                gToolMgr->setCurrentToolset(gBasicToolset);
+                LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
                // HACK: If we're quitting, and we were in customize avatar, don't
                // let the mini-map go visible again. JC
@@ -2887,7 +2899,7 @@ void LLAgent::endAnimationUpdateUI()
                // JC - Added for always chat in third person option
                gFocusMgr.setKeyboardFocus(NULL);
-                gToolMgr->setCurrentToolset(gMouselookToolset);
+                LLToolMgr::getInstance()->setCurrentToolset(gMouselookToolset);
                mViewsPushed = TRUE;
@@ -2929,7 +2941,7 @@ void LLAgent::endAnimationUpdateUI()
                        }
                        if (mAvatarObject->getParent())
                        {
-                                LLVector3 at_axis = gCamera->getAtAxis();
+                                LLVector3 at_axis = LLViewerCamera::getInstance()->getAtAxis();
                                LLViewerObject* root_object = (LLViewerObject*)mAvatarObject->getRoot();
                                if (root_object->flagCameraDecoupled())
                                {
@@ -2945,7 +2957,7 @@ void LLAgent::endAnimationUpdateUI()
        }
        else if (mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR)
        {
-                gToolMgr->setCurrentToolset(gFaceEditToolset);
+                LLToolMgr::getInstance()->setCurrentToolset(gFaceEditToolset);
                gFloaterMap->pushVisible(FALSE);
                /*
@@ -3028,24 +3040,21 @@ void LLAgent::updateCamera()
        }
        // Update UI with our camera inputs
-        if (gFloaterCamera)
+        LLFloaterCamera::getInstance()->mRotate->setToggleState(
-        {
+                mOrbitRightKey > 0.f,   // left
-                gFloaterCamera->mRotate->setToggleState(
+                mOrbitUpKey > 0.f,              // top
-                        mOrbitRightKey > 0.f,   // left
+                mOrbitLeftKey > 0.f,    // right
-                        mOrbitUpKey > 0.f,              // top
+                mOrbitDownKey > 0.f);   // bottom
-                        mOrbitLeftKey > 0.f,    // right
-                        mOrbitDownKey > 0.f);   // bottom
+        LLFloaterCamera::getInstance()->mZoom->setToggleState( 
+                mOrbitInKey > 0.f,              // top
-                gFloaterCamera->mZoom->setToggleState( 
+                mOrbitOutKey > 0.f);    // bottom
-                        mOrbitInKey > 0.f,              // top
-                        mOrbitOutKey > 0.f);    // bottom
+        LLFloaterCamera::getInstance()->mTrack->setToggleState(
+                mPanLeftKey > 0.f,              // left
-                gFloaterCamera->mTrack->setToggleState(
+                mPanUpKey > 0.f,                // top
-                        mPanLeftKey > 0.f,              // left
+                mPanRightKey > 0.f,             // right
-                        mPanUpKey > 0.f,                // top
+                mPanDownKey > 0.f);             // bottom
-                        mPanRightKey > 0.f,             // right
-                        mPanDownKey > 0.f);             // bottom
-        }
        // Handle camera movement based on keyboard.
        const F32 ORBIT_OVER_RATE = 90.f * DEG_TO_RAD;                  // radians per second
@@ -3068,7 +3077,7 @@ void LLAgent::updateCamera()
        {
                F32 input_rate = mOrbitInKey - mOrbitOutKey;
                
-                LLVector3d to_focus = gAgent.getPosGlobalFromAgent(gCamera->getOrigin()) - calcFocusPositionTargetGlobal();
+                LLVector3d to_focus = gAgent.getPosGlobalFromAgent(LLViewerCamera::getInstance()->getOrigin()) - calcFocusPositionTargetGlobal();
                F32 distance_to_focus = (F32)to_focus.magVec();
                // Move at distance (in meters) meters per second
                cameraOrbitIn( input_rate * distance_to_focus / gFPSClamped );
@@ -3185,8 +3194,9 @@ void LLAgent::updateCamera()
                        }
                        // ...adjust position for animation
-                        camera_pos_global = lerp(mAnimationCameraStartGlobal, camera_target_global, fraction_of_animation);
+                        F32 smooth_fraction_of_animation = llsmoothstep(0.0f, 1.0f, fraction_of_animation);
-                        mFocusGlobal = lerp(mAnimationFocusStartGlobal, focus_target_global, fraction_of_animation);
+                        camera_pos_global = lerp(mAnimationCameraStartGlobal, camera_target_global, smooth_fraction_of_animation);
+                        mFocusGlobal = lerp(mAnimationFocusStartGlobal, focus_target_global, smooth_fraction_of_animation);
                }
                else
                {
@@ -3205,13 +3215,52 @@ void LLAgent::updateCamera()
                        getAvatarObject()->updateAttachmentVisibility(mCameraMode);
                }
        }
-        else
+        else 
        {
                camera_pos_global = camera_target_global;
                mFocusGlobal = focus_target_global;
                mShowAvatar = TRUE;
        }
+        // smoothing
+        if (TRUE)       
+        {
+                LLVector3d agent_pos = getPositionGlobal();
+                LLVector3d camera_pos_agent = camera_pos_global - agent_pos;
+                
+                if (cameraThirdPerson()) // only smooth in third person mode
+                {
+                        F32 smoothing = llclampf(1.f - pow(2.f, -4.f * gSavedSettings.getF32("CameraPositionSmoothing") / gFPSClamped));
+                        // we use average FPS instead of LLCriticalDamp b/c exact frame time is jittery
+                                        
+                        if (!mFocusObject)  // we differentiate on avatar mode 
+                        {
+                                // for avatar-relative focus, we smooth in avatar space -
+                                // the avatar moves too jerkily w/r/t global space to smooth there.
+                                LLVector3d delta = camera_pos_agent - mCameraSmoothingLastPositionAgent;
+                                if (delta.magVec() < MAX_CAMERA_SMOOTH_DISTANCE)  // only smooth over short distances please
+                                {
+                                        camera_pos_agent = lerp(camera_pos_agent, mCameraSmoothingLastPositionAgent, smoothing);
+                                        camera_pos_global = camera_pos_agent + agent_pos;
+                                }
+                        }
+                        else
+                        {
+                                LLVector3d delta = camera_pos_global - mCameraSmoothingLastPositionGlobal;
+                                if (delta.magVec() < MAX_CAMERA_SMOOTH_DISTANCE) // only smooth over short distances please
+                                {
+                                        camera_pos_global = lerp(camera_pos_global, mCameraSmoothingLastPositionGlobal, smoothing);
+                                }
+                        }
+                }
+                                                                 
+                mCameraSmoothingLastPositionGlobal = camera_pos_global;
+                mCameraSmoothingLastPositionAgent = camera_pos_agent;
+        }
+        
        mCameraCurrentFOVZoomFactor = lerp(mCameraCurrentFOVZoomFactor, mCameraFOVZoomFactor, LLCriticalDamp::getInterpolant(FOV_ZOOM_HALF_LIFE));
 //      llinfos << "Current FOV Zoom: " << mCameraCurrentFOVZoomFactor << " Target FOV Zoom: " << mCameraFOVZoomFactor << " Object penetration: " << mFocusObjectDist << llendl;
@@ -3230,15 +3279,15 @@ void LLAgent::updateCamera()
        // Move the camera
        //Ventrella
-        gCamera->updateCameraLocation(mCameraPositionAgent, mCameraUpVector, focus_agent);
+        LLViewerCamera::getInstance()->updateCameraLocation(mCameraPositionAgent, mCameraUpVector, focus_agent);
-        //gCamera->updateCameraLocation(mCameraPositionAgent, camera_skyward, focus_agent);
+        //LLViewerCamera::getInstance()->updateCameraLocation(mCameraPositionAgent, camera_skyward, focus_agent);
        //end Ventrella
        //RN: translate UI offset after camera is oriented properly
-        gCamera->translate(gCamera->getLeftAxis() * ui_offset);
+        LLViewerCamera::getInstance()->translate(LLViewerCamera::getInstance()->getLeftAxis() * ui_offset);
        
        // Change FOV
-        gCamera->setView(gCamera->getDefaultFOV() / (1.f + mCameraCurrentFOVZoomFactor));
+        LLViewerCamera::getInstance()->setView(LLViewerCamera::getInstance()->getDefaultFOV() / (1.f + mCameraCurrentFOVZoomFactor));
        // follow camera when in customize mode
        if (cameraCustomizeAvatar())    
@@ -3250,11 +3299,11 @@ void LLAgent::updateCamera()
        if(gVoiceClient && getRegion())
        {
                LLMatrix3 rot;
-                rot.setRows(gCamera->getAtAxis(), gCamera->getLeftAxis (),  gCamera->getUpAxis());              
+                rot.setRows(LLViewerCamera::getInstance()->getAtAxis(), LLViewerCamera::getInstance()->getLeftAxis (),  LLViewerCamera::getInstance()->getUpAxis());            
                // MBW -- XXX -- Setting velocity to 0 for now.  May figure it out later...
                gVoiceClient->setCameraPosition(
-                                getRegion()->getPosGlobalFromRegion(gCamera->getOrigin()),// position
+                                getRegion()->getPosGlobalFromRegion(LLViewerCamera::getInstance()->getOrigin()),// position
                                LLVector3::zero,                        // velocity
                                rot);                                           // rotation matrix
        }
@@ -3356,7 +3405,7 @@ F32 LLAgent::calcCustomizeAvatarUIOffset( const LLVector3d& camera_pos_global )
                // Move the camera so that the avatar isn't covered up by this floater.
                F32 fraction_of_fov = 0.5f - (0.5f * (1.f - llmin(1.f, ((F32)rect.getWidth() / (F32)gViewerWindow->getWindowWidth()))));
-                F32 apparent_angle = fraction_of_fov * gCamera->getView() * gCamera->getAspect();  // radians
+                F32 apparent_angle = fraction_of_fov * LLViewerCamera::getInstance()->getView() * LLViewerCamera::getInstance()->getAspect();  // radians
                F32 offset = tan(apparent_angle);
                if( rect.mLeft < (gViewerWindow->getWindowWidth() - rect.mRight) )
@@ -3496,7 +3545,7 @@ void LLAgent::setupSitCamera()
 //-----------------------------------------------------------------------------
 const LLVector3 &LLAgent::getCameraPositionAgent() const
 {
-        return gCamera->getOrigin();
+        return LLViewerCamera::getInstance()->getOrigin();
 }
 //-----------------------------------------------------------------------------
@@ -3504,14 +3553,7 @@ const LLVector3 &LLAgent::getCameraPositionAgent() const
 //-----------------------------------------------------------------------------
 LLVector3d LLAgent::getCameraPositionGlobal() const
 {
-        if (gCamera)
+        return getPosGlobalFromAgent(LLViewerCamera::getInstance()->getOrigin());
-        {
-                return getPosGlobalFromAgent(gCamera->getOrigin());
-        }
-        else
-        {
-                return (LLVector3d::zero);
-        }
 }
 //-----------------------------------------------------------------------------
@@ -3761,7 +3803,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
        if (!gSavedSettings.getBOOL("DisableCameraConstraints") && !gAgent.isGodlike())
        {
-                LLViewerRegion* regionp = gWorldPointer->getRegionFromPosGlobal(
+                LLViewerRegion* regionp = LLWorld::getInstance()->getRegionFromPosGlobal(
                        camera_position_global);
                bool constrain = true;
                if(regionp && regionp->canManageEstate())
@@ -3786,7 +3828,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
                }
 // JC - Could constrain camera based on parcel stuff here.
-//                      LLViewerRegion *regionp = gWorldPointer->getRegionFromPosGlobal(camera_position_global);
+//                      LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromPosGlobal(camera_position_global);
 //                      
 //                      if (regionp && !regionp->mParcelOverlay->isBuildCameraAllowed(regionp->getPosRegionFromGlobal(camera_position_global)))
 //                      {
@@ -3799,14 +3841,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
        // Don't let camera go underground
        F32 camera_min_off_ground = getCameraMinOffGround();
-        if (gWorldPointer)
+        camera_land_height = LLWorld::getInstance()->resolveLandHeightGlobal(camera_position_global);
-        {
-                camera_land_height = gWorldPointer->resolveLandHeightGlobal(camera_position_global);
-        }
-        else
-        {
-                camera_land_height = 0.f;
-        }
        if (camera_position_global.mdV[VZ] < camera_land_height + camera_min_off_ground)
        {
@@ -3842,7 +3877,7 @@ void LLAgent::handleScrollWheel(S32 clicks)
        }
        else
        {
-                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
                const F32 ROOT_ROOT_TWO = sqrt(F_SQRT2);
                // Block if camera is animating
@@ -3922,7 +3957,7 @@ void LLAgent::changeCameraToMouselook(BOOL animate)
        // unpause avatar animation
        mPauseRequest = NULL;
-        gToolMgr->setCurrentToolset(gMouselookToolset);
+        LLToolMgr::getInstance()->setCurrentToolset(gMouselookToolset);
        gSavedSettings.setBOOL("FirstPersonBtnState",   FALSE);
        gSavedSettings.setBOOL("MouselookBtnState",             TRUE);
@@ -3936,7 +3971,7 @@ void LLAgent::changeCameraToMouselook(BOOL animate)
        }
        //gViewerWindow->stopGrab();
-        gSelectMgr->deselectAll();
+        LLSelectMgr::getInstance()->deselectAll();
        gViewerWindow->hideCursor();
        gViewerWindow->moveCursorToCenter();
@@ -4000,11 +4035,11 @@ void LLAgent::changeCameraToFollow(BOOL animate)
                mCameraMode = CAMERA_MODE_FOLLOW;
                // bang-in the current focus, position, and up vector of the follow cam
-                mFollowCam.reset( mCameraPositionAgent, gCamera->getPointOfInterest(), LLVector3::z_axis );
+                mFollowCam.reset( mCameraPositionAgent, LLViewerCamera::getInstance()->getPointOfInterest(), LLVector3::z_axis );
                
                if (gBasicToolset)
                {
-                        gToolMgr->setCurrentToolset(gBasicToolset);
+                        LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
                }
                if (mAvatarObject)
@@ -4073,7 +4108,7 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
        {
                if (gBasicToolset)
                {
-                        gToolMgr->setCurrentToolset(gBasicToolset);
+                        LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
                }
                mCameraLag.clearVec();
@@ -4098,7 +4133,7 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
        if (!mAvatarObject.isNull() && mAvatarObject->getParent())
        {
                LLQuaternion obj_rot = ((LLViewerObject*)mAvatarObject->getParent())->getRenderRotation();
-                at_axis = gCamera->getAtAxis();
+                at_axis = LLViewerCamera::getInstance()->getAtAxis();
                at_axis.mV[VZ] = 0.f;
                at_axis.normVec();
                resetAxes(at_axis * ~obj_rot);
@@ -4133,7 +4168,7 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
        if (gFaceEditToolset)
        {
-                gToolMgr->setCurrentToolset(gFaceEditToolset);
+                LLToolMgr::getInstance()->setCurrentToolset(gFaceEditToolset);
        }
        gSavedSettings.setBOOL("FirstPersonBtnState", FALSE);
@@ -4353,11 +4388,11 @@ void LLAgent::setCameraPosAndFocusGlobal(const LLVector3d& camera_pos, const LLV
                if( CAMERA_MODE_CUSTOMIZE_AVATAR == mCameraMode ) 
                {
                        // Compensate for the fact that the camera has already been offset to make room for LLFloaterCustomize.
-                        mAnimationCameraStartGlobal -= LLVector3d(gCamera->getLeftAxis() * calcCustomizeAvatarUIOffset( mAnimationCameraStartGlobal ));
+                        mAnimationCameraStartGlobal -= LLVector3d(LLViewerCamera::getInstance()->getLeftAxis() * calcCustomizeAvatarUIOffset( mAnimationCameraStartGlobal ));
                }
        }
        
-        //gCamera->setOrigin( gAgent.getPosAgentFromGlobal( camera_pos ) );
+        //LLViewerCamera::getInstance()->setOrigin( gAgent.getPosAgentFromGlobal( camera_pos ) );
        setFocusObject(gObjectList.findObject(object_id));
        mFocusTargetGlobal = focus;
        mCameraFocusOffsetTarget = camera_pos - focus;
@@ -4448,14 +4483,14 @@ void LLAgent::setFocusOnAvatar(BOOL focus_on_avatar, BOOL animate)
                        if (!mAvatarObject.isNull() && mAvatarObject->getParent())
                        {
                                LLQuaternion obj_rot = ((LLViewerObject*)mAvatarObject->getParent())->getRenderRotation();
-                                at_axis = gCamera->getAtAxis();
+                                at_axis = LLViewerCamera::getInstance()->getAtAxis();
                                at_axis.mV[VZ] = 0.f;
                                at_axis.normVec();
                                resetAxes(at_axis * ~obj_rot);
                        }
                        else
                        {
-                                at_axis = gCamera->getAtAxis();
+                                at_axis = LLViewerCamera::getInstance()->getAtAxis();
                                at_axis.mV[VZ] = 0.f;
                                at_axis.normVec();
                                resetAxes(at_axis);
@@ -4473,7 +4508,7 @@ void LLAgent::heardChat(const LLUUID& id)
 {
        // log text and voice chat to speaker mgr
        // for keeping track of active speakers, etc.
-        gLocalSpeakerMgr->speakerChatted(id);
+        LLLocalSpeakerMgr::getInstance()->speakerChatted(id);
        // don't respond to your own voice
        if (id == getID()) return;
@@ -4583,7 +4618,7 @@ void LLAgent::setStartPosition(U32 location_id)
                        // this simulator.  Clamp it to the region the agent is
                        // in, a little bit in on each side.
                        const F32 INSET = 0.5f; //meters
-                        const F32 REGION_WIDTH = gWorldPointer->getRegionWidthInMeters();
+                        const F32 REGION_WIDTH = LLWorld::getInstance()->getRegionWidthInMeters();
                        LLVector3 agent_pos = getPositionAgent();
@@ -4599,7 +4634,7 @@ void LLAgent::setStartPosition(U32 location_id)
                        // Don't let them go below ground, or too high.
                        agent_pos.mV[VZ] = llclamp( agent_pos.mV[VZ], 
                                mRegionp->getLandHeightRegion( agent_pos ), 
-                                gWorldPointer->getRegionMaxHeight() );
+                                LLWorld::getInstance()->getRegionMaxHeight() );
                        LLMessageSystem* msg = gMessageSystem;
                        msg->newMessageFast(_PREHASH_SetStartLocationRequest);
@@ -4889,7 +4924,7 @@ void LLAgent::buildLocationString(std::string& str)
        // create a defult name and description for the landmark
        std::string buffer;
-        if( gParcelMgr->getAgentParcelName().empty() )
+        if( LLViewerParcelMgr::getInstance()->getAgentParcelName().empty() )
        {
                // the parcel doesn't have a name
                buffer = llformat("%.32s (%d, %d, %d)",
@@ -4900,7 +4935,7 @@ void LLAgent::buildLocationString(std::string& str)
        {
                // the parcel has a name, so include it in the landmark name
                buffer = llformat("%.32s, %.32s (%d, %d, %d)",
-                                                  gParcelMgr->getAgentParcelName().c_str(),
+                                                  LLViewerParcelMgr::getInstance()->getAgentParcelName().c_str(),
                                                  getRegion()->getName().c_str(),
                                                  pos_x, pos_y, pos_z);
        }
@@ -4920,7 +4955,7 @@ LLQuaternion LLAgent::getHeadRotation()
        }
        // We must be in mouselook
-        LLVector3 look_dir( gCamera->getAtAxis() );
+        LLVector3 look_dir( LLViewerCamera::getInstance()->getAtAxis() );
        LLVector3 up = look_dir % mFrameAgent.getLeftAxis();
        LLVector3 left = up % look_dir;
@@ -4990,6 +5025,20 @@ void LLAgent::sendAnimationRequest(const LLUUID &anim_id, EAnimRequest request)
        sendReliableMessage();
 }
+void LLAgent::sendWalkRun(bool running)
+{
+        LLMessageSystem* msgsys = gMessageSystem;
+        if (msgsys)
+        {
+                msgsys->newMessageFast(_PREHASH_SetAlwaysRun);
+                msgsys->nextBlockFast(_PREHASH_AgentData);
+                msgsys->addUUIDFast(_PREHASH_AgentID, getID());
+                msgsys->addUUIDFast(_PREHASH_SessionID, getSessionID());
+                msgsys->addBOOLFast(_PREHASH_AlwaysRun, BOOL(running) );
+                sendReliableMessage();
+        }
+}
 void LLAgent::friendsChanged()
 {
        LLCollectProxyBuddies collector;
@@ -5147,7 +5196,7 @@ void LLAgent::processAgentDropGroup(LLMessageSystem *msg, void **)
                // refresh all group information
                gAgent.sendAgentDataUpdateRequest();
-                gGroupMgr->clearGroupData(group_id);
+                LLGroupMgr::getInstance()->clearGroupData(group_id);
                // close the floater for this group, if any.
                LLFloaterGroupInfo::closeGroup(group_id);
                // refresh the group panel of the search window, if necessary.
@@ -5226,7 +5275,7 @@ class LLAgentDropGroupViewerNode : public LLHTTPNode
                                // refresh all group information
                                gAgent.sendAgentDataUpdateRequest();
-                                gGroupMgr->clearGroupData(group_id);
+                                LLGroupMgr::getInstance()->clearGroupData(group_id);
                                // close the floater for this group, if any.
                                LLFloaterGroupInfo::closeGroup(group_id);
                                // refresh the group panel of the search window,
@@ -5687,14 +5736,14 @@ bool LLAgent::teleportCore(bool is_local)
        LLFloaterWorldMap::hide(NULL);
        LLFloaterDirectory::hide(NULL);
-        gParcelMgr->deselectLand();
+        LLViewerParcelMgr::getInstance()->deselectLand();
        // Close all pie menus, deselect land, etc.
        // Don't change the camera until we know teleport succeeded. JC
        resetView(FALSE);
        // local logic
-        gViewerStats->incStat(LLViewerStats::ST_TELEPORT_COUNT);
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_TELEPORT_COUNT);
        if (!is_local)
        {
                gTeleportDisplay = TRUE;
@@ -5802,7 +5851,7 @@ void LLAgent::teleportCancel()
 void LLAgent::teleportViaLocation(const LLVector3d& pos_global)
 {
        LLViewerRegion* regionp = getRegion();
-        LLSimInfo* info = gWorldMap->simInfoFromPosGlobal(pos_global);
+        LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromPosGlobal(pos_global);
        if(regionp && info)
        {
                U32 x_pos;
@@ -6857,7 +6906,7 @@ void LLAgent::sendAgentSetAppearance()
        msg->addUUIDFast(_PREHASH_AgentID, getID());
        msg->addUUIDFast(_PREHASH_SessionID, getSessionID());
-        // correct for the collisiton tolerance (to make it look like the 
+        // correct for the collision tolerance (to make it look like the 
        // agent is actually walking on the ground/object)
        // NOTE -- when we start correcting all of the other Havok geometry 
        // to compensate for the COLLISION_TOLERANCE ugliness we will have 
@@ -7401,19 +7450,6 @@ void LLAgent::userRemoveAllAttachments( void* userdata )
        gMessageSystem->sendReliable( gAgent.getRegionHost() );
 }
-bool LLAgent::LLHideGroupTitleListener::handleEvent(LLPointer<LLEvent> event, const LLSD &userdata)
-{
-        gAgent.setHideGroupTitle(event->getValue());
-        return true;
-}
-bool LLAgent::LLEffectColorListener::handleEvent(LLPointer<LLEvent> event, const LLSD &userdata)
-{
-        gAgent.setEffectColor(LLColor4(event->getValue()));
-        return true;
-}
 void LLAgent::observeFriends()
 {
        if(!mFriendObserver)
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 2a875a0..01462f1 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -36,6 +36,7 @@
 #include "indra_constants.h"
 #include "llmath.h"
+#include "llcontrol.h"
 #include "llcoordframe.h"
 #include "llevent.h"
 #include "llagentconstants.h"
@@ -180,7 +181,7 @@ public:
        void                    updateCamera();                 // call once per frame to update camera location/orientation
        void                    resetCamera();                                          // slam camera into its default position
        void                    setupSitCamera();
-        void                    setCameraCollidePlane(LLVector4 &plane) { mCameraCollidePlane = plane; }
+        void                    setCameraCollidePlane(const LLVector4 &plane) { mCameraCollidePlane = plane; }
        void                    changeCameraToDefault();
        void                    changeCameraToMouselook(BOOL animate = TRUE);
@@ -201,16 +202,17 @@ public:
        void                    heardChat(const LLUUID& id);
        void                    lookAtLastChat();
-        LLUUID                  getLastChatter() { return mLastChatterID; }
+        F32                     getTypingTime() { return mTypingTimer.getElapsedTimeF32(); }
-        F32                             getTypingTime() { return mTypingTimer.getElapsedTimeF32(); }
        void                    setAFK();
        void                    clearAFK();
        BOOL                    getAFK() const;
-        void                    setAlwaysRun()  { mbAlwaysRun = TRUE; }
+        void                    setAlwaysRun() { mbAlwaysRun = true; }
-        void                    clearAlwaysRun() { mbAlwaysRun = FALSE; }
+        void                    clearAlwaysRun() { mbAlwaysRun = false; }
-        BOOL                    getAlwaysRun() const { return mbAlwaysRun; }
+        void                    setRunning() { mbRunning = true; }
+        void                    clearRunning() { mbRunning = false; }
        void                    setBusy();
        void                    clearBusy();
@@ -220,13 +222,12 @@ public:
        void                    setGodLevel(U8 god_level)       { mGodLevel = god_level; }
        void                    setFirstLogin(BOOL b)           { mFirstLogin = b; }
        void                    setGenderChosen(BOOL b)         { mGenderChosen = b; }
-                
-        BOOL                    getAdminOverride() const        { return mAdminOverride; }
        // update internal datastructures and update the server with the
        // new contribution level. Returns true if the group id was found
        // and contribution could be set.
-        BOOL setGroupContribution(const LLUUID& group_id, S32 contribution);
+        BOOL                    setGroupContribution(const LLUUID& group_id, S32 contribution);
-        BOOL setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOOL list_in_profile);
+        BOOL                    setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOOL list_in_profile);
        void                    setHideGroupTitle(BOOL hide)    { mHideGroupTitle = hide; }
        //
@@ -255,6 +256,11 @@ public:
        F32                             getFocusObjectDist() const      { return mFocusObjectDist; }
        BOOL                    inPrelude();
        BOOL                    canManageEstate() const;
+        BOOL                    getAdminOverride() const        { return mAdminOverride; }
+        LLUUID                  getLastChatter() const { return mLastChatterID; }
+        bool                    getAlwaysRun() const { return mbAlwaysRun; }
+        bool                    getRunning() const { return mbRunning; }
        const LLUUID&   getInventoryRootID() const      { return mInventoryRootID; }
@@ -350,6 +356,7 @@ public:
        void                    roll(F32 angle);
        void                    yaw(F32 angle);
        LLVector3               getReferenceUpVector();
+    F32             clampPitchToLimits(F32 angle);
        void                    setThirdPersonHeadOffset(LLVector3 offset) { mThirdPersonHeadOffset = offset; }
        // Flight management
@@ -398,12 +405,12 @@ public:
        // Movement from user input.  All set the appropriate animation flags.
        // All turn off autopilot and make sure the camera is behind the avatar.
        // direction is either positive, zero, or negative
-        void                    moveAt(S32 direction);
+        void                    moveAt(S32 direction, bool reset_view = true);
        void                    moveAtNudge(S32 direction);
        void                    moveLeft(S32 direction);
        void                    moveLeftNudge(S32 direction);
        void                    moveUp(S32 direction);
-        void                    moveYaw(F32 mag);
+        void                    moveYaw(F32 mag, bool reset_view = true);
        void                    movePitch(S32 direction);
        void                    setOrbitLeftKey(F32 mag)                                { mOrbitLeftKey = mag; }
@@ -422,7 +429,7 @@ public:
        U32                     getControlFlags(); 
        void                    setControlFlags(U32 mask);                      // performs bitwise mControlFlags |= mask
-        void                    clearControlFlags(U32 mask);                    // performs bitwise mControlFlags &= mask
+        void                    clearControlFlags(U32 mask);                    // performs bitwise mControlFlags &= ~mask
        BOOL                    controlFlagsDirty() const;
        void                    enableControlFlagReset();
        void                    resetControlFlags();
@@ -535,6 +542,15 @@ public:
        F32                             getNearChatRadius() { return mNearChatRadius; }
+        enum EDoubleTapRunMode
+        {
+                DOUBLETAP_NONE,
+                DOUBLETAP_FORWARD,
+                DOUBLETAP_BACKWARD,
+                DOUBLETAP_SLIDELEFT,
+                DOUBLETAP_SLIDERIGHT
+        };
        enum ETeleportState
        {
                TELEPORT_NONE = 0,                      // No teleport in progress
@@ -637,6 +653,8 @@ public:
        BOOL                    areWearablesLoaded() { return mWearablesLoaded; }
+        void sendWalkRun(bool running);
        void observeFriends();
        void friendsChanged();
@@ -670,7 +688,6 @@ protected:
                                                BOOL notify = TRUE);
 public:
        // TODO: Make these private!
-        U32                             mViewerPort;                            // Port this agent transmits on.
        LLUUID                  mSecureSessionID;                       // secure token for this login session
        F32                             mDrawDistance;
@@ -709,7 +726,13 @@ public:
        static std::map<LLString, LLString> sTeleportErrorMessages;
        static std::map<LLString, LLString> sTeleportProgressMessages;
+        LLFrameTimer mDoubleTapRunTimer;
+        EDoubleTapRunMode mDoubleTapRunMode;
 private:
+        bool mbAlwaysRun; // should the avatar run by default rather than walk
+        bool mbRunning; // is the avatar trying to run right now
        // Access or "maturity" level
        U8                              mAccess;        // SIM_ACCESS_MATURE or SIM_ACCESS_PG
        ETeleportState  mTeleportState;
@@ -738,7 +761,6 @@ private:
        BOOL                    mViewsPushed;                                   // keep track of whether or not we have pushed views.
        BOOL            mCustomAnim ;                   //current animation is ANIM_AGENT_CUSTOMIZE ?
-        BOOL                    mbAlwaysRun;                                    // should the avatar run rather than walk
        BOOL                    mShowAvatar;                                    // should we render the avatar?
        BOOL                    mCameraAnimating;                               // camera is transitioning from one mode to another
        LLVector3d              mAnimationCameraStartGlobal;    // camera start position, global coords
@@ -762,7 +784,9 @@ private:
        BOOL                    mSitCameraEnabled;                              // use provided camera information when sitting?
        LLVector3               mSitCameraPos;                                  // root relative camera pos when sitting
        LLVector3               mSitCameraFocus;                                // root relative camera target when sitting
+        LLVector3d      mCameraSmoothingLastPositionGlobal;    
+        LLVector3d      mCameraSmoothingLastPositionAgent;    
+        
        //Ventrella
        LLVector3               mCameraUpVector;                                // camera's up direction in world coordinates (determines the 'roll' of the view)
        //End Ventrella
@@ -909,21 +933,6 @@ private:
                LLPointer<LLRefCount> mCB;
        };
-        //control listeners
-        class LLHideGroupTitleListener: public LLSimpleListener
-        {
-        public:
-                bool handleEvent(LLPointer<LLEvent> event, const LLSD &userdata);
-        };
-        class LLEffectColorListener: public LLSimpleListener
-        {
-        public:
-                bool handleEvent(LLPointer<LLEvent> event, const LLSD &userdata);
-        };
-        LLHideGroupTitleListener mHideGroupTitleListener;
-        LLEffectColorListener mEffectColorListener;
        LLFriendObserver* mFriendObserver;
 };
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index cb94e51..7c71e46 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -32,10 +32,11 @@
 #include "llviewerprecompiledheaders.h"
 #include "llappviewer.h"
+#include "llprimitive.h"
 #include "llversionviewer.h"
 #include "llfeaturemanager.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llalertdialog.h"
 #include "llerrorcontrol.h"
 #include "llviewerimagelist.h"
@@ -45,12 +46,12 @@
 #include "llviewerstats.h"
 #include "llmd5.h"
 #include "llpumpio.h"
-#include "llfloateractivespeakers.h"
 #include "llimpanel.h"
 #include "llmimetypes.h"
 #include "llstartup.h"
 #include "llfocusmgr.h"
 #include "llviewerjoystick.h"
+#include "llfloaterjoystick.h"
 #include "llares.h" 
 #include "llcurl.h"
 #include "llfloatersnapshot.h"
@@ -62,10 +63,13 @@
 #include "llmutelist.h"
 #include "llurldispatcher.h"
 #include "llurlhistory.h"
+#include "llfirstuse.h"
 #include "llweb.h"
 #include "llsecondlifeurls.h"
+#include <boost/bind.hpp>
 #if LL_WINDOWS
        #include "llwindebug.h"
 #endif
@@ -93,7 +97,6 @@
 #include "lltoolmgr.h"
 #include "llassetstorage.h"
 #include "llpolymesh.h"
-#include "lleconomy.h"
 #include "llcachename.h"
 #include "audioengine.h"
 #include "llviewermenu.h"
@@ -108,6 +111,7 @@
 #include "lldebugview.h"
 #include "llconsole.h"
 #include "llcontainerview.h"
+#include "llfloaterstats.h"
 #include "llhoverview.h"
 #include "llsdserialize.h"
@@ -148,14 +152,12 @@
 #include "llvieweraudio.h"
 #include "llimview.h"
 #include "llviewerthrottle.h"
+#include "llparcel.h"
 // 
 #include "llinventoryview.h"
-// *FIX: Remove these once the command line params thing is figured out.
+#include "llcommandlineparser.h"
-// Yuck!
-static int gTempArgC = 0;
-static char** gTempArgV;
 // *FIX: These extern globals should be cleaned up.
 // The globals either represent state/config/resource-storage of either 
@@ -168,7 +170,6 @@ static char** gTempArgV;
 //----------------------------------------------------------------------------
 // llviewernetwork.h
 #include "llviewernetwork.h"
-// extern EGridInfo gGridChoice;
 ////// Windows-specific includes to the bottom - nasty defines in these pollute the preprocessor
@@ -210,26 +211,13 @@ extern OSStatus DisplayReleaseNotes(void);
 #endif // LL_DARWIN
-#include "moviemaker.h"
-extern BOOL gbCapturing;
-#if !LL_SOLARIS
-        extern MovieMaker gMovieMaker;
-#endif
 extern BOOL gRandomizeFramerate;
 extern BOOL gPeriodicSlowFrame;
 ////////////////////////////////////////////////////////////
 // All from the last globals push...
-bool gVerifySSLCert = true;
 BOOL gHandleKeysAsync = FALSE;
-BOOL gProbeHardware = TRUE; // Use DirectX 9 to probe for hardware
-S32 gYieldMS = 0; // set in parse_args, used in mainLoop
-BOOL gYieldTime = FALSE;
 const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user flagged as Away From Keyboard
 F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
@@ -240,25 +228,13 @@ LLString gDisabledMessage; // Set in LLAppViewer::initConfiguration used in idle
 BOOL gHideLinks = FALSE; // Set in LLAppViewer::initConfiguration, used externally
 BOOL                            gAllowIdleAFK = TRUE;
-F32                                     gAFKTimeout = DEFAULT_AFK_TIMEOUT;
+BOOL                            gAllowTapTapHoldRun = TRUE;
 BOOL                            gShowObjectUpdates = FALSE;
-BOOL gLogMessages = FALSE;
-std::string gChannelName = LL_CHANNEL;
-BOOL gUseAudio = TRUE;
 BOOL gUseQuickTime = TRUE;
-LLString gCmdLineFirstName;
-LLString gCmdLineLastName;
-LLString gCmdLinePassword;
-BOOL                            gAutoLogin = FALSE;
-const char*                     DEFAULT_SETTINGS_FILE = "settings.xml";
-BOOL gRequestInventoryLibrary = TRUE;
-BOOL gGodConnect = FALSE;
 BOOL gAcceptTOS = FALSE;
 BOOL gAcceptCriticalMessage = FALSE;
-LLUUID                          gViewerDigest;  // MD5 digest of the viewer's executable file.
 eLastExecEvent gLastExecEvent = LAST_EXEC_NORMAL;
 LLSD gDebugInfo;
@@ -285,7 +261,6 @@ F32					gLogoutMaxTime = LOGOUT_REQUEST_TIME;
 LLUUID gInventoryLibraryOwner;
 LLUUID gInventoryLibraryRoot;
-BOOL                            gDisableVoice = FALSE;
 BOOL                            gDisconnected = FALSE;
 // Map scale in pixels per region
@@ -297,17 +272,11 @@ LLFrameTimer	gRestoreGLTimer;
 BOOL                    gRestoreGL = FALSE;
 BOOL                            gUseWireframe = FALSE;
-F32                                     gMouseSensitivity = 3.f;
-BOOL                            gInvertMouse = FALSE;
 // VFS globals - see llappviewer.h
 LLVFS* gStaticVFS = NULL;
 LLMemoryInfo gSysMemory;
-bool gPreloadImages = true;
-bool gPreloadSounds = true;
 LLString gLastVersionChannel;
 LLVector3                       gWindVec(3.0, 3.0, 0.0);
@@ -317,34 +286,16 @@ U32		gPacketsIn = 0;
 BOOL                            gPrintMessagesThisFrame = FALSE;
-BOOL gUseConsole = TRUE;
 BOOL gRandomizeFramerate = FALSE;
 BOOL gPeriodicSlowFrame = FALSE;
-BOOL gQAMode = FALSE;
+BOOL gCrashOnStartup = FALSE;
 BOOL gLLErrorActivated = FALSE;
 BOOL gLogoutInProgress = FALSE;
 ////////////////////////////////////////////////////////////
 // Internal globals... that should be removed.
-static F32 gQuitAfterSeconds = 0.f;
-static BOOL gRotateRight = FALSE;
-static BOOL gIgnorePixelDepth = FALSE;
-// Allow multiple viewers in ReleaseForDownload
-#if LL_RELEASE_FOR_DOWNLOAD
-static BOOL gMultipleViewersOK = FALSE;
-#else
-static BOOL gMultipleViewersOK = TRUE;
-#endif
-static std::map<std::string, std::string> gCommandLineSettings;
-static std::map<std::string, std::string> gCommandLineForcedSettings;
 static LLString gArgs;
-static LLString gOldSettingsFileName;
-static const char* LEGACY_DEFAULT_SETTINGS_FILE = "settings.ini";
 const char* MARKER_FILE_NAME = "SecondLife.exec_marker";
 const char* ERROR_MARKER_FILE_NAME = "SecondLife.error_marker";
 const char* LLERROR_MARKER_FILE_NAME = "SecondLife.llerror_marker";
@@ -367,52 +318,10 @@ std::string gLoginPage;
 std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
-static const char USAGE[] = "\n"
-"usage:\tviewer [options]\n"
-"options:\n"
-" -login <first> <last> <password>     log in as a user\n"
-" -autologin                           log in as last saved user\n"
-" -loginpage <URL>                     login authentication page to use\n"
-" -loginuri <URI>                      login server and CGI script to use\n"
-" -helperuri <URI>                     helper web CGI prefix to use\n"
-" -settings <filename>                 specify the filename of a\n"
-"                                        configuration file\n"
-"                                        default is settings.xml\n"
-" -setdefault <variable> <value>       specify the value of a particular\n"
-"                                        configuration variable which can be\n"
-"                                        overridden by settings.xml\n"
-" -set <variable> <value>              specify the value of a particular\n"
-"                                        configuration variable that\n"
-"                                        overrides all other settings\n"
-#if !LL_RELEASE_FOR_DOWNLOAD
-" -sim <simulator_ip>                  specify the simulator ip address\n"
-#endif
-" -god                                     log in as god if you have god access\n"
-" -purge                               delete files in cache\n"
-" -safe                                reset preferences, run in safe mode\n"
-" -noutc                               logs in local time, not UTC\n"
-" -nothread                            run vfs in single thread\n"
-" -noinvlib                            Do not request inventory library\n"
-" -multiple                            allow multiple viewers\n"
-" -nomultiple                          block multiple viewers\n"
-" -novoice                             disable voice\n"
-" -ignorepixeldepth                    ignore pixel depth settings\n"
-" -cooperative [ms]                    yield some idle time to local host\n"
-" -skin                                ui/branding skin folder to use\n"
-#if LL_WINDOWS
-" -noprobe                             disable hardware probe\n"
-#endif
-" -noquicktime                         disable QuickTime movies, speeds startup\n"
-" -nopreload                           don't preload UI images or sounds, speeds startup\n"
-// these seem to be unused
-//" -noenv                               turn off environmental effects\n"
-//" -proxy <proxy_ip>                    specify the proxy ip address\n"
-"\n";
 void idle_afk_check()
 {
        // check idle timers
-        if (gAllowIdleAFK && (gAwayTriggerTimer.getElapsedTimeF32() > gAFKTimeout))
+        if (gAllowIdleAFK && (gAwayTriggerTimer.getElapsedTimeF32() > gSavedSettings.getF32("AFKTimeout")))
        {
                gAgent.setAFK();
        }
@@ -432,8 +341,8 @@ void request_initial_instant_messages()
 {
        static BOOL requested = FALSE;
        if (!requested
-                && gMuteListp
+                && gMessageSystem
-                && gMuteListp->isLoaded()
+                && LLMuteList::getInstance()->isLoaded()
                && gAgent.getAvatarObject())
        {
                // Auto-accepted inventory items may require the avatar object
@@ -451,7 +360,7 @@ void request_initial_instant_messages()
 // Use these strictly for things that are constructed at startup,
 // or for things that are performance critical.  JC
-static void saved_settings_to_globals()
+static void settings_to_globals()
 {
        LLBUTTON_H_PAD          = gSavedSettings.getS32("ButtonHPad");
        LLBUTTON_V_PAD          = gSavedSettings.getS32("ButtonVPad");
@@ -489,17 +398,18 @@ static void saved_settings_to_globals()
        gDebugWindowProc = gSavedSettings.getBOOL("DebugWindowProc");
        gAllowIdleAFK = gSavedSettings.getBOOL("AllowIdleAFK");
-        gAFKTimeout = gSavedSettings.getF32("AFKTimeout");
+        gAllowTapTapHoldRun = gSavedSettings.getBOOL("AllowTapTapHoldRun");
-        gMouseSensitivity = gSavedSettings.getF32("MouseSensitivity");
-        gInvertMouse = gSavedSettings.getBOOL("InvertMouse");
        gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
        gMapScale = gSavedSettings.getF32("MapScale");
        gMiniMapScale = gSavedSettings.getF32("MiniMapScale");
        gHandleKeysAsync = gSavedSettings.getBOOL("AsyncKeyboard");
        LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
+}
+static void settings_modify()
+{
        LLRenderTarget::sUseFBO                         = gSavedSettings.getBOOL("RenderUseFBO");
-        LLVOAvatar::sUseImpostors                       = gSavedSettings.getBOOL("RenderUseImpostors");
+        LLVOAvatar::sUseImpostors                       = FALSE; //gSavedSettings.getBOOL("RenderUseImpostors");
        LLVOSurfacePatch::sLODFactor            = gSavedSettings.getF32("RenderTerrainLODFactor");
        LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //sqaure lod factor to get exponential range of [1,4]
@@ -539,374 +449,75 @@ static void saved_settings_to_globals()
        // propagate push to talk preference to current status
        gSavedSettings.setBOOL("PTTCurrentlyEnabled", TRUE); //gSavedSettings.getBOOL("EnablePushToTalk"));
-        settings_setup_listeners();
-        // gAgent.init() also loads from saved settings.
 }
-int parse_args(int argc, char **argv)
+void initGridChoice()
 {
-        // Sometimes IP addresses passed in on the command line have leading
+    LLString gridChoice = gSavedSettings.getString("GridChoice");
-        // or trailing white space.  Use LLString to clean that up.
+    if(!gridChoice.empty())
-        LLString ip_string;
-        S32 j;
-        for (j = 1; j < argc; j++) 
-        {
                // Used to show first chunk of each argument passed in the 
                // window title.
-                gArgs += argv[j];
+    {
-                gArgs += " ";
+        // find the grid choice from the user setting.
+        int gridIndex = GRID_INFO_NONE; 
-                LLString argument = argv[j];
+        for(;gridIndex < GRID_INFO_OTHER; ++gridIndex )
-                if ((!strcmp(argv[j], "-port")) && (++j < argc)) 
+        {
-                {
+            if(0 == LLString::compareInsensitive(gGridInfo[gridIndex].mLabel, gridChoice.c_str()))
-                        sscanf(argv[j], "%u", &(gAgent.mViewerPort));
+            {
-                }
+                gGridChoice = (EGridInfo)gridIndex;
-                else if ((!strcmp(argv[j], "-drop")) && (++j < argc)) 
-                {
+                if(GRID_INFO_LOCAL == gGridChoice)
-                        sscanf(argv[j], "%f", &gPacketDropPercentage);
+                {
-                }
+                    gGridName = LOOPBACK_ADDRESS_STRING;
-                else if ((!strcmp(argv[j], "-inbw")) && (++j < argc))
+                    break;
-                {
+                }
-                        sscanf(argv[j], "%f", &gInBandwidth);
+                else
-                }
+                {
-                else if ((!strcmp(argv[j], "-outbw")) && (++j < argc))
+                    gGridName = gGridInfo[gGridChoice].mName;
-                {
+                    break;
-                        sscanf(argv[j], "%f", &gOutBandwidth);
+                }
-                }
+            }
-                else if (!strcmp(argv[j], "--aditi"))
+        }
-                {
-                        gGridChoice = GRID_INFO_ADITI;
+        if(GRID_INFO_OTHER == gridIndex)
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
+        {
-                }
+                // *FIX:MEP Can and should we validate that this is an IP address?
-                else if (!strcmp(argv[j], "--agni"))
+                gGridChoice = (EGridInfo)gridIndex;
-                {
+                gGridName = llformat("%s", gSavedSettings.getString("GridChoice").c_str());
-                        gGridChoice = GRID_INFO_AGNI;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
+        }
-                }
+    }
-                else if (!strcmp(argv[j], "--aruna"))
-                {
-                        gGridChoice = GRID_INFO_ARUNA;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--durga"))
-                {
-                        gGridChoice = GRID_INFO_DURGA;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--ganga"))
-                {
-                        gGridChoice = GRID_INFO_GANGA;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--mitra"))
-                {
-                        gGridChoice = GRID_INFO_MITRA;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--mohini"))
-                {
-                        gGridChoice = GRID_INFO_MOHINI;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--nandi"))
-                {
-                        gGridChoice = GRID_INFO_NANDI;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--radha"))
-                {
-                        gGridChoice = GRID_INFO_RADHA;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--ravi"))
-                {
-                        gGridChoice = GRID_INFO_RAVI;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--siva"))
-                {
-                        gGridChoice = GRID_INFO_SIVA;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--shakti"))
-                {
-                        gGridChoice = GRID_INFO_SHAKTI;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--soma"))
-                {
-                        gGridChoice = GRID_INFO_SOMA;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--uma"))
-                {
-                        gGridChoice = GRID_INFO_UMA;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--vaak"))
-                {
-                        gGridChoice = GRID_INFO_VAAK;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--yami"))
-                {
-                        gGridChoice = GRID_INFO_YAMI;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "-loginpage") && (++j < argc))
-                {
-                        LLAppViewer::instance()->setLoginPage(utf8str_trim(argv[j]));
-                }
-                else if (!strcmp(argv[j], "-loginuri") && (++j < argc))
-                {
-            LLAppViewer::instance()->addLoginURI(utf8str_trim(argv[j]));
-                }
-                else if (!strcmp(argv[j], "-helperuri") && (++j < argc))
-                {
-            LLAppViewer::instance()->setHelperURI(utf8str_trim(argv[j]));
-                }
-                else if (!strcmp(argv[j], "-debugviews"))
-                {
-                        LLView::sDebugRects = TRUE;
-                }
-                else if (!strcmp(argv[j], "-skin") && (++j < argc))
-                {
-                        std::string folder(argv[j]);
-                        gDirUtilp->setSkinFolder(folder);
-                }
-                else if (!strcmp(argv[j], "-autologin") || !strcmp(argv[j], "--autologin")) // keep --autologin for compatibility
-                {
-                        gAutoLogin = TRUE;
-                }
-                else if (!strcmp(argv[j], "-quitafter") && (++j < argc))
-                {
-                        gQuitAfterSeconds = (F32)atof(argv[j]);
-                }
-                else if (!strcmp(argv[j], "-rotate"))
-                {
-                        gRotateRight = TRUE;
-                }
-//              else if (!strcmp(argv[j], "-noenv")) 
-//              {
-                        //turn OFF environmental effects for slow machines/video cards
-//                      gRequestParaboloidMap = FALSE;
-//              }
-                else if (!strcmp(argv[j], "-noaudio"))
-                {
-                        gUseAudio = FALSE;
-                }
-                else if (!strcmp(argv[j], "-nosound"))  // tends to be popular cmdline on Linux.
-                {
-                        gUseAudio = FALSE;
-                }
-                else if (!strcmp(argv[j], "-noprobe"))
-                {
-                        gProbeHardware = FALSE;
-                }
-                else if (!strcmp(argv[j], "-noquicktime"))
-                {
-                        // Developers can log in faster if they don't load all the
-                        // quicktime dlls.
-                        gUseQuickTime = false;
-                }
-                else if (!strcmp(argv[j], "-nopreload"))
-                {
-                        // Developers can log in faster if they don't decode sounds
-                        // or images on startup, ~5 seconds faster.
-                        gPreloadSounds = false;
-                        gPreloadImages = false;
-                }
-                else if (!strcmp(argv[j], "-purge"))
-                {
-                        LLAppViewer::instance()->purgeCache();
-                }
-                else if(!strcmp(argv[j], "-noinvlib"))
-                {
-                        gRequestInventoryLibrary = FALSE;
-                }
-                else if (!strcmp(argv[j], "-log"))
-                {
-                        gLogMessages = TRUE;
-                        continue;
-                }
-                else if (!strcmp(argv[j], "-logfile") && (++j < argc)) 
-                {
-                        // *NOTE: This buffer size is hard coded into scanf() below.
-                        char logfile[256];      // Flawfinder: ignore
-                        sscanf(argv[j], "%255s", logfile);      // Flawfinder: ignore
-                        llinfos << "Setting log file to " << logfile << llendl;
-                        LLFile::remove(logfile);
-                        LLError::logToFile(logfile);
-                }
-                else if (!strcmp(argv[j], "-settings") && (++j < argc)) 
-                {
-                        gSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, argv[j]);
-                }
-                else if (!strcmp(argv[j], "-setdefault") && (j + 2 < argc)) 
-                {
-                        std::string control_name;
-                        std::string control_value;
-                        
-                        j++;
-                        if (argv[j]) control_name = std::string(argv[j]);
-                        j++;
-                        if (argv[j]) control_value = std::string(argv[j]);
-                        
-                        // grab control name and value
-                        if (!control_name.empty())
-                        {
-                                gCommandLineSettings[control_name] = control_value;
-                        }
-                }
-                else if (!strcmp(argv[j], "-set") && (j + 2 < argc)) 
-                {
-                        std::string control_name;
-                        std::string control_value;
-                        
-                        j++;
-                        if (argv[j]) control_name = std::string(argv[j]);
-                        j++;
+#if !LL_RELEASE_FOR_DOWNLOAD
-                        if (argv[j]) control_value = std::string(argv[j]);
+        if (gGridChoice == GRID_INFO_NONE)
-                        
+        {
-                        // grab control name and value
+                // Development version: load last server choice by default (overridden by cmd line args)
-                        if (!control_name.empty())
+                S32 server = gSavedSettings.getS32("ServerChoice");
-                        {
+                if (server != 0)
-                                gCommandLineForcedSettings[control_name] = control_value;
+                        gGridChoice = (EGridInfo)llclamp(server, 0, (S32)GRID_INFO_COUNT - 1);
-                        }
+                if (server == GRID_INFO_OTHER)
-                }
-                else if (!strcmp(argv[j], "-login"))
-                {
-                        if (j + 3 < argc)
-                        {
-                                j++;
-                                gCmdLineFirstName = argv[j];
-                                j++;
-                                gCmdLineLastName = argv[j];
-                                j++;
-                                gCmdLinePassword = argv[j];
-                        }
-                        else
-                        {
-                                // only works if -login is last parameter on command line
-                                llerrs << "Not enough parameters to -login. Did you mean -loginuri?" << llendl;
-                        }
-                }
-                else if (!strcmp(argv[j], "-god"))
-                {
-                        gGodConnect = TRUE;
-                }
-                else if (!strcmp(argv[j], "-noconsole"))
-                {
-                        gUseConsole = FALSE;
-                }
-                else if (!strcmp(argv[j], "-safe"))
-                {
-                        llinfos << "Setting viewer feature table to run in safe mode, resetting prefs" << llendl;
-                        gFeatureManagerp->setSafe(TRUE);
-                }
-                else if (!strcmp(argv[j], "-multiple"))
-                {
-                        gMultipleViewersOK = TRUE;
-                }
-                else if (!strcmp(argv[j], "-nomultiple"))
-                {
-                        gMultipleViewersOK = FALSE;
-                }
-                else if (!strcmp(argv[j], "-novoice"))
-                {
-                        gDisableVoice = TRUE;
-                }
-                else if (!strcmp(argv[j], "-nothread"))
-                {
-                        LLVFile::ALLOW_ASYNC = FALSE;
-                        llinfos << "Running VFS in nothread mode" << llendl;
-                }
-                // some programs don't respect the command line options in protocol handlers (I'm looking at you, Opera)
-                // so this allows us to parse the URL straight off the command line without a "-url" paramater
-                else if (LLURLDispatcher::isSLURL(argv[j])
-                                 || !strcmp(argv[j], "-url") && (++j < argc)) 
-                {
-                        std::string slurl = argv[j];
-                        if (LLURLDispatcher::isSLURLCommand(slurl))
-                        {
-                                LLStartUp::sSLURLCommand = slurl;
-                        }
-                        else
-                        {
-                                LLURLSimString::setString(slurl);
-                        }
-                        // *NOTE: After setting the url, bail. What can happen is
-                        // that someone can use IE (or potentially other browsers)
-                        // and do the rough equivalent of command injection and
-                        // steal passwords. Phoenix. SL-55321
-                        return 0;
-                }
-                else if (!strcmp(argv[j], "-ignorepixeldepth"))
-                {
-                        gIgnorePixelDepth = TRUE;
-                }
-                else if (!strcmp(argv[j], "-cooperative"))
                {
-                        S32 ms_to_yield = 0;
+                        LLString custom_server = gSavedSettings.getString("CustomServer");
-                        if(++j < argc)
+                        if (custom_server.empty())
                        {
-                                S32 rv = sscanf(argv[j], "%d", &ms_to_yield);
+                                gGridName = "none";
-                                if(0 == rv)
-                                {
-                                        --j;
-                                }
                        }
                        else
                        {
-                                --j;
+                                gGridName = custom_server.c_str();
                        }
-                        gYieldMS = ms_to_yield;
-                        gYieldTime = TRUE;
-                }
-                else if (!strcmp(argv[j], "-no-verify-ssl-cert"))
-                {
-                        gVerifySSLCert = false;
                }
-                else if ( (!strcmp(argv[j], "--channel") || !strcmp(argv[j], "-channel"))  && (++j < argc)) 
-                {
-                        gChannelName = argv[j];
-                }
-#if LL_DARWIN
-                else if (!strncmp(argv[j], "-psn_", 5))
-                {
-                        // this is the Finder passing the process session number
-                        // we ignore this
-                }
-#endif
-                else if(!strncmp(argv[j], "-qa", 3))
-                {
-                        // This whole case should disappear with settings clean-up work in QAR-369
-                        // or at least be replaced by setting a boolean in the settings repository. -MG
-                        gQAMode = TRUE;
-                        LLUI::setQAMode(gQAMode);
-                }
-                else if(argument == "-crash")
-                {
-                        LLAppViewer::instance()->forceErrorBadMemoryAccess();
-                }
-                else
-                {
-                        // DBC - Mac OS X passes some stuff by default on the command line (e.g. psn).
+        gSavedSettings.setString("GridChoice", gGridInfo[gGridChoice].mLabel);
-                        // Second Life URLs are passed this way as well?
+        }
-                        llwarns << "Possible unknown keyword " << argv[j] << llendl;
+#endif
-                        // print usage information
+        if (gGridChoice == GRID_INFO_NONE)
-                        llinfos << USAGE << llendl;
+        {
-                        // return 1;
+                gGridChoice = GridDefaultChoice;
-                }
+        gSavedSettings.setString("GridChoice", gGridInfo[gGridChoice].mLabel);
        }
-        return 0;
 }
 bool send_url_to_other_instance(const std::string& url)
@@ -917,6 +528,7 @@ bool send_url_to_other_instance(const std::string& url)
        window_class[255] = 0;
        // Use the class instead of the window name.
        HWND other_window = FindWindow(window_class, NULL);
        if (other_window != NULL)
        {
                lldebugs << "Found other window with the name '" << gWindowTitle << "'" << llendl;
@@ -942,6 +554,10 @@ bool send_url_to_other_instance(const std::string& url)
 // The single viewer app.
 LLAppViewer* LLAppViewer::sInstance = NULL;
+const std::string LLAppViewer::sGlobalSettingsName = "Global"; 
+const std::string LLAppViewer::sPerAccountSettingsName = "PerAccount"; 
+const std::string LLAppViewer::sCrashSettingsName = "CrashSettings"; 
 LLTextureCache* LLAppViewer::sTextureCache = NULL; 
 LLWorkerThread* LLAppViewer::sImageDecodeThread = NULL; 
 LLTextureFetch* LLAppViewer::sTextureFetch = NULL; 
@@ -952,11 +568,12 @@ LLAppViewer::LLAppViewer() :
        mReportedCrash(false),
        mNumSessions(0),
        mPurgeCache(false),
-    mPurgeOnExit(false),
+        mPurgeOnExit(false),
-    mSecondInstance(false),
+        mSecondInstance(false),
        mSavedFinalSnapshot(false),
-    mQuitRequested(false),
+        mQuitRequested(false),
-    mLogoutRequestSent(false)
+        mLogoutRequestSent(false),
+        mYieldTime(-1)
 {
        if(NULL != sInstance)
        {
@@ -972,13 +589,6 @@ LLAppViewer::~LLAppViewer()
        removeMarkerFile();
 }
-bool LLAppViewer::tempStoreCommandOptions(int argc, char** argv)
-{
-        gTempArgC = argc;
-        gTempArgV = argv;
-        return true;
-}
 bool LLAppViewer::init()
 {
    // *NOTE:Mani - LLCurl::initClass is not thread safe. 
@@ -987,7 +597,6 @@ bool LLAppViewer::init()
    initThreads();
-        initEarlyConfiguration();
        //
        // Start of the application
@@ -1007,14 +616,19 @@ bool LLAppViewer::init()
        //
        // OK to write stuff to logs now, we've now crash reported if necessary
        //
-        // Set up some defaults...
-        gSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, DEFAULT_SETTINGS_FILE);
-        gOldSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, LEGACY_DEFAULT_SETTINGS_FILE);
    if (!initConfiguration())
                return false;
+    writeSystemInfo();
+        // Build a string representing the current version number.
+    gCurrentVersion = llformat("%s %d.%d.%d.%d", 
+        gSavedSettings.getString("VersionChannelName").c_str(), 
+        LL_VERSION_MAJOR, 
+        LL_VERSION_MINOR, 
+        LL_VERSION_PATCH, 
+        LL_VERSION_BUILD );
        //////////////////////////////////////////////////////////////////////////////
        //////////////////////////////////////////////////////////////////////////////
        //////////////////////////////////////////////////////////////////////////////
@@ -1022,47 +636,10 @@ bool LLAppViewer::init()
        // *FIX: The following code isn't grouped into functions yet.
        //
-        // Write system information into the debug log (CPU, OS, etc.)
+        // Various introspection concerning the libs we're using.
        //
-        writeSystemInfo();
+        llinfos << "J2C Engine is: " << LLImageJ2C::getEngineInfo() << llendl;
-        // Build a string representing the current version number.
-        gCurrentVersion = llformat("%s %d.%d.%d.%d", gChannelName.c_str(), LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD );
-        
-        //
-        // 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))
-        {
-                llinfos << "Failed to load settings from " << gSettingsFileName << llendl;
-                llinfos << "Loading legacy settings from " << gOldSettingsFileName << llendl;
-                gSavedSettings.loadFromFileLegacy(gOldSettingsFileName);
-        }
-        // need to do this here - need to have initialized global settings first
-        LLString nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" );
-        if ( nextLoginLocation.length() )
-        {
-                LLURLSimString::setString( nextLoginLocation.c_str() );
-        };
-        // Merge with the command line overrides
-        gSavedSettings.applyOverrides(gCommandLineForcedSettings);
-        gLastRunVersion = gSavedSettings.getString("LastRunVersion");
-        fixup_settings();
-        
        // 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());
@@ -1101,68 +678,29 @@ bool LLAppViewer::init()
        {
                LLError::setPrintLocation(true);
        }
-#if !LL_RELEASE_FOR_DOWNLOAD
-        if (gGridChoice == GRID_INFO_NONE)
-        {
-                // Development version: load last server choice by default (overridden by cmd line args)
-                
-                S32 server = gSavedSettings.getS32("ServerChoice");
-                if (server != 0)
-                        gGridChoice = (EGridInfo)llclamp(server, 0, (S32)GRID_INFO_COUNT - 1);
-                if (server == GRID_INFO_OTHER)
-                {
-                        LLString custom_server = gSavedSettings.getString("CustomServer");
-                        if (custom_server.empty())
-                        {
-                                snprintf(gGridName, MAX_STRING, "none");                /* Flawfinder: ignore */
-                        }
-                        else
-                        {
-                                snprintf(gGridName, MAX_STRING, "%s", custom_server.c_str());           /* Flawfinder: ignore */
-                        }
-                }
-        }
-#endif
-        if (gGridChoice == GRID_INFO_NONE)
-        {
-                gGridChoice = GridDefaultChoice;
-        }
        
        // Load art UUID information, don't require these strings to be declared in code.
-        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;
-        gColors.loadFromFile(colors_base_filename.c_str(), FALSE, TYPE_COL4U);
+        gColors.loadFromFileLegacy(colors_base_filename.c_str(), FALSE, TYPE_COL4U);
        // Load overrides from user colors file
        LLString user_colors_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "colors.xml");
        llinfos << "Loading user colors from " << user_colors_filename << llendl;
-        if (gColors.loadFromFile(user_colors_filename.c_str(), FALSE, TYPE_COL4U) == 0)
+        if (gColors.loadFromFileLegacy(user_colors_filename.c_str(), FALSE, TYPE_COL4U) == 0)
        {
-                llinfos << "Failed to load user colors from " << user_colors_filename << llendl;
+                llinfos << "Cannot load user colors from " << user_colors_filename << llendl;
-                LLString user_legacy_colors_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "colors.ini");
-                llinfos << "Loading legacy colors from " << user_legacy_colors_filename << llendl;
-                gColors.loadFromFileLegacy(user_legacy_colors_filename.c_str(), FALSE, TYPE_COL4U);
        }
        // Widget construction depends on LLUI being initialized
        LLUI::initClass(&gSavedSettings, 
                                        &gColors, 
-                                        &gViewerArt,
+                                        LLUIImageList::getInstance(),
-                                        &gImageList,
                                        ui_audio_callback,
                                        &LLUI::sGLScaleFactor);
        LLWeb::initClass();                       // do this after LLUI
-        gUICtrlFactory->setupPaths(); // update paths with correct language set
+        LLUICtrlFactory::getInstance()->setupPaths(); // update paths with correct language set
        
        /////////////////////////////////////////////////
        //
@@ -1173,16 +711,18 @@ bool LLAppViewer::init()
        LLAgent::parseTeleportMessages("teleport_strings.xml");
+        LLViewerJointMesh::updateVectorize();
        // load MIME type -> media impl mappings
        LLMIMETypes::parseMIMETypes( "mime_types.xml" ); 
-        mCrashBehavior = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
-        LLVectorPerformanceOptions::initClass();
-        // Move certain saved settings into global variables for speed
-        saved_settings_to_globals();
+        // Copy settings to globals. *TODO: Remove or move to appropriage class initializers
+        settings_to_globals();
+        // Setup settings listeners
+        settings_setup_listeners();
+        // Modify settings based on system configuration and compile options
+        settings_modify();
        // Find partition serial number (Windows) or hardware serial (Mac)
        mSerialNumber = generateSerialNumber();
@@ -1203,7 +743,7 @@ bool LLAppViewer::init()
        MemSetErrorHandler(first_mem_error_handler);
 #endif // LL_WINDOWS && LL_RELEASE_FOR_DOWNLOAD && LL_USE_SMARTHEAP
-        gViewerStats = new LLViewerStats();
+        // *Note: this is where gViewerStats used to be created.
        //
        // Initialize the VFS, and gracefully handle initialization errors
@@ -1262,17 +802,6 @@ bool LLAppViewer::init()
        // Load Custom bindings (override defaults)
        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" );          /* Flawfinder: ignore */
-        if( app_file )
-        {
-                LLMD5 app_md5;
-                app_md5.update( app_file ); // Automatically closes the file
-                app_md5.finalize();
-                app_md5.raw_digest( gViewerDigest.mData );
-        }
-        llinfos << "Viewer Digest: " << gViewerDigest << llendl;
        // If we don't have the right GL requirements, exit.
        if (!gGLManager.mHasRequirements && !gNoRender)
        {       
@@ -1303,7 +832,7 @@ bool LLAppViewer::init()
                minRAMString >> minRAM;
                minRAM = minRAM * 1024 * 1024;
-                if(!gFeatureManagerp->isGPUSupported())
+                if(!LLFeatureManager::getInstance()->isGPUSupported())
                {
                        minSpecs += LLAlertDialog::getTemplateMessage("UnsupportedGPU");
                        minSpecs += "\n";
@@ -1338,6 +867,16 @@ bool LLAppViewer::init()
        gSimLastTime = gRenderStartTime.getElapsedTimeF32();
        gSimFrames = (F32)gFrameCount;
+        LLViewerJoystick::getInstance()->init(false);
+        if (LLViewerJoystick::getInstance()->isLikeSpaceNavigator())
+        {
+                if (gSavedSettings.getString("JoystickInitialized") != "SpaceNavigator")
+                {
+                        LLFloaterJoystick::setSNDefaults();
+                        gSavedSettings.setString("JoystickInitialized", "SpaceNavigator");
+                }
+        }
+        
        return true;
 }
@@ -1352,9 +891,7 @@ bool LLAppViewer::mainLoop()
        LLHTTPClient::setPump(*gServicePump);
        LLCurl::setCAFile(gDirUtilp->getCAFile());
        
-        // initialize voice stuff here
+        // Note: this is where gLocalSpeakerMgr and gActiveSpeakerMgr used to be instantiated.
-        gLocalSpeakerMgr = new LLLocalSpeakerMgr();
-        gActiveChannelSpeakerMgr = new LLActiveSpeakerMgr();
        LLVoiceChannel::initClass();
        LLVoiceClient::init(gServicePump);
@@ -1362,7 +899,9 @@ bool LLAppViewer::mainLoop()
        LLMemType mt1(LLMemType::MTYPE_MAIN);
        LLTimer frameTimer,idleTimer;
        LLTimer debugTime;
-        
+        LLViewerJoystick* joystick(LLViewerJoystick::getInstance());
+        joystick->setNeedsReset(true);
+        
        // Handle messages
        while (!LLApp::isExiting())
        {
@@ -1383,7 +922,7 @@ bool LLAppViewer::mainLoop()
                                gViewerWindow->mWindow->gatherInput();
                        }
-#if 1 && !RELEASE_FOR_DOWNLOAD
+#if 1 && !LL_RELEASE_FOR_DOWNLOAD
                        // once per second debug info
                        if (debugTime.getElapsedTimeF32() > 1.f)
                        {
@@ -1403,8 +942,8 @@ bool LLAppViewer::mainLoop()
                                        && !gViewerWindow->getShowProgress()
                                        && !gFocusMgr.focusLocked())
                                {
+                                        joystick->scanJoystick();
                                        gKeyboard->scanKeyboard();
-                                        LLViewerJoystick::scanJoystick();
                                }
                                // Update state based on messages, user input, object idle.
@@ -1434,12 +973,6 @@ bool LLAppViewer::mainLoop()
                                        LLFloaterSnapshot::update(); // take snapshots
                                        
-#if !LL_SOLARIS
-                                        if (gbCapturing)
-                                        {
-                                                gMovieMaker.Snap();
-                                        }
-#endif
 #if LL_WINDOWS && LL_LCD_COMPILE
                                        // update LCD Screen
                                        gLcdScreen->UpdateDisplay();
@@ -1454,9 +987,9 @@ bool LLAppViewer::mainLoop()
                                bool run_multiple_threads = gSavedSettings.getBOOL("RunMultipleThreads");
                                // yield some time to the os based on command line option
-                                if(gYieldTime)
+                                if(mYieldTime >= 0)
                                {
-                                        ms_sleep(gYieldMS);
+                                        ms_sleep(mYieldTime);
                                }
                                // yield cooperatively when not running as foreground window
@@ -1589,15 +1122,11 @@ bool LLAppViewer::cleanup()
        gTransferManager.cleanup();
 #endif
        
-        // Clean up map data storage
+        // Note: this is where gWorldMap used to be deleted.
-        delete gWorldMap;
-        gWorldMap = NULL;
-        delete gHUDManager;
+        // Note: this is where gHUDManager used to be deleted.
-        gHUDManager = NULL;
+        LLHUDManager::getInstance()->shutdownClass();
+        
-        delete gToolMgr;
-        gToolMgr = NULL;
        delete gAssetStorage;
        gAssetStorage = NULL;
@@ -1607,17 +1136,12 @@ bool LLAppViewer::cleanup()
        delete gCacheName;
        gCacheName = NULL;
-        delete gGlobalEconomy;
+        // Note: this is where gLocalSpeakerMgr and gActiveSpeakerMgr used to be deleted.
-        gGlobalEconomy = NULL;
-        delete gActiveChannelSpeakerMgr;
-        gActiveChannelSpeakerMgr = NULL;
-        delete gLocalSpeakerMgr;
-        gLocalSpeakerMgr = NULL;
        LLNotifyBox::cleanup();
+        LLWorldMap::getInstance()->reset(); // release any images
+        
        llinfos << "Global stuff deleted" << llendflush;
 #if !LL_RELEASE_FOR_DOWNLOAD
@@ -1631,9 +1155,7 @@ bool LLAppViewer::cleanup()
        llwarns << "Hack, skipping audio engine cleanup" << llendflush;
 #endif
-        llinfos << "Cleaning up feature manager" << llendflush;
+        // Note: this is where LLFeatureManager::getInstance()-> used to be deleted.
-        delete gFeatureManagerp;
-        gFeatureManagerp = NULL;
        // Patch up settings for next time
        // Must do this before we delete the viewer window,
@@ -1709,20 +1231,22 @@ bool LLAppViewer::cleanup()
        gLcdScreen = NULL;
 #endif
-        if (!gVolumeMgr->cleanup())
+        LLVolumeMgr* volume_manager = LLPrimitive::getVolumeManager();
+        if (!volume_manager->cleanup())
        {
                llwarns << "Remaining references in the volume manager!" << llendflush;
        }
+        LLPrimitive::cleanupVolumeManager();
        LLViewerParcelMgr::cleanupGlobals();
-        delete gViewerStats;
+        // *Note: this is where gViewerStats used to be deleted.
-        gViewerStats = NULL;
        //end_messaging_system();
        LLFollowCamMgr::cleanupClass();
-        LLVolumeMgr::cleanupClass();
+        //LLVolumeMgr::cleanupClass();
+        LLPrimitive::cleanupVolumeManager();
        LLWorldMapView::cleanupClass();
        LLUI::cleanupClass();
        
@@ -1739,36 +1263,26 @@ bool LLAppViewer::cleanup()
        // Must do this after all panels have been deleted because panels that have persistent rects
        // save their rects on delete.
-        gSavedSettings.saveToFile(gSettingsFileName, TRUE);
+        gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);        
-        if (!gPerAccountSettingsFileName.empty())
-        {
+        // PerAccountSettingsFile should be empty if no use has been logged on.
-                gSavedPerAccountSettings.saveToFile(gPerAccountSettingsFileName, TRUE);
+        // *FIX:Mani This should get really saved in a "logoff" mode. 
-        }
+        gSavedPerAccountSettings.saveToFile(gSavedSettings.getString("PerAccountSettingsFile"), TRUE);
        llinfos << "Saved settings" << llendflush;
        std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
        // save all settings, even if equals defaults
        gCrashSettings.saveToFile(crash_settings_filename.c_str(), FALSE);
-        delete gUICtrlFactory;
-        gUICtrlFactory = NULL;
        gSavedSettings.cleanup();
-        gViewerArt.cleanup();
        gColors.cleanup();
        gCrashSettings.cleanup();
        // Save URL history file
        LLURLHistory::saveFile("url_history.xml");
-        if (gMuteListp)
+        // save mute list. gMuteList used to also be deleted here too.
-        {
+        LLMuteList::getInstance()->cache(gAgent.getID());
-                // save mute list
-                gMuteListp->cache(gAgent.getID());
-                delete gMuteListp;
-                gMuteListp = NULL;
-        }
        if (mPurgeOnExit)
        {
@@ -1838,10 +1352,10 @@ bool LLAppViewer::cleanup()
        
        end_messaging_system();
-    // *NOTE:Mani - The following call is not thread safe. 
+        // *NOTE:Mani - The following call is not thread safe. 
-    LLCurl::cleanupClass();
+        LLCurl::cleanupClass();
-    // If we're exiting to launch an URL, do that here so the screen
+        // If we're exiting to launch an URL, do that here so the screen
        // is at the right resolution before we launch IE.
        if (!gLaunchFileOnQuit.empty())
        {
@@ -1862,106 +1376,6 @@ bool LLAppViewer::cleanup()
        return true;
 }
-bool LLAppViewer::initEarlyConfiguration()
-{
-        // *FIX: globals - This method sets a bunch of globals early in the init process.
-        int argc = gTempArgC;
-        char** argv = gTempArgV;
-        // HACK! We REALLY want to know what grid they were trying to connect to if they
-        // crashed hard.
-        // So we walk through the command line args ONLY looking for the
-        // userserver arguments first.  And we don't do ANYTHING but set
-        // the gGridName (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.
-        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GridDefaultChoice].mName);              // Flawfinder: ignore
-        S32 j;
-        for (j = 1; j < argc; j++) 
-        {
-                if (!strcmp(argv[j], "--aditi"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_ADITI].mName);                // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--agni"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_AGNI].mName);         // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--siva"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_SIVA].mName);         // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--shakti"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_SHAKTI].mName);
-                }
-                else if (!strcmp(argv[j], "--durga"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_DURGA].mName);                // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--soma"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_SOMA].mName);         // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--ganga"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_GANGA].mName);                // Flawfinder: ignore 
-                }
-                else if (!strcmp(argv[j], "--vaak"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_VAAK].mName);
-                }
-                else if (!strcmp(argv[j], "--uma"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_UMA].mName);
-                }
-                else if (!strcmp(argv[j], "--mohini"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_MOHINI].mName);
-                }
-                else if (!strcmp(argv[j], "--yami"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_YAMI].mName);
-                }
-                else if (!strcmp(argv[j], "--nandi"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_NANDI].mName);
-                }
-                else if (!strcmp(argv[j], "--mitra"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_MITRA].mName);
-                }
-                else if (!strcmp(argv[j], "--radha"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_RADHA].mName);
-                }
-                else if (!strcmp(argv[j], "--ravi"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_RAVI].mName);
-                }
-                else if (!strcmp(argv[j], "--aruna"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_ARUNA].mName);
-                }
-                else if (!strcmp(argv[j], "-multiple"))
-                {
-                        // Hack to detect -multiple so we can disable the marker file check (which will always fail)
-                        gMultipleViewersOK = TRUE;
-                }
-                else if (!strcmp(argv[j], "-novoice"))
-                {
-                        // May need to know this early also
-                        gDisableVoice = TRUE;
-                }
-                else if (!strcmp(argv[j], "-url") && (++j < argc)) 
-                {
-                        LLURLSimString::setString(argv[j]);
-                }
-        }
-        return true;
-}
 bool LLAppViewer::initThreads()
 {
 #if MEM_TRACK_MEM
@@ -2022,14 +1436,359 @@ bool LLAppViewer::initLogging()
        return true;
 }
+void LLAppViewer::loadSettingsFromDirectory(ELLPath path_index)
+{
+        for(LLSD::map_iterator itr = mSettingsFileList.beginMap(); itr != mSettingsFileList.endMap(); ++itr)
+        {
+                LLString settings_name = (*itr).first;
+                LLString settings_file = mSettingsFileList[settings_name].asString();
+                LLString full_settings_path = gDirUtilp->getExpandedFilename(path_index, settings_file);
+                if(settings_name == sGlobalSettingsName)
+                {
+                        // The non-persistent setting, ClientSettingsFile, specifies a 
+                        // custom name to use for the global settings file.
+                        std::string custom_path;
+                        if(gSettings[sGlobalSettingsName]->controlExists("ClientSettingsFile"))
+                        {
+                                custom_path = 
+                                        gSettings[sGlobalSettingsName]->getString("ClientSettingsFile");
+                        }
+                        if(!custom_path.empty())
+                        {
+                                full_settings_path = custom_path;
+                        }
+                }
+                if(gSettings.find(settings_name) == gSettings.end())
+                {
+                        llwarns << "Cannot load " << settings_file << " - No matching settings group for name " << settings_name << llendl;
+                        continue;
+                }
+                if(!gSettings[settings_name]->loadFromFile(full_settings_path))
+                {
+                        llwarns << "Cannot load " << full_settings_path << " - No settings found." << llendl;
+                }
+                else
+                {
+                        llinfos << "Loaded settings file " << full_settings_path << llendl;
+                }
+        }
+}
+std::string LLAppViewer::getSettingsFileName(const std::string& file)
+{
+        if(mSettingsFileList.has(file))
+        {
+                return mSettingsFileList[file].asString();
+        }
+        return std::string();
+}
 bool LLAppViewer::initConfiguration()
 {
-        // Ye olde parse_args()...
+        //Set up internal pointers      
-        if(!doConfigFromCommandLine())
+        gSettings[sGlobalSettingsName] = &gSavedSettings;
+        gSettings[sPerAccountSettingsName] = &gSavedPerAccountSettings;
+        gSettings[sCrashSettingsName] = &gCrashSettings;
+        //Load settings files list
+        std::string settings_file_list = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "settings_files.xml");
+        LLControlGroup settings_control;
+        llinfos << "Loading settings file list" << settings_file_list << llendl;
+        if (0 == settings_control.loadFromFile(settings_file_list))
+        {
+        llerrs << "Cannot load default configuration file " << settings_file_list << llendl;
+        }
+        mSettingsFileList = settings_control.getLLSD("Files");
+        
+        // The settings and command line parsing have a fragile
+        // order-of-operation:
+        // - load defaults from app_settings
+        // - set procedural settings values
+        // - read command line settings
+        // - selectively apply settings needed to load user settings.
+    // - load overrides from user_settings 
+        // - apply command line settings (to override the overrides)
+        // - load per account settings (happens in llstartup
+        
+        // - load defaults
+        loadSettingsFromDirectory(LL_PATH_APP_SETTINGS);
+        // - set procedural settings 
+        gSavedSettings.setString("ClientSettingsFile", 
+        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global")));
+        gSavedSettings.setString("VersionChannelName", LL_CHANNEL);
+#ifndef         LL_RELEASE_FOR_DOWNLOAD
+        gSavedSettings.setBOOL("ShowConsoleWindow", TRUE);
+        gSavedSettings.setBOOL("AllowMultipleViewers", TRUE);
+#endif
+#if LL_WINDOWS
+        // Lists Japanese, Korean, and Chinese sanserif fonts available in
+        // Windows XP and Vista, as well as "Arial Unicode MS".
+        gSavedSettings.setString("FontSansSerifFallback",
+                                                         "MSGOTHIC.TTC;gulim.ttc;simhei.ttf;ArialUni.ttf");
+#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".
+        // The third filename is in UTF8, but it shows up in the font menu as "STHeiti Light"
+        gSavedSettings.setString("FontSansSerifFallback", 
+                                                         "\xE3\x83\x92\xE3\x83\xA9\xE3\x82\xAD\xE3\x82\x99\xE3\x83\x8E\xE8\xA7\x92\xE3\x82\xB3\xE3\x82\x99 Pro W3.otf;\xE3\x83\x92\xE3\x83\xA9\xE3\x82\xAD\xE3\x82\x99\xE3\x83\x8E\xE8\xA7\x92\xE3\x82\xB3\xE3\x82\x99 ProN W3.otf;AppleGothic.dfont;AppleGothic.ttf;\xe5\x8d\x8e\xe6\x96\x87\xe7\xbb\x86\xe9\xbb\x91.ttf");
+#else
+        // 'unicode.ttf' doesn't exist, but hopefully an international
+        // user can take the hint and drop in their favourite local font.
+        gSavedSettings.setString("FontSansSerifFallback",       
+                                                         "unicode.ttf");
+#endif
+        // These are warnings that appear on the first experience of that condition.
+        // They are already set in the settings_default.xml file, but still need to be added to LLFirstUse
+        // for disable/reset ability
+        LLFirstUse::addConfigVariable("FirstBalanceIncrease");
+        LLFirstUse::addConfigVariable("FirstBalanceDecrease");
+        LLFirstUse::addConfigVariable("FirstSit");
+        LLFirstUse::addConfigVariable("FirstMap");
+        LLFirstUse::addConfigVariable("FirstGoTo");
+        LLFirstUse::addConfigVariable("FirstBuild");
+        LLFirstUse::addConfigVariable("FirstLeftClickNoHit");
+        LLFirstUse::addConfigVariable("FirstTeleport");
+        LLFirstUse::addConfigVariable("FirstOverrideKeys");
+        LLFirstUse::addConfigVariable("FirstAttach");
+        LLFirstUse::addConfigVariable("FirstAppearance");
+        LLFirstUse::addConfigVariable("FirstInventory");
+        LLFirstUse::addConfigVariable("FirstSandbox");
+        LLFirstUse::addConfigVariable("FirstFlexible");
+        LLFirstUse::addConfigVariable("FirstDebugMenus");
+        LLFirstUse::addConfigVariable("FirstStreamingMusic");
+        LLFirstUse::addConfigVariable("FirstStreamingVideo");
+        LLFirstUse::addConfigVariable("FirstSculptedPrim");
+        LLFirstUse::addConfigVariable("FirstVoice");
+        LLFirstUse::addConfigVariable("FirstMedia");
+                
+    //////
+    // *FIX:Mani - Find a way to remove the gUICtrlFactory and
+    // LLAlertDialog::parseAlerts dependecies on the being loaded
+    // *before* the user settings. Having to do this init here
+    // seems odd. 
+        // This is where gUICtrlFactory used to be instantiated with a new LLUICtrlFactory
+        // which needed to happen before calling parseAlerts below.
+        // TODO: That method is still dependant upon the base LLUICtrlFactory constructor being called
+        // which registers some callbacks so I'm leaving in a call to getInstance here to cause that to
+        // still happen. This needs to be cleaned up later when the base and derived classes
+        // are planned to be combined. -MG
+        LLUICtrlFactory::getInstance();
+        
+        // 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);
+        // - read command line settings
+        LLControlGroupCLP clp;
+        std::string     cmd_line_config = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
+                                                                                                                  "cmd_line.xml");
+        clp.configure(cmd_line_config, &gSavedSettings);
+        if(!initParseCommandLine(clp))
        {
+                llwarns 
+                        << "Error parsing command line options. Command Line options ignored." 
+                        << llendl;
+                llinfos << "Command     line usage:\n" << clp << llendl;
+                std::ostringstream msg;
+                msg << "Second Life found an error parsing the command line. \n" 
+                        << "Please see: http://wiki.secondlife.com/wiki/Client_parameters \n"
+                        << "Error: " << clp.getErrorMessage();
+                OSMessageBox(
+                        msg.str().c_str(),
+                        NULL,
+                        OSMB_OK);
                return false;
        }
        
+        // - selectively apply settings 
+        // If the user has specified a alternate settings file name.
+        // Load it now before loading the user_settings/settings.xml
+        if(clp.hasOption("settings"))
+        {
+                std::string     user_settings_filename = 
+                        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, 
+                                                                                   clp.getOption("settings")[0]);               
+                gSavedSettings.setString("ClientSettingsFile", user_settings_filename);
+                llinfos << "Using command line specified settings filename: " 
+                        << user_settings_filename << llendl;
+        }
+        // - load overrides from user_settings 
+        loadSettingsFromDirectory(LL_PATH_USER_SETTINGS);
+        // - apply command line settings 
+        clp.notify(); 
+        // Handle initialization from settings.
+        // Start up     the     debugging console before handling other options.
+        if (gSavedSettings.getBOOL("ShowConsoleWindow"))
+        {
+                initConsole();
+        }
+        if(clp.hasOption("help"))
+        {
+                std::ostringstream msg;
+                msg << "Command line usage:\n" << clp;
+                llinfos << msg.str() << llendl;
+                OSMessageBox(
+                        msg.str().c_str(),
+                        NULL,
+                        OSMB_OK);
+                return false;
+        }
+    //////////////////////////
+    // Apply settings...
+    if(clp.hasOption("setdefault"))
+    {
+        //const LLCommandLineParser::token_vector_t& setdefault = clp.getOption("setdefault");
+        //if(0x1 & setdefault.size())
+        //{
+        //    llwarns << "Invalid '--setdefault' parameter count." << llendl;
+        //}
+        //else
+        //{
+        //    LLCommandLineParser::token_vector_t::const_iterator itr = setdefault.begin();
+        //    for(; itr != setdefault.end(); ++itr)
+        //    {
+        //        const std::string& name = *itr;
+        //        const std::string& value = *(++itr);
+        //        LLControlVariable* c = gSettings[sGlobalSettingsName]->getControl(name);
+        //        if(c)
+        //        {
+        //            c->setDefault(value);
+        //        }
+        //        else
+        //        {
+        //            llwarns << "'--setdefault' specified with unknown setting: '"
+        //                << name << "'." << llendl;
+        //        }
+        //    }
+        //}
+    }
+    if(clp.hasOption("set"))
+    {
+        const LLCommandLineParser::token_vector_t& set_values = clp.getOption("set");
+        if(0x1 & set_values.size())
+        {
+            llwarns << "Invalid '--set' parameter count." << llendl;
+        }
+        else
+        {
+            LLCommandLineParser::token_vector_t::const_iterator itr = set_values.begin();
+            for(; itr != set_values.end(); ++itr)
+            {
+                const std::string& name = *itr;
+                const std::string& value = *(++itr);
+                LLControlVariable* c = gSettings[sGlobalSettingsName]->getControl(name);
+                if(c)
+                {
+                    c->setValue(value, false);
+                }
+                else
+                {
+                    llwarns << "'--set' specified with unknown setting: '"
+                        << name << "'." << llendl;
+                }
+            }
+        }
+    }
+    initGridChoice();
+        // If we have specified crash on startup, set the global so we'll trigger the crash at the right time
+        if(clp.hasOption("crashonstartup"))
+        {
+                gCrashOnStartup = TRUE;
+        }
+        // Handle slurl use. NOTE: Don't let SL-55321 reappear.
+    // *FIX: This init code should be made more robust to prevent 
+    // the issue SL-55321 from returning. One thought is to allow 
+    // only select options to be set from command line when a slurl 
+    // is specified. More work on the settings system is needed to 
+    // achieve this. For now...
+    // *NOTE:Mani The command line parser parses tokens and is 
+    // setup to bail after parsing the '--url' option or the 
+    // first option specified without a '--option' flag (or
+    // any other option that uses the 'last_option' setting - 
+    // see LLControlGroupCLP::configure())
+    // What can happen is that someone can use IE (or potentially 
+    // other browsers) and do the rough equivalent of command 
+    // injection and steal passwords. Phoenix. SL-55321
+    if(clp.hasOption("url"))
+    {
+        std::string slurl = clp.getOption("url")[0];
+        if (LLURLDispatcher::isSLURLCommand(slurl))
+        {
+                LLStartUp::sSLURLCommand = slurl;
+        }
+        else
+        {
+                LLURLSimString::setString(slurl);
+        }
+    }
+    else if(clp.hasOption("slurl"))
+    {
+        std::string slurl = clp.getOption("slurl")[0];
+        if(LLURLDispatcher::isSLURL(slurl))
+        {
+            if (LLURLDispatcher::isSLURLCommand(slurl))
+            {
+                    LLStartUp::sSLURLCommand = slurl;
+            }
+            else
+            {
+                    LLURLSimString::setString(slurl);
+            }
+        }
+    }
+    const LLControlVariable* loginuri = gSavedSettings.getControl("LoginURI");
+    if(loginuri && LLString::null != loginuri->getValue().asString())
+    {   
+        addLoginURI(loginuri->getValue().asString());
+    }
+    const LLControlVariable* helperuri = gSavedSettings.getControl("HelperURI");
+    if(helperuri && LLString::null != helperuri->getValue().asString())
+    {   
+        setHelperURI(helperuri->getValue().asString());
+    }
+    const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinFolder");
+    if(skinfolder && LLString::null != skinfolder->getValue().asString())
+    {   
+        gDirUtilp->setSkinFolder(skinfolder->getValue().asString());
+    }
+    mYieldTime = gSavedSettings.getS32("YieldTime");
+             
        // XUI:translate
        gSecondLife = "Second Life";
@@ -2091,28 +1850,15 @@ bool LLAppViewer::initConfiguration()
        LLSplashScreen::show();
        LLSplashScreen::update(splash_msg.str().c_str());
-        LLVolumeMgr::initClass();
+        //LLVolumeMgr::initClass();
+        LLVolumeMgr* volume_manager = new LLVolumeMgr();
+        volume_manager->useMutex();     // LLApp and LLMutex magic must be manually enabled
+        LLPrimitive::setVolumeManager(volume_manager);
-        // Initialize the feature manager
+        // Note: this is where we used to initialize LLFeatureManager::getInstance()->.
-        // The feature manager is responsible for determining what features
-        // are turned on/off in the app.
-        gFeatureManagerp = new LLFeatureManager;
        gStartTime = totalTime();
-        ////////////////////////////////////////
-        //
-        // Process ini files
-        //
-        // declare all possible setting variables
-        declare_settings();
-#if !LL_RELEASE_FOR_DOWNLOAD
-//      only write the defaults for non-release builds!
-        gSavedSettings.saveToFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings_default.xml").c_str(), FALSE);
-#endif
        //
        // Set the name of the window
        //
@@ -2125,33 +1871,34 @@ bool LLAppViewer::initConfiguration()
 #endif
        LLString::truncate(gWindowTitle, 255);
-        if (!gMultipleViewersOK)
+        //RN: if we received a URL, hand it off to the existing instance
+        // don't call anotherInstanceRunning() when doing URL handoff, as
+        // it relies on checking a marker file which will not work when running
+        // out of different directories
+        std::string slurl;
+        if (!LLStartUp::sSLURLCommand.empty())
+        {
+                slurl = LLStartUp::sSLURLCommand;
+        }
+        else if (LLURLSimString::parse())
+        {
+                slurl = LLURLSimString::getURL();
+        }
+        if (!slurl.empty())
+        {
+                if (send_url_to_other_instance(slurl))
+                {
+                        // successfully handed off URL to existing instance, exit
+                        return false;
+                }
+        }
+        if (!gSavedSettings.getBOOL("AllowMultipleViewers"))
        {
            //
            // Check for another instance of the app running
            //
-                //RN: if we received a URL, hand it off to the existing instance
-                // don't call anotherInstanceRunning() when doing URL handoff, as
-                // it relies on checking a marker file which will not work when running
-                // out of different directories
-                std::string slurl;
-                if (!LLStartUp::sSLURLCommand.empty())
-                {
-                        slurl = LLStartUp::sSLURLCommand;
-                }
-                else if (LLURLSimString::parse())
-                {
-                        slurl = LLURLSimString::getURL();
-                }
-                if (!slurl.empty())
-                {
-                        if (send_url_to_other_instance(slurl))
-                        {
-                                // successfully handed off URL to existing instance, exit
-                                return false;
-                        }
-                }
-                
                mSecondInstance = anotherInstanceRunning();
                
                if (mSecondInstance)
@@ -2251,111 +1998,29 @@ bool LLAppViewer::initConfiguration()
                
                if (mSecondInstance)
                {
-                        gDisableVoice = TRUE;
+                        // This is the second instance of SL. Turn off voice support,
-                        /* Don't start another instance if using -multiple
+                        // but make sure the setting is *not* persisted.
-                        //RN: if we received a URL, hand it off to the existing instance
+                        LLControlVariable* disable_voice = gSavedSettings.getControl("CmdLineDisableVoice");
-                    if (LLURLSimString::parse())
+                        if(disable_voice)
-                    {
+                        {
-                            LLURLSimString::send_to_other_instance();
+                                const BOOL DO_NOT_PERSIST = FALSE;
-                                return 1;
+                                disable_voice->setValue(LLSD(TRUE), DO_NOT_PERSIST);
                        }
-                        */
                }
                initMarkerFile();
        }
-        return true; // Config was successful.
+        // need to do this here - need to have initialized global settings first
-}
+        LLString nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" );
+        if ( nextLoginLocation.length() )
-bool LLAppViewer::doConfigFromCommandLine()
-{
-        // *FIX: This is what parse args used to do, minus the arg reading part.
-        // Now the arg parsing is handled by LLApp::parseCommandOptions() and this
-        // method need only interpret settings. Perhaps some day interested parties 
-        // can ask an app about a setting rather than have the app set 
-        // a gazzillion globals.
-        
-        /////////////////////////////////////////
-        //
-        // Process command line arguments
-        //
-        S32 args_result = 0;
-#if LL_DARWIN
        {
-                // On the Mac, read in arguments.txt (if it exists) and process it for additional arguments.
+                LLURLSimString::setString( nextLoginLocation.c_str() );
-                LLString args;
+        };
-                if(_read_file_into_string(args, "arguments.txt"))               /* Flawfinder: ignore*/
-                {
-                        // The arguments file exists.  
-                        // It should consist of command line arguments separated by newlines.
-                        // Split it into individual arguments and build a fake argv[] to pass to parse_args.
-                        std::vector<std::string> arglist;
-                        
-                        arglist.push_back("newview");
-                        
-                        llinfos << "Reading additional command line arguments from arguments.txt..." << llendl;
-                        
-                        typedef boost::tokenizer<boost::escaped_list_separator<char> > tokenizer;
-                        boost::escaped_list_separator<char> sep("\\", "\r\n ", "\"'");
-                        tokenizer tokens(args, sep);
-                        tokenizer::iterator token_iter;
-                        for(token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
-                        {
-                                // people can put their password in the file. :(
-                                // http://jira.secondlife.com/browse/SEC-42
-                                //llinfos << "argument: '" << (token_iter->c_str()) << "'" << llendl;
-                                
-                                arglist.push_back(*token_iter);
-                        }
-                        char **fakeargv = new char*[arglist.size()];
-                        int i;
-                        for(i=0; i < arglist.size(); i++)
-                                fakeargv[i] = const_cast<char*>(arglist[i].c_str());
-                                
-                        args_result = parse_args(arglist.size(), fakeargv);
-                        delete[] fakeargv;
-                }
-                
-                // Get the user's preferred language string based on the Mac OS localization mechanism.
-                // To add a new localization:
-                        // go to the "Resources" section of the project
-                        // get info on "language.txt"
-                        // in the "General" tab, click the "Add Localization" button
-                        // create a new localization for the language you're adding
-                        // set the contents of the new localization of the file to the string corresponding to our localization
-                        //   (i.e. "en-us", "ja", etc.  Use the existing ones as a guide.)
-                CFURLRef url = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("language"), CFSTR("txt"), NULL);
-                char path[MAX_PATH];
-                if(CFURLGetFileSystemRepresentation(url, false, (UInt8 *)path, sizeof(path)))
-                {
-                        LLString lang;
-                        if(_read_file_into_string(lang, path))          /* Flawfinder: ignore*/
-                        {
-                                gCommandLineForcedSettings["SystemLanguage"] = lang;
-                        }
-                }
-                CFRelease(url);
-        }
-#endif
-        int argc = gTempArgC;
-        char** argv = gTempArgV;
-        //
+        gLastRunVersion = gSavedSettings.getString("LastRunVersion");
-        // Parse the command line arguments
-        //
-        args_result |= parse_args(argc, argv);
-        if (args_result)
-        {
-                removeMarkerFile();
-                return false;
-        }
-        return true;
+        return true; // Config was successful.
 }
 bool LLAppViewer::initWindow()
@@ -2374,10 +2039,11 @@ bool LLAppViewer::initWindow()
        window_title_str[sizeof(window_title_str) - 1] = '\0';
        // always start windowed
+        BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
        gViewerWindow = new LLViewerWindow(window_title_str, "Second Life",
                gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"),
                gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
-                FALSE, gIgnorePixelDepth);
+                FALSE, ignorePixelDepth);
                
        if (gSavedSettings.getBOOL("FullScreen"))
        {
@@ -2399,14 +2065,20 @@ bool LLAppViewer::initWindow()
                // Set this flag in case we crash while initializing GL
                gSavedSettings.setBOOL("RenderInitError", TRUE);
-                gSavedSettings.saveToFile( gSettingsFileName, TRUE );
+                gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
        
                gPipeline.init();
                stop_glerror();
                gViewerWindow->initGLDefaults();
                gSavedSettings.setBOOL("RenderInitError", FALSE);
-                gSavedSettings.saveToFile( gSettingsFileName, TRUE );
+                gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
+        }
+        //If we have a startup crash, it's usually near GL initialization, so simulate that.
+        if(gCrashOnStartup)
+        {
+                LLAppViewer::instance()->forceErrorLLError();
        }
        LLUI::sWindow = gViewerWindow->getWindow();
@@ -2414,11 +2086,6 @@ bool LLAppViewer::initWindow()
        LLAlertDialog::parseAlerts("alerts.xml");
        LLNotifyBox::parseNotify("notify.xml");
-        // *TODO - remove this when merging into release
-        // DON'T Clean up the feature manager lookup table - settings are needed
-        // for setting the graphics level.
-        //gFeatureManagerp->cleanupFeatureTables();
        // Show watch cursor
        gViewerWindow->setCursor(UI_CURSOR_WAIT);
@@ -2427,6 +2094,7 @@ bool LLAppViewer::initWindow()
        // show viewer window
        gViewerWindow->mWindow->show();
        
        return true;
 }
@@ -2455,6 +2123,7 @@ void LLAppViewer::cleanupSavedSettings()
        gSavedSettings.setBOOL("DebugWindowProc", gDebugWindowProc);
                
        gSavedSettings.setBOOL("AllowIdleAFK", gAllowIdleAFK);
+        gSavedSettings.setBOOL("AllowTapTapHoldRun", gAllowTapTapHoldRun);
        gSavedSettings.setBOOL("ShowObjectUpdates", gShowObjectUpdates);
        
        if (!gNoRender)
@@ -2462,7 +2131,7 @@ void LLAppViewer::cleanupSavedSettings()
                if (gDebugView)
                {
                        gSavedSettings.setBOOL("ShowDebugConsole", gDebugView->mDebugConsolep->getVisible());
-                        gSavedSettings.setBOOL("ShowDebugStats", gDebugView->mStatViewp->getVisible());
+                        gSavedSettings.setBOOL("ShowDebugStats", gDebugView->mFloaterStatsp->getVisible());
                }
        }
@@ -2508,7 +2177,7 @@ void LLAppViewer::writeSystemInfo()
 {
        gDebugInfo["SLLog"] = LLError::logFileName();
-        gDebugInfo["ClientInfo"]["Name"] = gChannelName;
+        gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
        gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
        gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
        gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
@@ -2543,6 +2212,13 @@ void LLAppViewer::writeSystemInfo()
        llinfos << "OS info: " << getOSInfo() << llendl;
 }
+void LLAppViewer::handleSyncViewerCrash()
+{
+        LLAppViewer* pApp = LLAppViewer::instance();
+        // Call to pure virtual, handled by platform specific llappviewer instance.
+        pApp->handleSyncCrashTrace(); 
+}
 void LLAppViewer::handleViewerCrash()
 {
        LLAppViewer* pApp = LLAppViewer::instance();
@@ -2562,13 +2238,25 @@ void LLAppViewer::handleViewerCrash()
        //We already do this in writeSystemInfo(), but we do it again here to make /sure/ we have a version
        //to check against no matter what
-        gDebugInfo["ClientInfo"]["Name"] = gChannelName;
+        gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
        gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
        gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
        gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
        gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD;
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if ( parcel && parcel->getMusicURL()[0])
+        {
+                gDebugInfo["ParcelMusicURL"] = parcel->getMusicURL();
+        }       
+        if ( parcel && parcel->getMediaURL()[0])
+        {
+                gDebugInfo["ParcelMediaURL"] = parcel->getMediaURL();
+        }
+        
        
-        gDebugInfo["SettingsFilename"] = gSettingsFileName;
+        gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
        gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
        gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName().c_str();
        gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath().c_str();
@@ -2625,10 +2313,8 @@ void LLAppViewer::handleViewerCrash()
                gMessageSystem->getCircuitInfo(gDebugInfo["CircuitInfo"]);
                gMessageSystem->stopLogging();
        }
-        if (gWorldp)
-        {
+        LLWorld::getInstance()->getInfo(gDebugInfo);
-                gWorldp->getInfo(gDebugInfo);
-        }
        // Close the debug file
        pApp->closeDebug();
@@ -2644,7 +2330,7 @@ void LLAppViewer::handleViewerCrash()
                pApp->removeMarkerFile(false);
        }
        
-        // Call to pure virtual, handled by platform specifc llappviewer instance.
+        // Call to pure virtual, handled by platform specific llappviewer instance.
        pApp->handleCrashReporting(); 
        return;
@@ -2740,7 +2426,11 @@ void LLAppViewer::initMarkerFile()
        ll_apr_file_remove(error_marker_file);
        
        //Freeze case checks
-        if(anotherInstanceRunning()) return;
+        if(anotherInstanceRunning()) 
+        {
+                return;
+        }
+        
        fMarker = ll_apr_file_open(mMarkerFileName, LL_APR_RB);         
        if (fMarker != NULL)
        {
@@ -2804,13 +2494,10 @@ void LLAppViewer::requestQuit()
                return;
        }
-        if (gHUDManager)
+        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
-        {
+        effectp->setPositionGlobal(gAgent.getPositionGlobal());
-                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
+        effectp->setColor(LLColor4U(gAgent.getEffectColor()));
-                effectp->setPositionGlobal(gAgent.getPositionGlobal());
+        LLHUDManager::getInstance()->sendEffects();
-                effectp->setColor(LLColor4U(gAgent.getEffectColor()));
-                gHUDManager->sendEffects();
-        }
        // Attempt to close all floaters that might be
        // editing things.
@@ -2952,7 +2639,7 @@ bool LLAppViewer::initCache()
        char static_vfs_index_file[LL_MAX_PATH];        // Flawfinder: ignore
        char static_vfs_data_file[LL_MAX_PATH]; // Flawfinder: ignore
-        if (gMultipleViewersOK)
+        if (gSavedSettings.getBOOL("AllowMultipleViewers"))
        {
                // don't mess with renaming the VFS in this case
                new_salt = old_salt;
@@ -3143,7 +2830,25 @@ const std::string& LLAppViewer::getHelperURI() const
 void LLAppViewer::addLoginURI(const std::string& uri)
 {
+        // *NOTE:Mani - login uri trumps the --grid (gGridChoice) setting.
+        // Update gGridChoice to reflect the loginURI setting.
    gLoginURIs.push_back(uri);
+        
+        const std::string& top_uri = getLoginURIs()[0];
+        int i = 0;
+        for(; i < GRID_INFO_COUNT; ++i)
+        {
+                if(top_uri == gGridInfo[i].mLoginURI)
+                {
+                        gGridChoice = (EGridInfo)i;
+                        break;
+                }
+        }
+        if(GRID_INFO_COUNT == i)
+        {
+                gGridChoice = GRID_INFO_OTHER;
+        }
 }
 void LLAppViewer::setHelperURI(const std::string& uri)
@@ -3151,17 +2856,6 @@ void LLAppViewer::setHelperURI(const std::string& uri)
    gHelperURI = uri;
 }
-void LLAppViewer::setLoginPage(const std::string& login_page)
-{
-        gLoginPage = login_page;
-}
-const std::string& LLAppViewer::getLoginPage()
-{
-        return gLoginPage;
-}
 // Callback from a dialog indicating user was logged out.  
 void finish_disconnect(S32 option, void* userdata)
 {
@@ -3224,6 +2918,7 @@ void LLAppViewer::badNetworkHandler()
        // Generates the minidump.
        LLWinDebug::handleException(NULL);
 #endif
+        LLAppViewer::handleSyncViewerCrash();
        LLAppViewer::handleViewerCrash();
        std::ostringstream message;
@@ -3257,7 +2952,8 @@ void LLAppViewer::saveFinalSnapshot()
                LLString snap_filename = gDirUtilp->getLindenUserDir();
                snap_filename += gDirUtilp->getDirDelimiter();
                snap_filename += SCREEN_LAST_FILENAME;
-                gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidth(), gViewerWindow->getWindowHeight(), FALSE, TRUE);
+                // use full pixel dimensions of viewer window (not post-scale dimensions)
+                gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, TRUE);
                mSavedFinalSnapshot = TRUE;
        }
 }
@@ -3299,7 +2995,10 @@ void LLAppViewer::saveNameCache()
 bool LLAppViewer::isInProductionGrid()
 {
-    return (GRID_INFO_AGNI == gGridChoice);
+        // *NOTE:Mani This used to compare GRID_INFO_AGNI to gGridChoice,
+        // but it seems that loginURI trumps that.
+        const std::string& loginURI = getLoginURIs()[0];
+        return (loginURI == gGridInfo[GRID_INFO_AGNI].mLoginURI);
 }
@@ -3330,8 +3029,6 @@ void LLAppViewer::idle()
        // Update frame timers
        static LLTimer idle_timer;
-        LLControlBase::updateAllListeners();
        LLFrameTimer::updateFrameTime();
        LLEventTimer::updateClass();
        LLCriticalDamp::updateInterpolants();
@@ -3352,9 +3049,10 @@ void LLAppViewer::idle()
        // Smoothly weight toward current frame
        gFPSClamped = (frame_rate_clamped + (4.f * gFPSClamped)) / 5.f;
-        if (gQuitAfterSeconds > 0.f)
+        F32 qas = gSavedSettings.getF32("QuitAfterSeconds");
+        if (qas > 0.f)
        {
-                if (gRenderStartTime.getElapsedTimeF32() > gQuitAfterSeconds)
+                if (gRenderStartTime.getElapsedTimeF32() > qas)
                {
                        LLAppViewer::instance()->forceQuit();
                }
@@ -3385,7 +3083,7 @@ void LLAppViewer::idle()
        {
                LLFastTimer t(LLFastTimer::FTM_NETWORK);
                // Update spaceserver timeinfo
-            gWorldp->setSpaceTimeUSec(gWorldp->getSpaceTimeUSec() + (U32)(dt_raw * SEC_TO_MICROSEC));
+            LLWorld::getInstance()->setSpaceTimeUSec(LLWorld::getInstance()->getSpaceTimeUSec() + (U32)(dt_raw * SEC_TO_MICROSEC));
    
    
            //////////////////////////////////////
@@ -3393,7 +3091,7 @@ void LLAppViewer::idle()
            // Update simulator agent state
            //
-                if (gRotateRight)
+                if (gSavedSettings.getBOOL("RotateRight"))
                {
                        gAgent.moveYaw(-1.f);
                }
@@ -3519,7 +3217,7 @@ void LLAppViewer::idle()
        {
                // After agent and camera moved, figure out if we need to
                // deselect objects.
-                gSelectMgr->deselectAllIfTooFar();
+                LLSelectMgr::getInstance()->deselectAllIfTooFar();
        }
@@ -3536,7 +3234,7 @@ void LLAppViewer::idle()
                
        if (!(logoutRequestSent() && hasSavedFinalSnapshot()))
                {
-                        gObjectList.update(gAgent, *gWorldp);
+                        gObjectList.update(gAgent, *LLWorld::getInstance());
                }
        }
        
@@ -3568,9 +3266,9 @@ void LLAppViewer::idle()
        {
                gFrameStats.start(LLFrameStats::UPDATE_EFFECTS);
-                gSelectMgr->updateEffects();
+                LLSelectMgr::getInstance()->updateEffects();
-                gHUDManager->cleanupEffects();
+                LLHUDManager::getInstance()->cleanupEffects();
-                gHUDManager->sendEffects();
+                LLHUDManager::getInstance()->sendEffects();
        }
        stop_glerror();
@@ -3590,21 +3288,20 @@ void LLAppViewer::idle()
        // Update surfaces, and surface textures as well.
        //
-        gWorldp->updateVisibilities();
+        LLWorld::getInstance()->updateVisibilities();
        {
                const F32 max_region_update_time = .001f; // 1ms
                LLFastTimer t(LLFastTimer::FTM_REGION_UPDATE);
-                gWorldp->updateRegions(max_region_update_time);
+                LLWorld::getInstance()->updateRegions(max_region_update_time);
        }
        
        /////////////////////////
        //
        // Update weather effects
        //
        if (!gNoRender)
        {
-                gWorldp->updateClouds(gFrameDTClamped);
+                LLWorld::getInstance()->updateClouds(gFrameDTClamped);
                gSky.propagateHeavenlyBodies(gFrameDTClamped);                          // moves sun, moon, and planets
                // Update wind vector 
@@ -3612,7 +3309,7 @@ void LLAppViewer::idle()
                static LLVector3 average_wind;
                LLViewerRegion *regionp;
-                regionp = gWorldp->resolveRegionGlobal(wind_position_region, gAgent.getPositionGlobal());       // puts agent's local coords into wind_position 
+                regionp = LLWorld::getInstance()->resolveRegionGlobal(wind_position_region, gAgent.getPositionGlobal());        // puts agent's local coords into wind_position 
                if (regionp)
                {
                        gWindVec = regionp->mWind.getVelocity(wind_position_region);
@@ -3635,27 +3332,6 @@ void LLAppViewer::idle()
        
        //////////////////////////////////////
        //
-        // Update images, using the image stats generated during object update/culling
-        //
-        // Can put objects onto the retextured list.
-        //
-        gFrameStats.start(LLFrameStats::IMAGE_UPDATE);
-        {
-                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.
-                const F32 max_image_decode_time = llmin(0.005f, 0.005f*10.f*gFrameIntervalSeconds); // 50 ms/second decode time (no more than 5ms/frame)
-                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.
        //
@@ -3667,17 +3343,22 @@ void LLAppViewer::idle()
                gPipeline.updateMove();
                gFrameStats.start(LLFrameStats::UPDATE_PARTICLES);
-                gWorldp->updateParticles();
+                LLWorld::getInstance()->updateParticles();
        }
        stop_glerror();
-        if (!LLViewerJoystick::sOverrideCamera)
+        if (LLViewerJoystick::getInstance()->getOverrideCamera())
        {
-                gAgent.updateCamera();
+                LLViewerJoystick::getInstance()->moveFlycam();
        }
        else
        {
-                LLViewerJoystick::updateCamera();
+                if (LLToolMgr::getInstance()->inBuildMode())
+                {
+                        LLViewerJoystick::getInstance()->moveObjects();
+                }
+                gAgent.updateCamera();
        }
        // objects and camera should be in sync, do LOD calculations now
@@ -3948,9 +3629,9 @@ void LLAppViewer::disconnectViewer()
                }
        }
-        if (gSelectMgr)
+        if (LLSelectMgr::getInstance())
        {
-                gSelectMgr->deselectAll();
+                LLSelectMgr::getInstance()->deselectAll();
        }
        if (!gNoRender)
@@ -3971,9 +3652,9 @@ void LLAppViewer::disconnectViewer()
        // Also writes cached agent settings to gSavedSettings
        gAgent.cleanup();
-        gObjectList.destroy();
+        // This is where we used to call gObjectList.destroy() and then delete gWorldp.
-        delete gWorldp;
+        // Now we just ask the LLWorld singleton to cleanly shut down.
-        gWorldp = NULL;
+        LLWorld::getInstance()->destroyClass();
        cleanup_xfer_manager();
        gDisconnected = TRUE;
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 88f3fdd..b3f3681 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -36,15 +36,21 @@ class LLTextureCache;
 class LLWorkerThread;
 class LLTextureFetch;
+class LLCommandLineParser;
 class LLAppViewer : public LLApp
 {
 public:
        LLAppViewer();
        virtual ~LLAppViewer();
-        // *NOTE:Mani - Don't use this!
+    /**
-        // Having 
+     * @brief Access to the LLAppViewer singleton.
-        static LLAppViewer* instance() {return sInstance; } 
+     * 
+     * The LLAppViewer singleton is created in main()/WinMain().
+     * So don't use it in pre-entry (static initialization) code.
+     */
+    static LLAppViewer* instance() {return sInstance; } 
        //
        // Main application logic
@@ -64,10 +70,6 @@ public:
    bool quitRequested() { return mQuitRequested; }
    bool logoutRequestSent() { return mLogoutRequestSent; }
-        // *FIX: This is meant to stay only until the command line issues are hashed out with repect to LLApp::parseCommandLine
-        // This version stores the argc and argv for later usage, make sure the params passed in last as long as this class.
-        bool tempStoreCommandOptions(int argc, char** argv);
        void closeDebug();
        const LLOSInfo& getOSInfo() const { return mSysOSInfo; }
@@ -78,7 +80,9 @@ public:
        S32 getCrashBehavior() const { return mCrashBehavior; } 
        void setCrashBehavior(S32 cb);
        virtual void handleCrashReporting() = 0; // What to do with crash report?
-        static void handleViewerCrash(); // Hey! The viewer crashed. Do this.
+        virtual void handleSyncCrashTrace() = 0; // any low-level crash-prep that has to happen in the context of the crashing thread before the crash report is delivered.
+        static void handleViewerCrash(); // Hey! The viewer crashed. Do this, soon.
+        static void handleSyncViewerCrash(); // Hey! The viewer crashed. Do this right NOW in the context of the crashing thread.
        // Thread accessors
        static LLTextureCache* getTextureCache() { return sTextureCache; }
@@ -87,9 +91,6 @@ public:
        const std::string& getSerialNumber() { return mSerialNumber; }
        
-        // *FIX:Mani purgeCache was made public for parse_args().
-        // If that beast is gone, make it private.
-        void purgeCache(); // Clear the local cache. 
        bool getPurgeCache() const { return mPurgeCache; }
        
        const LLString& getSecondLifeTitle() const; // The Second Life title.
@@ -101,8 +102,6 @@ public:
    const std::vector<std::string>& getLoginURIs() const;
    const std::string& getHelperURI() const;
    void resetURIs() const;
-    void setLoginPage(const std::string& login_page);
-    const std::string& getLoginPage();
    void forceDisconnect(const LLString& msg); // Force disconnection, with a message to the user.
    void badNetworkHandler(); // Cause a crash state due to bad network packet.
@@ -125,23 +124,39 @@ public:
    virtual void forceErrorInifiniteLoop();
    virtual void forceErrorSoftwareException();
+        // *NOTE: There are currently 3 settings files: 
+        // "Global", "PerAccount" and "CrashSettings"
+        // The list is found in app_settings/settings_files.xml
+        // but since they are used explicitly in code,
+        // the follow consts should also do the trick.
+        static const std::string sGlobalSettingsName; 
+        static const std::string sPerAccountSettingsName; 
+        static const std::string sCrashSettingsName; 
+        void loadSettingsFromDirectory(ELLPath path_index);
+        std::string getSettingsFileName(const std::string& file);
 protected:
        virtual bool initWindow(); // Initialize the viewer's window.
        virtual bool initLogging(); // Initialize log files, logging system, return false on failure.
+        virtual void initConsole() {}; // Initialize OS level debugging console.
        virtual bool initHardwareTest() { return true; } // A false result indicates the app should quit.
+    virtual bool initParseCommandLine(LLCommandLineParser& clp) 
+        { return true; } // Allow platforms to specify the command line args.
        
        virtual std::string generateSerialNumber() = 0; // Platforms specific classes generate this.
 private:
-        bool initEarlyConfiguration(); // Initialize setting needed by crash reporting.
        bool initThreads(); // Initialize viewer threads, return false on failure.
        bool initConfiguration(); // Initialize settings from the command line/config file.
        bool initCache(); // Initialize local client cache.
+        void purgeCache(); // Clear the local cache. 
-        bool doConfigFromCommandLine(); // calls parse args.
        void cleanupSavedSettings(); // Sets some config data to current or default values during cleanup.
        void removeCacheFiles(const char *filemask); // Deletes cached files the match the given wildcard.
@@ -190,6 +205,8 @@ private:
    bool mQuitRequested;                                // User wants to quit, may have modified documents open.
    bool mLogoutRequestSent;                    // Disconnect message sent to simulator, no longer safe to send messages to the sim.
+    S32 mYieldTime;
+        LLSD mSettingsFileList;
 };
 // consts from viewer.h
@@ -200,35 +217,18 @@ const S32 AGENT_UPDATES_PER_SECOND  = 10;
 //
 // "// llstartup" indicates that llstartup is the only client for this global.
-extern bool gVerifySSLCert; // parse_args setting used by llxmlrpctransaction.cpp
 extern BOOL gHandleKeysAsync; // gSavedSettings used by llviewerdisplay.cpp & llviewermenu.cpp
-extern BOOL gProbeHardware;
 extern LLString gDisabledMessage; // llstartup
 extern BOOL gHideLinks; // used by llpanellogin, lllfloaterbuycurrency, llstartup
 extern LLSD gDebugInfo;
 extern BOOL     gAllowIdleAFK;
-extern F32 gAFKTimeout;
+extern BOOL     gAllowTapTapHoldRun;
 extern BOOL     gShowObjectUpdates;
-extern BOOL gLogMessages; // llstartup 
-extern std::string gChannelName;
-extern BOOL gUseAudio; // llstartup
-extern LLString gCmdLineFirstName; // llstartup
-extern LLString gCmdLineLastName;
-extern LLString gCmdLinePassword;
-extern BOOL gAutoLogin; // llstartup
-extern const char* DEFAULT_SETTINGS_FILE; // llstartup
-extern BOOL gRequestInventoryLibrary; // llstartup
-extern BOOL gGodConnect; // llstartup
 extern BOOL gAcceptTOS;
 extern BOOL gAcceptCriticalMessage;
-extern LLUUID   gViewerDigest;  // MD5 digest of the viewer's executable file.
 typedef enum 
 {
@@ -271,7 +271,6 @@ extern LLUUID gInventoryLibraryOwner;
 extern LLUUID gInventoryLibraryRoot;
 extern BOOL             gDisconnected;
-extern BOOL             gDisableVoice;
 // Map scale in pixels per region
 extern F32 gMapScale;
@@ -281,9 +280,6 @@ extern LLFrameTimer	gRestoreGLTimer;
 extern BOOL                     gRestoreGL;
 extern BOOL             gUseWireframe;
-extern F32 gMouseSensitivity;
-extern BOOL gInvertMouse;
 // VFS globals - gVFS is for general use
 // gStaticVFS is read-only and is shipped w/ the viewer
 // it has pre-cache data like the UI .TGAs
@@ -291,9 +287,6 @@ extern LLVFS	*gStaticVFS;
 extern LLMemoryInfo gSysMemory;
-extern bool gPreloadImages;
-extern bool gPreloadSounds;
 extern LLString gLastVersionChannel;
 extern LLVector3 gWindVec;
@@ -304,10 +297,7 @@ extern BOOL gPrintMessagesThisFrame;
 extern LLUUID gSunTextureID;
 extern LLUUID gMoonTextureID;
-extern BOOL gUseConsole; 
 extern BOOL gRandomizeFramerate;
 extern BOOL gPeriodicSlowFrame;
-extern BOOL gQAMode;
 #endif // LL_LLAPPVIEWER_H
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp
index 659fbf49..084df9b 100644
--- a/linden/indra/newview/llappviewerlinux.cpp
+++ b/linden/indra/newview/llappviewerlinux.cpp
@@ -31,28 +31,50 @@
 #include "llviewerprecompiledheaders.h"
-#include "llmemtype.h"
 #include "llappviewerlinux.h"
+#include "llcommandlineparser.h"
+#include "llmemtype.h"
 #include "llviewernetwork.h"
 #include "llmd5.h"
-  #if LL_LINUX
+#include <exception>
-  #     include <dlfcn.h>               // RTLD_LAZY
-  #     include <execinfo.h>            // backtrace - glibc only
+#if LL_LINUX
-  #     ifndef LL_ELFBIN
+# include <dlfcn.h>             // RTLD_LAZY
-  #define LL_ELFBIN 1
+# include <execinfo.h>            // backtrace - glibc only
-  #     endif // LL_ELFBIN
+# ifndef LL_ELFBIN
-  #     if LL_ELFBIN
+#  define LL_ELFBIN 1
-  #          include <cxxabi.h>         // for symbol demangling
+# endif // LL_ELFBIN
-  #          include "ELFIO.h"          // for better backtraces
+# if LL_ELFBIN
-  #     endif // LL_ELFBIN
+#  include <cxxabi.h>         // for symbol demangling
-  #elif LL_SOLARIS
+#  include "ELFIO.h"          // for better backtraces
-  #     include <sys/types.h>
+# endif // LL_ELFBIN
-  #     include <unistd.h>
+#elif LL_SOLARIS
-  #     include <fcntl.h>
+# include <sys/types.h>
-  #     include <ucontext.h>
+# include <unistd.h>
-  #endif
+# include <fcntl.h>
+# include <ucontext.h>
+#endif
+namespace
+{
+        int gArgC = 0;
+        char **gArgV = NULL;
+        void (*gOldTerminateHandler)() = NULL;
+}
+static void exceptionTerminateHandler()
+{
+        // reinstall default terminate() handler in case we re-terminate.
+        if (gOldTerminateHandler) std::set_terminate(gOldTerminateHandler);
+        // treat this like a regular viewer crash, with nice stacktrace etc.
+        LLAppViewer::handleSyncViewerCrash();
+        LLAppViewer::handleViewerCrash();
+        // we've probably been killed-off before now, but...
+        gOldTerminateHandler(); // call old terminate() handler
+}
 int main( int argc, char **argv ) 
 {
@@ -62,18 +84,18 @@ int main( int argc, char **argv )
        asm ("ta\t6");           // NOTE:  Make sure memory alignment is enforced on SPARC
 #endif
+        gArgC = argc;
+        gArgV = argv;
        LLAppViewer* viewer_app_ptr = new LLAppViewerLinux();
+        // install unexpected exception handler
+        gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler);
+        // install crash handlers
        viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
+        viewer_app_ptr->setSyncErrorHandler(LLAppViewer::handleSyncViewerCrash);
-        bool ok = viewer_app_ptr->tempStoreCommandOptions(argc, argv);
+        bool ok = viewer_app_ptr->init();
-        if(!ok)
-        {
-                llwarns << "Unable to parse command line." << llendl;
-                return -1;
-        }
-        ok = viewer_app_ptr->init();
        if(!ok)
        {
                llwarns << "Application init failed." << llendl;
@@ -297,19 +319,22 @@ bool LLAppViewerLinux::init()
        return LLAppViewer::init();
 }
-void LLAppViewerLinux::handleCrashReporting()
+void LLAppViewerLinux::handleSyncCrashTrace()
 {
+        // This backtrace writes into stack_trace.log
+#  if LL_ELFBIN
+        do_elfio_glibc_backtrace(); // more useful backtrace
+#  else
+        do_basic_glibc_backtrace(); // only slightly useful backtrace
+#  endif // LL_ELFBIN
+}
+void LLAppViewerLinux::handleCrashReporting()
+{
        // Always generate the report, have the logger do the asking, and
        // don't wait for the logger before exiting (-> total cleanup).
        if (CRASH_BEHAVIOR_NEVER_SEND != LLAppViewer::instance()->getCrashBehavior())
        {       
-                // This backtrace writes into stack_trace.log
-#  if LL_ELFBIN
-                do_elfio_glibc_backtrace(); // more useful backtrace
-#  else
-                do_basic_glibc_backtrace(); // only slightly useful backtrace
-#  endif // LL_ELFBIN
                // launch the actual crash logger
                char* ask_dialog = "-dialog";
                if (CRASH_BEHAVIOR_ASK != LLAppViewer::instance()->getCrashBehavior())
@@ -321,10 +346,11 @@ void LLAppViewerLinux::handleCrashReporting()
                        {(char*)cmd.c_str(),
                         ask_dialog,
                         (char*)"-user",
-                         (char*)gGridName,
+                         (char*)gGridName.c_str(),
                         (char*)"-name",
                         (char*)LLAppViewer::instance()->getSecondLifeTitle().c_str(),
                         NULL};
+                fflush(NULL);
                pid_t pid = fork();
                if (pid == 0)
                { // child
@@ -348,9 +374,10 @@ void LLAppViewerLinux::handleCrashReporting()
                        }
                }
        }
-        // Sometimes signals don't seem to quit the viewer.  
+        // Sometimes signals don't seem to quit the viewer.  Also, we may
+        // have been called explicitly instead of from a signal handler.
        // Make sure we exit so as to not totally confuse the user.
-        exit(1);
+        _exit(1); // avoid atexit(), else we may re-crash in dtors.
 }
 bool LLAppViewerLinux::beingDebugged()
@@ -403,6 +430,12 @@ bool LLAppViewerLinux::initLogging()
        return LLAppViewer::initLogging();
 }
+bool LLAppViewerLinux::initParseCommandLine(LLCommandLineParser& clp)
+{
+        clp.parseCommandLine(gArgC, gArgV);
+        return true;
+}
 std::string LLAppViewerLinux::generateSerialNumber()
 {
        char serial_md5[MD5HEX_STR_SIZE];
diff --git a/linden/indra/newview/llappviewerlinux.h b/linden/indra/newview/llappviewerlinux.h
index 9347f20..a180b4d 100644
--- a/linden/indra/newview/llappviewerlinux.h
+++ b/linden/indra/newview/llappviewerlinux.h
@@ -36,6 +36,8 @@
 #include "llappviewer.h"
 #endif
+class LLCommandLineParser;
 class LLAppViewerLinux : public LLAppViewer
 {
 public:
@@ -52,8 +54,10 @@ protected:
        virtual bool beingDebugged();
        virtual void handleCrashReporting();
+        virtual void handleSyncCrashTrace();
        virtual bool initLogging();
+        virtual bool initParseCommandLine(LLCommandLineParser& clp);
 };
 #endif // LL_LLAPPVIEWERLINUX_H
diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp
index e277425..c128634 100644
--- a/linden/indra/newview/llappviewermacosx.cpp
+++ b/linden/indra/newview/llappviewermacosx.cpp
@@ -36,15 +36,25 @@
 #endif
 #include "llappviewermacosx.h"
+#include "llcommandlineparser.h"
 #include "llmemtype.h"
 #include "llviewernetwork.h"
+#include "llviewercontrol.h"
 #include "llmd5.h"
 #include "llurlsimstring.h"
 #include "llfloaterworldmap.h"
 #include "llurldispatcher.h"
 #include <Carbon/Carbon.h>
+namespace 
+{
+        // The command line args stored.
+        // They are not used immediately by the app.
+        int gArgC;
+        char** gArgV;
+}
 int main( int argc, char **argv ) 
 {
@@ -61,14 +71,11 @@ int main( int argc, char **argv )
        viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
-        bool ok = viewer_app_ptr->tempStoreCommandOptions(argc, argv);
+        // Store off the command line args for use later.
-        if(!ok)
+        gArgC = argc;
-        {
+        gArgV = argv;
-                llwarns << "Unable to parse command line." << llendl;
+        
-                return -1;
+        bool ok = viewer_app_ptr->init();
-        }
-        ok = viewer_app_ptr->init();
        if(!ok)
        {
                llwarns << "Application init failed." << llendl;
@@ -108,6 +115,84 @@ bool LLAppViewerMacOSX::init()
        return LLAppViewer::init();
 }
+// MacOSX may add and addition command line arguement for the process serial number.
+// The option takes a form like '-psn_0_12345'. The following method should be able to recognize
+// and either ignore or return a pair of values for the option.
+// look for this method to be added to the parser in parseAndStoreResults.
+std::pair<std::string, std::string> parse_psn(const std::string& s)
+{
+    if (s.find("-psn_") == 0) 
+        {
+                // *FIX:Mani Not sure that the value makes sense.
+                // fix it once the actual -psn_XXX syntax is known.
+                return std::make_pair("psn", s.substr(5));
+    }
+        else 
+        {
+        return std::make_pair(std::string(), std::string());
+    }
+}
+bool LLAppViewerMacOSX::initParseCommandLine(LLCommandLineParser& clp)
+{
+        // The next two lines add the support for parsing the mac -psn_XXX arg.
+        clp.addOptionDesc("psn", NULL, 1, "MacOSX process serial number");
+        clp.setCustomParser(parse_psn);
+        
+        // First parse the command line, not often used on the mac.
+        if(clp.parseCommandLine(gArgC, gArgV) == false)
+        {
+                return false;
+        }
+    
+    // Now read in the args from arguments txt.
+    // Succesive calls to clp.parse... will NOT override earlier 
+    // options. 
+    const char* filename = "arguments.txt";
+        llifstream ifs(filename, llifstream::binary);
+        if (!ifs.is_open())
+        {
+                llwarns << "Unable to open file" << filename << llendl;
+                return false;
+        }
+        
+        if(clp.parseCommandLineFile(ifs) == false)
+        {
+                return false;
+        }
+        
+        // Get the user's preferred language string based on the Mac OS localization mechanism.
+        // To add a new localization:
+                // go to the "Resources" section of the project
+                // get info on "language.txt"
+                // in the "General" tab, click the "Add Localization" button
+                // create a new localization for the language you're adding
+                // set the contents of the new localization of the file to the string corresponding to our localization
+                //   (i.e. "en-us", "ja", etc.  Use the existing ones as a guide.)
+        CFURLRef url = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("language"), CFSTR("txt"), NULL);
+        char path[MAX_PATH];
+        if(CFURLGetFileSystemRepresentation(url, false, (UInt8 *)path, sizeof(path)))
+        {
+                LLString lang;
+                if(_read_file_into_string(lang, path))          /* Flawfinder: ignore*/
+                {
+            LLControlVariable* c = gSavedSettings.getControl("SystemLanguage");
+            if(c)
+            {
+                c->setValue(lang, false);
+            }
+                }
+        }
+        CFRelease(url);
+        
+    return true;
+}
+void LLAppViewerMacOSX::handleSyncCrashTrace()
+{
+        // do nothing
+}
 void LLAppViewerMacOSX::handleCrashReporting()
 {
        // Macintosh
diff --git a/linden/indra/newview/llappviewermacosx.h b/linden/indra/newview/llappviewermacosx.h
index 9f0b723..0d8c460 100644
--- a/linden/indra/newview/llappviewermacosx.h
+++ b/linden/indra/newview/llappviewermacosx.h
@@ -50,7 +50,10 @@ public:
 protected:
        virtual void handleCrashReporting(); 
+        virtual void handleSyncCrashTrace();
        std::string generateSerialNumber();
+        virtual bool initParseCommandLine(LLCommandLineParser& clp);
 };
 #endif // LL_LLAPPVIEWERMACOSX_H
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp
index b665cb4..a2d89a3 100644
--- a/linden/indra/newview/llappviewerwin32.cpp
+++ b/linden/indra/newview/llappviewerwin32.cpp
@@ -55,41 +55,13 @@
 #include "llviewernetwork.h"
 #include "llmd5.h"
-void fill_args(int& argc, char** argv, const S32 max_args, LPSTR cmd_line)
+#include "llcommandlineparser.h"
-{
-        char *token = NULL;
-        if( cmd_line[0] == '\"' )
-        {
-                // Exe name is enclosed in quotes
-                token = strtok( cmd_line, "\"" );
-                argv[argc++] = token;
-                token = strtok( NULL, " \t," );
-        }
-        else
-        {
-                // Exe name is not enclosed in quotes
-                token = strtok( cmd_line, " \t," );
-        }
-        while( (token != NULL) && (argc < max_args) )
-        {
-                argv[argc++] = token;
-                /* Get next token: */
-                if (*(token + strlen(token) + 1) == '\"')               /* Flawfinder: ignore*/
-                {
-                        token = strtok( NULL, "\"");
-                }
-                else
-                {
-                        token = strtok( NULL, " \t," );
-                }
-        }
-}
-// *NOTE:Mani - this code is stolen from LLApp, where its never actually used.
 LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop)
 {
-        // Translate the signals/exceptions into cross-platform stuff
+    // *NOTE:Mani - this code is stolen from LLApp, where its never actually used.
+        
+    // Translate the signals/exceptions into cross-platform stuff
        // Windows implementation
        llinfos << "Entering Windows Exception Handler..." << llendl;
@@ -144,21 +116,7 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
        // *FIX: global
        gIconResource = MAKEINTRESOURCE(IDI_LL_ICON);
-        // In Win32, we need to generate argc and argv ourselves...
+        LLAppViewerWin32* viewer_app_ptr = new LLAppViewerWin32(lpCmdLine);
-        // Note: GetCommandLine() returns a  potentially return a LPTSTR
-        // which can resolve to a LPWSTR (unicode string).
-        // (That's why it's different from lpCmdLine which is a LPSTR.)
-        // We don't currently do unicode, so call the non-unicode version
-        // directly.
-        LPSTR cmd_line_including_exe_name = GetCommandLineA();
-        const S32       MAX_ARGS = 100;
-        int argc = 0;
-        char* argv[MAX_ARGS];           /* Flawfinder: ignore */
-        fill_args(argc, argv, MAX_ARGS, cmd_line_including_exe_name);
-        LLAppViewerWin32* viewer_app_ptr = new LLAppViewerWin32();
        // *FIX:Mani This method is poorly named, since the exception
        // is now handled by LLApp. 
@@ -180,13 +138,6 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
        viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
-        ok = viewer_app_ptr->tempStoreCommandOptions(argc, argv);
-        if(!ok)
-        {
-                llwarns << "Unable to parse command line." << llendl;
-                return -1;
-        }
        ok = viewer_app_ptr->init();
        if(!ok)
        {
@@ -308,7 +259,8 @@ void create_console()
        setvbuf( stderr, NULL, _IONBF, 0 );
 }
-LLAppViewerWin32::LLAppViewerWin32()
+LLAppViewerWin32::LLAppViewerWin32(const char* cmd_line) :
+    mCmdLine(cmd_line)
 {
 }
@@ -339,15 +291,11 @@ bool LLAppViewerWin32::cleanup()
        return result;
 }
-bool LLAppViewerWin32::initWindow()
+void LLAppViewerWin32::initConsole()
 {
-        // pop up debug console if necessary
+        // pop up debug console
-        if (gUseConsole && gSavedSettings.getBOOL("ShowConsoleWindow"))
+        create_console();
-        {
+        return LLAppViewer::initConsole();
-                create_console();
-        }
-        return LLAppViewer::initWindow();
 }
 void write_debug_dx(const char* str)
@@ -368,10 +316,14 @@ bool LLAppViewerWin32::initHardwareTest()
        // Do driver verification and initialization based on DirectX
        // hardware polling and driver versions
        //
-        if (gProbeHardware)
+        if (FALSE == gSavedSettings.getBOOL("NoHardwareProbe"))
        {
                BOOL vram_only = !gSavedSettings.getBOOL("ProbeHardwareOnStartup");
+                // per DEV-11631 - disable hardware probing for everything
+                // but vram.
+                vram_only = TRUE;
                LLSplashScreen::update("Detecting hardware...");
                llinfos << "Attempting to poll DirectX for hardware info" << llendl;
@@ -431,6 +383,16 @@ bool LLAppViewerWin32::initHardwareTest()
        return true;
 }
+bool LLAppViewerWin32::initParseCommandLine(LLCommandLineParser& clp)
+{
+    return clp.parseCommandLineString(mCmdLine);
+}
+void LLAppViewerWin32::handleSyncCrashTrace()
+{
+        // do nothing
+}
 void LLAppViewerWin32::handleCrashReporting()
 {
        // Windows only behaivor. Spawn win crash reporter.
@@ -486,4 +448,4 @@ std::string LLAppViewerWin32::generateSerialNumber()
                llwarns << "GetVolumeInformation failed" << llendl;
        }
        return serial_md5;
-}
-\ No newline at end of file
+}
diff --git a/linden/indra/newview/llappviewerwin32.h b/linden/indra/newview/llappviewerwin32.h
index b015cc9..fe16ec4 100644
--- a/linden/indra/newview/llappviewerwin32.h
+++ b/linden/indra/newview/llappviewerwin32.h
@@ -39,7 +39,7 @@
 class LLAppViewerWin32 : public LLAppViewer
 {
 public:
-        LLAppViewerWin32();
+        LLAppViewerWin32(const char* cmd_line);
        virtual ~LLAppViewerWin32();
        //
@@ -49,15 +49,19 @@ public:
        virtual bool cleanup();
 protected:
-        virtual bool initWindow(); // Initialize the viewer's window.
+        virtual void initConsole(); // Initialize OS level debugging console.
        virtual bool initHardwareTest(); // Win32 uses DX9 to test hardware.
+        virtual bool initParseCommandLine(LLCommandLineParser& clp);
        virtual void handleCrashReporting(); 
+        virtual void handleSyncCrashTrace();
        std::string generateSerialNumber();
 private:
        void disableWinErrorReporting();
+    std::string mCmdLine;
 };
 #endif // LL_LLAPPVIEWERWIN32_H
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index b024fc2..2691f71 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -159,7 +159,7 @@ void LLAssetUploadResponder::uploadFailure(const LLSD& content)
        // deal with L$ errors
        if (reason == "insufficient funds")
        {
-                LLFloaterBuyCurrency::buyCurrency("Uploading costs", gGlobalEconomy->getPriceUpload());
+                LLFloaterBuyCurrency::buyCurrency("Uploading costs", LLGlobalEconomy::Singleton::getInstance()->getPriceUpload());
        }
        else
        {
@@ -209,7 +209,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
                gAgent.sendReliableMessage();
                LLString::format_map_t args;
-                args["[AMOUNT]"] = llformat("%d",gGlobalEconomy->getPriceUpload());
+                args["[AMOUNT]"] = llformat("%d",LLGlobalEconomy::Singleton::getInstance()->getPriceUpload());
                LLNotifyBox::showXml("UploadPayment", args);
        }
diff --git a/linden/indra/newview/llaudiosourcevo.cpp b/linden/indra/newview/llaudiosourcevo.cpp
index ae8ce5d..e668078 100644
--- a/linden/indra/newview/llaudiosourcevo.cpp
+++ b/linden/indra/newview/llaudiosourcevo.cpp
@@ -71,51 +71,49 @@ void LLAudioSourceVO::updateGain()
        }
        BOOL mute = FALSE;
-        if (gParcelMgr)
+        LLVector3d pos_global;
-        {
-                LLVector3d pos_global;
-                if (mObjectp->isAttachment())
+        if (mObjectp->isAttachment())
+        {
+                LLViewerObject* parent = mObjectp;
+                while (parent && !parent->isAvatar())
                {
-                        LLViewerObject* parent = mObjectp;
+                        parent = (LLViewerObject*)parent->getParent();
-                        while (parent 
-                                   && !parent->isAvatar())
-                        {
-                                parent = (LLViewerObject*)parent->getParent();
-                        }
-                        if (parent)
-                                pos_global = parent->getPositionGlobal();
                }
-                
+                if (parent)
-                else
-                        pos_global = mObjectp->getPositionGlobal();
-                
-                if (!gParcelMgr->canHearSound(pos_global))
                {
-                        mute = TRUE;
+                        pos_global = parent->getPositionGlobal();
                }
        }
+        else
+        {
+                pos_global = mObjectp->getPositionGlobal();
+        }
+        
+        if (!LLViewerParcelMgr::getInstance()->canHearSound(pos_global))
+        {
+                mute = TRUE;
+        }
-        if (!mute && gMuteListp)
+        if (!mute)
        {
-                if (gMuteListp->isMuted(mObjectp->getID()))
+                if (LLMuteList::getInstance()->isMuted(mObjectp->getID()))
                {
                        mute = TRUE;
                }
-                else if (gMuteListp->isMuted(mOwnerID, LLMute::flagObjectSounds))
+                else if (LLMuteList::getInstance()->isMuted(mOwnerID, LLMute::flagObjectSounds))
                {
                        mute = TRUE;
                }
                else if (mObjectp->isAttachment())
                {
                        LLViewerObject* parent = mObjectp;
-                        while (parent 
+                        while (parent && !parent->isAvatar())
-                                   && !parent->isAvatar())
                        {
                                parent = (LLViewerObject*)parent->getParent();
                        }
                        if (parent 
-                                && gMuteListp->isMuted(parent->getID()))
+                                && LLMuteList::getInstance()->isMuted(parent->getID()))
                        {
                                mute = TRUE;
                        }
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index 86e0bfb..3a50cea 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -60,6 +60,8 @@
 #include "llviewerobjectlist.h"
 #include "llviewerwindow.h"
 #include "llvoavatar.h"
+#include "llimview.h"
+#include "llimpanel.h"
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
@@ -671,7 +673,18 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
                }
                if(notify)
                {
+                        // Popup a notify box with online status of this agent
                        LLNotifyBox::showXml(online ? "FriendOnline" : "FriendOffline", args);
+                        // If there's an open IM session with this agent, send a notification there too.
+                        LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, agent_id);
+                        LLFloaterIMPanel *floater = gIMMgr->findFloaterBySession(session_id);
+                        if (floater)
+                        {
+                                LLUIString notifyMsg = LLNotifyBox::getTemplateMessage((online ? "FriendOnline" : "FriendOffline"),args);
+                                if (!notifyMsg.empty())
+                                        floater->addHistoryLine(notifyMsg,gSavedSettings.getColor4("SystemChatColor"));
+                        }
                }
                mModifyMask |= LLFriendObserver::ONLINE;
diff --git a/linden/indra/newview/llcameraview.cpp b/linden/indra/newview/llcameraview.cpp
deleted file mode 100644
index 80e64f3..0000000
--- a/linden/indra/newview/llcameraview.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/** 
- * @file llcameraview.cpp
- * @brief Container for movement buttons like forward, left, fly
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-#include "llviewerprecompiledheaders.h"
-#include "llcameraview.h"
-#include "llvieweruictrlfactory.h"
-// Library includes
-#include "llfontgl.h"
-// Viewer includes
-#include "llagent.h"
-#include "lljoystickbutton.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-#include "llappviewer.h"
-// Constants
-const char *CAMERA_TITLE = "";
-const F32 CAMERA_BUTTON_DELAY = 0.0f;
-// Globals
-LLFloaterCamera* gFloaterCamera = NULL;
-//
-// Member functions
-//
-LLFloaterCamera::LLFloaterCamera(const std::string& name)
-:       LLFloater(name, "FloaterCameraRect", CAMERA_TITLE, FALSE, 100, 100, DRAG_ON_TOP,
-                          MINIMIZE_NO)
-{
-        setIsChrome(TRUE);
-        
-        S32 top = getRect().getHeight();
-        S32 bottom = 0;
-        S32 left = 16;
-        const S32 ROTATE_WIDTH = 64;
-        mRotate = new LLJoystickCameraRotate("cam rotate stick", 
-                LLRect( left, top, left + ROTATE_WIDTH, bottom ),
-                "cam_rotate_out.tga",
-                "cam_rotate_in.tga" );
-        mRotate->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
-        mRotate->setHeldDownDelay(CAMERA_BUTTON_DELAY);
-        mRotate->setToolTip( LLString("Rotate Camera Around Focus" )); // *TODO: Translate
-        mRotate->setSoundFlags(MOUSE_DOWN | MOUSE_UP);
-        addChild(mRotate);
-        left += ROTATE_WIDTH;
-        const S32 ZOOM_WIDTH = 16;
-        mZoom = new LLJoystickCameraZoom( 
-                "zoom",
-                LLRect( left, top, left + ZOOM_WIDTH, bottom ),
-                "cam_zoom_out.tga",
-                "cam_zoom_plus_in.tga",
-                "cam_zoom_minus_in.tga");
-        mZoom->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
-        mZoom->setHeldDownDelay(CAMERA_BUTTON_DELAY);
-        mZoom->setToolTip( LLString("Zoom Camera Towards Focus" )); // *TODO: Translate
-        mZoom->setSoundFlags(MOUSE_DOWN | MOUSE_UP);
-        addChild(mZoom);
-        left += ZOOM_WIDTH;
-        
-        const S32 TRACK_WIDTH = 64;
-        mTrack = new LLJoystickCameraTrack("cam track stick", 
-                LLRect( left, top, left + TRACK_WIDTH, bottom ),
-                "cam_tracking_out.tga",
-                "cam_tracking_in.tga");
-        mTrack->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
-        mTrack->setHeldDownDelay(CAMERA_BUTTON_DELAY);
-        mTrack->setToolTip( LLString("Move Camera Up and Down, Left and Right" )); // *TODO: Translate
-        mTrack->setSoundFlags(MOUSE_DOWN | MOUSE_UP);
-        addChild(mTrack);
-}
-LLFloaterCamera::~LLFloaterCamera()
-{
-        // children all deleted by LLView destructor
-        gFloaterCamera = NULL;
-}
-// virtual
-void LLFloaterCamera::onClose(bool app_quitting)
-{
-        LLFloater::onClose(app_quitting);
-        
-        if (!app_quitting)
-        {
-                gSavedSettings.setBOOL("ShowCameraControls", FALSE);
-        }
-}
-//
-// Static member functions
-//
-// static
-void LLFloaterCamera::show(void*)
-{
-        if(!gFloaterCamera)
-        {
-                gFloaterCamera = new LLFloaterCamera("camera floater");
-        }
-        gFloaterCamera->open(); /* Flawfinder: ignore */
-        gSavedSettings.setBOOL("ShowCameraControls", TRUE);
-}
-// static
-void LLFloaterCamera::toggle(void*)
-{
-        if (gFloaterCamera)
-        {
-                gFloaterCamera->close();
-        }
-        else
-        {
-                show(NULL);
-        }
-}
-// static
-BOOL LLFloaterCamera::visible(void*)
-{
-        if (gFloaterCamera)
-        {
-                return gFloaterCamera->getVisible();
-        }
-        else
-        {
-                return FALSE;
-        }
-}
-LLFloaterJoystick       *LLFloaterJoystick::sInstance = NULL;
-LLFloaterJoystick::LLFloaterJoystick( )
-: LLFloater("Joystick floater")
-{
-        sInstance = this;
-}
-LLFloaterJoystick::~LLFloaterJoystick()
-{
-        sInstance = NULL;
-}
-void LLFloaterJoystick::draw()
-{
-        for (U32 i = 0; i < 8; i++)
-        {
-                F32 value = gViewerWindow->getWindow()->getJoystickAxis(i);
-                mAxis[i]->addValue(value*gFrameIntervalSeconds);
-                
-                if (mAxisBar[i]->mMinBar > value)
-                {
-                        mAxisBar[i]->mMinBar = value;
-                }
-                if (mAxisBar[i]->mMaxBar < value)
-                {
-                        mAxisBar[i]->mMaxBar = value;
-                }
-        }
-        LLFloater::draw();
-}
-// static
-void LLFloaterJoystick::show(void*)
-{
-        if (sInstance)
-        {
-                sInstance->open();      /*Flawfinder: ignore*/
-        }
-        else
-        {
-                LLFloaterJoystick* floater = new LLFloaterJoystick();
-                gUICtrlFactory->buildFloater(floater, "floater_joystick.xml");
-                F32 range = gSavedSettings.getBOOL("FlycamAbsolute") ? 1024.f : 2.f;
-                LLUIString axis = floater->getUIString("Axis");
-                LLUIString joystick = floater->getUIString("JoystickMonitor");
-                LLView* child = floater->getChild<LLView>("ZoomLabel");
-                LLRect rect;
-                if (child)
-                {
-                        LLRect r = child->getRect();
-                        LLRect f = floater->getRect();
-                        rect = LLRect(150, r.mTop, r.mRight, 0);
-                }
-                floater->mAxisStats = new LLStatView("axis values", joystick, "", rect);
-                floater->mAxisStats->setDisplayChildren(TRUE);
-                for (U32 i = 0; i < 8; i++)
-                {
-                        axis.setArg("[NUM]", llformat("%d", i));
-                        floater->mAxis[i] = new LLStat(4);
-                        floater->mAxisBar[i] = floater->mAxisStats->addStat(axis, floater->mAxis[i]);
-                        floater->mAxisBar[i]->mMinBar = -range;
-                        floater->mAxisBar[i]->mMaxBar = range;
-                        floater->mAxisBar[i]->mLabelSpacing = range * 0.5f;
-                        floater->mAxisBar[i]->mTickSpacing = range * 0.25f;                     
-                }
-                
-                floater->addChild(floater->mAxisStats);
-                floater->open();        /*Flawfinder: ignore*/
-        }
-}
-//static 
-LLFloaterJoystick* LLFloaterJoystick::getInstance()
-{
-        return sInstance;
-}
-// static
-BOOL LLFloaterJoystick::visible(void*)
-{
-        return (sInstance != NULL);
-}
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index b47e468..d1834a6 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -45,6 +45,7 @@
 #include "llagent.h"
 #include "llbutton.h"
 #include "llcombobox.h"
+#include "llcommandhandler.h"   // secondlife:///app/chat/ support
 #include "llviewercontrol.h"
 #include "llfloaterchat.h"
 #include "llgesturemgr.h"
@@ -64,7 +65,7 @@
 #include "llmultigesture.h"
 #include "llui.h"
 #include "llviewermenu.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 //
@@ -76,6 +77,7 @@ LLChatBar *gChatBar = NULL;
 // legacy calllback glue
 void toggleChatHistory(void* user_data);
+void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel);
 class LLChatBarGestureObserver : public LLGestureManagerObserver
@@ -123,7 +125,7 @@ BOOL LLChatBar::postBuild()
        childSetCommitCallback("Say", onClickSay, this);
        // attempt to bind to an existing combo box named gesture
-        setGestureCombo(LLUICtrlFactory::getComboBoxByName(this, "Gesture"));
+        setGestureCombo(getChild<LLComboBox>( "Gesture"));
        LLButton * sayp = getChild<LLButton>("Say");
        if(sayp)
@@ -131,7 +133,7 @@ BOOL LLChatBar::postBuild()
                setDefaultBtn(sayp);
        }
-        mInputEditor = LLUICtrlFactory::getLineEditorByName(this, "Chat Editor");
+        mInputEditor = getChild<LLLineEditor>("Chat Editor");
        if (mInputEditor)
        {
                mInputEditor->setCallbackUserData(this);
@@ -157,36 +159,34 @@ BOOL LLChatBar::postBuild()
 //-----------------------------------------------------------------------
 // virtual
-BOOL LLChatBar::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
 {
        BOOL handled = FALSE;
-        if( getVisible() && getEnabled() && !called_from_parent)
+        // ALT-RETURN is reserved for windowed/fullscreen toggle
+        if( KEY_RETURN == key )
        {
-                // ALT-RETURN is reserved for windowed/fullscreen toggle
+                if (mask == MASK_CONTROL)
-                if( KEY_RETURN == key )
                {
-                        if (mask == MASK_CONTROL)
+                        // shout
-                        {
+                        sendChat(CHAT_TYPE_SHOUT);
-                                // shout
+                        handled = TRUE;
-                                sendChat(CHAT_TYPE_SHOUT);
-                                handled = TRUE;
-                        }
-                        else if (mask == MASK_NONE)
-                        {
-                                // say
-                                sendChat( CHAT_TYPE_NORMAL );
-                                handled = TRUE;
-                        }
                }
-                // only do this in main chatbar
+                else if (mask == MASK_NONE)
-                else if ( KEY_ESCAPE == key && gChatBar == this)
                {
-                        stopChat();
+                        // say
+                        sendChat( CHAT_TYPE_NORMAL );
                        handled = TRUE;
                }
        }
+        // only do this in main chatbar
+        else if ( KEY_ESCAPE == key && gChatBar == this)
+        {
+                stopChat();
+                handled = TRUE;
+        }
        return handled;
 }
@@ -429,10 +429,8 @@ void LLChatBar::sendChat( EChatType type )
 //-----------------------------------------------------------------------
 // static 
-void LLChatBar::startChat(void* userdata)
+void LLChatBar::startChat(const char* line)
 {
-        const char* line = (const char*)userdata;
        gChatBar->setVisible(TRUE);
        gChatBar->setKeyboardFocus(TRUE);
        gSavedSettings.setBOOL("ChatVisible", TRUE);
@@ -572,8 +570,6 @@ void LLChatBar::sendChatFromViewer(const std::string &utf8text, EChatType type,
 void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate)
 {
-        LLMessageSystem* msg = gMessageSystem;
        // Look for "/20 foo" channel chats.
        S32 channel = 0;
        LLWString out_text = stripChannelNumber(wtext, &channel);
@@ -618,6 +614,12 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
                }
        }
+        send_chat_from_viewer(utf8_out_text, type, channel);
+}
+void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel)
+{
+        LLMessageSystem* msg = gMessageSystem;
        msg->newMessageFast(_PREHASH_ChatFromViewer);
        msg->nextBlockFast(_PREHASH_AgentData);
        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@@ -629,7 +631,7 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
        gAgent.sendReliableMessage();
-        gViewerStats->incStat(LLViewerStats::ST_CHAT_COUNT);
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
 }
@@ -672,3 +674,24 @@ void toggleChatHistory(void* user_data)
 {
        LLFloaterChat::toggleInstance(LLSD());
 }
+class LLChatHandler : public LLCommandHandler
+{
+public:
+        // not allowed from outside the app
+        LLChatHandler() : LLCommandHandler("chat", false) { }
+    // Your code here
+        bool handle(const LLSD& tokens, const LLSD& queryMap)
+        {
+                if (tokens.size() < 2) return false;
+                S32 channel = tokens[0].asInteger();
+                std::string mesg = tokens[1].asString();
+                send_chat_from_viewer(mesg, CHAT_TYPE_NORMAL, channel);
+                return true;
+        }
+};
+// Creating the object registers with the dispatcher.
+LLChatHandler gChatHandler;
diff --git a/linden/indra/newview/llchatbar.h b/linden/indra/newview/llchatbar.h
index fd3b339..cfb5015 100644
--- a/linden/indra/newview/llchatbar.h
+++ b/linden/indra/newview/llchatbar.h
@@ -53,7 +53,7 @@ public:
        ~LLChatBar();
        virtual BOOL postBuild();
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
        void            refresh();
        void            refreshGestures();
@@ -90,7 +90,7 @@ public:
        static void onCommitGesture(LLUICtrl* ctrl, void* data);
-        static void startChat(void*);
+        static void startChat(const char* line);
        static void stopChat();
 protected:
diff --git a/linden/indra/newview/llcloud.cpp b/linden/indra/newview/llcloud.cpp
index 3b8e466..92199a7 100644
--- a/linden/indra/newview/llcloud.cpp
+++ b/linden/indra/newview/llcloud.cpp
@@ -157,7 +157,7 @@ void LLCloudGroup::updatePuffOwnership()
                }
                //llinfos << "Cloud moving to new group" << llendl;
-                LLCloudGroup *new_cgp = gWorldPointer->findCloudGroup(mCloudPuffs[i]);
+                LLCloudGroup *new_cgp = LLWorld::getInstance()->findCloudGroup(mCloudPuffs[i]);
                if (!new_cgp)
                {
                        //llinfos << "Killing puff not in group" << llendl;
diff --git a/linden/indra/newview/llcolorswatch.cpp b/linden/indra/newview/llcolorswatch.cpp
index e99b6bf..3f18d39 100644
--- a/linden/indra/newview/llcolorswatch.cpp
+++ b/linden/indra/newview/llcolorswatch.cpp
@@ -50,6 +50,8 @@
 #include "llviewerimagelist.h"
 #include "llfocusmgr.h"
+static LLRegisterWidget<LLColorSwatchCtrl> r("color_swatch");
 LLColorSwatchCtrl::LLColorSwatchCtrl(const std::string& name, const LLRect& rect, const LLColor4& color,
                void (*commit_callback)(LLUICtrl* ctrl, void* userdata),
                void* userdata )
@@ -74,8 +76,7 @@ LLColorSwatchCtrl::LLColorSwatchCtrl(const std::string& name, const LLRect& rect
        mBorder = new LLViewBorder("border", border_rect, LLViewBorder::BEVEL_IN);
        addChild(mBorder);
-        mAlphaGradientImage = gImageList.getImageFromUUID(LLUUID(gViewerArt.getString("color_swatch_alpha.tga")),
+        mAlphaGradientImage = LLUI::getUIImage("color_swatch_alpha.tga");
-                                                                                                          MIPMAP_FALSE, TRUE, GL_ALPHA8, GL_ALPHA);
 }
 LLColorSwatchCtrl::LLColorSwatchCtrl(const std::string& name, const LLRect& rect, const std::string& label, const LLColor4& color,
@@ -102,8 +103,7 @@ LLColorSwatchCtrl::LLColorSwatchCtrl(const std::string& name, const LLRect& rect
        mBorder = new LLViewBorder("border", border_rect, LLViewBorder::BEVEL_IN);
        addChild(mBorder);
-        mAlphaGradientImage = gImageList.getImageFromUUID(LLUUID(gViewerArt.getString("color_swatch_alpha.tga")),
+        mAlphaGradientImage = LLUI::getUIImage("color_swatch_alpha.tga");
-                                                                                                          MIPMAP_FALSE, TRUE, GL_ALPHA8, GL_ALPHA);
 }
 LLColorSwatchCtrl::~LLColorSwatchCtrl ()
@@ -129,13 +129,13 @@ BOOL LLColorSwatchCtrl::handleHover(S32 x, S32 y, MASK mask)
        return TRUE;
 }
-BOOL LLColorSwatchCtrl::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent)
+BOOL LLColorSwatchCtrl::handleUnicodeCharHere(llwchar uni_char)
 {
-        if( getVisible() && getEnabled() && !called_from_parent && ' ' == uni_char )
+        if( ' ' == uni_char )
        {
                showPicker(TRUE);
        }
-        return LLUICtrl::handleUnicodeCharHere(uni_char, called_from_parent);
+        return LLUICtrl::handleUnicodeCharHere(uni_char);
 }
 // forces color of this swatch and any associated floater to the input value, if currently invalid
@@ -203,46 +203,41 @@ BOOL LLColorSwatchCtrl::handleMouseUp(S32 x, S32 y, MASK mask)
 // assumes GL state is set for 2D
 void LLColorSwatchCtrl::draw()
 {
-        if( getVisible() )
+        mBorder->setKeyboardFocusHighlight(hasFocus());
-        {
+        // Draw border
-                mBorder->setKeyboardFocusHighlight(hasFocus());
+        LLRect border( 0, getRect().getHeight(), getRect().getWidth(), BTN_HEIGHT_SMALL );
-                // Draw border
+        gl_rect_2d( border, mBorderColor, FALSE );
-                LLRect border( 0, getRect().getHeight(), getRect().getWidth(), BTN_HEIGHT_SMALL );
-                gl_rect_2d( border, mBorderColor, FALSE );
-                LLRect interior = border;
+        LLRect interior = border;
-                interior.stretch( -1 );
+        interior.stretch( -1 );
-                // Check state
+        // Check state
-                if ( mValid )
+        if ( mValid )
+        {
+                // Draw the color swatch
+                gl_rect_2d_checkerboard( interior );
+                gl_rect_2d(interior, mColor, TRUE);
+                LLColor4 opaque_color = mColor;
+                opaque_color.mV[VALPHA] = 1.f;
+                gGL.color4fv(opaque_color.mV);
+                if (mAlphaGradientImage.notNull())
                {
-                        // Draw the color swatch
+                        gGL.pushMatrix();
-                        gl_rect_2d_checkerboard( interior );
-                        gl_rect_2d(interior, mColor, TRUE);
-                        LLColor4 opaque_color = mColor;
-                        opaque_color.mV[VALPHA] = 1.f;
-                        gGL.color4fv(opaque_color.mV);
-                        if (mAlphaGradientImage.notNull())
                        {
-                                gGL.pushMatrix();
+                                mAlphaGradientImage->draw(interior, mColor);
-                                {
-                                        gGL.translatef((F32)interior.mLeft, (F32)interior.mBottom, 0.f);
-                                        LLViewerImage::bindTexture(mAlphaGradientImage);
-                                        gl_rect_2d_simple_tex(interior.getWidth(), interior.getHeight());
-                                }
-                                gGL.popMatrix();
                        }
+                        gGL.popMatrix();
                }
-                else
+        }
-                {
+        else
-                        // Draw grey and an X
+        {
-                        gl_rect_2d(interior, LLColor4::grey, TRUE);
+                // Draw grey and an X
+                gl_rect_2d(interior, LLColor4::grey, TRUE);
-                        gl_draw_x(interior, LLColor4::black);
-                }
-                LLUICtrl::draw();
+                gl_draw_x(interior, LLColor4::black);
        }
+        LLUICtrl::draw();
 }
 void LLColorSwatchCtrl::setEnabled( BOOL enabled )
diff --git a/linden/indra/newview/llcolorswatch.h b/linden/indra/newview/llcolorswatch.h
index 1c3a08b..5db9ea5 100644
--- a/linden/indra/newview/llcolorswatch.h
+++ b/linden/indra/newview/llcolorswatch.h
@@ -66,8 +66,7 @@ public:
        ~LLColorSwatchCtrl ();
        virtual void setValue(const LLSD& value);
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_COLOR_SWATCH; }
-        virtual LLString getWidgetTag() const { return LL_COLOR_SWATCH_CTRL_TAG; }
        virtual LLSD getValue() const { return mColor.getValue(); }
        const LLColor4& get()                                                   { return mColor; }
        
@@ -85,7 +84,7 @@ public:
        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    handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+        virtual BOOL    handleUnicodeCharHere(llwchar uni_char);
        virtual void    draw();
        virtual void    setEnabled( BOOL enabled );
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
@@ -104,7 +103,7 @@ protected:
        LLUICtrlCallback mOnCancelCallback;
        LLUICtrlCallback mOnSelectCallback;
-        LLPointer<LLViewerImage> mAlphaGradientImage;
+        LLPointer<LLUIImage> mAlphaGradientImage;
 };
 #endif  // LL_LLBUTTON_H
diff --git a/linden/indra/newview/llcommandlineparser.cpp b/linden/indra/newview/llcommandlineparser.cpp
new file mode 100644
index 0000000..8123632
--- /dev/null
+++ b/linden/indra/newview/llcommandlineparser.cpp
@@ -0,0 +1,543 @@
+/**
+ * @file llcommandlineparser.cpp
+ * @brief The LLCommandLineParser class definitions
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */ 
+#include "llviewerprecompiledheaders.h"
+#include "llcommandlineparser.h"
+// *NOTE: The boost::lexical_cast generates 
+// the warning C4701(local used with out assignment) in VC7.1.
+// Disable the warning for the boost includes.
+#if _MSC_VER
+#   pragma warning(push)
+#   pragma warning( disable : 4701 )
+#else
+// NOTE: For the other platforms?
+#endif
+#include <boost/program_options.hpp>
+#include <boost/bind.hpp>
+#include<boost/tokenizer.hpp>
+#if _MSC_VER
+#   pragma warning(pop)
+#endif
+#include "llsdserialize.h"
+#include <iostream>
+#include <sstream>
+#include "llcontrol.h"
+namespace po = boost::program_options;
+// *NTOE:MEP - Currently the boost object reside in file scope. 
+// This has a couple of negatives, they are always around and 
+// there can be only one instance of each. 
+// The plus is that the boost-ly-ness of this implementation is 
+// hidden from the rest of the world. 
+// Its importatnt to realize that multiple LLCommandLineParser objects 
+// will all have this single repository of option escs and parsed options.
+// This could be good or bad, and probably won't matter for most use cases.
+namespace 
+{
+    po::options_description gOptionsDesc;
+    po::positional_options_description gPositionalOptions;
+        po::variables_map gVariableMap;
+    
+    const LLCommandLineParser::token_vector_t gEmptyValue;
+    void read_file_into_string(std::string& str, const std::basic_istream < char >& file)
+    {
+            std::ostringstream oss;
+            oss << file.rdbuf();
+            str = oss.str();
+    }
+    bool gPastLastOption = false;
+}
+class LLCLPError : public std::logic_error {
+public:
+    LLCLPError(const std::string& what) : std::logic_error(what) {}
+};
+class LLCLPLastOption : public std::logic_error {
+public:
+    LLCLPLastOption(const std::string& what) : std::logic_error(what) {}
+};
+class LLCLPValue : public po::value_semantic_codecvt_helper<char> 
+{
+    unsigned mMinTokens;
+    unsigned mMaxTokens;
+    bool mIsComposing;
+    typedef boost::function1<void, const LLCommandLineParser::token_vector_t&> notify_callback_t;
+    notify_callback_t mNotifyCallback;
+    bool mLastOption;
+public:
+    LLCLPValue() :
+        mMinTokens(0),
+        mMaxTokens(0),
+        mIsComposing(false),
+        mLastOption(false)
+        {}
+      
+    virtual ~LLCLPValue() {};
+    void setMinTokens(unsigned c) 
+    {
+        mMinTokens = c;
+    }
+    void setMaxTokens(unsigned c) 
+    {
+        mMaxTokens = c;
+    }
+    void setComposing(bool c)
+    {
+        mIsComposing = c;
+    }
+    void setLastOption(bool c)
+    {
+        mLastOption = c;
+    }
+    void setNotifyCallback(notify_callback_t f)
+    {
+        mNotifyCallback = f;
+    }
+    // Overrides to support the value_semantic interface.
+    virtual std::string name() const 
+    { 
+        const std::string arg("arg");
+        const std::string args("args");
+        return (max_tokens() > 1) ? args : arg; 
+    }
+    virtual unsigned min_tokens() const
+    {
+        return mMinTokens;
+    }
+    virtual unsigned max_tokens() const 
+    {
+        return mMaxTokens;
+    }
+    virtual bool is_composing() const 
+    {
+        return mIsComposing;
+    }
+    virtual bool apply_default(boost::any& value_store) const
+    {
+        return false; // No defaults.
+    }
+    virtual void notify(const boost::any& value_store) const
+    {
+        const LLCommandLineParser::token_vector_t* value =
+            boost::any_cast<const LLCommandLineParser::token_vector_t>(&value_store);
+        if(mNotifyCallback) 
+        {
+           mNotifyCallback(*value);
+        }
+    }
+protected:
+    void xparse(boost::any& value_store,
+         const std::vector<std::string>& new_tokens) const
+    {
+        if(gPastLastOption)
+        {
+            throw(LLCLPLastOption("Don't parse no more!"));
+        }
+        // Error checks. Needed?
+        if (!value_store.empty() && !is_composing()) 
+        {
+            throw(LLCLPError("Non composing value with multiple occurences."));
+        }
+        if (new_tokens.size() < min_tokens() || new_tokens.size() > max_tokens())
+        {
+            throw(LLCLPError("Illegal number of tokens specified."));
+        }
+        
+        if(value_store.empty())
+        {
+            value_store = boost::any(LLCommandLineParser::token_vector_t());
+        }
+        LLCommandLineParser::token_vector_t* tv = 
+            boost::any_cast<LLCommandLineParser::token_vector_t>(&value_store); 
+       
+        for(unsigned i = 0; i < new_tokens.size() && i < mMaxTokens; ++i)
+        {
+            tv->push_back(new_tokens[i]);
+        }
+        if(mLastOption)
+        {
+            gPastLastOption = true;
+        }
+    }
+};
+//----------------------------------------------------------------------------
+// LLCommandLineParser defintions
+//----------------------------------------------------------------------------
+void LLCommandLineParser::addOptionDesc(const LLString& option_name, 
+                                        boost::function1<void, const token_vector_t&> notify_callback,
+                                        unsigned int token_count,
+                                        const LLString& description,
+                                        const LLString& short_name,
+                                        bool composing,
+                                        bool positional,
+                                        bool last_option)
+{
+    // Compose the name for boost::po. 
+    // It takes the format "long_name, short name"
+    const LLString comma(",");
+    LLString boost_option_name = option_name;
+    if(short_name != LLString::null)
+    {
+        boost_option_name += comma;
+        boost_option_name += short_name;
+    }
+   
+    LLCLPValue* value_desc = new LLCLPValue();
+    value_desc->setMinTokens(token_count);
+    value_desc->setMaxTokens(token_count);
+    value_desc->setComposing(composing);
+    value_desc->setLastOption(last_option);
+    boost::shared_ptr<po::option_description> d(
+            new po::option_description(boost_option_name.c_str(), 
+                                    value_desc, 
+                                    description.c_str()));
+    if(!notify_callback.empty())
+    {
+        value_desc->setNotifyCallback(notify_callback);
+    }
+    gOptionsDesc.add(d);
+    if(positional)
+    {
+        gPositionalOptions.add(boost_option_name.c_str(), token_count);
+    }
+}
+bool LLCommandLineParser::parseAndStoreResults(po::command_line_parser& clp)
+{
+    try
+    {
+        clp.options(gOptionsDesc);
+        clp.positional(gPositionalOptions);
+        clp.style(po::command_line_style::default_style 
+                  | po::command_line_style::allow_long_disguise);
+                if(mExtraParser)
+                {
+                        clp.extra_parser(mExtraParser);
+                }
+                        
+        po::basic_parsed_options<char> opts = clp.run();
+        po::store(opts, gVariableMap);
+    }
+    catch(po::error& e)
+    {
+        llwarns << "Caught Error:" << e.what() << llendl;
+                mErrorMsg = e.what();
+        return false;
+    }
+    catch(LLCLPError& e)
+    {
+        llwarns << "Caught Error:" << e.what() << llendl;
+                mErrorMsg = e.what();
+        return false;
+    }
+    catch(LLCLPLastOption&) 
+    {
+        // Continue without parsing.
+                std::string msg = "Found tokens past last option. Ignoring.";
+        llwarns << msg << llendl;
+                mErrorMsg = msg;
+        // boost::po will have stored a mal-formed option. 
+        // All such options will be removed below.
+        for(po::variables_map::iterator i = gVariableMap.begin(); i != gVariableMap.end();)
+        {
+            po::variables_map::iterator tempI = i++;
+            if(tempI->second.empty())
+            {
+                gVariableMap.erase(tempI);
+            }
+        }
+    } 
+    return true;
+}
+bool LLCommandLineParser::parseCommandLine(int argc, char **argv)
+{
+    po::command_line_parser clp(argc, argv);
+    return parseAndStoreResults(clp);
+}
+bool LLCommandLineParser::parseCommandLineString(const std::string& str)
+{
+    // Split the string content into tokens
+    boost::escaped_list_separator<char> sep("\\", "\r\n ", "\"'");
+    boost::tokenizer< boost::escaped_list_separator<char> > tok(str, sep);
+    std::vector<std::string> tokens;
+    // std::copy(tok.begin(), tok.end(), std::back_inserter(tokens));
+    for(boost::tokenizer< boost::escaped_list_separator<char> >::iterator i = tok.begin();
+        i != tok.end();
+        ++i)
+    {
+        if(0 != i->size())
+        {
+            tokens.push_back(*i);
+        }
+    }
+    po::command_line_parser clp(tokens);
+    return parseAndStoreResults(clp);
+        
+}
+bool LLCommandLineParser::parseCommandLineFile(const std::basic_istream < char >& file)
+{
+    std::string args;
+    read_file_into_string(args, file);
+    return parseCommandLineString(args);
+}
+void LLCommandLineParser::notify()
+{
+    po::notify(gVariableMap);    
+}
+void LLCommandLineParser::printOptions() const
+{
+    for(po::variables_map::iterator i = gVariableMap.begin(); i != gVariableMap.end(); ++i)
+    {
+        std::string name = i->first;
+        token_vector_t values = i->second.as<token_vector_t>();
+        std::ostringstream oss;
+        oss << name << ": ";
+        for(token_vector_t::iterator t_itr = values.begin(); t_itr != values.end(); ++t_itr)
+        {
+            oss << t_itr->c_str() << " ";
+        }
+        llinfos << oss.str() << llendl;
+    }
+}
+std::ostream& LLCommandLineParser::printOptionsDesc(std::ostream& os) const
+{
+    return os << gOptionsDesc;
+}
+bool LLCommandLineParser::hasOption(const std::string& name) const
+{
+    return gVariableMap.count(name) > 0;
+}
+const LLCommandLineParser::token_vector_t& LLCommandLineParser::getOption(const std::string& name) const
+{
+    if(hasOption(name))
+    {
+        return gVariableMap[name].as<token_vector_t>();
+    }
+    return gEmptyValue;
+}
+//----------------------------------------------------------------------------
+// LLControlGroupCLP defintions
+//----------------------------------------------------------------------------
+void setControlValueCB(const LLCommandLineParser::token_vector_t& value, 
+                       const LLString& opt_name, 
+                       LLControlGroup* ctrlGroup)
+{
+    if(value.size() > 1)
+    {
+        llwarns << "Ignoring extra tokens mapped to the setting: " << opt_name << "." << llendl; 
+    }
+    
+    // *FIX: Do sematic conversion here.
+    // LLSD (ImplString) Is no good for doing string to type conversion for...
+    // booleans
+    // compound types
+    // ?...
+    LLControlVariable* ctrl = ctrlGroup->getControl(opt_name);
+    if(NULL != ctrl)
+    {
+        switch(ctrl->type())
+        {
+        case TYPE_BOOLEAN:
+            if(value.size() > 1)
+            {
+                llwarns << "Ignoring extra tokens." << llendl; 
+            }
+              
+            if(value.size() > 0)
+            {
+                // There's a token. check the string for true/false/1/0 etc.
+                BOOL result = false;
+                BOOL gotSet = LLString::convertToBOOL(value[0], result);
+                if(gotSet)
+                {
+                    ctrl->setValue(LLSD(result), false);
+                }
+            }
+            else
+            {
+                ctrl->setValue(LLSD(true), false);
+            }
+            break;
+        default:
+            {
+                // For the default types, let llsd do the conversion.
+                if(value.size() > 1)
+                {
+                    // Assume its an array...
+                    LLSD llsdArray;
+                    for(unsigned int i = 0; i < value.size(); ++i)
+                    {
+                        LLSD llsdValue;
+                        llsdValue.assign(LLSD::String(value[i]));
+                        llsdArray.set(i, llsdValue);
+                    }
+                    ctrl->setValue(llsdArray, false);
+                }
+                else if(value.size() > 0)
+                {
+                    LLSD llsdValue;
+                    llsdValue.assign(LLSD::String(value[0]));
+                    ctrl->setValue(llsdValue, false);
+                }
+            }
+            break;
+        }
+    }
+    else
+    {
+        llwarns << "Command Line option mapping '" 
+            << opt_name 
+            << "' not found! Ignoring." 
+            << llendl;
+    }
+}
+void LLControlGroupCLP::configure(const LLString& config_filename, LLControlGroup* controlGroup)
+{
+    // This method reads the llsd based config file, and uses it to set 
+    // members of a control group.
+    LLSD clpConfigLLSD;
+    
+    llifstream input_stream;
+    input_stream.open(config_filename.c_str(), std::ios::in | std::ios::binary);
+    if(input_stream.is_open())
+    {
+        LLSDSerialize::fromXML(clpConfigLLSD, input_stream);
+        for(LLSD::map_iterator option_itr = clpConfigLLSD.beginMap(); 
+            option_itr != clpConfigLLSD.endMap(); 
+            ++option_itr)
+        {
+            LLSD::String long_name = option_itr->first;
+            LLSD option_params = option_itr->second;
+            
+            LLString desc("n/a");
+            if(option_params.has("desc"))
+            {
+                desc = option_params["desc"].asString();
+            }
+            
+            LLString short_name = LLString::null;
+            if(option_params.has("short"))
+            {
+                short_name = option_params["short"].asString();
+            }
+            unsigned int token_count = 0;
+            if(option_params.has("count"))
+            {
+                token_count = option_params["count"].asInteger();
+            }
+            bool composing = false;
+            if(option_params.has("compose"))
+            {
+                composing = option_params["compose"].asBoolean();
+            }
+            bool positional = false;
+            if(option_params.has("positional"))
+            {
+                positional = option_params["positional"].asBoolean();
+            }
+            bool last_option = false;
+            if(option_params.has("last_option"))
+            {
+                last_option = option_params["last_option"].asBoolean();
+            }
+            boost::function1<void, const token_vector_t&> callback;
+            if(option_params.has("map-to") && (NULL != controlGroup))
+            {
+                LLString controlName = option_params["map-to"].asString();
+                callback = boost::bind(setControlValueCB, _1, 
+                                       controlName, controlGroup);
+            }
+            this->addOptionDesc(
+                long_name, 
+                callback,
+                token_count, 
+                desc, 
+                short_name, 
+                composing,
+                positional,
+                last_option);
+        }
+    }
+}
diff --git a/linden/indra/newview/llcommandlineparser.h b/linden/indra/newview/llcommandlineparser.h
new file mode 100644
index 0000000..e281871
--- /dev/null
+++ b/linden/indra/newview/llcommandlineparser.h
@@ -0,0 +1,166 @@
+/** 
+ * @file llcommandlineparser.h
+ * @brief LLCommandLineParser class declaration
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LL_LLCOMMANDLINEPARSER_H
+#define LL_LLCOMMANDLINEPARSER_H
+#include <boost/function/function1.hpp>
+// *NOTE:Mani The following is a forward decl of 
+// boost::program_options::command_line_parser
+// "yay" c++!
+namespace boost
+{
+        namespace program_options
+        {
+                template <class charT> class basic_command_line_parser;
+                typedef basic_command_line_parser<char> command_line_parser;
+        }
+}
+/** 
+ * @class LLCommandLineParser
+ * @brief Handle defining and parsing the command line.
+ */
+class LLCommandLineParser
+{
+public:
+        typedef std::vector< std::string > token_vector_t;
+        
+        /**
+         * @brief Add a value-less option to the command line description.
+         * @param option_name The long name of the cmd-line option. 
+         * @param description The text description of the option usage.
+         */
+        void addOptionDesc(
+                                           const LLString& option_name, 
+                                           boost::function1<void, const token_vector_t&> notify_callback = 0,
+                                           unsigned int num_tokens = 0,
+                                           const LLString& description = LLString::null,
+                                           const LLString& short_name = LLString::null,
+                                           bool composing = false,
+                                           bool positional = false,
+                                           bool last_option = false);
+        
+        /** 
+         * @brief Parse the command line given by argc/argv.
+         */
+        bool parseCommandLine(int argc, char **argv);
+        
+        /** 
+         * @brief Parse the command line contained by the given file.
+         */
+        bool parseCommandLineString(const std::string& str);
+        
+        /** 
+         * @brief Parse the command line contained by the given file.
+         */
+        bool parseCommandLineFile(const std::basic_istream< char >& file);
+        
+        /** 
+         * @brief Call callbacks associated with option descriptions.
+         * 
+         * Use this to handle the results of parsing. 
+         */
+        void notify();
+        
+        /** @brief Print a description of the configured options.
+         *
+         * Use this to print a description of options to the
+         * given ostream. Useful for displaying usage info.
+         */
+        std::ostream& printOptionsDesc(std::ostream& os) const;
+        
+        /** @brief Manual option setting accessors.
+         * 
+         * Use these to retrieve get the values set for an option.
+         * getOption will return an empty value if the option isn't
+         * set. 
+         */
+        bool hasOption(const std::string& name) const;
+        const token_vector_t& getOption(const std::string& name) const;
+        
+        /** @brief Print the list of configured options.
+         */
+        void printOptions() const;
+        
+        /** @bried Get the error message, if it exists.
+         */
+        const std::string& getErrorMessage() const { return mErrorMsg; }
+        
+        /** @brief Add a custom parser func to the parser.
+         *  
+         * Use this method to add a custom parser for parsing values
+         * the the simple parser may not handle.
+         * it will be applied to each parameter before the
+         * default parser gets a chance.
+         * The parser_func takes an input string, and should return a
+         * name/value pair as the result.
+         */
+        typedef boost::function1<std::pair<std::string, std::string>, const std::string&> parser_func;
+        void setCustomParser(parser_func f) { mExtraParser = f; }
+        
+private:
+        bool parseAndStoreResults(boost::program_options::command_line_parser& clp);
+        std::string mErrorMsg;
+        parser_func mExtraParser;
+};
+inline std::ostream& operator<<(std::ostream& out, const LLCommandLineParser& clp)
+{
+    return clp.printOptionsDesc(out);
+}
+class LLControlGroup; 
+/** 
+ * @class LLControlGroupCLP
+ * @brief Uses the CLP to configure an LLControlGroup
+ *
+ * 
+ */
+class LLControlGroupCLP : public LLCommandLineParser
+{
+public:
+        /**
+         * @brief Configure the command line parser according the given config file.
+         *
+         * @param config_filename The name of the XML based LLSD config file. 
+         * @param clp A reference to the command line parser object to configure.
+         *
+         * *FIX:Mani Specify config file format.
+         */
+        void configure(const LLString& config_filename, 
+                                   LLControlGroup* controlGroup);
+};
+#endif // LL_LLCOMMANDLINEPARSER_H
diff --git a/linden/indra/newview/llcompilequeue.cpp b/linden/indra/newview/llcompilequeue.cpp
index 8e1ba81..aeaa189 100644
--- a/linden/indra/newview/llcompilequeue.cpp
+++ b/linden/indra/newview/llcompilequeue.cpp
@@ -56,7 +56,7 @@
 #include "lldir.h"
 #include "llfloaterchat.h"
 #include "llviewerstats.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
@@ -106,7 +106,7 @@ LLFloaterScriptQueue::LLFloaterScriptQueue(const std::string& name,
                          DRAG_ON_TOP, MINIMIZE_YES, CLOSE_YES)
 {
-        gUICtrlFactory->buildFloater(this,"floater_script_queue.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_queue.xml");
        childSetAction("close",onCloseBtn,this);
        childSetEnabled("close",FALSE);
@@ -201,7 +201,7 @@ BOOL LLFloaterScriptQueue::start()
        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");
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
        list->addCommentText(buffer);
        return nextObject();
@@ -235,7 +235,7 @@ BOOL LLFloaterScriptQueue::nextObject()
        if(isDone() && !mDone)
        {
                
-                LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "queue output");
+                LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
                mDone = TRUE;
                char buffer[MAX_STRING];                /*Flawfinder: ignore*/
@@ -412,10 +412,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
        }
        else
        {
-                if( gViewerStats )
+                LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                {
-                        gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                }
                if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status )
                {
@@ -442,7 +439,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
        }
        if(queue) 
        {
-                LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(queue, "queue output");
+                LLScrollListCtrl* list = queue->getChild<LLScrollListCtrl>("queue output");
                list->addCommentText(buffer);
        }
        delete data;
@@ -621,7 +618,7 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
                        if (object)
                        {
                                LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
-                                LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "queue output");
+                                LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
                                char buffer[MAX_STRING];                 /*Flawfinder: ignore*/
                                snprintf(buffer, sizeof(buffer), "Resetting '%s'.", item->getName().c_str());                   /* Flawfinder: ignore */
                                list->addCommentText(buffer);
@@ -684,7 +681,7 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
                        if (object)
                        {
                                LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
-                                LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "queue output");
+                                LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
                                char buffer[MAX_STRING];        /*Flawfinder: ignore*/
                                snprintf(buffer, sizeof(buffer), "Running '%s'.", item->getName().c_str());                     /* Flawfinder: ignore */
                                list->addCommentText(buffer);
@@ -749,7 +746,7 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj,
                        if (object)
                        {
                                LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
-                                LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "queue output");
+                                LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
                                char buffer[MAX_STRING];                 /*Flawfinder: ignore*/
                                snprintf(buffer, sizeof(buffer), "Not running '%s'.", item->getName().c_str());         /* Flawfinder: ignore */
                                list->addCommentText(buffer);
diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp
index 79ab8cc..517e06f 100644
--- a/linden/indra/newview/llconsole.cpp
+++ b/linden/indra/newview/llconsole.cpp
@@ -76,16 +76,6 @@ LLConsole::~LLConsole()
        mColors.clear();
 }
-EWidgetType LLConsole::getWidgetType() const
-{
-        return WIDGET_TYPE_CONSOLE;
-}
-LLString LLConsole::getWidgetTag() const
-{
-        return LL_CONSOLE_TAG;
-}
 void LLConsole::setLinePersistTime(F32 seconds)
 {
        mLinePersistTime = seconds;
@@ -172,12 +162,11 @@ void LLConsole::draw()
        }
        else
        {
-                LLUUID image_id;
+                LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
-                image_id.set(gViewerArt.getString("rounded_square.tga"));
-                LLViewerImage* imagep = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
                F32 console_opacity = llclamp(gSavedSettings.getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
-                LLColor4 color(0.f, 0.f, 0.f, console_opacity);
+                LLColor4 color = gColors.getColor("ConsoleBackground");
+                color.mV[VALPHA] *= console_opacity;
                S32 max_width = 0;
                for (i = 0; i < line_count; i++)
@@ -191,8 +180,7 @@ void LLConsole::draw()
                S32 target_width = max_width;
                mLastBoxHeight = llmax(target_height, (S32)lerp((F32)mLastBoxHeight, (F32)target_height, u));
                mLastBoxWidth = llmax(MIN_CONSOLE_WIDTH, llmax(target_width, (S32)lerp((F32)mLastBoxWidth, (F32)target_width, u)));
-                gl_draw_scaled_image_with_border(-15, -10, 16, 16, mLastBoxWidth + 15, mLastBoxHeight,
+                imagep->drawSolid(-15, -10, mLastBoxWidth + 15, mLastBoxHeight, color);
-                                                                imagep, color, TRUE );
        }
        y_pos += (line_count-1) * mFont->getLineHeight();
diff --git a/linden/indra/newview/llconsole.h b/linden/indra/newview/llconsole.h
index 9b50b83..04d8600 100644
--- a/linden/indra/newview/llconsole.h
+++ b/linden/indra/newview/llconsole.h
@@ -71,8 +71,6 @@ public:
                S32 font_size_index, F32 persist_time );
        virtual ~LLConsole();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        // each line lasts this long after being added
        void                    setLinePersistTime(F32 seconds);
diff --git a/linden/indra/newview/llcontainerview.cpp b/linden/indra/newview/llcontainerview.cpp
index 53c8e92..730da17 100644
--- a/linden/indra/newview/llcontainerview.cpp
+++ b/linden/indra/newview/llcontainerview.cpp
@@ -39,12 +39,15 @@
 #include "llui.h"
 #include "llresmgr.h"
 #include "llstring.h"
+#include "llscrollcontainer.h"
 LLContainerView::LLContainerView(const std::string& name, const LLRect& rect)
 :       LLView(name, rect, FALSE)
 {
+        mShowLabel = TRUE;
        mCollapsible = TRUE;
        mDisplayChildren = TRUE;
+        mScrollContainer = NULL;
 }
 LLContainerView::~LLContainerView()
@@ -52,77 +55,107 @@ LLContainerView::~LLContainerView()
        // Children all cleaned up by default view destructor.
 }
-EWidgetType LLContainerView::getWidgetType() const
-{
-        return WIDGET_TYPE_CONTAINER_VIEW;
-}
-LLString LLContainerView::getWidgetTag() const
-{
-        return LL_CONTAINER_VIEW_TAG;
-}
 BOOL LLContainerView::handleMouseDown(S32 x, S32 y, MASK mask)
 {
        BOOL handled = FALSE;
        if (mDisplayChildren)
        {
-                handled = LLView::childrenHandleMouseDown(x, y, mask) != NULL;
+                handled = (LLView::childrenHandleMouseDown(x, y, mask) != NULL);
        }
        if (!handled)
        {
-                if( mCollapsible && (y >= getRect().getHeight() - 10) )
+                if( mCollapsible && mShowLabel && (y >= getRect().getHeight() - 10) )
                {
                        setDisplayChildren(!mDisplayChildren);
                        reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
+                        handled = TRUE;
                }
        }
-        return TRUE;
+        return handled;
 }
 BOOL LLContainerView::handleMouseUp(S32 x, S32 y, MASK mask)
 {
+        BOOL handled = FALSE;
        if (mDisplayChildren)
        {
-                LLView::childrenHandleMouseUp(x, y, mask);
+                handled = (LLView::childrenHandleMouseUp(x, y, mask) != NULL);
        }
-        return TRUE;
+        return handled;
 }
 void LLContainerView::draw()
 {
-        if (!getVisible())
-        {
-                return;
-        }
        {
                LLGLSNoTexture gls_no_texture;
                gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, LLColor4(0.f, 0.f, 0.f, 0.25f));
        }
                
-        // Draw the label.
+        // Draw the label
-        gResMgr->getRes( LLFONT_OCRA )->renderUTF8(mLabel, 0, 2, getRect().getHeight() - 2, LLColor4(1,1,1,1), LLFontGL::LEFT, LLFontGL::TOP);
+        if (mShowLabel)
+        {
+                LLResMgr::getInstance()->getRes( LLFONT_OCRA )->renderUTF8(mLabel, 0, 2, getRect().getHeight() - 2, LLColor4(1,1,1,1), LLFontGL::LEFT, LLFontGL::TOP);
+        }
        LLView::draw();
 }
 void LLContainerView::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
+        S32 desired_width = width;
+        S32 desired_height = height;
+        if (mScrollContainer)
+        {
+                BOOL dum_bool;
+                mScrollContainer->calcVisibleSize(&desired_width, &desired_height, &dum_bool, &dum_bool);
+        }
+        else
+        {
+                // if we're uncontained - make height as small as possible
+                desired_height = 0;
+        }
+        arrange(desired_width, desired_height, called_from_parent);
+        // sometimes, after layout, our container will change size (scrollbars popping in and out)
+        // if so, attempt another layout
+        if (mScrollContainer)
+        {
+                S32 new_container_width;
+                S32 new_container_height;
+                BOOL dum_bool;
+                mScrollContainer->calcVisibleSize(&new_container_width, &new_container_height, &dum_bool, &dum_bool);
+                if ((new_container_width != desired_width) ||
+                        (new_container_height != desired_height))  // the container size has changed, attempt to arrange again
+                {
+                        arrange(new_container_width, new_container_height, called_from_parent);
+                }
+        }
+}
+void LLContainerView::arrange(S32 width, S32 height, BOOL called_from_parent)
+{
        // Determine the sizes and locations of all contained views
-        U32 total_height = 0;
+        S32 total_height = 0;
-        U32 top, left, right, bottom;
+        S32 top, left, right, bottom;
        //LLView *childp;
        // These will be used for the children
        left = 4;
        top = getRect().getHeight() - 4;
-        right = getRect().getWidth() - 2;
+        right = width - 2;
        bottom = top;
        
        // Leave some space for the top label/grab handle
-        total_height += 20;
+        if (mShowLabel)
+        {
+                total_height += 20;
+        }
        if (mDisplayChildren)
        {
@@ -142,7 +175,9 @@ void LLContainerView::reshape(S32 width, S32 height, BOOL called_from_parent)
                }
                total_height += child_height;
        }
-        
+        if (total_height < height)
+                total_height = height;
        
        if (followsTop())
        {
@@ -157,7 +192,12 @@ void LLContainerView::reshape(S32 width, S32 height, BOOL called_from_parent)
        // HACK: casting away const. Should use setRect or some helper function instead.
                const_cast<LLRect&>(getRect()).mRight = getRect().mLeft + width;
-        top = total_height - 20;
+        top = total_height;
+        if (mShowLabel)
+                {
+                        top -= 20;
+                }
+        
        bottom = top;
        if (mDisplayChildren)
@@ -184,6 +224,7 @@ void LLContainerView::reshape(S32 width, S32 height, BOOL called_from_parent)
                        getParent()->reshape(getParent()->getRect().getWidth(), getParent()->getRect().getHeight(), FALSE);
                }
        }
 }
 LLRect LLContainerView::getRequiredRect()
@@ -196,10 +237,14 @@ LLRect LLContainerView::getRequiredRect()
        // Leave some space for the top label/grab handle
-        if (mDisplayChildren)
+        if (mShowLabel)
        {
                total_height = 20;
+        }
                
+        if (mDisplayChildren)
+        {
                // Determine total height
                U32 child_height = 0;
                for (child_list_const_iter_t child_iter = getChildList()->begin();
@@ -213,11 +258,6 @@ LLRect LLContainerView::getRequiredRect()
                total_height += child_height;
        }
-        else
-        {
-                total_height = 20;
-        }
        req_rect.mTop = total_height;
        return req_rect;
 }
diff --git a/linden/indra/newview/llcontainerview.h b/linden/indra/newview/llcontainerview.h
index f47d685..62222b5 100644
--- a/linden/indra/newview/llcontainerview.h
+++ b/linden/indra/newview/llcontainerview.h
@@ -36,6 +36,8 @@
 #include "lltextbox.h"
 #include "llstatbar.h"
+class LLScrollableContainerView;
 class LLContainerView : public LLView
 {
 protected:
@@ -47,9 +49,6 @@ public:
        LLContainerView(const std::string& name, const LLRect& rect);
        ~LLContainerView();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
        virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
@@ -58,7 +57,14 @@ public:
        virtual LLRect getRequiredRect();       // Return the height of this object, given the set options.
        void setLabel(const LLString& label);
+        void showLabel(BOOL show) { mShowLabel = show; }
        void setDisplayChildren(const BOOL displayChildren);
        BOOL getDisplayChildren() { return mDisplayChildren; }
+        void setScrollContainer(LLScrollableContainerView* scroll) {mScrollContainer = scroll;}
+ private:
+        LLScrollableContainerView* mScrollContainer;
+        void arrange(S32 width, S32 height, BOOL called_from_parent = TRUE);
+        BOOL mShowLabel;
 };
 #endif // LL_CONTAINERVIEW_
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
deleted file mode 100644
index 7534fd5..0000000
--- a/linden/indra/newview/llcontroldef.cpp
+++ /dev/null
@@ -1,2159 +0,0 @@
-/** 
- * @file llcontroldef.cpp
- * @author James Cook
- * @brief Viewer control settings
- *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-// Put default viewer settings in here
-#include "llviewerprecompiledheaders.h"
-#include "llviewercontrol.h"
-#include "indra_constants.h"
-#include "v3math.h"
-#include "v3dmath.h"
-#include "llrect.h"
-#include "v4color.h"
-#include "v4coloru.h"
-#include "v3color.h"
-#include "llfirstuse.h"
-// For Listeners
-#include "audioengine.h"
-#include "llagent.h"
-#include "llconsole.h"
-#include "lldrawpoolterrain.h"
-#include "llflexibleobject.h"
-#include "llfeaturemanager.h"
-#include "llglslshader.h"
-#include "llpanelgeneral.h"
-#include "llpanelinput.h"
-#include "llsky.h"
-#include "llvieweraudio.h"
-#include "llviewerimagelist.h"
-#include "llviewerthrottle.h"
-#include "llviewerwindow.h"
-#include "llvoavatar.h"
-#include "llvosurfacepatch.h"
-#include "llvosky.h"
-#include "llvowlsky.h"
-#include "llvotree.h"
-#include "llvovolume.h"
-#include "llworld.h"
-#include "pipeline.h"
-#include "llviewerjoystick.h"
-#include "llviewerparcelmgr.h"
-#include "llparcel.h"
-#include "llnotify.h"
-#include "llkeyboard.h"
-#include "llglimmediate.h"
-extern BOOL gResizeScreenTexture;
-void declare_settings()
-{
-        // Somewhat under 1024 by 768, to give space for Windows task bar / Mac menu bar
-        // to emphasize window isn't actually maximized.
-        const S32 WINDOW_WIDTH = 1000;
-        const S32 WINDOW_HEIGHT = 700;
-        //------------------------------------------------------------------------
-        // Color constants
-        //------------------------------------------------------------------------
-        const S32 TOOL_PANEL_HEIGHT = 162 + 32;
-        const S32 TOOL_PANEL_WIDTH = 75 + 8;
-        // Colors that can be changed in the UI
-        gSavedSettings.declareColor4("EffectColor", LLColor4(1.f, 1.f, 1.f, 1.f), "Particle effects color");
-        gSavedSettings.declareColor4("SystemChatColor", LLColor4(0.8f, 1.f, 1.f, 1.f), "Color of chat messages from SL System");
-        gSavedSettings.declareColor4("AgentChatColor",  LLColor4(1.0f, 1.0f, 1.0f, 1.0f), "Color of chat messages from other residents");
-        gSavedSettings.declareColor4("ObjectChatColor", LLColor4(0.7f, 0.9f, 0.7f, 1.0f), "Color of chat messages from objects");
-        gSavedSettings.declareColor4("llOwnerSayChatColor",     LLColor4(0.99f, 0.99f, 0.69f, 1.0f), "Color of chat messages from objects only visible to the owner");
-        gSavedSettings.declareColor4("BackgroundChatColor",     LLColor4(0.f, 0.f, 0.f, 1.0f), "Color of chat bubble background");
-        gSavedSettings.declareColor4("ScriptErrorColor",        LLColor4(0.82f, 0.82f, 0.99f, 1.0f), "Color of script error messages");
-        gSavedSettings.declareColor4("HTMLLinkColor",   LLColor4(0.6f, 0.6f, 1.0f, 1.0f), "Color of hyperlinks");
-        
-        // color palette in color picker
-        gSavedSettings.declareColor4("ColorPaletteEntry01", LLColor4 ( 0.0f, 0.0f, 0.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry02", LLColor4 ( 0.5f, 0.5f, 0.5f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry03", LLColor4 ( 0.5f, 0.0f, 0.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry04", LLColor4 ( 0.5f, 0.5f, 0.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry05", LLColor4 ( 0.0f, 0.5f, 0.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry06", LLColor4 ( 0.0f, 0.5f, 0.5f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry07", LLColor4 ( 0.0f, 0.0f, 0.5f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry08", LLColor4 ( 0.5f, 0.0f, 0.5f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry09", LLColor4 ( 0.5f, 0.5f, 0.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry10", LLColor4 ( 0.0f, 0.25f, 0.25f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry11", LLColor4 ( 0.0f, 0.5f, 1.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry12", LLColor4 ( 0.0f, 0.25f, 0.5f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry13", LLColor4 ( 0.5f, 0.0f, 1.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry14", LLColor4 ( 0.5f, 0.25f, 0.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry15", LLColor4 ( 1.0f, 1.0f, 1.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry16", LLColor4 ( 1.0f, 1.0f, 1.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry17", LLColor4 ( 1.0f, 1.0f, 1.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry18", LLColor4 ( 0.75f, 0.75f, 0.75f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry19", LLColor4 ( 1.0f, 0.0f, 0.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry20", LLColor4 ( 1.0f, 1.0f, 0.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry21", LLColor4 ( 0.0f, 1.0f, 0.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry22", LLColor4 ( 0.0f, 1.0f, 1.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry23", LLColor4 ( 0.0f, 0.0f, 1.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry24", LLColor4 ( 1.0f, 0.0f, 1.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry25", LLColor4 ( 1.0f, 1.0f, 0.5f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry26", LLColor4 ( 0.0f, 1.0f, 0.5f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry27", LLColor4 ( 0.5f, 1.0f, 1.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry28", LLColor4 ( 0.5f, 0.5f, 1.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry29", LLColor4 ( 1.0f, 0.0f, 0.5f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry30", LLColor4 ( 1.0f, 0.5f, 0.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry31", LLColor4 ( 1.0f, 1.0f, 1.0f, 1.0f ), "Color picker palette entry");
-        gSavedSettings.declareColor4("ColorPaletteEntry32", LLColor4 ( 1.0f, 1.0f, 1.0f, 1.0f ), "Color picker palette entry");
-        //------------------------------------------------------------------------
-        // Main menu
-        //------------------------------------------------------------------------
-        gSavedSettings.declareS32("MenuBarHeight", 18, "", NO_PERSIST );
-        gSavedSettings.declareS32("MenuBarWidth", 410, "", NO_PERSIST );
-        gSavedSettings.declareF32("MenuAccessKeyTime", 0.25f, "Time (seconds) in which the menu key must be tapped to move focus to the menu bar");
-        gSavedSettings.declareBOOL("UseAltKeyForMenus", FALSE, "Access menus via keyboard by tapping Alt");
-        // Which background overlay to use
-        gSavedSettings.declareS32("MapOverlayIndex", 0, "Currently selected world map type");
-        //------------------------------------------------------------------------
-        // Pie Menus
-        //------------------------------------------------------------------------
-        gSavedSettings.declareF32("PieMenuLineWidth", 2.5f, "Width of lines in pie menu display (pixels)");
-        //------------------------------------------------------------------------
-        // Drop Shadows
-        //------------------------------------------------------------------------
-        gSavedSettings.declareS32("DropShadowButton",   2, "Drop shadow width for buttons (pixels)");
-        gSavedSettings.declareS32("DropShadowFloater",  5, "Drop shadow width for floaters (pixels)");
-        gSavedSettings.declareS32("DropShadowSlider",   3, "Drop shadow width for sliders (pixels)");
-        gSavedSettings.declareS32("DropShadowTooltip",  4, "Drop shadow width for tooltips (pixels)");
-        //------------------------------------------------------------------------
-        // Buttons
-        //------------------------------------------------------------------------
-        gSavedSettings.declareS32("ButtonHPad", 10, "Default horizontal spacing between buttons (pixels)");             // space from left of button to text
-        gSavedSettings.declareS32("ButtonVPad", 1, "Default vertical spacing between buttons (pixels)");                // space from bottom of button to text
-        gSavedSettings.declareS32("ButtonHeightSmall", 16, "Default height for small buttons (pixels)");
-        gSavedSettings.declareS32("ButtonHeight", 20, "Default height for normal buttons (pixels)");
-        gSavedSettings.declareF32("ButtonFlashRate", 2.f, "Frequency at which buttons flash (hz)");
-        gSavedSettings.declareS32("ButtonFlashCount", 3, "Number of flashes after which flashing buttons stay lit up");
-        //gSavedSettings.declareS32("ButtonHeightToolbar", 32, "[NOT USED]");
-        //gSavedSettings.declareS32("DefaultButtonWidth", DEFAULT_BUTTON_WIDTH, "[NOT USED]");
-        //gSavedSettings.declareS32("DefaultButtonHeight", DEFAULT_BUTTON_HEIGHT, "[NOT USED]");
-        //------------------------------------------------------------------------
-        // Scroll Lists
-        //------------------------------------------------------------------------
-        gSavedSettings.declareF32("TypeAheadTimeout", 1.5f, "Time delay before clearing type-ahead buffer in lists (seconds)");
-        //------------------------------------------------------------------------
-        // ToolTips
-        //------------------------------------------------------------------------
-        gSavedSettings.declareF32("ToolTipDelay", 0.7f, "Seconds before displaying tooltip when mouse stops over UI element");
-        gSavedSettings.declareF32("DragAndDropToolTipDelay", 0.1f, "Seconds before displaying tooltip when performing drag and drop operation");
-        //------------------------------------------------------------------------
-        // Auto-Open Folders
-        //------------------------------------------------------------------------
-        gSavedSettings.declareF32("FolderAutoOpenDelay", 0.75f, "Seconds before automatically expanding the folder under the mouse when performing inventory drag and drop");
-        gSavedSettings.declareF32("InventoryAutoOpenDelay", 1.f, "Seconds before automatically opening inventory when mouse is over inventory button when performing inventory drag and drop");
-        gSavedSettings.declareBOOL("ShowEmptyFoldersWhenSearching", FALSE, "Shows folders that do not have any visible contents when applying a filter to inventory");
-        gSavedSettings.declareS32("FilterItemsPerFrame", 500, "Maximum number of inventory items to match against search filter every frame (lower to increase framerate while searching, higher to improve search speed)");
-        gSavedSettings.declareBOOL("DebugInventoryFilters", FALSE, "Turn on debugging display for inventory filtering");
-        gSavedSettings.declareF32("FolderLoadingMessageWaitTime", 0.5f, "Seconds to wait before showing the LOADING... text in folder views");
-        //------------------------------------------------------------------------
-        // Status bar
-        //------------------------------------------------------------------------
-        gSavedSettings.declareS32("StatusBarHeight", 26, "Height of menu/status bar at top of screen (pixels)" );
-        //gSavedSettings.declareS32("StatusBarButtonWidth", 80, "[NOT USED]");
-        gSavedSettings.declareS32("StatusBarPad", 10, "Spacing between popup buttons at bottom of screen (Stand up, Release Controls)");
-        //gSavedSettings.declareS32("ChatWidth", 250, "[NOT USED]");
-        //------------------------------------------------------------------------
-        // Toolbar bar
-        //------------------------------------------------------------------------
-        //gSavedSettings.declareS32("ToolBarHeight", 20, "[NOT USED]" );
-        //gSavedSettings.declareS32("ToolBarWidth", 480, "[NOT USED]" );
-        //gSavedSettings.declareS32("ToolBarButtonWidth", 80, "[NOT USED]" );
-        //------------------------------------------------------------------------
-        // Fonts
-        //------------------------------------------------------------------------
-        gSavedSettings.declareF32("FontScreenDPI",      96.f, "Font resolution, higher is bigger (pixels per inch)");           // windows standard
-        gSavedSettings.declareF32("FontSizeMonospace", 9.f, "Size of monospaced font (points, or 1/72 of an inch)");
-        gSavedSettings.declareF32("FontSizeSmall",      9.f, "Size of small font (points, or 1/72 of an inch)");
-        gSavedSettings.declareF32("FontSizeMedium",     10.f, "Size of medium font (points, or 1/72 of an inch)");
-        gSavedSettings.declareF32("FontSizeLarge",      12.f, "Size of large font (points, or 1/72 of an inch)");
-        gSavedSettings.declareF32("FontSizeHuge",       16.f, "Size of huge font (points, or 1/72 of an inch)");
-        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
-        // 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".
-        // The third filename is in UTF8, but it shows up in the font menu as "STHeiti Light"
-        gSavedSettings.declareString("FontSansSerifFallback",   "\xE3\x83\x92\xE3\x83\xA9\xE3\x82\xAD\xE3\x82\x99\xE3\x83\x8E\xE8\xA7\x92\xE3\x82\xB3\xE3\x82\x99 Pro W3.otf;\xE3\x83\x92\xE3\x83\xA9\xE3\x82\xAD\xE3\x82\x99\xE3\x83\x8E\xE8\xA7\x92\xE3\x82\xB3\xE3\x82\x99 ProN W3.otf;AppleGothic.dfont;AppleGothic.ttf;\xe5\x8d\x8e\xe6\x96\x87\xe7\xbb\x86\xe9\xbb\x91.ttf", "Name of san-serif font (Truetype file name)");
-#else
-        // 'unicode.ttf' doesn't exist, but hopefully an international
-        // user can take the hint and drop in their favourite local font.
-        gSavedSettings.declareString("FontSansSerifFallback",   "unicode.ttf", "Name of fallback san-serif font (Truetype file name)");
-#endif
-        gSavedSettings.declareF32("FontSansSerifFallbackScale", 1.0, "Scale of fallback font relative to huge font (fraction of huge font size)");
-        gSavedSettings.declareString("FontSansSerifBold",       "MtBdLfRg.ttf", "Name of bold font (Truetype file name)");
-        //------------------------------------------------------------------------
-        // Chat
-        //------------------------------------------------------------------------
-        // 0 = small, 1 = big
-        gSavedSettings.declareS32("ChatFontSize", 1, "Size of chat text in chat console (0 = small, 1 = big)");
-        // Does the console occupy full window width or only left 2/3?
-        gSavedSettings.declareBOOL("ChatFullWidth", TRUE, "Chat console takes up full width of SL window");
-        // opacity of console background
-        gSavedSettings.declareF32("ConsoleBackgroundOpacity", 0.4f, "Opacity of chat console (0.0 = completely transparent, 1.0 = completely opaque)");
-        gSavedSettings.declareS32("ConsoleMaxLines", 40, "Max number of lines of chat text visible in console.");
-        // Seconds to keep line of text on console
-        gSavedSettings.declareF32("ChatPersistTime", 15.f, "Time for which chat stays visible in console (seconds)");
-        gSavedSettings.declareBOOL("PlayTypingAnim", TRUE, "Your avatar plays the typing animation whenever you type in the chat bar");
-        // show chat in bubbles above avatar heads
-        gSavedSettings.declareBOOL("UseChatBubbles", FALSE, "Show chat above avatars head in chat bubbles");
-        gSavedSettings.declareF32("ChatBubbleOpacity", 0.5f, "Opacity of chat bubble background (0.0 = completely transparent, 1.0 = completely opaque)");
-        gSavedSettings.declareBOOL("AllowIdleAFK", TRUE, "Automatically set AFK (away from keyboard) mode when idle");
-        gSavedSettings.declareF32("AFKTimeout", 300.f, "Time before automatically setting AFK (away from keyboard) mode (seconds)");    // 5 minutes
-        gSavedSettings.declareBOOL("SmallAvatarNames", TRUE, "Display avatar name text in smaller font");
-        gSavedSettings.declareBOOL("ScriptErrorsAsChat", FALSE, "Display script errors and warning in chat history");
-        gSavedSettings.declareBOOL("ChatShowTimestamps", TRUE, "Show timestamps in chat");
-        gSavedSettings.declareBOOL("EnableVoiceChat", TRUE, "Enable talking to other residents with a microphone");
-        gSavedSettings.declareBOOL("VoiceCallsFriendsOnly", FALSE, "Only accept voice calls from residents on your friends list");
-        gSavedSettings.declareBOOL("PTTCurrentlyEnabled", TRUE, "", NO_PERSIST);
-        gSavedSettings.declareBOOL("ShowVoiceChannelPopup", FALSE, "Controls visibility of the current voice channel popup above the voice tab");
-        gSavedSettings.declareBOOL("EnablePushToTalk", TRUE, "Must hold down a key or moouse button when talking into your microphone");
-        gSavedSettings.declareString("PushToTalkButton", "MiddleMouse", "Which button or keyboard key is used for push-to-talk");
-        gSavedSettings.declareBOOL("PushToTalkToggle", FALSE, "Should the push-to-talk button behave as a toggle");
-        gSavedSettings.declareS32("VoiceEarLocation", 0, "Location of the virtual ear for voice");
-        gSavedSettings.declareString("VivoxDebugServerName", "bhd.vivox.com", "Hostname of the vivox account server to use for voice when not connected to Agni.");
-        gSavedSettings.declareColor4("SpeakingColor", LLColor4(0.f, 1.f, 0.f, 1.f), "Color of various indicators when resident is speaking on a voice channel.");
-        gSavedSettings.declareColor4("OverdrivenColor", LLColor4(1.f, 0.f, 0.f, 1.f), "Color of various indicators when resident is speaking too loud.");
-        gSavedSettings.declareString("VoiceInputAudioDevice", "Default", "Audio input device to use for voice");
-        gSavedSettings.declareString("VoiceOutputAudioDevice", "Default", "Audio output device to use for voice");
-        gSavedSettings.declareString("VivoxDebugLevel", "-1", "Logging level to use when launching the vivox daemon");
-        //voice amplitude images;
-        
-        /*
-        gSavedSettings.declareString("VoiceImageLevel0", "5b41b4c3-eb70-0f0f-17d9-1765cbd07d39", "Texture UUID for voice image level 0");       
-        gSavedSettings.declareString("VoiceImageLevel1", "b06ffd0a-7bfe-0449-0bbc-df291f1857c4", "Texture UUID for voice image level 1");
-        gSavedSettings.declareString("VoiceImageLevel2", "bfa16494-b731-5b59-3260-9e4fd29d63f7", "Texture UUID for voice image level 2");
-        gSavedSettings.declareString("VoiceImageLevel3", "6951074f-de1d-3c55-cb2f-e972877f7f81", "Texture UUID for voice image level 3");
-        gSavedSettings.declareString("VoiceImageLevel4", "ce3df80a-f0c5-a7cb-f5bc-d3bb38949d0d", "Texture UUID for voice image level 4");
-        gSavedSettings.declareString("VoiceImageLevel5", "8d0e359c-5cea-bdf5-b6b0-32d2fea6355c", "Texture UUID for voice image level 5");
-        gSavedSettings.declareString("VoiceImageLevel6", "ad9e64e0-a763-5d8c-f2e8-7b5dfdb7f20f", "Texture UUID for voice image level 6");
-        */
-        
-        /*
-        // Jeffrey's first version
-        gSavedSettings.declareString("VoiceImageLevel0", "5b41b4c3-eb70-0f0f-17d9-1765cbd07d39", "Texture UUID for voice image level 0");       
-        gSavedSettings.declareString("VoiceImageLevel1", "cde76ae8-0044-d575-8e2c-65fb0a14cbde", "Texture UUID for voice image level 1");
-        gSavedSettings.declareString("VoiceImageLevel2", "cde76ae8-0044-d575-8e2c-65fb0a14cbde", "Texture UUID for voice image level 2");
-        gSavedSettings.declareString("VoiceImageLevel3", "cde76ae8-0044-d575-8e2c-65fb0a14cbde", "Texture UUID for voice image level 3");
-        gSavedSettings.declareString("VoiceImageLevel4", "cde76ae8-0044-d575-8e2c-65fb0a14cbde", "Texture UUID for voice image level 4");
-        gSavedSettings.declareString("VoiceImageLevel5", "cde76ae8-0044-d575-8e2c-65fb0a14cbde", "Texture UUID for voice image level 5");
-        gSavedSettings.declareString("VoiceImageLevel6", "cde76ae8-0044-d575-8e2c-65fb0a14cbde", "Texture UUID for voice image level 6");
-        */
-        
-        // Brent's first version
-        /*
-        gSavedSettings.declareString("VoiceImageLevel0", "5b41b4c3-eb70-0f0f-17d9-1765cbd07d39", "Texture UUID for voice image level 0");       
-        gSavedSettings.declareString("VoiceImageLevel1", "72365124-c7a7-a1f9-3d7a-d8e521eb5011", "Texture UUID for voice image level 1");
-        gSavedSettings.declareString("VoiceImageLevel2", "72365124-c7a7-a1f9-3d7a-d8e521eb5011", "Texture UUID for voice image level 2");
-        gSavedSettings.declareString("VoiceImageLevel3", "72365124-c7a7-a1f9-3d7a-d8e521eb5011", "Texture UUID for voice image level 3");
-        gSavedSettings.declareString("VoiceImageLevel4", "72365124-c7a7-a1f9-3d7a-d8e521eb5011", "Texture UUID for voice image level 4");
-        gSavedSettings.declareString("VoiceImageLevel5", "72365124-c7a7-a1f9-3d7a-d8e521eb5011", "Texture UUID for voice image level 5");
-        gSavedSettings.declareString("VoiceImageLevel6", "72365124-c7a7-a1f9-3d7a-d8e521eb5011", "Texture UUID for voice image level 6");
-        */
-        
-        /*
-        // Brent's second version
-        gSavedSettings.declareString("VoiceImageLevel0", "5b41b4c3-eb70-0f0f-17d9-1765cbd07d39", "Texture UUID for voice image level 0");       
-        gSavedSettings.declareString("VoiceImageLevel1", "4ee6a7ac-472e-b5ff-7125-f6213798cbee", "Texture UUID for voice image level 1");
-        gSavedSettings.declareString("VoiceImageLevel2", "4ee6a7ac-472e-b5ff-7125-f6213798cbee", "Texture UUID for voice image level 2");
-        gSavedSettings.declareString("VoiceImageLevel3", "4ee6a7ac-472e-b5ff-7125-f6213798cbee", "Texture UUID for voice image level 3");
-        gSavedSettings.declareString("VoiceImageLevel4", "4ee6a7ac-472e-b5ff-7125-f6213798cbee", "Texture UUID for voice image level 4");
-        gSavedSettings.declareString("VoiceImageLevel5", "4ee6a7ac-472e-b5ff-7125-f6213798cbee", "Texture UUID for voice image level 5");
-        gSavedSettings.declareString("VoiceImageLevel6", "4ee6a7ac-472e-b5ff-7125-f6213798cbee", "Texture UUID for voice image level 6");
-        */
-        
-        // Jeffrey's tweak on 4/9/07
-        gSavedSettings.declareString("VoiceImageLevel0", "041ee5a0-cb6a-9ac5-6e49-41e9320507d5", "Texture UUID for voice image level 0");       
-        gSavedSettings.declareString("VoiceImageLevel1", "29de489d-0491-fb00-7dab-f9e686d31e83", "Texture UUID for voice image level 1");
-        gSavedSettings.declareString("VoiceImageLevel2", "29de489d-0491-fb00-7dab-f9e686d31e83", "Texture UUID for voice image level 2");
-        gSavedSettings.declareString("VoiceImageLevel3", "29de489d-0491-fb00-7dab-f9e686d31e83", "Texture UUID for voice image level 3");
-        gSavedSettings.declareString("VoiceImageLevel4", "29de489d-0491-fb00-7dab-f9e686d31e83", "Texture UUID for voice image level 4");
-        gSavedSettings.declareString("VoiceImageLevel5", "29de489d-0491-fb00-7dab-f9e686d31e83", "Texture UUID for voice image level 5");
-        gSavedSettings.declareString("VoiceImageLevel6", "29de489d-0491-fb00-7dab-f9e686d31e83", "Texture UUID for voice image level 6");
-        
-        gSavedSettings.declareString("VoiceHost", "127.0.0.1", "Client SLVoice host to connect to");
-        gSavedSettings.declareU32("VoicePort", 44124, "Client SLVoice port to connect to");
-        
-        //------------------------------------------------------------------------
-        // Caution Script Permission Prompts
-        //------------------------------------------------------------------------
-        gSavedSettings.declareBOOL("PermissionsCautionEnabled", TRUE, "When enabled, changes the handling of script permission requests to help avoid accidental granting of certain permissions, such as the debit permission", NO_PERSIST);
-        gSavedSettings.declareS32("PermissionsCautionNotifyBoxHeight", 344, "Height of caution-style notification messages", NO_PERSIST);
-        //------------------------------------------------------------------------
-        // Other....
-        //------------------------------------------------------------------------
-        gSavedSettings.declareBOOL("ScriptHelpFollowsCursor", FALSE, "Scripting help window updates contents based on script editor contents under text cursor");
-        gSavedSettings.declareS32("LastFeatureVersion", 0, "[DO NOT MODIFY] Version number for tracking hardware changes", TRUE);
-        gSavedSettings.declareS32("NumSessions", 0, "Number of successful logins to Second Life");
-        gSavedSettings.declareBOOL("ShowInventory", FALSE, "Open inventory window on login");
-        gSavedSettings.declareBOOL("ChatOnlineNotification", TRUE, "Provide notifications for when friend log on and off of SL");
-        gSavedSettings.declareString("DefaultObjectTexture", "89556747-24cb-43ed-920b-47caed15465f", "Texture used as 'Default' in texture picker. (UUID texture reference)" );  // maple texture
-        gSavedSettings.declareBOOL("ShowPropertyLines", FALSE, "Show line overlay demarking property boundaries");
-        gSavedSettings.declareBOOL("ShowParcelOwners", FALSE, "", NO_PERSIST);
-        gSavedSettings.declareBOOL("ToolboxAutoMove", FALSE, "[NOT USED]");
-        gSavedSettings.declareBOOL("ToolboxShowMore", TRUE, "Whether to show additional build tool controls", TRUE);
-        gSavedSettings.declareRect("ToolboxRect", LLRect(0, 100, 100, 100), "Rectangle for tools window" ); // only care about position
-        // User interface button states
-        gSavedSettings.declareBOOL("FirstPersonBtnState",       FALSE,  "", NO_PERSIST);
-        gSavedSettings.declareBOOL("MouselookBtnState",         FALSE,  "", NO_PERSIST);
-        gSavedSettings.declareBOOL("ThirdPersonBtnState",       TRUE,   "", NO_PERSIST);
-        gSavedSettings.declareBOOL("BuildBtnState",                     FALSE,  "", NO_PERSIST);
-        //gSavedSettings.declareBOOL("TalkBtnState",            FALSE, "[NOT USED]");
-        gSavedSettings.declareBOOL("ShowPermissions",   FALSE, "", NO_PERSIST);
-        gSavedSettings.declareBOOL("ShowTools",                 FALSE, "", NO_PERSIST);
-        gSavedSettings.declareString("NextLoginLocation", "", "Location to log into by default.");      // if present in settings.ini, will force you to that sim/x/y/z on next login 
-//      gSavedSettings.declareBOOL("ShowBasicHelpOnLaunch",     TRUE);
-        gSavedSettings.declareRect("BasicHelpRect",                     LLRect(0, 404, 467, 0), "Rectangle for help window" );  // Only width and height are used
-        gSavedSettings.declareS32("LastPrefTab", 0, "Last selected tab in preferences window");
-        
-        gSavedSettings.declareString("LSLHelpURL", "https://wiki.secondlife.com/wiki/[LSL_STRING]", "URL that points to LSL help files, with [LSL_STRING] corresponding to the referenced LSL function or keyword");
-        // link for editable wiki (https doesn't seem to work right now with our embedded browser)
-        //gSavedSettings.declareString("LSLHelpURL", "https://wiki.secondlife.com/wiki/[LSL_STRING]", "URL that points to LSL help files, with [LSL_STRING] corresponding to the referenced LSL function or keyword");
-        // Wearable default images
-//      const char* UI_IMG_BLACK_UUID           = "e2244626-f22f-4839-8123-1e7baddeb659";
-        const char* UI_IMG_WHITE_UUID           = "5748decc-f629-461c-9a36-a35a221fe21f";
-//      const char* UI_IMG_DARKGRAY_UUID        = "267e26d3-e0e1-41b8-91b1-3b337102928d";
-//      const char* UI_IMG_LIGHTGRAY_UUID       = "c520bf46-cc5d-412b-a60b-9f1bd245189f";
-        gSavedSettings.declareString("UIImgDefaultShirtUUID",           UI_IMG_WHITE_UUID,                                      "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgDefaultPantsUUID",           UI_IMG_WHITE_UUID,                                      "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgDefaultEyesUUID",            "6522e74d-1660-4e7f-b601-6f48c1659a77", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgDefaultHairUUID",            "7ca39b4c-bd19-4699-aff7-f93fd03d3e7b", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgDefaultShoesUUID",           UI_IMG_WHITE_UUID,                                              "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgDefaultSocksUUID",           UI_IMG_WHITE_UUID,                                      "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgDefaultGlovesUUID",          UI_IMG_WHITE_UUID,                                      "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgDefaultJacketUUID",          UI_IMG_WHITE_UUID,                                      "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgDefaultUnderwearUUID",       UI_IMG_WHITE_UUID,                                      "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgDefaultSkirtUUID",           UI_IMG_WHITE_UUID,                                      "", NO_PERSIST);
-        // Utility color for texture defaults
-        gSavedSettings.declareString("UIImgWhiteUUID",                          UI_IMG_WHITE_UUID,                                              "", NO_PERSIST);
-        // Movement widget controls
-        const S32 MOVE_BTN_COL1 = 20;
-        const S32 MOVE_BTN_COL2 = MOVE_BTN_COL1 + 25;
-        const S32 MOVE_BTN_COL3 = MOVE_BTN_COL2 + 21;
-        const S32 MOVE_BTN_COL4 = MOVE_BTN_COL3 + 25;
-        const S32 MOVE_BTN_COL5 = MOVE_BTN_COL4 + 25;
-//      const S32 MOVE_BTN_COL6 = MOVE_BTN_COL5 + 20;
-        const S32 MOVE_BTN_ROW1 = 4;
-        const S32 MOVE_BTN_ROW2 = MOVE_BTN_ROW1 + 25;
-        const S32 MOVE_BTN_ROW3 = MOVE_BTN_ROW2 + 25;
-        const S32 MOVE_BTN_FLY_LEFT = MOVE_BTN_COL1+96;
-        const S32 MOVE_BTN_FLY_WIDTH = 40;
-        const S32 MOVE_BTN_FLY_RIGHT = MOVE_BTN_FLY_LEFT + MOVE_BTN_FLY_WIDTH;
-        //gSavedSettings.declareBOOL("CreateObjectsCentered",   FALSE, "[NOT USED]");
-        //gSavedSettings.declareBOOL("ShowMoveArrows", TRUE, "[NOT USED]");
-        gSavedSettings.declareRect("SlideLeftBtnRect",
-                LLRect(MOVE_BTN_COL1, MOVE_BTN_ROW3,    MOVE_BTN_COL2,  MOVE_BTN_ROW2),
-                "", NO_PERSIST  );
-        gSavedSettings.declareRect("TurnLeftBtnRect",
-                LLRect(MOVE_BTN_COL1, MOVE_BTN_ROW2,    MOVE_BTN_COL2,  MOVE_BTN_ROW1),
-                "", NO_PERSIST  );
-        gSavedSettings.declareRect("ForwardBtnRect",
-                LLRect(MOVE_BTN_COL2, MOVE_BTN_ROW3,    MOVE_BTN_COL3,  MOVE_BTN_ROW2),
-                "", NO_PERSIST  );
-        gSavedSettings.declareRect("BackwardBtnRect",
-                LLRect(MOVE_BTN_COL2, MOVE_BTN_ROW2,    MOVE_BTN_COL3,  MOVE_BTN_ROW1),
-                "", NO_PERSIST  );
-        gSavedSettings.declareRect("SlideRightBtnRect",
-                LLRect(MOVE_BTN_COL3, MOVE_BTN_ROW3,    MOVE_BTN_COL4,  MOVE_BTN_ROW2),
-                "", NO_PERSIST  );
-        gSavedSettings.declareRect("TurnRightBtnRect",
-                LLRect(MOVE_BTN_COL3, MOVE_BTN_ROW2,    MOVE_BTN_COL4,  MOVE_BTN_ROW1),
-                "", NO_PERSIST  );
-        gSavedSettings.declareRect("MoveUpBtnRect",
-                LLRect(MOVE_BTN_COL4, MOVE_BTN_ROW3,    MOVE_BTN_COL5,  MOVE_BTN_ROW2),
-                "", NO_PERSIST  );
-        gSavedSettings.declareRect("MoveDownBtnRect",
-                LLRect(MOVE_BTN_COL4, MOVE_BTN_ROW2,    MOVE_BTN_COL5,  MOVE_BTN_ROW1),
-                "", NO_PERSIST  );
-        gSavedSettings.declareBOOL("FlyBtnState",                       FALSE,  "", NO_PERSIST);
-        gSavedSettings.declareBOOL("SitBtnState",                       FALSE,  "", NO_PERSIST);
-        gSavedSettings.declareRect("FlyBtnRect",
-                LLRect(MOVE_BTN_FLY_LEFT, 20,   MOVE_BTN_FLY_RIGHT,      4), "", NO_PERSIST     );
-        gSavedSettings.declareBOOL("RunBtnState",                       FALSE,  "", NO_PERSIST);
-        gSavedSettings.declareRect("RunBtnRect",
-                LLRect(MOVE_BTN_FLY_LEFT, 40,   MOVE_BTN_FLY_RIGHT,      24), "", NO_PERSIST    );
-        const S32 MOVE_WIDTH = MOVE_BTN_FLY_RIGHT + 4;
-        const S32 MOVE_HEIGHT = MOVE_BTN_ROW3 + 4;
-        gSavedSettings.declareRect("FloaterMoveRect", LLRect(0, MOVE_HEIGHT, MOVE_WIDTH, 0), "Rectangle for avatar control window");
-        // 0 = never, 1 = fade, 2 = always
-        gSavedSettings.declareS32("RenderName", 2, "Controls display of names above avatars (0 = never, 1 = fade, 2 = always)");
-        gSavedSettings.declareF32("RenderNameShowTime", 10.f, "Fade avatar names after specified time (seconds)");              // seconds
-        gSavedSettings.declareF32("RenderNameFadeDuration", 1.f, "Time interval over which to fade avatar names (seconds)");    // seconds
-        gSavedSettings.declareBOOL("RenderNameHideSelf", FALSE, "Don't display own name above avatar");
-        gSavedSettings.declareBOOL("RenderHideGroupTitle", FALSE, "Don't show my group title in my name label");
-        gSavedSettings.declareBOOL("RenderGroupTitleAll", TRUE, "Show group titles in name labels");
-        // Camera widget controls
-        const S32 CAMERA_OFFSET = 64;
-        const S32 CAMERA_LEFT = MOVE_BTN_FLY_RIGHT + 10;
-        const S32 CAMERA_WIDTH = 16 + 64 + 16 + 64 + 16;
-        const S32 CAMERA_HEIGHT = 64;
-        gSavedSettings.declareRect("FloaterCameraRect",
-                LLRect(CAMERA_LEFT + CAMERA_OFFSET, CAMERA_HEIGHT + CAMERA_OFFSET, CAMERA_LEFT+CAMERA_WIDTH + CAMERA_OFFSET, 0 + CAMERA_OFFSET), "Rectangle for camera control window");
-        // Tool view
-        LLRect floater_tools_rect;
-        floater_tools_rect.setOriginAndSize(0, 300, TOOL_PANEL_WIDTH, 368);
-        //gSavedSettings.declareRect("FloaterToolsRect",        floater_tools_rect, "[NOT USED]");
-        gSavedSettings.declareRect("ToolHelpRect",      LLRect(8, TOOL_PANEL_HEIGHT-16, TOOL_PANEL_WIDTH -8, TOOL_PANEL_HEIGHT-16-16), "", NO_PERSIST); // relative to ToolPanelRect
-        gSavedSettings.declareRect("FloaterFriendsRect", LLRect(0, 400, 250, 0), "Rectangle for friends window");
-        gSavedSettings.declareRect("FloaterSnapshotRect", LLRect(0, 200, 200, 400), "Rectangle for snapshot window");
-        //gSavedSettings.declareRect("AccountHistoryRect", LLRect(100, 500, 500, 200), "[NOT USED]");
-        // Energy bar
-        //gSavedSettings.declareBOOL("ShowEnergyPanel", FALSE, "[NOT USED]");
-        gSavedSettings.declareS32("EnergyFromTop", 20, "", NO_PERSIST );
-        gSavedSettings.declareS32("EnergyWidth", 175, "", NO_PERSIST );
-        gSavedSettings.declareS32("EnergyHeight", 40, "", NO_PERSIST );
-        gSavedSettings.declareBOOL("UIFloaterTestBool", FALSE, "Example saved setting for the test floater");
-        //------------------------------------------------------------------------
-        // UI UUIDS
-        //------------------------------------------------------------------------
-        gSavedSettings.declareString("UIImgBtnCloseInactiveUUID",       "779e4fa3-9b13-f74a-fba9-3886fe9c86ba", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnCloseActiveUUID",         "47a8c844-cd2a-4b1a-be01-df8b1612fe5d", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnClosePressedUUID",        "e5821134-23c0-4bd0-af06-7fa95b9fb01a", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnMinimizeInactiveUUID","6e72abba-1378-437f-bf7a-f0c15f3e99a3", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnMinimizeActiveUUID",      "34c9398d-bb78-4643-9633-46a2fa3e9637", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnMinimizePressedUUID",     "39801651-26cb-4926-af57-7af9352c273c", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnRestoreInactiveUUID",     "0eafa471-70af-4882-b8c1-40a310929744", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnRestoreActiveUUID",       "111b39de-8928-4690-b7b2-e17d5c960277", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnRestorePressedUUID",      "90a0ed5c-2e7b-4845-9958-a64a1b30f312", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnTearOffInactiveUUID",     "74e1a96f-4833-a24d-a1bb-1bce1468b0e7", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnTearOffActiveUUID",       "74e1a96f-4833-a24d-a1bb-1bce1468b0e7", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnTearOffPressedUUID",      "d2524c13-4ba6-af7c-e305-8ac6cc18d86a", "", NO_PERSIST);
-        // Stay in IM after hitting return.
-        gSavedSettings.declareBOOL("PinTalkViewOpen", TRUE, "Stay in IM after hitting return");
-        // Close chat after hitting return.
-        gSavedSettings.declareBOOL("CloseChatOnReturn", FALSE, "Close chat after hitting return");
-        // Copy IM messages into chat history
-        gSavedSettings.declareBOOL("ContactsTornOff", FALSE, "Show contacts window separately from Communicate window.");
-        gSavedSettings.declareBOOL("ChatHistoryTornOff", FALSE, "Show chat history window separately from Communicate window.");
-        gSavedSettings.declareBOOL("IMInChatHistory", FALSE, "Copy IM into chat history");
-        gSavedSettings.declareBOOL("IMShowTimestamps", TRUE, "Show timestamps in IM");
-        // Has the user intentionally entered chatting mode, hence wanting the
-        // chat UI to be displayed, keyboard focus to go into chat, etc.
-        gSavedSettings.declareBOOL("ChatVisible", FALSE, "Chat bar is visible");
-        gSavedSettings.declareString("UIImgDirectionArrowUUID",         "586383e8-4d9b-4fba-9196-2b5938e79c2c", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgResizeBottomRightUUID",      "e3690e25-9690-4f6c-a745-e7dcd885285a", "", NO_PERSIST);
-        // Move buttons
-        gSavedSettings.declareString("UIImgBtnForwardOutUUID",          "a0eb4021-1b20-4a53-892d-8faa9265a6f5", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnForwardInUUID",           "54197a61-f5d1-4c29-95d2-c071d08849cb", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnSlideLeftOutUUID",        "82476321-0374-4c26-9567-521535ab4cd7", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnSlideLeftInUUID",         "724996f5-b956-46f6-9844-4fcfce1d5e83", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnLeftOutUUID",                     "13a93910-6b44-45eb-ad3a-4d1324c59bac", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnLeftInUUID",                      "95463c78-aaa6-464d-892d-3a805b6bb7bf", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnRightOutUUID",            "5a44fd04-f52b-4c30-8b00-4a31e27614bd", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnRightInUUID",                     "5e616d0d-4335-476f-9977-560bccd009da", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnSlideRightOutUUID",       "1fbe4e60-0607-44d1-a50a-032eff56ae75", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnSlideRightInUUID",        "7eeb57d2-3f37-454d-a729-8b217b8be443", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnMoveUpInUUID",            "49b4b357-e430-4b56-b9e0-05b8759c3c82", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnMoveUpOutUUID",           "f887146d-829f-4e39-9211-cf872b78f97c", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnMoveDownInUUID",          "b92a70b9-c841-4c94-b4b3-cee9eb460d48", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnMoveDownOutUUID",         "b5abc9fa-9e62-4e03-bc33-82c4c1b6b689", "", NO_PERSIST);
-//      gSavedSettings.declareString("UIImgBtnPopupOutUUID",            "f41ecdbf-e4b7-4eae-80fa-f0c842d85c1c");
-//      gSavedSettings.declareString("UIImgBtnPopupInUUID",                     "432fd877-f2ad-45ce-8ae7-d1ced88462cb");
-        // Scrollbar
-        gSavedSettings.declareString("UIImgBtnScrollUpOutUUID",         "dad084d7-9a46-452a-b0ff-4b9f1cefdde9", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnScrollUpInUUID",          "a93abdf3-27b5-4e22-a8fa-c48216cd2e3a", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnScrollDownOutUUID",       "b4ecdecf-5c8d-44e7-b882-17a77e88ed55", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnScrollDownInUUID",        "d2421bab-2eaf-4863-b8f6-5e4c52519247", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnScrollLeftOutUUID",       "43773e8d-49aa-48e0-80f3-a04715f4677a", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnScrollLeftInUUID",        "ea137a32-6718-4d05-9c22-7d570d27b2cd", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnScrollRightOutUUID",      "3d700d19-e708-465d-87f2-46c8c0ee7938", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnScrollRightInUUID",       "b749de64-e903-4c3c-ac0b-25fb6fa39cb5", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnJumpLeftOutUUID",     "3c18c87e-5f50-14e2-e744-f44734aa365f",     "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnJumpLeftInUUID",      "9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1",     "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnJumpRightOutUUID",        "ff9a71eb-7414-4cf8-866e-a701deb7c3cf", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnJumpRightInUUID",     "7dabc040-ec13-2309-ddf7-4f161f6de2f4",     "", NO_PERSIST);
-        // Spin control
-        gSavedSettings.declareString("UIImgBtnSpinUpOutUUID",                   "56576e6e-6710-4e66-89f9-471b59122794", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnSpinUpInUUID",                    "c8450082-96a0-4319-8090-d3ff900b4954", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnSpinDownOutUUID",                 "b6d240dd-5602-426f-b606-bbb49a30726d", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnSpinDownInUUID",                  "a985ac71-052f-48e6-9c33-d931c813ac92", "", NO_PERSIST);
-        // Radio button control
-        gSavedSettings.declareString("UIImgRadioActiveUUID",                    "7a1ba9b8-1047-4d1e-9cfc-bc478c80b63f", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgRadioActiveSelectedUUID",    "52f09e07-5816-4052-953c-94c6c10479b7", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgRadioInactiveUUID",                  "90688481-67ff-4af0-be69-4aa084bcad1e", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgRadioInactiveSelectedUUID",  "1975db39-aa29-4251-aea0-409ac09d414d", "", NO_PERSIST);
-        // Checkbox control
-        gSavedSettings.declareString("UIImgCheckboxActiveUUID",                 "05bb64ee-96fd-4243-b74e-f40a41bc53ba", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgCheckboxActiveSelectedUUID", "cf4a2ed7-1533-4686-9dde-df9a37ddca55", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgCheckboxInactiveUUID",               "7d94cb59-32a2-49bf-a516-9e5a2045f9d9", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgCheckboxInactiveSelectedUUID", "c817c642-9abd-4236-9287-ae0513fe7d2b", "", NO_PERSIST);
-        // Tab panels
-        gSavedSettings.declareString("UIImgBtnTabTopPartialOutUUID",    "932ad585-0e45-4a57-aa23-4cf81beeb7b0", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnTabTopPartialInUUID",             "7c6c6c26-0e25-4438-89bd-30d8b8e9d704", "",  NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnTabBottomPartialOutUUID", "8dca716c-b29c-403a-9886-91c028357d6e", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnTabBottomPartialInUUID",  "eb0b0904-8c91-4f24-b500-1180b91140de", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnTabTopOutUUID",                   "1ed83f57-41cf-4052-a3b4-2e8bb78d8191", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnTabTopInUUID",                    "16d032e8-817b-4368-8a4e-b7b947ae3889", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnTabBottomOutUUID",                "bf0a8779-689b-48c3-bb9a-6af546366ef4", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnTabBottomInUUID",                 "c001d8fd-a869-4b6f-86a1-fdcb106df9c7", "", NO_PERSIST);
-        // Tools
-        // TODO: Move to gViewerArt
-        gSavedSettings.declareString("UIImgGrabUUID",                                   "c63f124c-6340-4fbf-b59e-0869a44adb64", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgGrabSelectedUUID",                   "c1e21504-f136-451d-b8e9-929037812f1d", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgMoveUUID",                                   "2fa5dc06-bcdd-4e09-a426-f9f262d4fa65", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgMoveSelectedUUID",                   "46f17c7b-8381-48c3-b628-6a406e060dd6", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgRotateUUID",                                 "c34b1eaa-aae3-4351-b082-e26c0b636779", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgRotateSelectedUUID",                 "cdfb7fde-0d13-418a-9d89-2bd91019fc95", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgScaleUUID",                                  "88a90fef-b448-4883-9344-ecf378a60433", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgScaleSelectedUUID",                  "55aa57ef-508a-47f7-8867-85d21c5a810d", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgFaceUUID",                                   "ce15fd63-b0b6-463c-a37d-ea6393208b3e", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgFaceSelectedUUID",                   "b4870163-6208-42a9-9801-93133bf9a6cd", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgFocusUUID",                                  "57bc39d1-288c-4519-aea6-6d1786a5c274", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgFocusSelectedUUID",                  "ab6a730e-ddfd-4982-9a32-c6de3de6d31d", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgCreateUUID",                                 "7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgCreateSelectedUUID",                 "0098b015-3daf-4cfe-a72f-915369ea97c2", "", NO_PERSIST);
-        // Gun Tool texures
-        gSavedSettings.declareBOOL("ShowCrosshairs",                                    TRUE, "Display crosshairs when in mouselook mode");
-        gSavedSettings.declareString("UIImgCrosshairsUUID",                             "6e1a3980-bf2d-4274-8970-91e60d85fb52", "Image to use for crosshair display (UUID texture reference)");
-        gSavedSettings.declareString("Language",                                                "default", "Language specifier (for XUI)" );
-        gSavedSettings.declareString("SystemLanguage",                                  "en-us", "Language indicated by system settings (for XUI)" );
-        
-        /////////////////////////////////////////////////
-        // Other booleans
-        gSavedSettings.declareBOOL("DebugPermissions",                                  FALSE, "Log permissions for selected inventory items");
-        gSavedSettings.declareBOOL("ApplyColorImmediately", TRUE, "Preview selections in color picker immediately");
-        gSavedSettings.declareBOOL("ApplyTextureImmediately", TRUE, "Preview selections in texture picker immediately");
-        gSavedSettings.declareBOOL("CreateToolKeepSelected", FALSE, "After using create tool, keep the create tool active");
-        gSavedSettings.declareBOOL("CreateToolCopySelection", FALSE, "", NO_PERSIST);
-        gSavedSettings.declareBOOL("CreateToolCopyCenters", TRUE, "", NO_PERSIST);
-        gSavedSettings.declareBOOL("CreateToolCopyRotates", FALSE, "", NO_PERSIST);
-        gSavedSettings.declareBOOL("QuietSnapshotsToDisk", FALSE, "Take snapshots to disk without playing animation or sound");
-        gSavedSettings.declareBOOL("DisableCameraConstraints", FALSE, "Disable the normal bounds put on the camera by avatar position");
-        
-        //gSavedSettings.declareBOOL("LogTimestamps", FALSE, "[NOT USED]");
-        //gSavedSettings.declareBOOL("AgentUpdateMouseQuery", FALSE, "[NOT USED]");
-        gSavedSettings.declareBOOL("AutoLogin", FALSE, "Login automatically using last username/password combination");
-        gSavedSettings.declareBOOL("LoginAsGod", FALSE, "Attempt to login with god powers (Linden accounts only)");
-        //gSavedSettings.declareBOOL("CameraFromPelvis", FALSE, "[NOT USED]");
-        gSavedSettings.declareBOOL("CameraOffset", FALSE, "Render with camera offset from view frustum (rendering debug)");
-        //gSavedSettings.declareBOOL("DynamicNearClip", TRUE, "[NOT USED]");
-        gSavedSettings.declareBOOL("AnimationDebug", FALSE, "Show active animations in a bubble above avatars head");
-        gSavedSettings.declareBOOL("DisplayAvatarAgentTarget", FALSE, "Show avatar positioning locators (animation debug)");
-        //gSavedSettings.declareBOOL("DisplaySkeletons", TRUE, "[NOT USED]");
-        gSavedSettings.declareBOOL("DisplayTimecode", FALSE, "Display timecode on screen");
-        //gSavedSettings.declareBOOL("Drone", FALSE, "[NOT USED]");
-        gSavedSettings.declareBOOL("DisableRendering", FALSE, "Disable GL rendering and GUI (load testing)");
-        //gSavedSettings.declareBOOL("DumpPolyMeshTable", FALSE, "[NOT USED]");
-        //gSavedSettings.declareBOOL("LimitAvatarToValidRegions", TRUE, "[NOT USED]");
-        gSavedSettings.declareBOOL("VerboseLogs", FALSE, "Display source file and line number for each log item for debugging purposes");
-        gSavedSettings.declareBOOL("FirstPersonAvatarVisible", FALSE, "Display avatar and attachments below neck while in mouselook");
-        gSavedSettings.declareBOOL("ShowNearClip", FALSE, "", NO_PERSIST);
-        gSavedSettings.declareBOOL("DebugWindowProc", FALSE, "Log windows messages");
-        gSavedSettings.declareBOOL("ShowTangentBasis", FALSE, "Render normal and binormal (debugging bump mapping)");
-        gSavedSettings.declareBOOL("AnimateTextures", TRUE, "Enable texture animation (debug)");
-        // Selection stuff
-        gSavedSettings.declareBOOL("LimitSelectDistance", TRUE, "Disallow selection of objects beyond max select distance");
-        gSavedSettings.declareF32( "MaxSelectDistance", 64.f, "Maximum allowed selection distance (meters from avatar)");
-        gSavedSettings.declareBOOL("LimitDragDistance", TRUE, "Limit translation of object via translate tool");
-        gSavedSettings.declareF32( "MaxDragDistance", 48.f, "Maximum allowed translation distance in a single operation of translate tool (meters from start point)");
-        gSavedSettings.declareBOOL( "SelectOwnedOnly", FALSE, "Select only objects you own" );
-        gSavedSettings.declareBOOL( "SelectMovableOnly", FALSE, "Select only objects you can move" );
-        gSavedSettings.declareBOOL( "RectangleSelectInclusive", TRUE, "Select objects that have at least one vertex inside selection rectangle" );
-        gSavedSettings.declareBOOL( "RenderHiddenSelections", TRUE, "Show selection lines on objects that are behind other objects" );
-        gSavedSettings.declareBOOL( "RenderLightRadius", FALSE, "Render the radius of selected lights" );
-        gSavedSettings.declareF32("SelectionHighlightThickness", 0.010f, "Thickness of selection highlight line (fraction of view distance)");
-        gSavedSettings.declareF32("SelectionHighlightUScale", 0.1f, "Scale of texture display on selection highlight line (fraction of texture size)");
-        gSavedSettings.declareF32("SelectionHighlightVScale", 1.f, "Scale of texture display on selection highlight line (fraction of texture size)");
-        gSavedSettings.declareF32("SelectionHighlightAlpha", 0.40f, "Opacity of selection highlight (0.0 = completely transparent, 1.0 = completely opaque)" );
-        gSavedSettings.declareF32("SelectionHighlightAlphaTest", 0.1f, "Alpha value below which pixels are displayed on selection highlight line (0.0 = show all pixels, 1.0 = show now pixels)");
-        gSavedSettings.declareF32("SelectionHighlightUAnim", 0.f, "Rate at which texture animates along U direction in selection highlight line (fraction of texture per second)");
-        gSavedSettings.declareF32("SelectionHighlightVAnim", 0.5f, "Rate at which texture animates along V direction in selection highlight line (fraction of texture per second)");
-        gSavedSettings.declareBOOL("LogMessages", FALSE, "Log network traffic");
-        gSavedSettings.declareBOOL("MouseSun", FALSE, "", NO_PERSIST);
-        gSavedSettings.declareBOOL("ShowAxes", FALSE, "Render coordinate frame at your position");
-        gSavedSettings.declareBOOL("ShowMiniMap", TRUE, "Display mini map on login");
-        gSavedSettings.declareBOOL("ShowWorldMap", FALSE, "Display world map on login");
-        gSavedSettings.declareBOOL("ShowToolBar", TRUE, "Show toolbar at bottom of screen");
-        gSavedSettings.declareBOOL("ShowCameraControls", FALSE, "Display camera controls on login");
-        gSavedSettings.declareBOOL("ShowMovementControls", FALSE, "Display movement controls on login");
-        gSavedSettings.declareBOOL("ShowLeaders", FALSE, "", NO_PERSIST);
-        gSavedSettings.declareBOOL("ShowDirectory", FALSE, "", NO_PERSIST);
-        gSavedSettings.declareBOOL("AutoLoadWebProfiles", FALSE, "Automatically load ALL profile webpages without asking first.");
-        gSavedSettings.declareBOOL("ShowCommunicate", FALSE, "", NO_PERSIST);
-        gSavedSettings.declareBOOL("ShowChatHistory", FALSE, "", NO_PERSIST);
-#ifdef LL_RELEASE_FOR_DOWNLOAD
-        gSavedSettings.declareBOOL("ShowConsoleWindow", FALSE, "Show log in separate OS window");
-#else
-        gSavedSettings.declareBOOL("ShowConsoleWindow", TRUE, "Show log in separate OS window");
-#endif
-        // These are ignorable warnings
-        gSavedSettings.addWarning("AboutDirectX9");
-        gSavedSettings.addWarning("AboutBadPCI");
-        gSavedSettings.addWarning("AboutOldGraphicsDriver");
-        gSavedSettings.addWarning("AboutPCIGraphics");
-        gSavedSettings.addWarning("ReturnToOwner");
-        gSavedSettings.addWarning("QuickTimeInstalled");
-        gSavedSettings.addWarning("BrowserLaunch");
-        gSavedSettings.addWarning("DeedObject");
-        gSavedSettings.addWarning("NewClassified");
-        // These are warnings that appear on the first experience of that condition.
-        
-        LLFirstUse::addConfigVariable("FirstBalanceIncrease");
-        LLFirstUse::addConfigVariable("FirstBalanceDecrease");
-        LLFirstUse::addConfigVariable("FirstSit");
-        LLFirstUse::addConfigVariable("FirstMap");
-        LLFirstUse::addConfigVariable("FirstGoTo");
-        LLFirstUse::addConfigVariable("FirstBuild");
-        LLFirstUse::addConfigVariable("FirstLeftClickNoHit");
-        LLFirstUse::addConfigVariable("FirstTeleport");
-        LLFirstUse::addConfigVariable("FirstOverrideKeys");
-        LLFirstUse::addConfigVariable("FirstAttach");
-        LLFirstUse::addConfigVariable("FirstAppearance");
-        LLFirstUse::addConfigVariable("FirstInventory");
-        LLFirstUse::addConfigVariable("FirstSandbox");
-        LLFirstUse::addConfigVariable("FirstFlexible");
-        LLFirstUse::addConfigVariable("FirstDebugMenus");
-        LLFirstUse::addConfigVariable("FirstStreamingMusic");
-        LLFirstUse::addConfigVariable("FirstStreamingVideo");
-        LLFirstUse::addConfigVariable("FirstSculptedPrim");
-        LLFirstUse::addConfigVariable("FirstVoice");
-        LLFirstUse::addConfigVariable("FirstMedia");
-        gSavedSettings.declareBOOL("ShowDebugConsole", FALSE, "Show log in SL window");
-        gSavedSettings.declareBOOL("ShowDebugStats", FALSE, "Show performance stats display");
-        gSavedSettings.declareBOOL("OpenDebugStatBasic", TRUE, "Expand basic performance stats display");
-        gSavedSettings.declareBOOL("OpenDebugStatAdvanced", FALSE, "Expand advanced performance stats display");
-        gSavedSettings.declareBOOL("OpenDebugStatNet", TRUE, "Expand network stats display");
-        gSavedSettings.declareBOOL("OpenDebugStatRender", TRUE, "Expand render stats display");
-        gSavedSettings.declareBOOL("OpenDebugStatSim", TRUE, "Expand simulator performance stats display");
-        gSavedSettings.declareBOOL("ShowDepthBuffer", FALSE, "Show depth buffer contents");
-        gSavedSettings.declareBOOL("DebugShowTime", FALSE, "Show depth buffer contents");
-        gSavedSettings.declareBOOL("DebugShowRenderInfo", FALSE, "Show depth buffer contents");
-        gSavedSettings.declareBOOL("DebugShowColor", FALSE, "Show color under cursor");
-        
-//      gSavedSettings.declareBOOL("ShowHUD", TRUE);
-        //gSavedSettings.declareBOOL("ShowHUDText", TRUE, "[NOT USED]");
-        //gSavedSettings.declareBOOL("ShowHeadlight", FALSE, "[NOT USED]");
-        //gSavedSettings.declareBOOL("ShowLand", TRUE, "[NOT USED]");
-//      gSavedSettings.declareBOOL("ShowMove", TRUE);
-        //gSavedSettings.declareBOOL("SurfaceDetail", TRUE, "[NOT USED]");
-        //gSavedSettings.declareBOOL("ShowObjectBounds", FALSE, "[NOT USED]");
-        //gSavedSettings.declareBOOL("ShowObjectEdit", FALSE, "[NOT USED]");
-        gSavedSettings.declareBOOL("ShowObjectUpdates", FALSE, "Show when update messages are received for individual objects");
-        //gSavedSettings.declareBOOL("ShowObjects", TRUE, "[NOT USED]");
-        //gSavedSettings.declareBOOL("ShowRegions", FALSE, "[NOT USED]");
-//      gSavedSettings.declareBOOL("ShowTalk", TRUE);
-        //gSavedSettings.declareBOOL("ShowTimerBar", FALSE, "[NOT USED]");
-        //gSavedSettings.declareBOOL("ShowWater", FALSE, "[NOT USED]");
-        gSavedSettings.declareBOOL("SpeedTest", FALSE, "Performance testing mode, no network");
-        //gSavedSettings.declareBOOL("TempMouseLook", FALSE, "[NOT USED]");
-        gSavedSettings.declareBOOL("UseEnergy", TRUE, "", NO_PERSIST);
-//      gSavedSettings.declareBOOL("UseFirstPersonDrag", FALSE);
-        //gSavedSettings.declareBOOL("UseLighting", TRUE, "[NOT USED]");
-        //gSavedSettings.declareBOOL("UseWireframe", FALSE, NO_PERSIST);
-        gSavedSettings.declareBOOL("VelocityInterpolate", TRUE, "Extrapolate object motion from last packet based on received velocity");
-        gSavedSettings.declareBOOL("PingInterpolate", FALSE, "Extrapolate object position along velocity vector based on ping delay");
-        gSavedSettings.declareBOOL("AvatarBacklight", TRUE, "Add rim lighting to avatar rendering to approximate shininess of skin");
-        // Startup stuff
-        gSavedSettings.declareF32("PrecachingDelay", 6.f, "Delay when logging in to load world before showing it (seconds)");   // seconds
-        // Rendering stuff
-        gSavedSettings.declareBOOL("RenderCubeMap",                             TRUE, "Whether we can render the cube map or not");
-        gSavedSettings.declareF32("RenderGamma",                                0.f, "Sets gamma exponent for renderer");
-        gSavedSettings.declareBOOL("RenderWater",                               TRUE, "Display water" );
-        gSavedSettings.declareF32( "RenderFarClip",                             256.f, "Distance of far clip plane from camera (meters)" );
-        gSavedSettings.declareBOOL( "RenderUseFarClip",                 TRUE, "If false, frustum culling will ignore far clip plane.");
-        gSavedSettings.declareF32( "RenderFogRatio",                    4.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("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)" );
-        gSavedSettings.declareBOOL("RenderDynamicLOD",                  TRUE, "Dynamically adjust level of detail.");
-        gSavedSettings.declareF32( "RenderVolumeLODFactor",             1.f, "Controls level of detail of primitives (multiplier for current screen area when calculated level of detail)" );
-        gSavedSettings.declareF32( "RenderFlexTimeFactor",              1.f, "Controls level of detail of flexible objects (multiplier for amount of time spent processing flex objects)" );
-        gSavedSettings.declareF32( "RenderTreeLODFactor",               0.5f, "Controls level of detail of vegetation (multiplier for current screen area when calculated level of detail)" );
-        gSavedSettings.declareF32( "RenderAvatarLODFactor",             0.5f, "Controls level of detail of avatars (multiplier for current screen area when calculated level of detail)" );
-        gSavedSettings.declareF32( "RenderTerrainLODFactor",    1.0f, "Controls level of detail of terrain (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("RenderVBOEnable",                   TRUE, "Use GL Vertex Buffer Objects" );
-        gSavedSettings.declareS32("RenderMaxVBOSize",                   32,     "Maximum size of a vertex buffer (in KB).");
-        gSavedSettings.declareS32("RenderReflectionRes",                64, "Reflection map resolution.");
-        //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("RenderInitError",                   FALSE, "Error occured while initializing GL");
-        
-        gSavedSettings.declareBOOL("RenderWaterMipNormal", TRUE, "Use mip maps for water normal map.");
-        gSavedSettings.declareBOOL("RenderDynamicReflections",  FALSE, "Generate a dynamic cube map for reflections (objects reflect their environment, experimental).");
-        gSavedSettings.declareBOOL("RenderWaterReflections",    FALSE, "Reflect the environment in the water.");
-        gSavedSettings.declareS32("RenderReflectionDetail",             2, "Detail of reflection render pass.");
-        gSavedSettings.declareBOOL("RenderGammaFull",                   TRUE, "Use fully controllable gamma correction, instead of faster, hard-coded gamma correction of 2.");
-        gSavedSettings.declareBOOL("RenderGlow",                                TRUE, "Render bloom post effect.");
-        gSavedSettings.declareF32("RenderGlowStrength",                 0.35f, "Additive strength of glow");
-        gSavedSettings.declareF32("RenderGlowWidth",                    1.3f, "Glow sample size (higher = wider and softer but eventually more pixelated");
-        gSavedSettings.declareS32("RenderGlowIterations",               2, "Number of times to iterate the glow (higher = wider and smoother but slower)");
-        gSavedSettings.declareS32("RenderGlowResolutionPow",    9, "Glow map resolution power of two.");
-        gSavedSettings.declareF32("RenderGlowMinLuminance",             1.0f, "Min luminance intensity necessary to consider an object bright enough to automatically glow. (Gets clamped to 0 - 1.0 range)");
-        gSavedSettings.declareF32("RenderGlowMaxExtractAlpha",  0.065f, "Max glow alpha value for brightness extraction to auto-glow.");
-        
-        gSavedSettings.declareVec3("RenderGlowLumWeights",              LLVector3(0.299f, 0.587f, 0.114f), "Weights for each color channel to be used in calculating luminance (should add up to 1.0)");
-        
-        gSavedSettings.declareVec3("RenderGlowWarmthWeights",   LLVector3(1.0f, 0.5f, 0.7f), "Weight of each color channel used before finding the max warmth");
-        
-        gSavedSettings.declareF32("RenderGlowWarmthAmount",             0.f, "Amount of warmth extraction to use (versus luminance extraction). 0 = lum, 1.0 = warmth");
-        gSavedSettings.declareS32("RenderWaterRefResolution",   512, "Water planar reflection resolution.");
-        gSavedSettings.declareBOOL("RenderObjectBump",                  TRUE, "Show bumpmapping on primitives");
-        gSavedSettings.declareBOOL("RenderAvatarCloth",                 1, "Controls if avatars use wavy cloth");
-        gSavedSettings.declareBOOL("RenderAvatarVP",                    TRUE, "Use vertex programs to perform hardware skinning of avatar");
-        gSavedSettings.declareS32("RenderAvatarMaxVisible",             35, "Maximum number of avatars to display at any one time");
-        //gSavedSettings.declareBOOL("RenderForceGetTexImage",  FALSE, "[NOT USED]");
-        gSavedSettings.declareBOOL("RenderFastUI",                              FALSE, "[NOT USED]");   
-        gSavedSettings.declareS32("DebugBeaconLineWidth", 1, "Size of lines for Debug Beacons");
-        gSavedSettings.declareBOOL("RenderCustomSettings", 0, "Do you want to set the graphics settings yourself");
-        gSavedSettings.declareU32("RenderQualityPerformance", 1, "Which graphics settings you've chosen");
-        gSavedSettings.declareBOOL("RenderUseShaderLOD",        TRUE, "Whether we want to have different shaders for LOD" );    
-        gSavedSettings.declareF32("RenderShaderLODThreshold", 1.0f, "Fraction of draw distance defining the switch to a different shader LOD");
-        gSavedSettings.declareBOOL("RenderUseShaderNearParticles",      FALSE, "Whether we want to use shaders on near particles" );
-        gSavedSettings.declareF32("RenderShaderParticleThreshold", 0.25f, "Fraction of draw distance to not use shader on particles");
-        gSavedSettings.declareBOOL("RenderUseFBO", FALSE, "Whether we want to use GL_EXT_framebuffer_objects.");
-        gSavedSettings.declareBOOL("RenderUseImpostors", TRUE, "Whether we want to use impostors for far away avatars.");
-        gSavedSettings.declareBOOL("RenderAppleUseMultGL", FALSE, "Whether we want to use multi-threaded OpenGL on Apple hardware (requires restart of SL).");
-        gSavedSettings.declareF32("RenderSunDynamicRange", 1.0f, "Defines what percent brighter the sun is than local point lights (1.0 = 100% brighter. Value should not be less than 0. ).");
-        gSavedSettings.declareBOOL("RenderUseCleverUI", FALSE, "Turns on the \"clever\" UI rendering optimization.  It's a known performace gain (and enabled by default) on apple.");
-        //debug render stuff
-        gSavedSettings.declareBOOL("RenderDebugTextureBind", FALSE, "Enable texture bind performance test.");
-        // Snapshot params
-        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" );
-        gSavedSettings.declareBOOL("KeepAspectForSnapshot",             TRUE, "Use full window when taking snapshot, regardless of requested image size" );
-        gSavedSettings.declareBOOL("AutoSnapshot",                              FALSE, "Update snapshot when camera stops moving, or any parameter changes" );
-        gSavedSettings.declareBOOL("AdvanceSnapshot",               FALSE, "Display advanced parameter settings in snaphot interface" );
-        gSavedSettings.declareS32("LastSnapshotType",                   0, "Select this as next type of snapshot to take (0 = postcard, 1 = texture, 2 = local image)" );
-        gSavedSettings.declareS32("LastSnapshotWidth",                  1024, "The width of the last snapshot, in px" );
-        gSavedSettings.declareS32("LastSnapshotHeight",                 768, "The height of the last snapshot, in px" );
-        
-        gSavedSettings.declareS32("SnapshotPostcardLastResolution",     0, "Take next postcard snapshot at this resolution" );
-        gSavedSettings.declareS32("SnapshotTextureLastResolution",      0, "Take next texture snapshot at this resolution" );
-        gSavedSettings.declareS32("SnapshotLocalLastResolution",        0, "Take next local snapshot at this resolution" );
-        gSavedSettings.declareS32("SnapshotQuality",                    75, "Quality setting of postcard JPEGs (0 = worst, 100 = best)" );
-        gSavedSettings.declareBOOL("DisableVerticalSync",               TRUE, "Update frames as fast as possible (FALSE = update frames between display scans)" );
-        // Statistics stuff
-        gSavedSettings.declareBOOL("StatsAutoRun", FALSE, "Play back autopilot");
-        gSavedSettings.declareS32("StatsNumRuns", -1, "Loop autopilot playback this number of times");
-        //gSavedSettings.declareBOOL("StatsContinuousLoop", FALSE, "[NOT USED]");
-        gSavedSettings.declareBOOL("StatsQuitAfterRuns", FALSE, "Quit application after this number of autopilot playback runs");
-        gSavedSettings.declareBOOL("StatsSessionTrackFrameStats", FALSE, "Track rendering and network statistics");
-        gSavedSettings.declareString("StatsPilotFile", "pilot.txt", "Filename for stats logging autopilot path");
-        gSavedSettings.declareString("StatsSummaryFile", "fss.txt", "Filename for stats logging summary");
-        gSavedSettings.declareString("StatsFile", "fs.txt", "Filename for stats logging output");
-        // Image pipeline stuff
-        gSavedSettings.declareS32("TextureMemory", 0, "Amount of memory to use for textures in MB (0 = autodetect)"); // default to auto-detect
-        //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");
-        // Image compression
-        gSavedSettings.declareBOOL("LosslessJ2CUpload", FALSE, "Use lossless compression for small image uploads");
-        
-        // Threading
-        gSavedSettings.declareBOOL("RunMultipleThreads", FALSE, "If TRUE keep background threads active during render");
-        // Cooperative Multitasking
-        gSavedSettings.declareS32("BackgroundYieldTime", 40, "Amount of time to yield every frame to other applications when SL is not the foreground window (milliseconds)");
-        // Camera control
-        gSavedSettings.declareBOOL("AutoPilotLocksCamera", FALSE, "Keep camera position locked when avatar walks to selected position");
-        //gSavedSettings.declareBOOL("AvatarLooksAtCamera", TRUE, "[NOT USED]");
-        //gSavedSettings.declareF32("FlyHeightOffGround",               1.f, "[NOT USED]");
-        gSavedSettings.declareF32("DynamicCameraStrength", 2.f, "Amount camera lags behind avatar motion (0 = none, 30 = avatar velocity)");
-        gSavedSettings.declareVec3("CameraOffsetBuild",         LLVector3(-6.0f,  0,  6.0f), "Default camera position relative to focus point when entering build mode");
-        gSavedSettings.declareVec3("CameraOffsetDefault",       LLVector3(-3.0f,  0,  0.75f), "Default camera offset from avatar");
-        //gSavedSettings.declareVec3("CameraOffsetDefault",     LLVector3(-3.0f,  0,  1.5f));
-        //gSavedSettings.declareVec3("FocusOffsetBuild",                LLVector3(4,  0,  0), "[NOT USED]");
-        gSavedSettings.declareVec3("FocusOffsetDefault",        LLVector3(1,  0,  1), "Default focus point offset relative to avatar (x-axis is forward)");
-        gSavedSettings.declareBOOL("TrackFocusObject", TRUE, "Camera tracks last object zoomed on");
-        gSavedSettings.declareBOOL("CameraMouseWheelZoom", TRUE, "Camera zooms in and out with mousewheel");
-        gSavedSettings.declareVec3d("FocusPosOnLogout",         LLVector3d(0,  0,  0), "Camera focus point when last logged out (global coordinates)");
-        gSavedSettings.declareVec3d("CameraPosOnLogout",        LLVector3d(0,  0,  0), "Camera position when last logged out (global coordinates)");
-        // Terrain coloring
-        // JC 8/28/2002 - Adjusted to make the beta farm look good, with
-        // 20 meter water height.  Talk with me before changing these.
-        gSavedSettings.declareF32("TerrainColorStartHeight", 20.f, "Starting altitude for terrain texturing (meters)"); // -1 to 1
-        gSavedSettings.declareF32("TerrainColorHeightRange", 60.f, "Altitude range over which a given terrain texture has effect (meters)");    // max land height
-        // Avatar stuff
-        gSavedSettings.declareF32("PitchFromMousePosition", 90.f, "Vertical range over which avatar head tracks mouse position (degrees of head rotation from top of window to bottom)");
-        gSavedSettings.declareF32("YawFromMousePosition", 90.f, "Horizontal range over which avatar head tracks mouse position (degrees of head rotation from left of window to right)");
-        gSavedSettings.declareF32("ZoomTime", 0.4f, "Time of transition between different camera modes (seconds)");
-        gSavedSettings.declareS32("AvatarCompositeLimit", 5, "Maximum number of avatars to display appearance changes on the fly");
-        // Default throttle
-        // These must also be changed in llviewerthrottle.h
-        // 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)");
-        //gSavedSettings.declareS32("BWRadio", 0, "[NOT USED]");
-        gSavedSettings.declareRect("ChatterboxRect", LLRect(0, 400, 350, 0), "Rectangle for chatterbox window");
-        gSavedSettings.declareRect("FloaterActiveSpeakersRect", LLRect(0, 300, 250, 0), "Rectangle for active speakers window");
-        // Avatar customizing floaters
-        gSavedSettings.declareRect("FloaterCustomizeAppearanceRect", LLRect(0, 540, 494, 0), "Rectangle for avatar customization window");
-        // Build options floater
-        gSavedSettings.declareRect("FloaterBuildOptionsRect", LLRect(0,0,0,0), "Rectangle for build options window.");
-        
-        gSavedSettings.declareRect("FloaterJoystickRect", LLRect(0,0,0,0), "Rectangle for joystick controls window.");
-        // Map floater
-        gSavedSettings.declareRect("FloaterMiniMapRect", LLRect(0, 225, 200, 0), "Rectangle for world map");
-        //Lag-o-Meter floater
-        gSavedSettings.declareRect("FloaterLagMeter", LLRect(0, 142, 350, 0), "Rectangle for lag meter");
-        gSavedSettings.declareBOOL("LagMeterShrunk", FALSE, "Last large/small state for lag meter");
-        gSavedSettings.declareF32("MapScale", 128.f, "World map zoom level (pixels per region)");
-        gSavedSettings.declareF32("MiniMapScale", 128.f, "Miniature world map zoom levle (pixels per region)");
-        gSavedSettings.declareBOOL("MiniMapRotate",     TRUE, "Rotate miniature world map to avatar direction");
-        gSavedSettings.declareString("UIImgBtnPanUpOutUUID",    "47a8c844-cd2a-4b1a-be01-df8b1612fe5d", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnPanUpInUUID",             "e5821134-23c0-4bd0-af06-7fa95b9fb01a", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnPanDownOutUUID",  "47a8c844-cd2a-4b1a-be01-df8b1612fe5d", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnPanDownInUUID",   "e5821134-23c0-4bd0-af06-7fa95b9fb01a", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnPanLeftOutUUID",  "47a8c844-cd2a-4b1a-be01-df8b1612fe5d", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnPanLeftInUUID",   "e5821134-23c0-4bd0-af06-7fa95b9fb01a", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnPanRightOutUUID", "47a8c844-cd2a-4b1a-be01-df8b1612fe5d", "", NO_PERSIST);
-        gSavedSettings.declareString("UIImgBtnPanRightInUUID",  "e5821134-23c0-4bd0-af06-7fa95b9fb01a", "", NO_PERSIST);
-        // Talk panel
-        gSavedSettings.declareRect("FloaterIMRect",                             LLRect(0, 10*16, 500, 0), "Rectangle for IM window");
-        // Chat floater
-        // Rectangle should almost fill the bottom of the screen on 800x600
-        // Note that the saved rect size is the size with history shown.
-        gSavedSettings.declareRect("FloaterChatRect",                   LLRect( 0, 10*16 + 12, 500, 0 ), "Rectangle for chat history");
-        gSavedSettings.declareRect("FloaterContactsRect",               LLRect( 0, 390, 395, 0 ), "Rectangle for chat history");
-        gSavedSettings.declareRect("FloaterMuteRect3",                  LLRect( 0, 300, 300, 0), "Rectangle for mute window");
-        gSavedPerAccountSettings.declareString("BusyModeResponse",              "The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.", "Auto response to instant messages while in busy mode.");
-        gSavedPerAccountSettings.declareString("InstantMessageLogPath", "", "Path to your log files.");
-        gSavedPerAccountSettings.declareBOOL("LogInstantMessages",      FALSE, "Log Instant Messages");
-        gSavedPerAccountSettings.declareBOOL("LogChat", FALSE, "Log Chat");
-        gSavedPerAccountSettings.declareBOOL("LogShowHistory",  FALSE, "Log Show History");
-        gSavedPerAccountSettings.declareBOOL("IMLogTimestamp",  FALSE, "Log Timestamp of Instant Messages");
-        gSavedPerAccountSettings.declareBOOL("LogChatTimestamp",        FALSE, "Log Timestamp of Chat");
-        gSavedPerAccountSettings.declareBOOL("LogChatIM",       FALSE, "Log Incoming Instant Messages with Chat");
-        gSavedPerAccountSettings.declareBOOL("LogTimestampDate",        FALSE, "Include Date with Timestamp");
-        // Inventory
-        gSavedSettings.declareRect("FloaterInventoryRect", LLRect(0, 400, 300, 0), "Rectangle for inventory window" );
-        // properties, only width and height is used.
-        gSavedSettings.declareRect("PropertiesRect", LLRect(0, 320, 350, 0), "Rectangle for inventory item properties window");
-        // Previews - only width and height are used
-        gSavedSettings.declareRect("PreviewTextureRect",                        LLRect(0, 400, 400, 0), "Rectangle for texture preview window" );  // Only width and height are used
-        gSavedSettings.declareRect("PreviewScriptRect",                         LLRect(0, 550, 500, 0), "Rectangle for script preview window" );  // Only width and height are used
-        gSavedSettings.declareRect("LSLHelpRect",                                       LLRect(0, 400, 400, 0), "Rectangle for LSL help window" );  // Only width and height are used
-        gSavedSettings.declareRect("PreviewLandmarkRect",                       LLRect(0,  90, 300, 0), "Rectangle for landmark preview window" );  // Only width and height are used
-        gSavedSettings.declareRect("PreviewURLRect",                            LLRect(0,  90, 300, 0), "Rectangle for URL preview window" );  // Only width and height are used
-        gSavedSettings.declareRect("PreviewEventRect",                          LLRect(0, 530, 420, 0), "Rectangle for Event preview window" );  // Only width and height are used
-        gSavedSettings.declareRect("PreviewClassifiedRect",                     LLRect(0, 530, 420, 0), "Rectangle for URL preview window" );  // Only width and height are used
-        gSavedSettings.declareRect("PreviewSoundRect",                          LLRect(0,  85, 300, 0), "Rectangle for sound preview window" );  // Only width and height are used
-        gSavedSettings.declareRect("PreviewObjectRect",                         LLRect(0,  85, 300, 0), "Rectangle for object preview window" );  // Only width and height are used
-        gSavedSettings.declareRect("PreviewWearableRect",                       LLRect(0,  85, 300, 0), "Rectangle for wearable preview window" );  // Only width and height are used
-        gSavedSettings.declareRect("PreviewAnimRect",                           LLRect(0,  85, 300, 0), "Rectangle for animation preview window" );  // Only width and height are used
-        // permissions manager
-        gSavedSettings.declareRect("PermissionsManagerRect",            LLRect(0,  85, 300, 0), "Rectangle for permissions manager window" );  // Only width and height are used
-        // Land floater - force to top left
-        //gSavedSettings.declareRect("FloaterLandRect3", LLRect(0, 370, 340, 0));
-        //gSavedSettings.declareRect("FloaterLandRect4", LLRect(0, 370, 400, 0), "Rectangle for About Land window"); // deprecated
-        gSavedSettings.declareRect("FloaterLandRect5", LLRect(0, 370, 460, 0), "Rectangle for About Land window");
-        // Texture Picker
-        gSavedSettings.declareRect("TexturePickerRect",                         LLRect(0, 290, 350, 0), "Rectangle for texture picker" );  // Only width and height are used
-        gSavedSettings.declareBOOL("TexturePickerShowFolders", TRUE, "Show folders with no texures in texture picker");
-        gSavedSettings.declareRect("FloaterGestureRect", LLRect(0, 480, 320, 0), "Rectangle for gestures window");
-        gSavedSettings.declareRect("FloaterClothingRect", LLRect(0, 480, 320, 0), "Rectangle for clothing window");
-        gSavedSettings.declareBOOL("ClothingBtnState", FALSE, "", NO_PERSIST);
-        gSavedSettings.declareRect("FloaterHTMLRect", LLRect(0, 500, 700, 0), "Rectangle for HTML window");
-        gSavedSettings.declareRect("FloaterRegionInfo", LLRect(0, 512, 480, 0), "Rectangle for region info window");
-        // Landmark Picker
-        gSavedSettings.declareRect("FloaterLandmarkRect", LLRect(0, 290, 310, 0), "Rectangle for landmark picker" );  // Only width and height are used
-        // editors
-        // Only width and height are used
-        gSavedSettings.declareRect("NotecardEditorRect", LLRect(0, 400, 400, 0), "Rectangle for notecard editor");
-        // recompile everything dialog
-        gSavedSettings.declareRect("CompileOutputRect", LLRect(0, 400, 300, 0), "Rectangle for script Recompile Everything output window");
-        // L$
-        gSavedSettings.declareRect("FloaterPayRectB", LLRect(0, 150, 400, 0), "Rectangle for pay window");
-        // Buy
-        gSavedSettings.declareRect("FloaterBuyRect", LLRect(0, 250, 300, 0), "Rectangle for buy window");
-        // Buy Contents
-        gSavedSettings.declareRect("FloaterBuyContentsRect", LLRect(0, 250, 300, 0), "Rectangle for Buy Contents window");
-        // Open Contents
-        gSavedSettings.declareRect("FloaterOpenObjectRect", LLRect(0, 350, 300, 0), "Rectangle for Open Object window");
-        // the about box
-        gSavedSettings.declareRect("FloaterMediaRect", LLRect(16,650,600,128), "Rectangle for media browser window");
-        // the about box
-        gSavedSettings.declareRect("FloaterAboutRect", LLRect(0, 440, 470, 0), "Rectangle for About window");
-        // the mean box
-        gSavedSettings.declareRect("FloaterBumpRect", LLRect(0, 180, 400, 0), "Rectangle for Bumps/Hits window");
-        // the inspect box
-        gSavedSettings.declareRect("FloaterInspectRect", LLRect(0, 400, 400, 0), "Rectangle for Object Inspect window");
-        // World map.  If 0,0,0,0, will attempt to size to 80% of fullscreen.
-        gSavedSettings.declareRect("FloaterWorldMapRect2",
-                                                                LLRect(0,0,0,0), "Rectangle for world map window");
-        // Find dialog.
-        gSavedSettings.declareRect("FloaterFindRect2", LLRect(0, 570, 780, 0), "Rectangle for Find window");
-        // Talk To dialog, force to top of screen
-        //gSavedSettings.declareRect("FloaterTalkToRect", LLRect(0, 130, 330, 0), "[NOT USED]");
-        // Script error/debug dialog, force to top of screen
-        gSavedSettings.declareRect("FloaterScriptDebugRect", LLRect(0, 130, 450, 0), "Rectangle for Script Error/Debug window");
-        // HUD Console
-        gSavedSettings.declareS32("ConsoleBufferSize",  40, "Size of chat console history (lines of chat)");
-        //gSavedSettings.declareString("UIImgCompassTextureUUID",               "79156764-de98-4815-9d50-b10a7646bcf4", "[NOT USED]");
-        // Script Panel
-        //gSavedSettings.declareRect("ScriptPanelRect",  LLRect(250,  175 + 400,  250 + 400, 175), "[NOT USED]");
-        // volume floater
-        gSavedSettings.declareRect("FloaterAudioVolumeRect", LLRect(0, 440, 470, 0), "Rectangle for Audio Volume window");
-        
-        // Radio button sets
-        gSavedSettings.declareU32("AvatarSex", 0, "", NO_PERSIST);
-        // Radio button sets
-        gSavedSettings.declareS32("RadioLandBrushAction", 0, "Last selected land modification operation (0 = flatten, 1 = raise, 2 = lower, 3 = smooth, 4 = roughen, 5 = revert)");
-        gSavedSettings.declareS32("RadioLandBrushSize", 0, "Size of land modification brush (0 = small, 1 = medium, 2 = large)");
-        // Build Options Panel
-        gSavedSettings.declareBOOL("SnapEnabled", TRUE, "Enable snapping to grid");
-        gSavedSettings.declareBOOL("SnapToMouseCursor", FALSE, "When snapping to grid, center object on nearest grid point to mouse cursor");
-        gSavedSettings.declareF32 ("GridResolution", 0.5f, "Size of single grid step (meters)");
-        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");
-        gSavedSettings.declareF32 ("RotationStep", 1.0f, "All rotations via rotation tool are constrained to multiples of this unit (degrees)");
-        // Saved state for window
-        gSavedSettings.declareBOOL("WindowMaximized", TRUE, "SL viewer window maximized on login");
-        gSavedSettings.declareS32("WindowHeight", WINDOW_HEIGHT, "SL viewer window height");
-        gSavedSettings.declareS32("WindowWidth", WINDOW_WIDTH, "SL viewer window width");
-        gSavedSettings.declareS32("WindowX", 10, "X coordinate of lower left corner of SL viewer window, relative to primary display (pixels)");
-        gSavedSettings.declareS32("WindowY", 10, "Y coordinate of lower left corner of SL viewer window, relative to primary display (pixels)");
-        // Fullscreen menu options
-        gSavedSettings.declareBOOL("FullScreen", FALSE, "Run SL in fullscreen mode");
-//#if LL_DARWIN
-//      gSavedSettings.declareBOOL("FullScreen", FALSE);
-//#else
-//      gSavedSettings.declareBOOL("FullScreen", TRUE);
-//#endif
-        // Fullscreen actual settings
-        gSavedSettings.declareS32("FullScreenWidth", 1024, "Fullscreen resolution in width");
-        gSavedSettings.declareS32("FullScreenHeight", 768, "Fullscreen resolution in height");
-        gSavedSettings.declareF32("FullScreenAspectRatio", 1.3333f, "Aspect ratio of fullscreen display (width / height)");
-        gSavedSettings.declareBOOL("FullScreenAutoDetectAspectRatio", TRUE, "Automatically detect proper aspect ratio for fullscreen display");
-        
-        //resolution divisor
-        gSavedSettings.declareU32("RenderResolutionDivisor", 1, "Divisor for rendering 3D scene at reduced resolution.");
-        // UI general settigns
-        gSavedSettings.declareBOOL("TabToTextFieldsOnly", FALSE, "TAB key takes you to next text entry field, instead of next widget");
-        gSavedSettings.declareF32("UIScaleFactor", 1.f, "Size of UI relative to default layout on 1024x768 screen");
-        gSavedSettings.declareBOOL("UIAutoScale", TRUE, "Keep UI scale consistent across different resolutions");
-        
-        // Login
-        gSavedSettings.declareString("FirstName", "", "Login first name");
-        gSavedSettings.declareString("LastName", "", "Login last name");
-    gSavedPerAccountSettings.declareU32("LastLogoff", 0, "Last logoff");
-        // Legacy password storage.  Now stored in separate file.
-        gSavedSettings.declareString("Marker", "", "[NOT USED]");
-        gSavedSettings.declareBOOL("RememberPassword", TRUE, "Keep password (in encrypted form) for next login");
-        gSavedSettings.declareBOOL("LoginLastLocation", TRUE, "Login at same location you last logged out");
-        gSavedSettings.declareBOOL("ShowStartLocation", FALSE, "Display starting location menu on login screen");
-        gSavedSettings.declareBOOL("FlyingAtExit", FALSE, "Was flying when last logged out, so fly when logging in");
-        gSavedSettings.declareBOOL("ForceShowGrid", FALSE, "Always show grid dropdown on login screen");
-//      gSavedSettings.declareString("AvatarTexture", "be20de2d-7812-4e0e-80f2-33aadf185a9f");
-        gSavedSettings.declareU32("RegionTextureSize", 256, "Terrain texture dimensions (power of 2)");
-        // Selection option
-        gSavedSettings.declareBOOL("EditLinkedParts", FALSE, "Select individual parts of linked objects", NO_PERSIST);
-        // Selection beam
-        gSavedSettings.declareBOOL("ShowSelectionBeam", TRUE, "Show selection particle beam when selecting or interacting with objects.");
-        
-        // Scale manipulator
-        gSavedSettings.declareBOOL("ScaleUniform", FALSE, "Scale selected objects evenly about center of selection");
-        gSavedSettings.declareBOOL("ScaleShowAxes", FALSE, "Show indicator of selected scale axis when scaling");
-        gSavedSettings.declareBOOL("ScaleStretchTextures", TRUE, "Stretch textures along with object when scaling");
-        //------------------------------------------------------------------------
-        // Help viewer
-        //------------------------------------------------------------------------
-        gSavedSettings.declareString("HelpHomeURL", "help/index.html", "URL of initial help page");
-        gSavedSettings.declareString("HelpLastVisitedURL", "help/index.html", "URL of last help page, will be shown next time help is accessed");
-        // HTML dialog (general purpose)
-        gSavedSettings.declareRect("HtmlFloaterRect", LLRect(16,650,600,128), "Rectangle for HTML Floater window");
-        // HTML sim release message floater
-        gSavedSettings.declareRect("HtmlReleaseMessage", LLRect(46,520,400,128), "Rectangle for HTML Release Message Floater window");
-        
-        
-        // HTML help 
-        gSavedSettings.declareString("HtmlHelpLastPage", "", "Last URL visited via help system");
-        gSavedSettings.declareRect("HtmlHelpRect", LLRect(16,650,600,128), "Rectangle for HTML help window");
-        gSavedSettings.declareRect("HtmlFindRect", LLRect(16,650,600,128), "Rectangle for HTML find window");
-        // Audio
-        gSavedSettings.declareBOOL("ShowVolumeSettingsPopup", FALSE, "Show individual volume slider for voice, sound effects, etc");
-        gSavedSettings.declareF32("AudioLevelMaster", 1.0f, "Master audio level, or overall volume");
-        gSavedSettings.declareF32("AudioLevelSFX",        1.0f, "Audio level of in-world sound effects");
-        gSavedSettings.declareF32("AudioLevelAmbient",0.5f, "Audio level of environment sounds");
-        gSavedSettings.declareF32("AudioLevelUI",        0.5f, "Audio level of UI sound effects");
-        gSavedSettings.declareF32("AudioLevelMusic", 1.0f, "Audio level of streaming music");
-        gSavedSettings.declareF32("AudioLevelVoice", 0.5f, "Audio level of voice chat");
-        gSavedSettings.declareF32("AudioLevelMedia", 1.0f, "Audio level of Quicktime movies");
-        gSavedSettings.declareF32("AudioLevelMic", 1.0f, "Audio level of microphone input");
-//      gSavedSettings.declareF32("MediaAudioVolume", 1.0f, "Audio level of Quicktime movies"); // removed
-        gSavedSettings.declareF32("AudioLevelDistance", 1.0f, "Scale factor for audio engine (multiple of world scale, 2.0 = audio falls off twice as fast)");
-        gSavedSettings.declareF32("AudioLevelDoppler", 1.0f, "Scale of doppler effect on moving audio sources (1.0 = normal, <1.0 = diminished doppler effect, >1.0 = enhanced doppler effect)");
-        gSavedSettings.declareF32("AudioLevelRolloff", 1.0f, "Controls the distance-based dropoff of audio volume (fraction or multiple of default audio rolloff)");
-        gSavedSettings.declareBOOL("AudioStreamingMusic", FALSE, "Enable streaming audio");
-        gSavedSettings.declareBOOL("AudioStreamingVideo", FALSE, "Enable streaming video");
-        gSavedSettings.declareBOOL("AutoMimeDiscovery", FALSE, "Enable viewer mime type discovery of media URLs");
-        // Media
-        gSavedSettings.declareBOOL("ParcelMediaAutoPlayEnable", FALSE, "Auto play parcel media when available");
-        //UI Sounds
-        gSavedSettings.declareBOOL("UISndDebugSpamToggle", FALSE, "Log UI sound effects as they are played");
-        gSavedSettings.declareF32("UISndHealthReductionThreshold", 10.f, "Amount of health reduction required to trigger \"pain\" sound");
-        gSavedSettings.declareF32("UISndMoneyChangeThreshold", 50.f, "Amount of change in L$ balance required to trigger \"money\" sound");
-        gSavedSettings.declareString("UISndAlert",                      "ed124764-705d-d497-167a-182cd9fa2e6c", "Sound file for alerts (uuid for sound asset)");
-        //gSavedSettings.declareString("UISndAppearanceAnimate",        "6cf2be26-90cb-2669-a599-f5ab7698225f", "[NOT USED]");
-        gSavedSettings.declareString("UISndBadKeystroke",       "2ca849ba-2885-4bc3-90ef-d4987a5b983a", "Sound file for invalid keystroke (uuid for sound asset)");
-        //gSavedSettings.declareString("UISndChatFromObject",   "00000000-0000-0000-0000-000000000000", "[NOT USED]");
-        gSavedSettings.declareString("UISndClick",                      "4c8c3c77-de8d-bde2-b9b8-32635e0fd4a6", "Sound file for mouse click (uuid for sound asset)");
-        gSavedSettings.declareString("UISndClickRelease",       "4c8c3c77-de8d-bde2-b9b8-32635e0fd4a6", "Sound file for mouse button release (uuid for sound asset)");
-//      gSavedSettings.declareString("UISndError",                      "cb58f920-5b52-8a49-b81c-e532adbbe6f1", "Sound file for UI error (uuid for sound asset)");
-        gSavedSettings.declareString("UISndHealthReductionF",   "219c5d93-6c09-31c5-fb3f-c5fe7495c115", "Sound file for female pain (uuid for sound asset)");
-        gSavedSettings.declareString("UISndHealthReductionM",   "e057c244-5768-1056-c37e-1537454eeb62", "Sound file for male pain (uuid for sound asset)");
-        //gSavedSettings.declareString("UISndIncomingChat",             "00000000-0000-0000-0000-000000000000", "[NOT USED]");
-        //gSavedSettings.declareString("UISndIncomingIM",                   "00000000-0000-0000-0000-000000000000", "[NOT USED]");
-        //gSavedSettings.declareString("UISndInvApplyToObject",         "00000000-0000-0000-0000-000000000000", "[NOT USED]");
-        gSavedSettings.declareString("UISndInvalidOp",          "4174f859-0d3d-c517-c424-72923dc21f65", "Sound file for invalid operations (uuid for sound asset)");
-        //gSavedSettings.declareString("UISndInventoryCopyToInv",       "00000000-0000-0000-0000-000000000000", "[NOT USED]");
-        gSavedSettings.declareString("UISndMoneyChangeDown",    "104974e3-dfda-428b-99ee-b0d4e748d3a3", "Sound file for L$ balance increase (uuid for sound asset)");
-        gSavedSettings.declareString("UISndMoneyChangeUp",      "77a018af-098e-c037-51a6-178f05877c6f", "Sound file for L$ balance decrease(uuid for sound asset)");
-        gSavedSettings.declareString("UISndNewIncomingIMSession",     "67cc2844-00f3-2b3c-b991-6418d01e1bb7", "Sound file for new instant message session(uuid for sound asset)");
-        //gSavedSettings.declareString("UISndObjectCopyToInv",  "00000000-0000-0000-0000-000000000000", "[NOT USED]");
-        gSavedSettings.declareString("UISndObjectCreate",               "f4a0660f-5446-dea2-80b7-6482a082803c", "Sound file for object creation (uuid for sound asset)");
-        gSavedSettings.declareString("UISndObjectDelete",               "0cb7b00a-4c10-6948-84de-a93c09af2ba9", "Sound file for object deletion (uuid for sound asset)");
-        gSavedSettings.declareString("UISndObjectRezIn",                "3c8fc726-1fd6-862d-fa01-16c5b2568db6", "Sound file for rezzing objects (uuid for sound asset)");
-        gSavedSettings.declareString("UISndObjectRezOut",               "00000000-0000-0000-0000-000000000000", "Sound file for derezzing objects (uuid for sound asset)");
-        gSavedSettings.declareString("UISndPieMenuAppear",      "8eaed61f-92ff-6485-de83-4dcc938a478e", "Sound file for opening pie menu (uuid for sound asset)");
-        gSavedSettings.declareString("UISndPieMenuHide",            "00000000-0000-0000-0000-000000000000", "Sound file for closing pie menu (uuid for sound asset)");
-        gSavedSettings.declareString("UISndPieMenuSliceHighlight0",     "d9f73cf8-17b4-6f7a-1565-7951226c305d", "Sound file for selecting pie menu item 0 (uuid for sound asset)");
-        gSavedSettings.declareString("UISndPieMenuSliceHighlight1",     "f6ba9816-dcaf-f755-7b67-51b31b6233e5", "Sound file for selecting pie menu item 1 (uuid for sound asset)");
-        gSavedSettings.declareString("UISndPieMenuSliceHighlight2",     "7aff2265-d05b-8b72-63c7-dbf96dc2f21f", "Sound file for selecting pie menu item 2 (uuid for sound asset)");
-        gSavedSettings.declareString("UISndPieMenuSliceHighlight3",     "09b2184e-8601-44e2-afbb-ce37434b8ba1", "Sound file for selecting pie menu item 3 (uuid for sound asset)");
-        gSavedSettings.declareString("UISndPieMenuSliceHighlight4",     "bbe4c7fc-7044-b05e-7b89-36924a67593c", "Sound file for selecting pie menu item 4 (uuid for sound asset)");
-        gSavedSettings.declareString("UISndPieMenuSliceHighlight5",     "d166039b-b4f5-c2ec-4911-c85c727b016c", "Sound file for selecting pie menu item 5 (uuid for sound asset)");
-        gSavedSettings.declareString("UISndPieMenuSliceHighlight6",     "242af82b-43c2-9a3b-e108-3b0c7e384981", "Sound file for selecting pie menu item 6 (uuid for sound asset)");
-        gSavedSettings.declareString("UISndPieMenuSliceHighlight7",     "c1f334fb-a5be-8fe7-22b3-29631c21cf0b", "Sound file for selecting pie menu item 7 (uuid for sound asset)");
-        gSavedSettings.declareString("UISndSnapshot",               "3d09f582-3851-c0e0-f5ba-277ac5c73fb4", "Sound file for taking a snapshot (uuid for sound asset)");
-        //gSavedSettings.declareString("UISndStartAutopilot",   "00000000-0000-0000-0000-000000000000", "[NOT USED]");
-        //gSavedSettings.declareString("UISndStartFollowpilot",         "00000000-0000-0000-0000-000000000000", "[NOT USED]");
-        gSavedSettings.declareString("UISndStartIM",                "c825dfbc-9827-7e02-6507-3713d18916c1", "Sound file for starting a new IM session (uuid for sound asset)");
-        //gSavedSettings.declareString("UISndStopAutopilot",    "00000000-0000-0000-0000-000000000000", "[NOT USED]");
-        gSavedSettings.declareString("UISndTeleportOut",                "d7a9a565-a013-2a69-797d-5332baa1a947", "Sound file for teleporting (uuid for sound asset)");
-        //gSavedSettings.declareString("UISndTextureApplyToObject",     "00000000-0000-0000-0000-000000000000", "[NOT USED]");
-        //gSavedSettings.declareString("UISndTextureCopyToInv",         "00000000-0000-0000-0000-000000000000", "[NOT USED]");
-        gSavedSettings.declareString("UISndTyping",             "5e191c7b-8996-9ced-a177-b2ac32bfea06", "Sound file for starting to type a chat message (uuid for sound asset)");
-//      gSavedSettings.declareString("UISndWarning",            "449bc80c-91b6-6365-8fd1-95bd91016624", "Sound file for alerts (uuid for sound asset)");
-        gSavedSettings.declareString("UISndWindowClose",            "2c346eda-b60c-ab33-1119-b8941916a499", "Sound file for closing a window (uuid for sound asset)");
-        gSavedSettings.declareString("UISndWindowOpen",             "c80260ba-41fd-8a46-768a-6bf236360e3a", "Sound file for opening a window (uuid for sound asset)");
-        // Sky params
-        gSavedSettings.declareBOOL("SkyOverrideSimSunPosition", FALSE, "", NO_PERSIST);
-        gSavedSettings.declareVec3("SkySunDefaultPosition", LLVector3(1.f, 0.f, 0.1f), "Default position of sun in sky (direction in world coordinates)");
-        gSavedSettings.declareF32("SkyAmbientScale", 0.3f, "Controls strength of ambient, or non-directional light from the sun and moon (fraction or multiple of default ambient level)");
-        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");
-        gSavedSettings.declareU32("WLSkyDetail", 64, "Controls vertex detail on the WindLight sky.  Lower numbers will give better performance and uglier skies.");
-        gSavedSettings.declareBOOL("SkyUseClassicClouds", TRUE, "Whether to use the old Second Life particle clouds or not");
-        gSavedSettings.declareBOOL("WindLightUseAtmosShaders", TRUE, "Whether to enable or disable WindLight atmospheric shaders.");
-        gSavedSettings.declareBOOL("SkyEditPresets", FALSE, "Whether to be able to edit the sky defaults or not");
-        // Water params
-        gSavedSettings.declareF32("WaterGLFogDepthFloor", 0.25f, "Controls how dark water gl fog can get");
-        gSavedSettings.declareF32("WaterGLFogDepthScale", 50.0f, "Controls how quickly gl fog gets dark under water");
-        gSavedSettings.declareF32("WaterGLFogDensityScale", 0.02f, "Maps shader water fog density to gl fog density");
-        gSavedSettings.declareBOOL("EnableRippleWater", TRUE, "Whether to use ripple water shader or not");
-        gSavedSettings.declareBOOL("WaterEditPresets", FALSE, "Whether to be able to edit the water defaults or not");
-        // Windlight window params
-        gSavedSettings.declareRect("FloaterEnvRect", LLRect(50, 150, 650, 0), "Rectangle for Environment Editor" );
-        gSavedSettings.declareRect("FloaterAdvancedSkyRect", LLRect(50, 220, 450, 0), "Rectangle for Advanced Sky Editor" );
-        gSavedSettings.declareRect("FloaterDayCycleRect", LLRect(50, 450, 300, 0), "Rectangle for Day Cycle Editor" );
-        gSavedSettings.declareRect("FloaterAdvancedWaterRect", LLRect(50, 220, 450, 0), "Rectangle for Advanced Water Editor" );
-        // Graphics compatibility and driver crash workaround params
-        gSavedSettings.declareBOOL("UseStartScreen", TRUE, "Whether to load a start screen image or not.");
-        // Tweaked draw distance default settings
-        gSavedSettings.declareBOOL("Disregard128DefaultDrawDistance", TRUE, "Whether to use the auto default to 128 draw distance");
-        gSavedSettings.declareBOOL("Disregard96DefaultDrawDistance", TRUE, "Whether to use the auto default to 96 draw distance");
-        // Cache Stuff
-        gSavedSettings.declareU32("VFSSalt", 1, "[DO NOT MODIFY] Controls local file caching behavior");
-        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");
-        gSavedSettings.declareString("OverlayTitle", "Set_via_OverlayTitle_in_settings.xml", 
-                "Controls watermark text message displayed on screen when \"ShowOverlayTitle\" is enabled (one word, underscores become spaces)");  // Must be one word, but underscores are replaced by spaces. Hah!
-        // Secret debug stuff.
-        gSavedSettings.declareBOOL("UseDebugMenus", FALSE, "Turns on \"Debug\" menu");
-        gSavedSettings.declareS32("ServerChoice", 0, "[DO NOT MODIFY] Controls which grid you connect to");
-        gSavedSettings.declareString("CustomServer", "", "Specifies IP address or hostname of grid to which you connect");
-        gSavedSettings.declareBOOL("UseDebugLogin", FALSE, "Provides extra control over which grid to connect to");
-        // First run is true on the first startup of a given installation.
-        // It is not related to whether your ACCOUNT has been logged in before.
-        // Set to false if you reach the login screen.
-        gSavedSettings.declareBOOL("FirstRunThisInstall", TRUE, "Specifies that you have not run the viewer since you installed the latest update");
-        // Is this the first successful login for a given installation?
-        // It is not related to whether your ACCOUNT has been logged in before.
-        // Set to false if you successfully connect.
-        gSavedSettings.declareBOOL("FirstLoginThisInstall", TRUE, "Specifies that you have not successfully logged in since you installed the latest update");
-        // 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" );
-        gSavedSettings.declareBOOL("MeanCollisionPushObject", FALSE, "You have experienced an abuse of being pushed by a scripted object");
-        gSavedSettings.declareBOOL("MeanCollisionSelected", FALSE, "You have experienced an abuse of being pushed via a selected object");
-        gSavedSettings.declareBOOL("MeanCollisionScripted", FALSE, "You have experienced an abuse from a scripted object");
-        gSavedSettings.declareBOOL("MeanCollisionPhysical", FALSE, "You have experienced an abuse from a physical object");
-        // Does left-click show menu, or only do grabbing?
-        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");
-        gSavedSettings.declareBOOL("AppearanceCameraMovement", TRUE, "When entering appearance editing mode, camera zooms in on currently selected portion of avatar");
-        //gSavedSettings.declareBOOL("AltShowsPhysical", FALSE, "When ALT key is held down, physical objects are rendered in red.");
-        gSavedSettings.declareBOOL("BeaconAlwaysOn", FALSE, "Beacons / highlighting always on");
-        gSavedSettings.declareBOOL("scriptsbeacon", FALSE, "Beacon / Highlight scripted objects");
-        gSavedSettings.declareBOOL("physicalbeacon", TRUE, "Beacon / Highlight physical objects");
-        gSavedSettings.declareBOOL("soundsbeacon", FALSE, "Beacon / Highlight sound generators");
-        gSavedSettings.declareBOOL("particlesbeacon", FALSE, "Beacon / Highlight particle generators");
-        gSavedSettings.declareBOOL("scripttouchbeacon", TRUE, "Beacon / Highlight scripted objects with touch function");
-        gSavedSettings.declareBOOL("renderbeacons", FALSE, "Beacon / Highlight particle generators");
-        gSavedSettings.declareBOOL("renderhighlights", TRUE, "Beacon / Highlight scripted objects with touch function");
-        gSavedSettings.declareBOOL("MuteAudio", FALSE, "All audio plays at 0 volume (streaming audio still takes up bandwidth, for example)");
-        gSavedSettings.declareBOOL("MuteWhenMinimized", TRUE, "Mute audio when SL window is minimized");
-        gSavedSettings.declareBOOL("MuteMusic", FALSE, "Music plays at 0 volume (streaming audio still takes up bandwidth)");
-        gSavedSettings.declareBOOL("MuteMedia", FALSE, "Media plays at 0 volume (streaming audio still takes up bandwidth)");
-        gSavedSettings.declareBOOL("MuteVoice", FALSE, "Voice plays at 0 volume (streaming audio still takes up bandwidth)");
-        gSavedSettings.declareBOOL("MuteSounds", FALSE, "Sound effects play at 0 volume");
-        gSavedSettings.declareBOOL("MuteAmbient", FALSE, "Ambient sound effects, such as wind noise, play at 0 volume");
-        gSavedSettings.declareBOOL("MuteUI", FALSE, "UI sound effects play at 0 volume");
-        gSavedSettings.declareS32("NotifyBoxWidth", 350, "Width of notification messages");
-        gSavedSettings.declareS32("NotifyBoxHeight", 200, "Height of notification messages");
-        gSavedSettings.declareS32("GroupNotifyBoxWidth", 400, "Width of group notice messages");
-        gSavedSettings.declareS32("GroupNotifyBoxHeight", 260, "Height of group notice messages");
-        // Time in seconds.
-        gSavedSettings.declareF32("NotifyTipDuration", 4.f, "Length of time that notification tips stay on screen (seconds)");
-        gSavedSettings.declareBOOL("NotifyMoneyChange", TRUE, "Pop up notifications for all L$ transactions");
-        gSavedSettings.declareBOOL("ShowNewInventory", TRUE,
-                "Automatically views new notecards/textures/landmarks");
-        gSavedSettings.declareBOOL("AutoAcceptNewInventory", FALSE,
-                "Automatically accept new notecards/textures/landmarks");
-        // Bitfield
-        // 1 = by date
-        // 2 = folders always by name
-        // 4 = system folders to top
-        // This where the default first time user gets his settings.
-        gSavedSettings.declareU32("InventorySortOrder", 1 | 2 | 4, "Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)");
-        gSavedSettings.declareU32("RecentItemsSortOrder", 1, "Specifies sort key for recent inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)");
-        gSavedSettings.declareU32("TexturePickerSortOrder", 2, "Specifies sort key for textures in texture picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)");
-        gSavedSettings.declareU32("AvatarPickerSortOrder", 2, "Specifies sort key for textures in avatar picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)");
-        // Pixels away from edge that windows snap.
-        gSavedSettings.declareS32("SnapMargin", 10, "Controls maximum distance between windows before they auto-snap together (pixels)");
-        // Will be set on first run
-        gSavedSettings.declareS32("FloaterViewBottom", -1, "[DO NOT MODIFY] Controls layout of floating windows within SL window");
-        // Automatically fly when up key held down, and automatically stop
-        // flying when landing on something.
-        gSavedSettings.declareBOOL("AutomaticFly", TRUE, "Fly by holding jump key or using \"Fly\" command (FALSE = fly by using \"Fly\" command only)");
-        // Index of the last find panel you opened.
-        gSavedSettings.declareString("LastFindPanel", "find_all_panel", "Controls which find operation appears by default when clicking \"Find\" button ");
-        // grab keystrokes at last possible moment to minimize latency
-        gSavedSettings.declareBOOL("AsyncKeyboard", TRUE, "Improves responsiveness to keyboard input when at low framerates");
-        // Numpad numbers move avatar even when numlock is off/you're using a Mac?
-        gSavedSettings.declareS32("NumpadControl", 0, "How numpad keys control your avatar. 0 = Like the normal arrow keys, 1 = Numpad moves avatar when numlock is off, 2 = Numpad moves avatar regardless of numlock (use this if you have no numlock)");
-        // 1.2.9: For transition from 1.2.8 to 1.2.9, need to ask people
-        // this question regardless of number of executions.
-        // 1.6.10: We're just defaulting crash reporting to on
-        // 1.7.x: We ask at crash time, but leave this so when you flip back and
-        // forth between 1.6 and 1.7 it doesn't ask you every time.
-        gSavedSettings.declareBOOL("AskedAboutCrashReports", FALSE, "Turns off dialog asking if you want to enable crash reporting");
-        // Default for the "Online" checkbox in Find -> People
-        gSavedSettings.declareBOOL("FindPeopleOnline", TRUE, "Limits people search to only users who are logged on");
-        // Default for checkboxes in Find -> Land
-        //gSavedSettings.declareBOOL("FindLandForSale", TRUE);
-        //gSavedSettings.declareBOOL("FindLandAuction", TRUE);
-        // Default for Find -> Land combo box
-        gSavedSettings.declareString("FindLandType", "All", "Controls which type of land you are searching for in Find Land interface (\"All\", \"Auction\", \"For Sale\")");
-        gSavedSettings.declareBOOL("FindLandPrice", TRUE, "Enables filtering of land search results by price");
-        gSavedSettings.declareBOOL("FindLandArea", FALSE, "Enables filtering of land search results by area");
-        // Checkboxes in Find -> Popular
-        // Should these all be the same?  I imagine we might want a single "show mature." - bbc
-        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");
-        gSavedSettings.declareBOOL("ShowMatureGroups", TRUE, "Display results of find groups that are in flagged as mature");
-        
-        gSavedSettings.declareBOOL("FindPlacesPictures", TRUE, "Display only results of find places that have pictures");
-        gSavedSettings.declareBOOL("MapShowEvents", TRUE, "Show events on world map");
-        //gSavedSettings.declareBOOL("MapShowPicks", TRUE, "[NOT USED]");
-        gSavedSettings.declareBOOL("MapShowPopular", TRUE, "Show popular places on world map");
-        gSavedSettings.declareBOOL("MapShowLandForSale", FALSE, "Show land for sale on world map");
-        gSavedSettings.declareBOOL("MapShowTelehubs", TRUE, "Show telehubs on world map");
-        gSavedSettings.declareBOOL("MapShowPeople", TRUE, "Show other users on world map");
-        gSavedSettings.declareBOOL("MapShowInfohubs", TRUE, "Show infohubs on the world map");
-        gSavedSettings.declareBOOL("MapShowClassifieds", TRUE, "Show locations associated with classified ads on world map");
-        // Search panel in directory uses this URL for queries
-        gSavedSettings.declareString("SearchURLDefault",
-                "http://secondlife.com/app/search/index.php?",
-                "URL to load for empty searches");
-        gSavedSettings.declareString("SearchURLQuery",
-                "http://secondlife.com/app/search/search_proxy.php?q=[QUERY]&s=[COLLECTION]&",
-                "URL to use for searches");
-        // Version 2 added [SESSION], must invalidate old saved settings.
-        gSavedSettings.declareString("SearchURLSuffix2",
-                "lang=[LANG]&m=[MATURE]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]",
-                "Parameters added to end of search queries");
-        // Hide/Show search bar
-        gSavedSettings.declareBOOL("ShowSearchBar", TRUE, "Show the Search Bar in the Status Overlay");
-        // Arrow keys move avatar while in chat?
-        gSavedSettings.declareBOOL("ArrowKeysMoveAvatar", TRUE, "While cursor is in chat entry box, arrow keys still control your avatar");
-        gSavedSettings.declareBOOL("ChatBarStealsFocus", TRUE, "Whenever keyboard focus is removed from the UI, and the chat bar is visible, the chat bar takes focus");
-        // Show yellow selection fence in snapshots for auctions?
-        gSavedSettings.declareBOOL("AuctionShowFence", TRUE, "When auctioning land, include parcel boundary marker in snapshot");
-        // Use DX9 to probe hardware on startup.  Only do this once,
-        // because it's slow.
-        gSavedSettings.declareBOOL("ProbeHardwareOnStartup", TRUE, "Query current hardware configuration on application startup");
-        
-        // have we told the user his hardware sucks?  Let him know just once
-        gSavedSettings.declareBOOL("AlertedUnsupportedHardware", FALSE, "Toggle that lets us tell the user he's on old hardware only once");
-        // enable/disable system color picker
-        gSavedSettings.declareBOOL("UseDefaultColorPicker", FALSE, "Use color picker supplied by operating system");
-        gSavedSettings.declareF32("PickerContextOpacity", 0.35f, "Controls overall opacity of context frustrum connecting color and texture pickers with their swatches");
-        gSavedSettings.declareF32("ColumnHeaderDropDownDelay", 0.3f, "Time in seconds of mouse click before column header shows sort options list");
-        // support for avatar exporter
-        //gSavedSettings.declareString("AvExportPath", "", "[NOT USED]");
-        //gSavedSettings.declareString("AvExportBaseName", "", "[NOT USED]");
-        // Show in-world hover tips for objects
-        gSavedSettings.declareBOOL("ShowHoverTips", TRUE, "Show descriptive tooltip when mouse hovers over items in world");
-        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.");
-        // Use an external web browser (Firefox, Internet Explorer)
-        gSavedSettings.declareBOOL("UseExternalBrowser", FALSE, "Use default browser when opening web pages instead of in-world browser.");
-        gSavedSettings.declareBOOL("CookiesEnabled", TRUE, "Accept cookies from Web sites?");
-        // browser home page
-        gSavedSettings.declareString("BrowserHomePage", "http://www.secondlife.com", "[NOT USED]");
-        // browser proxy variables
-        gSavedSettings.declareBOOL("BrowserProxyEnabled", FALSE, "Use Web Proxy");
-        gSavedSettings.declareString("BrowserProxyAddress", "", "Address for the Web Proxy]");
-        gSavedSettings.declareS32("BrowserProxyPort", 3128, "Port for Web Proxy");
-        gSavedSettings.declareS32("BrowserProxySocks45", 5, "[NOT USED]");
-        gSavedSettings.declareString("BrowserProxyExclusions", "", "[NOT USED]");
-        // Allow user to completely disable web pages on prims
-        gSavedSettings.declareBOOL("UseWebPagesOnPrims", FALSE, "[NOT USED]");
-        // use object-object occlusion culling
-        gSavedSettings.declareBOOL("UseOcclusion", TRUE, "Enable object culling based on occlusion (coverage) by other objects");
-        gSavedSettings.declareBOOL("RenderFastAlpha", FALSE, "Use lossy alpha rendering optimization (opaque/nonexistent small alpha faces).");
-        gSavedSettings.declareBOOL("DoubleClickAutoPilot", FALSE, "Enable double-click auto pilot");
-        
-        //cheesy beacon effects
-        gSavedSettings.declareBOOL("CheesyBeacon", FALSE, "Enable cheesy beacon effects");
-        //flycam controls and joystick mapping
-        gSavedSettings.declareS32("FlycamAxis0", 0, "Flycam hardware axis mapping for internal axis 0 ([0, 5]).");
-        gSavedSettings.declareS32("FlycamAxis1", 1, "Flycam hardware axis mapping for internal axis 1 ([0, 5]).");
-        gSavedSettings.declareS32("FlycamAxis2", 2, "Flycam hardware axis mapping for internal axis 2 ([0, 5]).");
-        gSavedSettings.declareS32("FlycamAxis3", 3, "Flycam hardware axis mapping for internal axis 3 ([0, 5]).");
-        gSavedSettings.declareS32("FlycamAxis4", 4, "Flycam hardware axis mapping for internal axis 4 ([0, 5]).");
-        gSavedSettings.declareS32("FlycamAxis5", 5, "Flycam hardware axis mapping for internal axis 5 ([0, 5]).");
-        gSavedSettings.declareS32("FlycamAxis6", -1, "Flycam hardware axis mapping for internal axis 6 ([0, 5]).");
-        gSavedSettings.declareF32("FlycamAxisScale0", 1, "Flycam axis 0 scaler.");
-        gSavedSettings.declareF32("FlycamAxisScale1", 1, "Flycam axis 1 scaler.");
-        gSavedSettings.declareF32("FlycamAxisScale2", 1, "Flycam axis 2 scaler.");
-        gSavedSettings.declareF32("FlycamAxisScale3", 1, "Flycam axis 3 scaler.");
-        gSavedSettings.declareF32("FlycamAxisScale4", 1, "Flycam axis 4 scaler.");
-        gSavedSettings.declareF32("FlycamAxisScale5", 1, "Flycam axis 5 scaler.");
-        gSavedSettings.declareF32("FlycamAxisScale6", 1, "Flycam axis 6 scaler.");
-        gSavedSettings.declareF32("FlycamAxisDeadZone0", 0.1f, "Flycam axis 0 dead zone.");
-        gSavedSettings.declareF32("FlycamAxisDeadZone1", 0.1f, "Flycam axis 1 dead zone.");
-        gSavedSettings.declareF32("FlycamAxisDeadZone2", 0.1f, "Flycam axis 2 dead zone.");
-        gSavedSettings.declareF32("FlycamAxisDeadZone3", 0.1f, "Flycam axis 3 dead zone.");
-        gSavedSettings.declareF32("FlycamAxisDeadZone4", 0.1f, "Flycam axis 4 dead zone.");
-        gSavedSettings.declareF32("FlycamAxisDeadZone5", 0.1f, "Flycam axis 5 dead zone.");
-        gSavedSettings.declareF32("FlycamAxisDeadZone6", 0.1f, "Flycam axis 6 dead zone.");
-        gSavedSettings.declareF32("FlycamFeathering", 16.f, "Flycam feathering (less is softer)");
-        gSavedSettings.declareBOOL("FlycamAutoLeveling", TRUE, "Keep Flycam level.");
-        gSavedSettings.declareBOOL("FlycamAbsolute", FALSE, "Treat Flycam values as absolute positions (not deltas).");
-        gSavedSettings.declareBOOL("FlycamZoomDirect", FALSE, "Map flycam zoom axis directly to camera zoom."); 
-        // logitech LCD settings
-        gSavedSettings.declareS32("LCDDestination", 0, "Which LCD to use");
-        gSavedSettings.declareBOOL("DisplayChat", TRUE, "Display Latest Chat message on LCD");
-        gSavedSettings.declareBOOL("DisplayIM", TRUE, "Display Latest IM message on LCD");
-        gSavedSettings.declareBOOL("DisplayRegion", TRUE, "Display Location information on LCD");
-        gSavedSettings.declareBOOL("DisplayDebug", TRUE, "Display Network Information on LCD");
-        gSavedSettings.declareBOOL("DisplayDebugConsole", TRUE, "Display Console Debug Information on LCD");
-        gSavedSettings.declareBOOL("DisplayLinden", TRUE, "Display Account Information on LCD");
-        // Vector Processor & Math
-        gSavedSettings.declareBOOL("VectorizePerfTest", TRUE, "Test SSE/vectorization performance and choose fastest version.");
-        gSavedSettings.declareBOOL("VectorizeEnable", FALSE, "Enable general vector operations and data alignment.");
-        gSavedSettings.declareBOOL("VectorizeSkin", TRUE, "Enable vector operations for avatar skinning.");
-        gSavedSettings.declareU32( "VectorizeProcessor", 0, "0=Compiler Default, 1=SSE, 2=SSE2, autodetected", NO_PERSIST);
-        gSavedSettings.declareBOOL("SaveMinidump", TRUE, "Save minidump for developer debugging on crash");
-        //
-        // crash_settings.xml
-        //
-        // Setting name is shared with win_crash_logger
-        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 fixup_settings()
-{
-#if LL_RELEASE_FOR_DOWNLOAD
-        // Force some settings on startup
-        gSavedSettings.setBOOL("AnimateTextures", TRUE); // Force AnimateTextures to always be on
-#endif
-        
-        // Special code to tweak with defaults
-        std::string last_major, last_minor, last_patch;
-        S32 digit = gLastRunVersion.find_first_of("0123456789");
-        S32 dot = gLastRunVersion.find_first_of('.', digit);
-        if (dot != std::string::npos && digit != std::string::npos)
-        {
-                last_major = gLastRunVersion.substr(digit, dot-digit);
-                digit = dot+1;
-                dot = gLastRunVersion.find_first_of('.', digit);
-        }
-        if (dot != std::string::npos && digit != std::string::npos)
-        {
-                last_minor = gLastRunVersion.substr(digit, dot-digit);
-                digit = dot+1;
-                dot = gLastRunVersion.find_first_of('.', digit);
-        }
-        if (dot != std::string::npos && digit != std::string::npos)
-        {
-                last_patch = gLastRunVersion.substr(digit, dot-digit);
-        }
-        // 1.18.x -> 1.19.x
-        if (last_major == "1" && last_minor == "18")
-        {
-                if (!gSavedSettings.hasLoaded("EnableVoiceChat"))
-                {
-                        gSavedSettings.setBOOL("EnableVoiceChat", FALSE); // Default 1.18.x users to voice chat disabled
-                }
-        }
-        gSavedSettings.clearLoaded();
-}
-////////////////////////////////////////////////////////////////////////////
-// Listeners
-class LLAFKTimeoutListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gAFKTimeout = (F32) event->getValue().asReal();
-                return true;
-        }
-};
-static LLAFKTimeoutListener afk_timeout_listener;
-class LLMouseSensitivityListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gMouseSensitivity = (F32) event->getValue().asReal();
-                return true;
-        }
-};
-static LLMouseSensitivityListener mouse_sensitivity_listener;
-class LLInvertMouseListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gInvertMouse = event->getValue().asBoolean();
-                return true;
-        }
-};
-static LLInvertMouseListener invert_mouse_listener;
-class LLRenderAvatarMouselookListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLVOAvatar::sVisibleInFirstPerson = event->getValue().asBoolean();
-                return true;
-        }
-};
-static LLRenderAvatarMouselookListener render_avatar_mouselook_listener;
-class LLRenderFarClipListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                F32 draw_distance = (F32) event->getValue().asReal();
-                gAgent.mDrawDistance = draw_distance;
-                if (gWorldPointer)
-                {
-                        gWorldPointer->setLandFarClip(draw_distance);
-                }
-                return true;
-        }
-};
-static LLRenderFarClipListener render_far_clip_listener;
-class LLTerrainDetailListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLDrawPoolTerrain::sDetailMode = event->getValue().asInteger();
-                return true;
-        }
-};
-static LLTerrainDetailListener terrain_detail_listener;
-class LLSetShaderListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLShaderMgr::setShaders();
-                return true;
-        }
-};
-static LLSetShaderListener set_shader_listener;
-class LLReleaseGLBufferListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                if (gPipeline.isInit())
-                {
-                        gPipeline.releaseGLBuffers();
-                        gPipeline.createGLBuffers();
-                }
-                return true;
-        }
-};
-static LLReleaseGLBufferListener release_gl_buffer_listener;
-class LLVolumeLODListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLVOVolume::sLODFactor = (F32) event->getValue().asReal();
-                LLVOVolume::sDistanceFactor = 1.f-LLVOVolume::sLODFactor * 0.1f;
-                return true;
-        }
-};
-static LLVolumeLODListener volume_lod_listener;
-class LLAvatarLODListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLVOAvatar::sLODFactor = (F32) event->getValue().asReal();
-                return true;
-        }
-};
-static LLAvatarLODListener avatar_lod_listener;
-class LLTerrainLODListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLVOSurfacePatch::sLODFactor = (F32) event->getValue().asReal();
-                //sqaure lod factor to get exponential range of [0,4] and keep
-                //a value of 1 in the middle of the detail slider for consistency
-                //with other detail sliders (see panel_preferences_graphics1.xml)
-                LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor;
-                return true;
-        }
-};
-static LLTerrainLODListener terrain_lod_listener;
-class LLTreeLODListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLVOTree::sTreeFactor = (F32) event->getValue().asReal();
-                return true;
-        }
-};
-static LLTreeLODListener tree_lod_listener;
-class LLFlexLODListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLVolumeImplFlexible::sUpdateFactor = (F32) event->getValue().asReal();
-                return true;
-        }
-};
-static LLFlexLODListener flex_lod_listener;
-class LLGammaListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                F32 gamma = (F32) event->getValue().asReal();
-                if (gamma == 0.0f)
-                {
-                        gamma = 1.0f; // restore normal gamma
-                }
-                if (gViewerWindow && gViewerWindow->getWindow() && gamma != gViewerWindow->getWindow()->getGamma())
-                {
-                        // Only save it if it's changed
-                        if (!gViewerWindow->getWindow()->setGamma(gamma))
-                        {
-                                llwarns << "setGamma failed!" << llendl;
-                        }
-                }
-                return true;
-        }
-};
-static LLGammaListener gamma_listener;
-const F32 MAX_USER_FOG_RATIO = 10.f;
-const F32 MIN_USER_FOG_RATIO = 0.5f;
-class LLFogRatioListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                F32 fog_ratio = llmax(MIN_USER_FOG_RATIO, 
-                                                        llmin((F32) event->getValue().asReal(), 
-                                                        MAX_USER_FOG_RATIO));
-                gSky.setFogRatio(fog_ratio);
-                return true;
-        }
-};
-static LLFogRatioListener fog_ratio_listener;
-class LLMaxPartCountListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLViewerPartSim::setMaxPartCount(event->getValue().asInteger());
-                return true;
-        }
-};
-static LLMaxPartCountListener max_partCount_listener;
-const S32 MAX_USER_COMPOSITE_LIMIT = 100;
-const S32 MIN_USER_COMPOSITE_LIMIT = 0;
-class LLCompositeLimitListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                S32 composite_limit = llmax(MIN_USER_COMPOSITE_LIMIT, 
-                                                        llmin((S32)event->getValue().asInteger(), 
-                                                        MAX_USER_COMPOSITE_LIMIT));
-                LLVOAvatar::sMaxOtherAvatarsToComposite = composite_limit;
-                return true;
-        }
-};
-static LLCompositeLimitListener composite_limit_listener;
-class LLVideoMemoryListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gImageList.updateMaxResidentTexMem(event->getValue().asInteger());
-                return true;
-        }
-};
-static LLVideoMemoryListener video_memory_listener;
-class LLBandwidthListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gViewerThrottle.setMaxBandwidth((F32) event->getValue().asReal());
-                return true;
-        }
-};
-static LLBandwidthListener bandwidth_listener;
-class LLChatFontSizeListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gConsole->setFontSize(event->getValue().asInteger());
-                return true;
-        }
-};
-static LLChatFontSizeListener chat_font_size_listener;
-class LLChatPersistTimeListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gConsole->setLinePersistTime((F32) event->getValue().asReal());
-                return true;
-        }
-};
-static LLChatPersistTimeListener chat_persist_time_listener;
-class LLConsoleMaxLinesListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gConsole->setMaxLines(event->getValue().asInteger());
-                return true;
-        }
-};
-static LLConsoleMaxLinesListener console_max_lines_listener;
-// Listener for all volume settings
-class LLAudioListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                audio_update_volume(true);
-                return true;
-        }
-};
-static LLAudioListener audio_listener;
-class LLJoystickListener : public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLViewerJoystick::updateCamera(TRUE);
-                return true;
-        }
-};
-static LLJoystickListener joystick_listener;
-class LLAudioStreamMusicListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                if (gAudiop)
-                {
-                        if ( event->getValue().asBoolean() )
-                        {
-                                if (gParcelMgr
-                                        && gParcelMgr->getAgentParcel()
-                                        && !gParcelMgr->getAgentParcel()->getMusicURL().empty())
-                                {
-                                        // if stream is already playing, don't call this
-                                        // otherwise music will briefly stop
-                                        if ( ! gAudiop->isInternetStreamPlaying() )
-                                        {
-                                                gAudiop->startInternetStream(gParcelMgr->getAgentParcel()->getMusicURL().c_str());
-                                        }
-                                }
-                        }
-                        else
-                        {
-                                gAudiop->stopInternetStream();
-                        }
-                }
-                return true;
-        }
-};
-static LLAudioStreamMusicListener audio_stream_music_listener;
-class LLUseOcclusionListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLPipeline::sUseOcclusion = (event->getValue().asBoolean() && gGLManager.mHasOcclusionQuery 
-                                && gFeatureManagerp->isFeatureAvailable("UseOcclusion") && !gUseWireframe) ? 2 : 0;
-                return true;
-        }
-};
-static LLUseOcclusionListener use_occlusion_listener;
-class LLNumpadControlListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                if (gKeyboard)
-                {
-                        gKeyboard->setNumpadDistinct(static_cast<LLKeyboard::e_numpad_distinct>(event->getValue().asInteger()));
-                }
-                return true;
-        }
-};
-static LLNumpadControlListener numpad_control_listener;
-class LLRenderUseVBOListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                if (gPipeline.isInit())
-                {
-                        gPipeline.setUseVBO(event->getValue().asBoolean());
-                }
-                return true;
-        }
-};
-static LLRenderUseVBOListener render_use_vbo_listener;
-class LLWLSkyDetailListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                if (gSky.mVOWLSkyp.notNull())
-                {
-                        gSky.mVOWLSkyp->updateGeometry(gSky.mVOWLSkyp->mDrawable);
-                }
-                return true;
-        }
-};
-static LLWLSkyDetailListener wl_sky_detail_listener;
-class LLRenderLightingDetailListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                if (gPipeline.isInit())
-                {
-                        gPipeline.setLightingDetail(event->getValue().asInteger());
-                }
-                return true;
-        }
-};
-static LLRenderLightingDetailListener render_lighting_detail_listener;
-class LLResetVertexBuffersListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                if (gPipeline.isInit())
-                {
-                        gPipeline.resetVertexBuffers();
-                }
-                return true;
-        }
-};
-static LLResetVertexBuffersListener reset_vbo_listener;
-class LLRenderDynamicLODListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLPipeline::sDynamicLOD = event->getValue().asBoolean();
-                return true;
-        }
-};
-static LLRenderDynamicLODListener render_dynamic_lod_listener;
-class LLRenderUseFBOListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLRenderTarget::sUseFBO = event->getValue().asBoolean();
-                if (gPipeline.isInit())
-                {
-                        gPipeline.releaseGLBuffers();
-                        gPipeline.createGLBuffers();
-                }
-                return true;
-        }
-};
-static LLRenderUseFBOListener render_use_fbo_listener;
-class LLRenderUseImpostorsListener : public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLVOAvatar::sUseImpostors = event->getValue().asBoolean();
-                return true;
-        }
-};
-static LLRenderUseImpostorsListener render_use_impostors_listener;
-class LLRenderUseCleverUIListener : public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gGL.setClever(event->getValue().asBoolean());
-                return true;
-        }
-};
-static LLRenderUseCleverUIListener render_use_clever_ui_listener;
-class LLRenderResolutionDivisorListener : public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gResizeScreenTexture = TRUE;
-                return true;
-        }
-};
-static LLRenderResolutionDivisorListener render_resolution_divisor_listener;
-////////////////////////////////////////////////////////////////////////////
-void settings_setup_listeners()
-{
-        gSavedSettings.getControl("FirstPersonAvatarVisible")->addListener(&render_avatar_mouselook_listener);
-        gSavedSettings.getControl("MouseSensitivity")->addListener(&mouse_sensitivity_listener);
-        gSavedSettings.getControl("InvertMouse")->addListener(&invert_mouse_listener);
-        gSavedSettings.getControl("AFKTimeout")->addListener(&afk_timeout_listener);
-        gSavedSettings.getControl("RenderFarClip")->addListener(&render_far_clip_listener);
-        gSavedSettings.getControl("RenderTerrainDetail")->addListener(&terrain_detail_listener);
-        gSavedSettings.getControl("RenderAvatarVP")->addListener(&set_shader_listener);
-        gSavedSettings.getControl("VertexShaderEnable")->addListener(&set_shader_listener);
-        gSavedSettings.getControl("RenderDynamicReflections")->addListener(&set_shader_listener);
-        gSavedSettings.getControl("RenderGlow")->addListener(&release_gl_buffer_listener);
-        gSavedSettings.getControl("RenderGlow")->addListener(&set_shader_listener);
-        gSavedSettings.getControl("EnableRippleWater")->addListener(&set_shader_listener);
-        gSavedSettings.getControl("RenderGlowResolutionPow")->addListener(&release_gl_buffer_listener);
-        gSavedSettings.getControl("RenderAvatarCloth")->addListener(&set_shader_listener);
-        gSavedSettings.getControl("WindLightUseAtmosShaders")->addListener(&set_shader_listener);
-        gSavedSettings.getControl("RenderGammaFull")->addListener(&set_shader_listener);
-        gSavedSettings.getControl("RenderVolumeLODFactor")->addListener(&volume_lod_listener);
-        gSavedSettings.getControl("RenderAvatarLODFactor")->addListener(&avatar_lod_listener);
-        gSavedSettings.getControl("RenderTerrainLODFactor")->addListener(&terrain_lod_listener);
-        gSavedSettings.getControl("RenderTreeLODFactor")->addListener(&tree_lod_listener);
-        gSavedSettings.getControl("RenderFlexTimeFactor")->addListener(&flex_lod_listener);
-        gSavedSettings.getControl("ThrottleBandwidthKBPS")->addListener(&bandwidth_listener);
-        gSavedSettings.getControl("RenderGamma")->addListener(&gamma_listener);
-        gSavedSettings.getControl("RenderFogRatio")->addListener(&fog_ratio_listener);
-        gSavedSettings.getControl("RenderMaxPartCount")->addListener(&max_partCount_listener);
-        gSavedSettings.getControl("RenderDynamicLOD")->addListener(&render_dynamic_lod_listener);
-        gSavedSettings.getControl("RenderDebugTextureBind")->addListener(&reset_vbo_listener);
-        gSavedSettings.getControl("RenderFastAlpha")->addListener(&reset_vbo_listener);
-        gSavedSettings.getControl("RenderObjectBump")->addListener(&reset_vbo_listener);
-        gSavedSettings.getControl("RenderMaxVBOSize")->addListener(&reset_vbo_listener);
-        gSavedSettings.getControl("RenderUseFBO")->addListener(&render_use_fbo_listener);
-        gSavedSettings.getControl("RenderUseImpostors")->addListener(&render_use_impostors_listener);
-        gSavedSettings.getControl("RenderUseCleverUI")->addListener(&render_use_clever_ui_listener);
-        gSavedSettings.getControl("RenderResolutionDivisor")->addListener(&render_resolution_divisor_listener);
-        gSavedSettings.getControl("AvatarCompositeLimit")->addListener(&composite_limit_listener);
-        gSavedSettings.getControl("TextureMemory")->addListener(&video_memory_listener);
-        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(&audio_listener);
-        gSavedSettings.getControl("AudioLevelSFX")->addListener(&audio_listener);
-        gSavedSettings.getControl("AudioLevelUI")->addListener(&audio_listener);
-        gSavedSettings.getControl("AudioLevelAmbient")->addListener(&audio_listener);
-        gSavedSettings.getControl("AudioLevelMusic")->addListener(&audio_listener);
-        gSavedSettings.getControl("AudioLevelMedia")->addListener(&audio_listener);
-        gSavedSettings.getControl("AudioLevelVoice")->addListener(&audio_listener);
-        gSavedSettings.getControl("AudioLevelDistance")->addListener(&audio_listener);
-        gSavedSettings.getControl("AudioLevelDoppler")->addListener(&audio_listener);
-        gSavedSettings.getControl("AudioLevelRolloff")->addListener(&audio_listener);
-        gSavedSettings.getControl("AudioStreamingMusic")->addListener(&audio_stream_music_listener);
-        // AudioStreamingVideo initialized in llviewermedia.cpp
-        gSavedSettings.getControl("MuteAudio")->addListener(&audio_listener);
-        gSavedSettings.getControl("MuteMusic")->addListener(&audio_listener);
-        gSavedSettings.getControl("MuteMedia")->addListener(&audio_listener);
-        gSavedSettings.getControl("MuteVoice")->addListener(&audio_listener);
-        gSavedSettings.getControl("MuteAmbient")->addListener(&audio_listener);
-        gSavedSettings.getControl("MuteUI")->addListener(&audio_listener);
-        gSavedSettings.getControl("RenderVBOEnable")->addListener(&render_use_vbo_listener);
-        gSavedSettings.getControl("WLSkyDetail")->addListener(&wl_sky_detail_listener);
-        gSavedSettings.getControl("RenderLightingDetail")->addListener(&render_lighting_detail_listener);
-        gSavedSettings.getControl("NumpadControl")->addListener(&numpad_control_listener);
-        gSavedSettings.getControl("FlycamAxis0")->addListener(&joystick_listener);
-        gSavedSettings.getControl("FlycamAxis1")->addListener(&joystick_listener);
-        gSavedSettings.getControl("FlycamAxis2")->addListener(&joystick_listener);
-        gSavedSettings.getControl("FlycamAxis3")->addListener(&joystick_listener);
-        gSavedSettings.getControl("FlycamAxis4")->addListener(&joystick_listener);
-        gSavedSettings.getControl("FlycamAxis5")->addListener(&joystick_listener);
-        gSavedSettings.getControl("FlycamAxis6")->addListener(&joystick_listener);
-}
diff --git a/linden/indra/newview/llcubemap.cpp b/linden/indra/newview/llcubemap.cpp
index baa33ac..e11f058 100644
--- a/linden/indra/newview/llcubemap.cpp
+++ b/linden/indra/newview/llcubemap.cpp
@@ -71,7 +71,7 @@ void LLCubeMap::initGL()
        llassert(gGLManager.mInited);
        if (gGLManager.mHasCubeMap
-            && gFeatureManagerp->isFeatureAvailable("RenderCubeMap"))
+            && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"))
        {
                mTargets[0] = GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB;
                mTargets[1] = GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB;
@@ -181,7 +181,7 @@ GLuint LLCubeMap::getGLName()
 void LLCubeMap::bind()
 {
        if (gGLManager.mHasCubeMap
-            //&& gFeatureManagerp->isFeatureAvailable("RenderCubeMap")
+            //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
            )
        {
                // We assume that if they have cube mapping, they have multitexturing.
@@ -209,7 +209,7 @@ void LLCubeMap::enableTexture(S32 stage)
        mTextureStage = stage;
        if (gGLManager.mHasCubeMap &&
            stage >= 0
-            //&& gFeatureManagerp->isFeatureAvailable("RenderCubeMap")
+            //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
            )
        {
                glActiveTextureARB(GL_TEXTURE0_ARB + stage); // NOTE: leaves texture stage set
@@ -246,7 +246,7 @@ void LLCubeMap::disable(void)
 void LLCubeMap::disableTexture(void)
 {
        if (gGLManager.mHasCubeMap && mTextureStage >= 0
-            //&& gFeatureManagerp->isFeatureAvailable("RenderCubeMap")
+            //&& LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")
            )
        {
                glActiveTextureARB(GL_TEXTURE0_ARB + mTextureStage);
diff --git a/linden/indra/newview/llcurrencyuimanager.cpp b/linden/indra/newview/llcurrencyuimanager.cpp
index 74ee8cc..8964054 100644
--- a/linden/indra/newview/llcurrencyuimanager.cpp
+++ b/linden/indra/newview/llcurrencyuimanager.cpp
@@ -349,7 +349,7 @@ void LLCurrencyUIManager::Impl::onCurrencyKey(
 void LLCurrencyUIManager::Impl::prepare()
 {
-        LLLineEditor* lindenAmount = LLUICtrlFactory::getLineEditorByName(&mPanel,"currency_amt");
+        LLLineEditor* lindenAmount = mPanel.getChild<LLLineEditor>("currency_amt");
        if (lindenAmount)
        {
                lindenAmount->setPrevalidate(LLLineEditor::prevalidateNonNegativeS32);
@@ -370,7 +370,7 @@ void LLCurrencyUIManager::Impl::updateUI()
        mPanel.childShow("currency_action");
-        LLLineEditor* lindenAmount = LLUICtrlFactory::getLineEditorByName(&mPanel,"currency_amt");
+        LLLineEditor* lindenAmount = mPanel.getChild<LLLineEditor>("currency_amt");
        if (lindenAmount) 
        {
                lindenAmount->setVisible(true);
diff --git a/linden/indra/newview/lldebugview.cpp b/linden/indra/newview/lldebugview.cpp
index a512d62..9e64a60 100644
--- a/linden/indra/newview/lldebugview.cpp
+++ b/linden/indra/newview/lldebugview.cpp
@@ -43,6 +43,7 @@
 #include "imageids.h"
 #include "llvelocitybar.h"
 #include "llviewerwindow.h"
+#include "llfloaterstats.h"
 //
 // Globals
@@ -100,16 +101,15 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect)
        // Debug statistics
        //
        r.set(rect.getWidth() - 250,
-                  rect.getHeight(),
+                  rect.getHeight() - 50,
                  rect.getWidth(),
-                  rect.getHeight() - 400);
+                  rect.getHeight() - 450);
-        mStatViewp = new LLContainerView("statistics", r);
+        mFloaterStatsp = new LLFloaterStats(r);
-        mStatViewp->setLabel("Statistics");
-        mStatViewp->setFollowsTop();
+        mFloaterStatsp->setFollowsTop();
-        mStatViewp->setFollowsRight();
+        mFloaterStatsp->setFollowsRight();
-        // Default to off
+        // since this is a floater, it belongs to LLFloaterView
-        mStatViewp->setVisible(FALSE);
+        //addChild(mFloaterStatsp);
-        addChild(mStatViewp);
        const S32 VELOCITY_LEFT = 10; // 370;
        const S32 VELOCITY_WIDTH = 500;
@@ -130,13 +130,3 @@ LLDebugView::~LLDebugView()
        gTextureView = NULL;
 }
-EWidgetType LLDebugView::getWidgetType() const
-{
-        return WIDGET_TYPE_DEBUG_VIEW;
-}
-LLString LLDebugView::getWidgetTag() const
-{
-        return LL_DEBUG_VIEW_TAG;
-}
diff --git a/linden/indra/newview/lldebugview.h b/linden/indra/newview/lldebugview.h
index edaf253..aaa1f57 100644
--- a/linden/indra/newview/lldebugview.h
+++ b/linden/indra/newview/lldebugview.h
@@ -46,7 +46,7 @@ class LLFastTimerView;
 class LLMemoryView;
 class LLConsole;
 class LLTextureView;
-class LLContainerView;
+class LLFloaterStats;
 class LLDebugView : public LLView
 {
@@ -54,14 +54,11 @@ public:
        LLDebugView(const std::string& name, const LLRect &rect);
        ~LLDebugView();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        LLFrameStatView* mFrameStatView;
        LLFastTimerView* mFastTimerView;
        LLMemoryView*    mMemoryView;
        LLConsole*               mDebugConsolep;
-        LLContainerView* mStatViewp;
+        LLFloaterStats*  mFloaterStatsp;
 };
 extern LLDebugView* gDebugView;
diff --git a/linden/indra/newview/lldelayedgestureerror.cpp b/linden/indra/newview/lldelayedgestureerror.cpp
new file mode 100644
index 0000000..0a1c9df
--- /dev/null
+++ b/linden/indra/newview/lldelayedgestureerror.cpp
@@ -0,0 +1,125 @@
+/** 
+ * @file lldelayedgestureerror.cpp
+ * @brief Delayed gesture error message -- try to wait until name has been retrieved
+ * @author Dale Glass
+ *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
+ * Copyright (c) 2004-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+#include "lldelayedgestureerror.h"
+#include <list>
+#include "llnotify.h"
+#include "llcallbacklist.h"
+#include "llinventory.h"
+#include "llviewerinventory.h"
+#include "llinventorymodel.h"
+const F32 MAX_NAME_WAIT_TIME = 5.0f;
+LLDelayedGestureError::ErrorQueue LLDelayedGestureError::sQueue;
+//static
+void LLDelayedGestureError::gestureMissing(const LLUUID &id)
+{
+        LLErrorEntry ent("GestureMissing", id);
+        if ( ! doDialog(ent) )
+        {
+                enqueue(ent);
+        }
+}
+//static
+void LLDelayedGestureError::gestureFailedToLoad(const LLUUID &id)
+{
+        LLErrorEntry ent("UnableToLoadGesture", id);
+        if ( ! doDialog(ent) )
+        {
+                enqueue(ent);
+        }
+}
+//static
+void LLDelayedGestureError::enqueue(const LLErrorEntry &ent)
+{
+        if ( sQueue.empty() )
+        {
+                gIdleCallbacks.addFunction(onIdle, NULL);
+        }
+        sQueue.push_back(ent);
+}
+//static 
+void LLDelayedGestureError::onIdle(void *userdata)
+{
+        if ( ! sQueue.empty() )
+        {
+                LLErrorEntry ent = sQueue.front();
+                sQueue.pop_front();
+                if ( ! doDialog(ent, false ) )
+                {
+                        enqueue(ent);
+                }
+        }
+        else
+        {
+                // Nothing to do anymore
+                gIdleCallbacks.deleteFunction(onIdle, NULL);
+        }
+}
+//static 
+bool LLDelayedGestureError::doDialog(const LLErrorEntry &ent, bool uuid_ok)
+{
+        LLStringBase<char>::format_map_t args;
+        LLInventoryItem *item = gInventory.getItem( ent.mItemID );
+        if ( item )
+        {
+                args["[NAME]"] = item->getName();
+        }
+        else
+        {
+                if ( uuid_ok || ent.mTimer.getElapsedTimeF32() > MAX_NAME_WAIT_TIME )
+                {
+                        args["[NAME]"] = LLString( ent.mItemID.asString() );
+                }
+                else
+                {
+                        return false;
+                }
+        }
+         
+        LLNotifyBox::showXml(ent.mNotifyName, args);
+        return true;
+}
diff --git a/linden/indra/newview/lldelayedgestureerror.h b/linden/indra/newview/lldelayedgestureerror.h
new file mode 100644
index 0000000..9f8e9e0
--- /dev/null
+++ b/linden/indra/newview/lldelayedgestureerror.h
@@ -0,0 +1,82 @@
+/** 
+ * @file lldelayedgestureerror.h
+ * @brief Delayed gesture error message -- try to wait until name has been retrieved
+ * @author Dale Glass
+ *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
+ * Copyright (c) 2004-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LL_DELAYEDGESTUREERROR_H
+#define LL_DELAYEDGESTUREERROR_H
+#include <list>
+#include "lltimer.h"
+// TODO: Refactor to be more generic - this may be useful for other delayed notifications in the future
+class LLDelayedGestureError
+{
+public:
+        /**
+         * @brief Generates a missing gesture error
+         * @param id UUID of missing gesture
+         * Delays message for up to 5 seconds if UUID can't be immediately converted to a text description
+         */
+        static void gestureMissing(const LLUUID &id);
+        /**
+         * @brief Generates a gesture failed to load error
+         * @param id UUID of missing gesture
+         * Delays message for up to 5 seconds if UUID can't be immediately converted to a text description
+         */
+        static void gestureFailedToLoad(const LLUUID &id);
+private:
+        
+        struct LLErrorEntry
+        {
+                LLErrorEntry(const LLString& notify, const LLUUID &item) : mTimer(), mNotifyName(notify), mItemID(item) {}
+                LLTimer mTimer;
+                LLString mNotifyName;
+                LLUUID mItemID;
+        };
+        static bool doDialog(const LLErrorEntry &ent, bool uuid_ok = false);
+        static void enqueue(const LLErrorEntry &ent);
+        static void onIdle(void *userdata);
+        typedef std::list<LLErrorEntry> ErrorQueue;
+        static ErrorQueue sQueue;
+};
+#endif
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 228049f..3a2841d 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -85,7 +85,7 @@ LLDynamicArrayPtr<LLPointer<LLDrawable> > LLDrawable::sDeadList;
 void LLDrawable::incrementVisible() 
 {
        sCurVisible++;
-        sCurPixelAngle = (F32) gViewerWindow->getWindowDisplayHeight()/gCamera->getView();
+        sCurPixelAngle = (F32) gViewerWindow->getWindowDisplayHeight()/LLViewerCamera::getInstance()->getView();
 }
 void LLDrawable::init()
 {
diff --git a/linden/indra/newview/lldrawpoolalpha.cpp b/linden/indra/newview/lldrawpoolalpha.cpp
index 1ad7132..cc2600e 100644
--- a/linden/indra/newview/lldrawpoolalpha.cpp
+++ b/linden/indra/newview/lldrawpoolalpha.cpp
@@ -208,7 +208,7 @@ void LLDrawPoolAlpha::renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask
        // and it's close
        if(is_particle && !gSavedSettings.getBOOL("RenderUseShaderNearParticles"))
        {
-                if((dist < gCamera->getFar() * gSavedSettings.getF32("RenderShaderParticleThreshold")))
+                if((dist < LLViewerCamera::getInstance()->getFar() * gSavedSettings.getF32("RenderShaderParticleThreshold")))
                {
                        use_shaders = FALSE;
                }
diff --git a/linden/indra/newview/lldrawpoolavatar.cpp b/linden/indra/newview/lldrawpoolavatar.cpp
index 5518a93..b461757 100644
--- a/linden/indra/newview/lldrawpoolavatar.cpp
+++ b/linden/indra/newview/lldrawpoolavatar.cpp
@@ -463,7 +463,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
        if ((sShaderLevel >= SHADER_LEVEL_CLOTH))
        {
                LLMatrix4 rot_mat;
-                gCamera->getMatrixToLocal(rot_mat);
+                LLViewerCamera::getInstance()->getMatrixToLocal(rot_mat);
                LLMatrix4 cfr(OGL_TO_CFR_ROTATION);
                rot_mat *= cfr;
                
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index 0bfb737..2345406 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -141,7 +141,12 @@ void LLStandardBumpmap::restoreGL()
 //              llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl;
                gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label;
-                gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = gImageList.getImage( LLUUID(gViewerArt.getString(bump_file)) );
+                gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage = 
+                        gImageList.getImageFromFile(bump_file,
+                                                                                TRUE, 
+                                                                                FALSE, 
+                                                                                0, 
+                                                                                0);
                LLStandardBumpmap::sStandardBumpmapCount++;
        }
diff --git a/linden/indra/newview/lldrawpoolground.cpp b/linden/indra/newview/lldrawpoolground.cpp
index dc5e397..a1c5a99 100644
--- a/linden/indra/newview/lldrawpoolground.cpp
+++ b/linden/indra/newview/lldrawpoolground.cpp
@@ -79,7 +79,7 @@ void LLDrawPoolGround::render(S32 pass)
        F32 water_height = gAgent.getRegion()->getWaterHeight();
        glPushMatrix();
-        LLVector3 origin = gCamera->getOrigin();
+        LLVector3 origin = LLViewerCamera::getInstance()->getOrigin();
        glTranslatef(origin.mV[0], origin.mV[1], llmax(origin.mV[2], water_height));
        LLFace *facep = mDrawFace[0];
diff --git a/linden/indra/newview/lldrawpoolsky.cpp b/linden/indra/newview/lldrawpoolsky.cpp
index ef91b58..ac5c389 100644
--- a/linden/indra/newview/lldrawpoolsky.cpp
+++ b/linden/indra/newview/lldrawpoolsky.cpp
@@ -103,14 +103,14 @@ void LLDrawPoolSky::render(S32 pass)
        LLGLClampToFarClip far_clip(glh_get_current_projection());
-        LLGLEnable fog_enable( (mVertexShaderLevel < 1 && gCamera->cameraUnderWater()) ? GL_FOG : 0);
+        LLGLEnable fog_enable( (mVertexShaderLevel < 1 && LLViewerCamera::getInstance()->cameraUnderWater()) ? GL_FOG : 0);
        gPipeline.disableLights();
        
        LLGLDisable clip(GL_CLIP_PLANE0);
        glPushMatrix();
-        LLVector3 origin = gCamera->getOrigin();
+        LLVector3 origin = LLViewerCamera::getInstance()->getOrigin();
        glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]);
        glEnableClientState(GL_VERTEX_ARRAY);
diff --git a/linden/indra/newview/lldrawpoolterrain.cpp b/linden/indra/newview/lldrawpoolterrain.cpp
index 82fcd59..1d43698 100644
--- a/linden/indra/newview/lldrawpoolterrain.cpp
+++ b/linden/indra/newview/lldrawpoolterrain.cpp
@@ -68,13 +68,15 @@ LLDrawPoolTerrain::LLDrawPoolTerrain(LLViewerImage *texturep) :
        // Hack!
        sDetailScale = 1.f/gSavedSettings.getF32("RenderTerrainScale");
        sDetailMode = gSavedSettings.getS32("RenderTerrainDetail");
-        mAlphaRampImagep = gImageList.getImageFromUUID(LLUUID(gViewerArt.getString("alpha_gradient.tga")),
+        mAlphaRampImagep = gImageList.getImageFromFile("alpha_gradient.tga",
-                                                                                                   TRUE, TRUE, GL_ALPHA8, GL_ALPHA);
+                                                                                                   TRUE, TRUE, GL_ALPHA8, GL_ALPHA,
+                                                                                                   LLUUID("e97cf410-8e61-7005-ec06-629eba4cd1fb"));
        mAlphaRampImagep->bind(0);
        mAlphaRampImagep->setClamp(TRUE, TRUE);
-        m2DAlphaRampImagep = gImageList.getImageFromUUID(LLUUID(gViewerArt.getString("alpha_gradient_2d.tga")),
+        m2DAlphaRampImagep = gImageList.getImageFromFile("alpha_gradient_2d.j2c",
-                                                                                                         TRUE, TRUE, GL_ALPHA8, GL_ALPHA);
+                                                                                                        TRUE, TRUE, GL_ALPHA8, GL_ALPHA,
+                                                                                                        LLUUID("38b86f85-2575-52a9-a531-23108d8da837"));
        m2DAlphaRampImagep->bind(0);
        m2DAlphaRampImagep->setClamp(TRUE, TRUE);
        
diff --git a/linden/indra/newview/lldrawpoolwater.cpp b/linden/indra/newview/lldrawpoolwater.cpp
index ed0077a..922a5d8 100644
--- a/linden/indra/newview/lldrawpoolwater.cpp
+++ b/linden/indra/newview/lldrawpoolwater.cpp
@@ -59,6 +59,7 @@ static float sTime;
 BOOL LLDrawPoolWater::sSkipScreenCopy = FALSE;
 BOOL LLDrawPoolWater::sNeedsReflectionUpdate = TRUE;
+BOOL LLDrawPoolWater::sNeedsDistortionUpdate = TRUE;
 LLColor4 LLDrawPoolWater::sWaterFogColor = LLColor4(0.2f, 0.5f, 0.5f, 0.f);
 LLVector3 LLDrawPoolWater::sLightDir;
@@ -74,8 +75,7 @@ LLDrawPoolWater::LLDrawPoolWater() :
        mHBTex[1]->setClamp(TRUE, TRUE);
        mWaterImagep = gImageList.getImage(WATER_TEST);
-        //mWaterNormp = gImageList.getImage(LLUUID(gViewerArt.getString("water_normal.tga")));
+        mWaterNormp = gImageList.getImage(DEFAULT_WATER_NORMAL);
-        mWaterNormp = gImageList.getImage(LLWaterParamManager::instance()->getNormalMapID());
        restoreGL();
 }
@@ -99,7 +99,7 @@ LLDrawPool *LLDrawPoolWater::instancePool()
 void LLDrawPoolWater::prerender()
 {
-        mVertexShaderLevel = (gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap")) ?
+        mVertexShaderLevel = (gGLManager.mHasCubeMap && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")) ?
                LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_WATER) : 0;
        // got rid of modulation by light color since it got a little too
@@ -111,7 +111,7 @@ void LLDrawPoolWater::prerender()
 S32 LLDrawPoolWater::getNumPasses()
 {
-        if (gCamera->getOrigin().mV[2] < 1024.f)
+        if (LLViewerCamera::getInstance()->getOrigin().mV[2] < 1024.f)
        {
                return 1;
        }
@@ -176,11 +176,11 @@ void LLDrawPoolWater::render(S32 pass)
        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
        glEnable(GL_TEXTURE_2D); // Texture unit 1
-        LLVector3 camera_up = gCamera->getUpAxis();
+        LLVector3 camera_up = LLViewerCamera::getInstance()->getUpAxis();
        F32 up_dot = camera_up * LLVector3::z_axis;
        LLColor4 water_color;
-        if (gCamera->cameraUnderWater())
+        if (LLViewerCamera::getInstance()->cameraUnderWater())
        {
                water_color.setVec(1.f, 1.f, 1.f, 0.4f);
        }
@@ -260,7 +260,7 @@ void LLDrawPoolWater::render(S32 pass)
                glMatrixMode(GL_TEXTURE);
                glLoadIdentity();
-                LLMatrix4 camera_mat = gCamera->getModelview();
+                LLMatrix4 camera_mat = LLViewerCamera::getInstance()->getModelview();
                LLMatrix4 camera_rot(camera_mat.getMat3());
                camera_rot.invert();
@@ -404,7 +404,7 @@ void LLDrawPoolWater::shade()
        LLGLSLShader* shader;
-        F32 eyedepth = gCamera->getOrigin().mV[2] - gAgent.getRegion()->getWaterHeight();
+        F32 eyedepth = LLViewerCamera::getInstance()->getOrigin().mV[2] - gAgent.getRegion()->getWaterHeight();
        
        if (eyedepth < 0.f && LLPipeline::sWaterReflections)
        {
@@ -487,7 +487,7 @@ void LLDrawPoolWater::shade()
        //shader->uniformMatrix4fv("inverse_ref", 1, GL_FALSE, (GLfloat*) gGLObliqueProjectionInverse.mMatrix);
        shader->uniform1f(LLShaderMgr::WATER_WATERHEIGHT, eyedepth);
        shader->uniform1f(LLShaderMgr::WATER_TIME, sTime);
-        shader->uniform3fv(LLShaderMgr::WATER_EYEVEC, 1, gCamera->getOrigin().mV);
+        shader->uniform3fv(LLShaderMgr::WATER_EYEVEC, 1, LLViewerCamera::getInstance()->getOrigin().mV);
        shader->uniform3fv(LLShaderMgr::WATER_SPECULAR, 1, light_diffuse.mV);
        shader->uniform1f(LLShaderMgr::WATER_SPECULAR_EXP, light_exp);
        shader->uniform2fv(LLShaderMgr::WATER_WAVE_DIR1, 1, param_mgr->getWave1Dir().mV);
@@ -507,9 +507,9 @@ void LLDrawPoolWater::shade()
        shader->uniform1f("sunAngle2", 0.1f + 0.2f*sunAngle);
        LLColor4 water_color;
-        LLVector3 camera_up = gCamera->getUpAxis();
+        LLVector3 camera_up = LLViewerCamera::getInstance()->getUpAxis();
        F32 up_dot = camera_up * LLVector3::z_axis;
-        if (gCamera->cameraUnderWater())
+        if (LLViewerCamera::getInstance()->cameraUnderWater())
        {
                water_color.setVec(1.f, 1.f, 1.f, 0.4f);
                shader->uniform1f(LLShaderMgr::WATER_REFSCALE, param_mgr->getScaleBelow());
@@ -546,6 +546,7 @@ void LLDrawPoolWater::shade()
                        
                        if (water->getUseTexture())
                        {
+                                sNeedsDistortionUpdate = TRUE;
                                face->renderIndexed();
                        }
                        else
@@ -557,6 +558,7 @@ void LLDrawPoolWater::shade()
                                }
                                else
                                {
+                                        sNeedsDistortionUpdate = TRUE;
                                        face->renderIndexed();
                                }
                        }
diff --git a/linden/indra/newview/lldrawpoolwater.h b/linden/indra/newview/lldrawpoolwater.h
index 45cefac..b0ea542 100644
--- a/linden/indra/newview/lldrawpoolwater.h
+++ b/linden/indra/newview/lldrawpoolwater.h
@@ -50,6 +50,7 @@ protected:
 public:
        static BOOL sSkipScreenCopy;
        static BOOL sNeedsReflectionUpdate;
+        static BOOL sNeedsDistortionUpdate;
        static LLVector3 sLightDir;
        static LLColor4 sWaterFogColor;
diff --git a/linden/indra/newview/lldrawpoolwlsky.cpp b/linden/indra/newview/lldrawpoolwlsky.cpp
index 3e8d1b2..d18f0de 100644
--- a/linden/indra/newview/lldrawpoolwlsky.cpp
+++ b/linden/indra/newview/lldrawpoolwlsky.cpp
@@ -96,7 +96,7 @@ void LLDrawPoolWLSky::endRenderPass( S32 pass )
 void LLDrawPoolWLSky::renderDome(F32 camHeightLocal, LLGLSLShader * shader) const
 {
-        LLVector3 const & origin = gCamera->getOrigin();
+        LLVector3 const & origin = LLViewerCamera::getInstance()->getOrigin();
        llassert_always(NULL != shader);
@@ -288,7 +288,7 @@ void LLDrawPoolWLSky::render(S32 pass)
        renderSkyHaze(camHeightLocal);
-        LLVector3 const & origin = gCamera->getOrigin();
+        LLVector3 const & origin = LLViewerCamera::getInstance()->getOrigin();
        glPushMatrix();
                glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]);
diff --git a/linden/indra/newview/lldynamictexture.cpp b/linden/indra/newview/lldynamictexture.cpp
index 4a47855..14b80d6 100644
--- a/linden/indra/newview/lldynamictexture.cpp
+++ b/linden/indra/newview/lldynamictexture.cpp
@@ -148,11 +148,11 @@ void LLDynamicTexture::preRender(BOOL clear_depth)
                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
        }
        // Set up camera
-        mCamera.setOrigin(*gCamera);
+        mCamera.setOrigin(*LLViewerCamera::getInstance());
-        mCamera.setAxes(*gCamera);
+        mCamera.setAxes(*LLViewerCamera::getInstance());
-        mCamera.setAspect(gCamera->getAspect());
+        mCamera.setAspect(LLViewerCamera::getInstance()->getAspect());
-        mCamera.setView(gCamera->getView());
+        mCamera.setView(LLViewerCamera::getInstance()->getView());
-        mCamera.setNear(gCamera->getNear());
+        mCamera.setNear(LLViewerCamera::getInstance()->getNear());
        glViewport(mOrigin.mX, mOrigin.mY, mWidth, mHeight);
        if (clear_depth)
@@ -177,11 +177,11 @@ void LLDynamicTexture::postRender(BOOL success)
        gViewerWindow->setupViewport();
        // restore camera
-        gCamera->setOrigin(mCamera);
+        LLViewerCamera::getInstance()->setOrigin(mCamera);
-        gCamera->setAxes(mCamera);
+        LLViewerCamera::getInstance()->setAxes(mCamera);
-        gCamera->setAspect(mCamera.getAspect());
+        LLViewerCamera::getInstance()->setAspect(mCamera.getAspect());
-        gCamera->setView(mCamera.getView());
+        LLViewerCamera::getInstance()->setView(mCamera.getView());
-        gCamera->setNear(mCamera.getNear());
+        LLViewerCamera::getInstance()->setNear(mCamera.getNear());
 }
 //-----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llface.cpp b/linden/indra/newview/llface.cpp
index 2be82f7..0c8de14 100644
--- a/linden/indra/newview/llface.cpp
+++ b/linden/indra/newview/llface.cpp
@@ -471,10 +471,8 @@ 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"));
+        LLViewerImage* red_blue_imagep = gImageList.getImageFromFile("uv_test1.j2c", TRUE, TRUE);
-        LLUUID uv_img_green_id(gViewerArt.getString("uv_test2.tga"));
+        LLViewerImage* green_imagep = gImageList.getImageFromFile("uv_test2.tga", TRUE, TRUE);
-        LLViewerImage* red_blue_imagep = gImageList.getImage(uv_img_red_blue_id, TRUE, TRUE);
-        LLViewerImage* green_imagep = gImageList.getImage(uv_img_green_id, TRUE, TRUE);
        LLGLSObjectSelect object_select;
        LLGLEnable blend(GL_BLEND);
diff --git a/linden/indra/newview/llfasttimerview.cpp b/linden/indra/newview/llfasttimerview.cpp
index d2e04de..372d8fa 100644
--- a/linden/indra/newview/llfasttimerview.cpp
+++ b/linden/indra/newview/llfasttimerview.cpp
@@ -113,10 +113,6 @@ static struct ft_display_info ft_display_table[] =
        { LLFastTimer::FTM_PIPELINE,                    "     Pipeline",        &LLColor4::magenta4, 0 },
        { LLFastTimer::FTM_CLEANUP,                             "  Cleanup",            &LLColor4::cyan3, 0 },
        { LLFastTimer::FTM_AUDIO_UPDATE,                "  Audio Update",       &LLColor4::yellow3, 0 },
-        { 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, 1 },
@@ -146,6 +142,10 @@ static struct ft_display_info ft_display_table[] =
    { LLFastTimer::FTM_CULL_REBOUND,            "   Rebound",           &LLColor4::blue3, 0 },
        { LLFastTimer::FTM_FRUSTUM_CULL,                "   Frustum Cull",      &LLColor4::blue4, 0 },
        { LLFastTimer::FTM_OCCLUSION_READBACK,  "   Occlusion Read", &LLColor4::red2, 0 },
+        { 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_STATESORT,                   "  State Sort", &LLColor4::orange1, 1 },
        { LLFastTimer::FTM_STATESORT_DRAWABLE,  "   Drawable",          &LLColor4::orange2, 0 },
        { LLFastTimer::FTM_STATESORT_POSTSORT,  "   Post Sort", &LLColor4::orange3, 0 },
@@ -270,16 +270,6 @@ LLFastTimerView::~LLFastTimerView()
        delete[] mBarEnd;
 }
-EWidgetType LLFastTimerView::getWidgetType() const
-{
-        return WIDGET_TYPE_FAST_TIMER_VIEW;
-}
-LLString LLFastTimerView::getWidgetTag() const
-{
-        return LL_FAST_TIMER_VIEW_TAG;
-}
 BOOL LLFastTimerView::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
        if (mBarRect.pointInRect(x, y))
@@ -408,14 +398,10 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask)
 BOOL LLFastTimerView::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-        if (getVisible() && pointInView(x, y))
+        LLFastTimer::sPauseHistory = TRUE;
-        {
+        mScrollIndex = llclamp(mScrollIndex - clicks, 
-                LLFastTimer::sPauseHistory = TRUE;
+                                                        0, llmin(LLFastTimer::sLastFrameIndex, (S32)LLFastTimer::FTM_HISTORY_NUM-MAX_VISIBLE_HISTORY));
-                mScrollIndex = llclamp(mScrollIndex - clicks, 
+        return TRUE;
-                                                                0, llmin(LLFastTimer::sLastFrameIndex, (S32)LLFastTimer::FTM_HISTORY_NUM-MAX_VISIBLE_HISTORY));
-                return TRUE;
-        }
-        return FALSE;
 }
 void LLFastTimerView::draw()
@@ -437,7 +423,7 @@ void LLFastTimerView::draw()
        S32 left, top, right, bottom;
        S32 x, y, barw, barh, dx, dy;
        S32 texth, textw;
-        LLViewerImage* box_imagep = gImageList.getImage(LLUUID(gViewerArt.getString("rounded_square.tga")), MIPMAP_FALSE, TRUE);
+        LLPointer<LLUIImage> box_imagep = LLUI::getUIImage("rounded_square.tga");
        // Make sure all timers are accounted for
        // Set 'FTM_OTHER' to unaccounted ticks last frame
@@ -806,7 +792,7 @@ void LLFastTimerView::draw()
                
                // Draw bars for each history entry
                // Special: -1 = show running average
-                LLViewerImage::bindTexture(box_imagep);
+                LLViewerImage::bindTexture(box_imagep->getImage());
                for (S32 j=-1; j<histmax && y > LINE_GRAPH_HEIGHT; j++)
                {
                        int sublevel_dx[FTV_DISPLAY_NUM+1];
@@ -938,7 +924,7 @@ void LLFastTimerView::draw()
                                        gGL.color4fv(color.mV);
                                        F32 start_fragment = llclamp((F32)(left - sublevel_left[level]) / (F32)sublevel_dx[level], 0.f, 1.f);
                                        F32 end_fragment = llclamp((F32)(right - sublevel_left[level]) / (F32)sublevel_dx[level], 0.f, 1.f);
-                                        gl_segmented_rect_2d_fragment_tex(sublevel_left[level], top - level + scale_offset, sublevel_right[level], bottom + level - scale_offset, box_imagep->getWidth(), box_imagep->getHeight(), 16, start_fragment, end_fragment);
+                                        gl_segmented_rect_2d_fragment_tex(sublevel_left[level], top - level + scale_offset, sublevel_right[level], bottom + level - scale_offset, box_imagep->getTextureWidth(), box_imagep->getTextureHeight(), 16, start_fragment, end_fragment);
                                }
                                        
diff --git a/linden/indra/newview/llfasttimerview.h b/linden/indra/newview/llfasttimerview.h
index bd103e2..75eb165 100644
--- a/linden/indra/newview/llfasttimerview.h
+++ b/linden/indra/newview/llfasttimerview.h
@@ -41,9 +41,6 @@ public:
        LLFastTimerView(const std::string& name, const LLRect& rect);
        virtual ~LLFastTimerView();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
        virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
        virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index f96b2db..9f79c18 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -75,8 +75,6 @@ const char FEATURE_TABLE_FILENAME[] = "featuretable.txt";
 const char GPU_TABLE_FILENAME[] = "gpu_table.txt";
-LLFeatureManager *gFeatureManagerp = NULL;
 LLFeatureInfo::LLFeatureInfo(const char *name, const BOOL available, const F32 level) : mValid(TRUE)
 {
        mName = name;
@@ -483,7 +481,7 @@ void LLFeatureManager::applyFeatures(bool skipFeatures)
                }
                // get the control setting
-                LLControlBase* ctrl = gSavedSettings.getControl(mIt->first);
+                LLControlVariable* ctrl = gSavedSettings.getControl(mIt->first);
                if(ctrl == NULL)
                {
                        llwarns << "AHHH! Control setting " << mIt->first << " does not exist!" << llendl;
diff --git a/linden/indra/newview/llfeaturemanager.h b/linden/indra/newview/llfeaturemanager.h
index c98fb0d..b45046b 100644
--- a/linden/indra/newview/llfeaturemanager.h
+++ b/linden/indra/newview/llfeaturemanager.h
@@ -1,6 +1,6 @@
 /** 
 * @file llfeaturemanager.h
- * @brief LLFeatureManager class definition
+ * @brief The feature manager is responsible for determining what features are turned on/off in the app.
 *
 * $LicenseInfo:firstyear=2003&license=viewergpl$
 * 
@@ -94,7 +94,7 @@ protected:
 };
-class LLFeatureManager : public LLFeatureList
+class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManager>
 {
 public:
        LLFeatureManager() : mInited(FALSE), mTableVersion(0), mSafe(FALSE), mGPUClass(GPU_CLASS_UNKNOWN) {}
@@ -148,6 +148,5 @@ protected:
        BOOL            mGPUSupported;
 };
-extern LLFeatureManager *gFeatureManagerp;
 #endif // LL_LLFEATUREMANAGER_H
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index 4ea950f..e6dee2c 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -38,7 +38,6 @@
 // viewer includes
 #include "llnotify.h"
-#include "llfloatervoicewizard.h"
 #include "llviewercontrol.h"
 #include "llui.h"
 #include "llappviewer.h"
@@ -49,7 +48,8 @@ std::set<LLString> LLFirstUse::sConfigVariables;
 // static
 void LLFirstUse::addConfigVariable(const LLString& var)
 {
-        gSavedSettings.addWarning(var);
+        //Don't add the warning, now that we're storing the default in the settings_default.xml file
+        //gSavedSettings.addWarning(var);
        sConfigVariables.insert(var);
 }
@@ -254,18 +254,6 @@ void LLFirstUse::useSculptedPrim()
 }
 // static 
-void LLFirstUse::useVoice()
-{
-        if (gDisableVoice) return;
-        if (gSavedSettings.getWarning("FirstVoice"))
-        {
-                gSavedSettings.setWarning("FirstVoice", FALSE);
-                LLFloaterVoiceWizard::showInstance();
-        }
-}
-// static 
 void LLFirstUse::useMedia()
 {
        if (gSavedSettings.getWarning("FirstMedia"))
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index 413db4b..176ca2d 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -104,7 +104,6 @@ public:
        static void useFlexible();
        static void useDebugMenus();
        static void useSculptedPrim();
-        static void useVoice();
        static void useMedia();
        
 protected:
diff --git a/linden/indra/newview/llflexibleobject.cpp b/linden/indra/newview/llflexibleobject.cpp
index e9c2332..fe7fafa 100644
--- a/linden/indra/newview/llflexibleobject.cpp
+++ b/linden/indra/newview/llflexibleobject.cpp
@@ -36,7 +36,7 @@
 #include "llface.h"
 #include "llflexibleobject.h"
 #include "llglheaders.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llviewerobject.h"
 #include "llimagegl.h"
 #include "llagent.h"
@@ -246,7 +246,6 @@ void LLVolumeImplFlexible::setAttributesOfAllSections()
 void LLVolumeImplFlexible::onSetVolume(const LLVolumeParams &volume_params, const S32 detail)
 {
-        
 }
 //---------------------------------------------------------------------------------
@@ -280,7 +279,7 @@ BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6
        F32 app_angle = llround((F32) atan2( mVO->getScale().mV[2]*2.f, mVO->mDrawable->mDistanceWRTCamera) * RAD_TO_DEG, 0.01f);
        // Rendering sections increases with visible angle on the screen
-        mRenderRes = (S32)(FLEXIBLE_OBJECT_MAX_SECTIONS*4*app_angle*DEG_TO_RAD/gCamera->getView());
+        mRenderRes = (S32)(FLEXIBLE_OBJECT_MAX_SECTIONS*4*app_angle*DEG_TO_RAD/LLViewerCamera::getInstance()->getView());
        if (mRenderRes > FLEXIBLE_OBJECT_MAX_SECTIONS)
        {
                mRenderRes = FLEXIBLE_OBJECT_MAX_SECTIONS;
@@ -330,7 +329,7 @@ BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6
                        id = parent->getVolumeInterfaceID();
                }
-                U32 update_period = (U32) (gCamera->getScreenPixelArea()*0.01f/(pixel_area*(sUpdateFactor+1.f)))+1;
+                U32 update_period = (U32) (LLViewerCamera::getInstance()->getScreenPixelArea()*0.01f/(pixel_area*(sUpdateFactor+1.f)))+1;
                if ((LLDrawable::getCurrentFrame()+id)%update_period == 0)
                {
@@ -359,7 +358,7 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
        if (mSimulateRes == 0)
        {
                mVO->markForUpdate(TRUE);
-                if (!doIdleUpdate(gAgent, *gWorldp, 0.0))
+                if (!doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0))
                {
                        return; // we did not get updated or initialized, proceeding without can be dangerous
                }
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index ddedef4..8e55cf8 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -46,7 +46,7 @@
 #include "llviewerregion.h"
 #include "llversionviewer.h"
 #include "llviewerbuild.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llappviewer.h" 
 #include "llglheaders.h"
 #include "llmediamanager.h"
@@ -70,7 +70,7 @@ LLFloaterAbout* LLFloaterAbout::sInstance = NULL;
 LLFloaterAbout::LLFloaterAbout() 
 :       LLFloater("floater_about", "FloaterAboutRect", "")
 {
-        gUICtrlFactory->buildFloater(this, "floater_about.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_about.xml");
        // Support for changing product name.
        LLString title("About ");
@@ -84,7 +84,7 @@ LLFloaterAbout::LLFloaterAbout()
                + llformat(" %d.%d.%d (%d) %s %s (%s)",
                                   LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
                                   __DATE__, __TIME__,
-                                   gChannelName.c_str());
+                                   gSavedSettings.getString("VersionChannelName").c_str());
        support.append(version);
        support.append("\n\n");
@@ -157,23 +157,16 @@ LLFloaterAbout::LLFloaterAbout()
                }
        }
-        if (gViewerStats
+        if (gPacketsIn > 0)
-                && gPacketsIn > 0)
        {
                LLString packet_loss = llformat("Packets Lost: %.0f/%.0f (%.1f%%)", 
-                        gViewerStats->mPacketsLostStat.getCurrent(),
+                        LLViewerStats::getInstance()->mPacketsLostStat.getCurrent(),
                        F32(gPacketsIn),
-                        100.f*gViewerStats->mPacketsLostStat.getCurrent() / F32(gPacketsIn) );
+                        100.f*LLViewerStats::getInstance()->mPacketsLostStat.getCurrent() / F32(gPacketsIn) );
                support.append(packet_loss);
                support.append("\n");
        }
-        // MD5 digest of executable
-        support.append("Viewer Digest: ");
-        char viewer_digest_string[UUID_STR_LENGTH]; /*Flawfinder: ignore*/
-        gViewerDigest.toString( viewer_digest_string );
-        support.append(viewer_digest_string);
        // Fix views
        childDisable("credits_editor");
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 7445ef0..ed2f9f8 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -36,7 +36,7 @@
 #include "llagent.h"
 #include "llvoavatar.h"
 #include "llfloateravatarinfo.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 #include "llscrolllistctrl.h"
 #include "llbutton.h"
@@ -52,9 +52,6 @@ const LLColor4 INACTIVE_COLOR(0.3f, 0.3f, 0.3f, 0.5f);
 const LLColor4 ACTIVE_COLOR(0.5f, 0.5f, 0.5f, 1.f);
 const F32 TYPING_ANIMATION_FPS = 2.5f;
-LLLocalSpeakerMgr*      gLocalSpeakerMgr = NULL;
-LLActiveSpeakerMgr*             gActiveChannelSpeakerMgr = NULL;
 LLSpeaker::LLSpeaker(const LLUUID& id, const LLString& name, const ESpeakerType type) : 
        mStatus(LLSpeaker::STATUS_TEXT_ONLY),
        mLastSpokeTime(0.f), 
@@ -78,7 +75,7 @@ LLSpeaker::LLSpeaker(const LLUUID& id, const LLString& name, const ESpeakerType
                mDisplayName = name;
        }
-        gVoiceClient->setUserVolume(id, gMuteListp->getSavedResidentVolume(id));
+        gVoiceClient->setUserVolume(id, LLMuteList::getInstance()->getSavedResidentVolume(id));
        mActivityTimer.resetWithExpiry(SPEAKER_TIMEOUT);
 }
@@ -166,7 +163,7 @@ LLFloaterActiveSpeakers::LLFloaterActiveSpeakers(const LLSD& seed) : mPanel(NULL
        mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, NULL);
        // do not automatically open singleton floaters (as result of getInstance())
        BOOL no_open = FALSE;
-        gUICtrlFactory->buildFloater(this, "floater_active_speakers.xml", &getFactoryMap(), no_open);   
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_active_speakers.xml", &getFactoryMap(), no_open);   
        //RN: for now, we poll voice client every frame to get voice amplitude feedback
        //gVoiceClient->addObserver(this);
        mPanel->refreshSpeakers();
@@ -176,8 +173,17 @@ LLFloaterActiveSpeakers::~LLFloaterActiveSpeakers()
 {
 }
+void LLFloaterActiveSpeakers::onOpen()
+{
+        gSavedSettings.setBOOL("ShowActiveSpeakers", TRUE);
+}
 void LLFloaterActiveSpeakers::onClose(bool app_quitting)
 {
+        if (!app_quitting)
+        {
+                gSavedSettings.setBOOL("ShowActiveSpeakers", FALSE);
+        }
        setVisible(FALSE);
 }
@@ -190,7 +196,7 @@ void LLFloaterActiveSpeakers::draw()
 BOOL LLFloaterActiveSpeakers::postBuild()
 {
-        mPanel = (LLPanelActiveSpeakers*)LLUICtrlFactory::getPanelByName(this, "active_speakers_panel");
+        mPanel = getChild<LLPanelActiveSpeakers>("active_speakers_panel");
        return TRUE;
 }
@@ -203,7 +209,7 @@ void LLFloaterActiveSpeakers::onChange()
 void* LLFloaterActiveSpeakers::createSpeakersPanel(void* data)
 {
        // don't show text only speakers
-        return new LLPanelActiveSpeakers(gActiveChannelSpeakerMgr, FALSE);
+        return new LLPanelActiveSpeakers(LLActiveSpeakerMgr::getInstance(), FALSE);
 }
 //
@@ -281,24 +287,29 @@ LLPanelActiveSpeakers::LLPanelActiveSpeakers(LLSpeakerMgr* data_source, BOOL sho
 BOOL LLPanelActiveSpeakers::postBuild()
 {
-        mSpeakerList = LLUICtrlFactory::getScrollListByName(this, "speakers_list");
+        std::string sort_column = gSavedSettings.getString(LLString("FloaterActiveSpeakersSortColumn"));
+        BOOL sort_ascending     = gSavedSettings.getBOOL(  LLString("FloaterActiveSpeakersSortAscending"));
+        mSpeakerList = getChild<LLScrollListCtrl>("speakers_list");
+        mSpeakerList->sortByColumn(sort_column, sort_ascending);
        mSpeakerList->setDoubleClickCallback(onDoubleClickSpeaker);
        mSpeakerList->setCommitOnSelectionChange(TRUE);
        mSpeakerList->setCommitCallback(onSelectSpeaker);
+        mSpeakerList->setSortChangedCallback(onSortChanged);
        mSpeakerList->setCallbackUserData(this);
-        mMuteTextCtrl = getCtrlByNameAndType("mute_text_btn", WIDGET_TYPE_DONTCARE);
+        mMuteTextCtrl = getChild<LLUICtrl>("mute_text_btn");
        childSetCommitCallback("mute_text_btn", onClickMuteTextCommit, this);
-        mMuteVoiceCtrl = getCtrlByNameAndType("mute_btn", WIDGET_TYPE_DONTCARE);
+        mMuteVoiceCtrl = getChild<LLUICtrl>("mute_btn");
        childSetCommitCallback("mute_btn", onClickMuteVoiceCommit, this);
        childSetAction("mute_btn", onClickMuteVoice, this);
        childSetCommitCallback("speaker_volume", onVolumeChange, this);
-        mNameText = LLUICtrlFactory::getTextBoxByName(this, "resident_name");
+        mNameText = getChild<LLTextBox>("resident_name");
        
-        mProfileBtn = LLUICtrlFactory::getButtonByName(this, "profile_btn");
+        mProfileBtn = getChild<LLButton>("profile_btn");
        childSetAction("profile_btn", onClickProfile, this);
        childSetCommitCallback("moderator_allow_voice", onModeratorMuteVoice, this);
@@ -332,7 +343,7 @@ void LLPanelActiveSpeakers::addSpeaker(const LLUUID& speaker_id)
                columns[0]["column"] = "icon_speaking_status";
                columns[0]["type"] = "icon";
-                columns[0]["value"] = gViewerArt.getString("icn_active-speakers-dot-lvl0.tga");
+                columns[0]["value"] = "icn_active-speakers-dot-lvl0.tga";
                LLString speaker_name;
                if (speakerp->mDisplayName.empty())
@@ -388,14 +399,13 @@ void LLPanelActiveSpeakers::refreshSpeakers()
        mSpeakerMgr->update();
-        const LLString icon_image_0 = gViewerArt.getString("icn_active-speakers-dot-lvl0.tga");
+        const LLString icon_image_0 = "icn_active-speakers-dot-lvl0.tga";
-        const LLString icon_image_1 = gViewerArt.getString("icn_active-speakers-dot-lvl1.tga");
+        const LLString icon_image_1 = "icn_active-speakers-dot-lvl1.tga";
-        const LLString icon_image_2 = gViewerArt.getString("icn_active-speakers-dot-lvl2.tga");
+        const LLString icon_image_2 = "icn_active-speakers-dot-lvl2.tga";
        std::vector<LLScrollListItem*> items = mSpeakerList->getAllData();
-        LLUUID mute_icon_image = LLUUID(gViewerArt.getString("mute_icon.tga"));
+        LLString mute_icon_image = "mute_icon.tga";
        LLSpeakerMgr::speaker_list_t speaker_list;
        mSpeakerMgr->getSpeakerList(&speaker_list, mShowTextChatters);
@@ -516,27 +526,23 @@ void LLPanelActiveSpeakers::refreshSpeakers()
        mSpeakerList->setSorted(FALSE);
        LLPointer<LLSpeaker> selected_speakerp = mSpeakerMgr->findSpeaker(selected_id);
-        
+        // update UI for selected participant
-        if (gMuteListp)
+        if (mMuteVoiceCtrl)
        {
-                // update UI for selected participant
+                mMuteVoiceCtrl->setValue(LLMuteList::getInstance()->isMuted(selected_id, LLMute::flagVoiceChat));
-                if (mMuteVoiceCtrl)
+                mMuteVoiceCtrl->setEnabled(LLVoiceClient::voiceEnabled()
-                {
+                                                                        && gVoiceClient->getVoiceEnabled(selected_id)
-                        mMuteVoiceCtrl->setValue(gMuteListp->isMuted(selected_id, LLMute::flagVoiceChat));
+                                                                        && selected_id.notNull() 
-                        mMuteVoiceCtrl->setEnabled(LLVoiceClient::voiceEnabled()
-                                                                                && gVoiceClient->getVoiceEnabled(selected_id)
-                                                                                && selected_id.notNull() 
-                                                                                && selected_id != gAgent.getID() 
-                                                                                && (selected_speakerp.notNull() && selected_speakerp->mType == LLSpeaker::SPEAKER_AGENT));
-                }
-                if (mMuteTextCtrl)
-                {
-                        mMuteTextCtrl->setValue(gMuteListp->isMuted(selected_id, LLMute::flagTextChat));
-                        mMuteTextCtrl->setEnabled(selected_id.notNull() 
                                                                        && selected_id != gAgent.getID() 
-                                                                        && selected_speakerp.notNull() 
+                                                                        && (selected_speakerp.notNull() && selected_speakerp->mType == LLSpeaker::SPEAKER_AGENT));
-                                                                        && !gMuteListp->isLinden(selected_speakerp->mDisplayName));
+        }
-                }
+        if (mMuteTextCtrl)
+        {
+                mMuteTextCtrl->setValue(LLMuteList::getInstance()->isMuted(selected_id, LLMute::flagTextChat));
+                mMuteTextCtrl->setEnabled(selected_id.notNull() 
+                                                                && selected_id != gAgent.getID() 
+                                                                && selected_speakerp.notNull() 
+                                                                && !LLMuteList::getInstance()->isLinden(selected_speakerp->mDisplayName));
        }
        childSetValue("speaker_volume", gVoiceClient->getUserVolume(selected_id));
        childSetEnabled("speaker_volume", LLVoiceClient::voiceEnabled()
@@ -597,7 +603,7 @@ void LLPanelActiveSpeakers::setSpeaker(const LLUUID& id, const LLString& name, L
 void LLPanelActiveSpeakers::setVoiceModerationCtrlMode(
        const BOOL& moderated_voice)
 {
-        LLUICtrl* voice_moderation_ctrl = getCtrlByNameAndType("moderation_mode", WIDGET_TYPE_DONTCARE);
+        LLUICtrl* voice_moderation_ctrl = getChild<LLUICtrl>("moderation_mode");
        if ( voice_moderation_ctrl )
        {
@@ -613,7 +619,7 @@ void LLPanelActiveSpeakers::onClickMuteTextCommit(LLUICtrl* ctrl, void* user_dat
 {
        LLPanelActiveSpeakers* panelp = (LLPanelActiveSpeakers*)user_data;
        LLUUID speaker_id = panelp->mSpeakerList->getValue().asUUID();
-        BOOL is_muted = gMuteListp->isMuted(speaker_id, LLMute::flagTextChat);
+        BOOL is_muted = LLMuteList::getInstance()->isMuted(speaker_id, LLMute::flagTextChat);
        std::string name;
        //fill in name using voice client's copy of name cache
@@ -629,11 +635,11 @@ void LLPanelActiveSpeakers::onClickMuteTextCommit(LLUICtrl* ctrl, void* user_dat
        if (!is_muted)
        {
-                gMuteListp->add(mute, LLMute::flagTextChat);
+                LLMuteList::getInstance()->add(mute, LLMute::flagTextChat);
        }
        else
        {
-                gMuteListp->remove(mute, LLMute::flagTextChat);
+                LLMuteList::getInstance()->remove(mute, LLMute::flagTextChat);
        }
 }
@@ -648,7 +654,7 @@ void LLPanelActiveSpeakers::onClickMuteVoiceCommit(LLUICtrl* ctrl, void* user_da
 {
        LLPanelActiveSpeakers* panelp = (LLPanelActiveSpeakers*)user_data;
        LLUUID speaker_id = panelp->mSpeakerList->getValue().asUUID();
-        BOOL is_muted = gMuteListp->isMuted(speaker_id, LLMute::flagVoiceChat);
+        BOOL is_muted = LLMuteList::getInstance()->isMuted(speaker_id, LLMute::flagVoiceChat);
        std::string name;
        LLPointer<LLSpeaker> speakerp = panelp->mSpeakerMgr->findSpeaker(speaker_id);
@@ -664,11 +670,11 @@ void LLPanelActiveSpeakers::onClickMuteVoiceCommit(LLUICtrl* ctrl, void* user_da
        if (!is_muted)
        {
-                gMuteListp->add(mute, LLMute::flagVoiceChat);
+                LLMuteList::getInstance()->add(mute, LLMute::flagVoiceChat);
        }
        else
        {
-                gMuteListp->remove(mute, LLMute::flagVoiceChat);
+                LLMuteList::getInstance()->remove(mute, LLMute::flagVoiceChat);
        }
 }
@@ -683,7 +689,7 @@ void LLPanelActiveSpeakers::onVolumeChange(LLUICtrl* source, void* user_data)
        gVoiceClient->setUserVolume(speaker_id, new_volume); 
        // store this volume setting for future sessions
-        gMuteListp->setSavedResidentVolume(speaker_id, new_volume);
+        LLMuteList::getInstance()->setSavedResidentVolume(speaker_id, new_volume);
 }
 //static 
@@ -716,11 +722,23 @@ void LLPanelActiveSpeakers::onSelectSpeaker(LLUICtrl* source, void* user_data)
        panelp->handleSpeakerSelect();
 }
+//static
+void LLPanelActiveSpeakers::onSortChanged(void* user_data)
+{
+        LLPanelActiveSpeakers* panelp = (LLPanelActiveSpeakers*)user_data;
+        std::string sort_column = panelp->mSpeakerList->getSortColumnName();
+        BOOL sort_ascending = panelp->mSpeakerList->getSortAscending();
+        gSavedSettings.setString(LLString("FloaterActiveSpeakersSortColumn"), sort_column);
+        gSavedSettings.setBOOL(  LLString("FloaterActiveSpeakersSortAscending"), sort_ascending);
+}
 //static 
 void LLPanelActiveSpeakers::onModeratorMuteVoice(LLUICtrl* ctrl, void* user_data)
 {
        LLPanelActiveSpeakers* self = (LLPanelActiveSpeakers*)user_data;
-        LLUICtrl* speakers_list = self->getCtrlByNameAndType("speakers_list", WIDGET_TYPE_DONTCARE);
+        LLUICtrl* speakers_list = self->getChild<LLUICtrl>("speakers_list");
        if (!speakers_list || !gAgent.getRegion()) return;
        std::string url = gAgent.getRegion()->getCapability("ChatSessionRequest");
@@ -785,7 +803,7 @@ void LLPanelActiveSpeakers::onModeratorMuteVoice(LLUICtrl* ctrl, void* user_data
 void LLPanelActiveSpeakers::onModeratorMuteText(LLUICtrl* ctrl, void* user_data)
 {
        LLPanelActiveSpeakers* self = (LLPanelActiveSpeakers*)user_data;
-        LLUICtrl* speakers_list = self->getCtrlByNameAndType("speakers_list", WIDGET_TYPE_DONTCARE);
+        LLUICtrl* speakers_list = self->getChild<LLUICtrl>("speakers_list");
        if (!speakers_list || !gAgent.getRegion()) return;
        std::string url = gAgent.getRegion()->getCapability("ChatSessionRequest");
diff --git a/linden/indra/newview/llfloateractivespeakers.h b/linden/indra/newview/llfloateractivespeakers.h
index 55acbd7..0aa4de9 100644
--- a/linden/indra/newview/llfloateractivespeakers.h
+++ b/linden/indra/newview/llfloateractivespeakers.h
@@ -156,7 +156,7 @@ protected:
        virtual void updateSpeakerList();
 };
-class LLActiveSpeakerMgr : public LLSpeakerMgr
+class LLActiveSpeakerMgr : public LLSpeakerMgr, public LLSingleton<LLActiveSpeakerMgr>
 {
 public:
        LLActiveSpeakerMgr();
@@ -164,7 +164,7 @@ protected:
        virtual void updateSpeakerList();
 };
-class LLLocalSpeakerMgr : public LLSpeakerMgr
+class LLLocalSpeakerMgr : public LLSpeakerMgr, public LLSingleton<LLLocalSpeakerMgr>
 {
 public:
        LLLocalSpeakerMgr();
@@ -186,6 +186,7 @@ public:
        virtual ~LLFloaterActiveSpeakers();
        /*virtual*/ BOOL postBuild();
+        /*virtual*/ void onOpen();
        /*virtual*/ void onClose(bool app_quitting);
        /*virtual*/ void draw();
@@ -223,6 +224,7 @@ public:
        static void onClickProfile(void* user_data);
        static void onDoubleClickSpeaker(void* user_data);
        static void onSelectSpeaker(LLUICtrl* source, void* user_data);
+        static void onSortChanged(void* user_data);
        static void     onModeratorMuteVoice(LLUICtrl* ctrl, void* user_data);
        static void     onModeratorMuteText(LLUICtrl* ctrl, void* user_data);
        static void     onChangeModerationMode(LLUICtrl* ctrl, void* user_data);
@@ -290,7 +292,5 @@ protected:
        LLPointer<SpeakerClearListener> mSpeakerClearListener;
 };
-extern LLLocalSpeakerMgr*       gLocalSpeakerMgr;
-extern LLActiveSpeakerMgr*              gActiveChannelSpeakerMgr;
 #endif // LL_LLFLOATERACTIVESPEAKERS_H
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index 0b486b3..6892b8d 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -61,7 +61,7 @@
 #include "llviewermenufile.h"   // upload_new_resource()
 #include "llvoavatar.h"
 #include "pipeline.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 S32 LLFloaterAnimPreview::sUploadAmount = 10;
@@ -143,7 +143,7 @@ BOOL LLFloaterAnimPreview::postBuild()
        S32 btn_left = PREVIEW_HPAD;
        r.set( btn_left, y, btn_left + 32, y - BTN_HEIGHT );
-        mPlayButton = LLViewerUICtrlFactory::getButtonByName(this, "play_btn");
+        mPlayButton = getChild<LLButton>( "play_btn");
        if (!mPlayButton)
        {
                mPlayButton = new LLButton("play_btn", LLRect(0,0,0,0));
@@ -157,7 +157,7 @@ BOOL LLFloaterAnimPreview::postBuild()
        mPlayButton->setScaleImage(TRUE);
-        mStopButton = LLViewerUICtrlFactory::getButtonByName(this, "stop_btn");
+        mStopButton = getChild<LLButton>( "stop_btn");
        if (!mStopButton)
        {
                mStopButton = new LLButton("stop_btn", LLRect(0,0,0,0));
@@ -265,7 +265,7 @@ BOOL LLFloaterAnimPreview::postBuild()
                        //temp.mV[VZ] = 0.f;
                        F32 pelvis_max_displacement = pelvis_offset + (temp.magVec() * 0.5f) + 1.f;
                        
-                        F32 camera_zoom = gCamera->getDefaultFOV() / (2.f * atan(pelvis_max_displacement / PREVIEW_CAMERA_DISTANCE));
+                        F32 camera_zoom = LLViewerCamera::getInstance()->getDefaultFOV() / (2.f * atan(pelvis_max_displacement / PREVIEW_CAMERA_DISTANCE));
                
                        mAnimPreview->setZoom(camera_zoom);
@@ -1015,7 +1015,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, *gCamera);
+        gPipeline.markVisible(mDummyAvatar->mDrawable, *LLViewerCamera::getInstance());
        // stop extraneous animations
        mDummyAvatar->stopMotion( ANIM_AGENT_HEAD_ROT, TRUE );
@@ -1069,15 +1069,15 @@ BOOL	LLPreviewAnimation::render()
                LLQuaternion(mCameraYaw, LLVector3::z_axis);
        LLQuaternion av_rot = avatarp->mRoot.getWorldRotation() * camera_rot;
-        gCamera->setOriginAndLookAt(
+        LLViewerCamera::getInstance()->setOriginAndLookAt(
                target_pos + ((LLVector3(mCameraDistance, 0.f, 0.f) + mCameraOffset) * av_rot),         // camera
                LLVector3::z_axis,                                                                                                                                      // up
                target_pos + (mCameraOffset  * av_rot) );                                                                                       // point of interest
-        gCamera->setView(gCamera->getDefaultFOV() / mCameraZoom);
+        LLViewerCamera::getInstance()->setView(LLViewerCamera::getInstance()->getDefaultFOV() / mCameraZoom);
-        gCamera->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
+        LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
-        mCameraRelPos = gCamera->getOrigin() - avatarp->mHeadp->getWorldPosition();
+        mCameraRelPos = LLViewerCamera::getInstance()->getOrigin() - avatarp->mHeadp->getWorldPosition();
        //avatarp->setAnimationData("LookAtPoint", (void *)&mCameraRelPos);
diff --git a/linden/indra/newview/llfloaterauction.cpp b/linden/indra/newview/llfloaterauction.cpp
index f0086c4..6b1c3e0 100644
--- a/linden/indra/newview/llfloaterauction.cpp
+++ b/linden/indra/newview/llfloaterauction.cpp
@@ -48,7 +48,7 @@
 #include "llviewerimagelist.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llviewerdisplay.h"
 #include "llviewercontrol.h"
@@ -74,7 +74,7 @@ LLFloaterAuction::LLFloaterAuction() :
        LLFloater("floater_auction"),
        mParcelID(-1)
 {
-        gUICtrlFactory->buildFloater(this, "floater_auction.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_auction.xml");
        childSetValue("fence_check",
                LLSD( gSavedSettings.getBOOL("AuctionShowFence") ) );
@@ -106,8 +106,8 @@ void LLFloaterAuction::show()
 void LLFloaterAuction::initialize()
 {
-        mParcelp = gParcelMgr->getParcelSelection();
+        mParcelp = LLViewerParcelMgr::getInstance()->getParcelSelection();
-        LLViewerRegion* region = gParcelMgr->getSelectionRegion();
+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
        LLParcel* parcelp = mParcelp->getParcel();
        if(parcelp && region && !parcelp->getForSale())
        {
@@ -141,7 +141,7 @@ void LLFloaterAuction::draw()
 {
        LLFloater::draw();
-        if(getVisible() && !isMinimized() && mImage.notNull()) 
+        if(!isMinimized() && mImage.notNull()) 
        {
                LLRect rect;
                if (childGetRect("snapshot_icon", rect))
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp
index a26299c..942a394 100644
--- a/linden/indra/newview/llfloateravatarinfo.cpp
+++ b/linden/indra/newview/llfloateravatarinfo.cpp
@@ -37,30 +37,9 @@
 // viewer project includes
 #include "llagentdata.h"
-//#include "llbutton.h"
-//#include "llcallingcard.h"
-//#include "llcheckboxctrl.h"
-//#include "llcommandhandler.h"
-//#include "llfloaterworldmap.h"
-//#include "llfloatermute.h"
-//#include "llinventoryview.h"
-//#include "lllineeditor.h"
-//#include "llmutelist.h"
-//#include "llscrolllistctrl.h"
-//#include "lltabcontainer.h"
-//#include "llimview.h"
-//#include "lluiconstants.h"
-//#include "llviewerobject.h"
-//#include "llviewerobjectlist.h"
-//#include "llviewerregion.h"
-//#include "llviewborder.h"
-//#include "llinventorymodel.h"
-//#include "lltextbox.h"
-//#include "lltexturectrl.h"
-//#include "llviewertexteditor.h"
 #include "llcommandhandler.h"
 #include "llpanelavatar.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 // linden library includes
 #include "llinventory.h"
@@ -133,7 +112,7 @@ LLFloaterAvatarInfo::LLFloaterAvatarInfo(const std::string& name, const LLRect &
        factory_map["Panel Avatar"] = LLCallbackMap(createPanelAvatar, this);
        
-        gUICtrlFactory->buildFloater(this, "floater_profile.xml", &factory_map);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_profile.xml", &factory_map);
        if(mPanelAvatarp)
@@ -266,6 +245,7 @@ void LLFloaterAvatarInfo::showProfileCallback(S32 option, void *userdata)
 //// virtual
 void LLFloaterAvatarInfo::draw()
 {
+        // skip LLPreview::draw()
        LLFloater::draw();
 }
diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp
index 4d01bab..f31626e 100644
--- a/linden/indra/newview/llfloateravatarpicker.cpp
+++ b/linden/indra/newview/llfloateravatarpicker.cpp
@@ -41,7 +41,7 @@
 #include "lllineeditor.h"
 #include "llscrolllistctrl.h"
 #include "lltextbox.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llagent.h"
 const S32 MIN_WIDTH = 200;
@@ -88,7 +88,7 @@ LLFloaterAvatarPicker::LLFloaterAvatarPicker() :
        mCallback(NULL),
        mCallbackUserdata(NULL)
 {
-        gUICtrlFactory->buildFloater(this, "floater_avatar_picker.xml", NULL);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_avatar_picker.xml", NULL);
 }
 BOOL LLFloaterAvatarPicker::postBuild()
@@ -98,7 +98,7 @@ BOOL LLFloaterAvatarPicker::postBuild()
        childSetAction("Find", onBtnFind, this);
        childDisable("Find");
-        mListNames = LLViewerUICtrlFactory::getScrollListByName(this, "Names");
+        mListNames = getChild<LLScrollListCtrl>("Names");
        childSetDoubleClickCallback("Names",onBtnAdd);
        childSetCommitCallback("Names", onList, this);
        childDisable("Names");
@@ -115,7 +115,7 @@ BOOL LLFloaterAvatarPicker::postBuild()
                mListNames->addCommentText("No results");
        }
-        mInventoryPanel = (LLInventoryPanel*)this->getCtrlByNameAndType("Inventory Panel", WIDGET_TYPE_INVENTORY_PANEL);
+        mInventoryPanel = getChild<LLInventoryPanel>("Inventory Panel");
        if(mInventoryPanel)
        {
                mInventoryPanel->setFilterTypes(0x1 << LLInventoryType::IT_CALLINGCARD);
@@ -388,7 +388,7 @@ void LLFloaterAvatarPicker::editKeystroke(LLLineEditor* caller, void* user_data)
 }
 // virtual
-BOOL LLFloaterAvatarPicker::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLFloaterAvatarPicker::handleKeyHere(KEY key, MASK mask)
 {
        if (key == KEY_RETURN
                && mask == MASK_NONE)
@@ -410,5 +410,5 @@ BOOL LLFloaterAvatarPicker::handleKeyHere(KEY key, MASK mask, BOOL called_from_p
                return TRUE;
        }
-        return LLFloater::handleKeyHere(key, mask, called_from_parent);
+        return LLFloater::handleKeyHere(key, mask);
 }
diff --git a/linden/indra/newview/llfloateravatarpicker.h b/linden/indra/newview/llfloateravatarpicker.h
index 6b8498c..7fcb5c0 100644
--- a/linden/indra/newview/llfloateravatarpicker.h
+++ b/linden/indra/newview/llfloateravatarpicker.h
@@ -74,7 +74,7 @@ protected:
        void find();
        void setAllowMultiple(BOOL allow_multiple);
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
 protected:
        LLScrollListCtrl*       mListNames;
diff --git a/linden/indra/newview/llfloateravatartextures.cpp b/linden/indra/newview/llfloateravatartextures.cpp
index d112ee2..0b529b7 100644
--- a/linden/indra/newview/llfloateravatartextures.cpp
+++ b/linden/indra/newview/llfloateravatartextures.cpp
@@ -35,7 +35,7 @@
 #include "lltexturectrl.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerobjectlist.h"
 #include "llvoavatar.h"
@@ -55,7 +55,7 @@ LLFloaterAvatarTextures* LLFloaterAvatarTextures::show(const LLUUID &id)
        LLFloaterAvatarTextures* floaterp = new LLFloaterAvatarTextures(id);
        // Builds and adds to gFloaterView
-        gUICtrlFactory->buildFloater(floaterp, "floater_avatar_textures.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_avatar_textures.xml");
        gFloaterView->addChild(floaterp);
        floaterp->open();       /*Flawfinder: ignore*/
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index fac5ea3..377dd75 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -37,7 +37,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llfloaterbuildoptions.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 // library includes
 #include "llfontgl.h"
@@ -79,7 +79,7 @@ void LLFloaterBuildOptions::show(void*)
        {
                LLFloaterBuildOptions* floater = new LLFloaterBuildOptions();
-                gUICtrlFactory->buildFloater(floater, "floater_build_options.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(floater, "floater_build_options.xml");
                floater->open();        /*Flawfinder: ignore*/
        }
 }
diff --git a/linden/indra/newview/llfloaterbump.cpp b/linden/indra/newview/llfloaterbump.cpp
index d340112..61d1b81 100644
--- a/linden/indra/newview/llfloaterbump.cpp
+++ b/linden/indra/newview/llfloaterbump.cpp
@@ -36,7 +36,7 @@
 #include "llscrolllistctrl.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewermessage.h"
 #include "llappviewer.h"                // gPacificDaylightTime
@@ -55,7 +55,7 @@ LLFloaterBump::LLFloaterBump()
 {
        sInstance = this;
-        gUICtrlFactory->buildFloater(this, "floater_bumps.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_bumps.xml");
 }
@@ -78,7 +78,7 @@ void LLFloaterBump::show(void *contents)
                sInstance = new LLFloaterBump();
        }
        
-        LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(sInstance, "bump_list");
+        LLScrollListCtrl* list = sInstance->getChild<LLScrollListCtrl>("bump_list");
        if (!list) return;
        list->deleteAllItems();
diff --git a/linden/indra/newview/llfloaterbuy.cpp b/linden/indra/newview/llfloaterbuy.cpp
index 95a7b41..18d2913 100644
--- a/linden/indra/newview/llfloaterbuy.cpp
+++ b/linden/indra/newview/llfloaterbuy.cpp
@@ -46,7 +46,7 @@
 #include "llselectmgr.h"
 #include "llscrolllistctrl.h"
 #include "llviewerobject.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 LLFloaterBuy* LLFloaterBuy::sInstance = NULL;
@@ -54,7 +54,7 @@ LLFloaterBuy* LLFloaterBuy::sInstance = NULL;
 LLFloaterBuy::LLFloaterBuy()
 :       LLFloater("floater_buy_object", "FloaterBuyRect", "")
 {
-        gUICtrlFactory->buildFloater(this, "floater_buy_object.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_buy_object.xml");
        childDisable("object_list");
        childDisable("item_list");
@@ -72,17 +72,17 @@ LLFloaterBuy::~LLFloaterBuy()
 void LLFloaterBuy::reset()
 {
-        LLScrollListCtrl* object_list = LLUICtrlFactory::getScrollListByName(this, "object_list");
+        LLScrollListCtrl* object_list = getChild<LLScrollListCtrl>("object_list");
        if (object_list) object_list->deleteAllItems();
-        LLScrollListCtrl* item_list = LLUICtrlFactory::getScrollListByName(this, "item_list");
+        LLScrollListCtrl* item_list = getChild<LLScrollListCtrl>("item_list");
        if (item_list) item_list->deleteAllItems();
 }
 // static
 void LLFloaterBuy::show(const LLSaleInfo& sale_info)
 {
-        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
        if (selection->getRootObjectCount() != 1)
        {
@@ -104,7 +104,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
        sInstance->open(); /*Flawfinder: ignore*/
        sInstance->setFocus(TRUE);
        sInstance->mSaleInfo = sale_info;
-        sInstance->mObjectSelection = gSelectMgr->getEditSelection();
+        sInstance->mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
        // Always center the dialog.  User can change the size,
        // but purchases are important and should be center screen.
@@ -133,7 +133,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
        LLUUID owner_id;
        LLString owner_name;
-        BOOL owners_identical = gSelectMgr->selectGetOwner(owner_id, owner_name);
+        BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
        if (!owners_identical)
        {
                gViewerWindow->alertXml("BuyObjectOneOwner");
@@ -151,13 +151,13 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
        LLSD row;
        // Compute icon for this item
-        LLUUID icon_id = get_item_icon_uuid(LLAssetType::AT_OBJECT, 
+        LLString icon_name = get_item_icon_name(LLAssetType::AT_OBJECT, 
-                                                 LLInventoryType::IT_OBJECT,
+                                                                         LLInventoryType::IT_OBJECT,
-                                                 0x0, FALSE);
+                                                                         0x0, FALSE);
        row["columns"][0]["column"] = "icon";
        row["columns"][0]["type"] = "icon";
-        row["columns"][0]["value"] = icon_id;
+        row["columns"][0]["value"] = icon_name;
        
        // Append the permissions that you will acquire (not the current
        // permissions).
@@ -256,13 +256,13 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
                        item_is_multi = TRUE;
                }
-                LLUUID icon_id = get_item_icon_uuid(inv_item->getType(), 
+                LLString icon_name = get_item_icon_name(inv_item->getType(), 
                                                         inv_item->getInventoryType(),
                                                         inv_item->getFlags(),
                                                         item_is_multi);
                row["columns"][0]["column"] = "icon";
                row["columns"][0]["type"] = "icon";
-                row["columns"][0]["value"] = icon_id;
+                row["columns"][0]["value"] = icon_name;
                                
                // Append the permissions that you will acquire (not the current
                // permissions).
@@ -307,7 +307,7 @@ void LLFloaterBuy::onClickBuy(void*)
        // *NOTE: doesn't work for multiple object buy, which UI does not
        // currently support sale info is used for verification only, if
        // it doesn't match region info then sale is canceled.
-        gSelectMgr->sendBuy(gAgent.getID(), category_id, sInstance->mSaleInfo );
+        LLSelectMgr::getInstance()->sendBuy(gAgent.getID(), category_id, sInstance->mSaleInfo );
        sInstance->close();
 }
diff --git a/linden/indra/newview/llfloaterbuycontents.cpp b/linden/indra/newview/llfloaterbuycontents.cpp
index d32a631..8b2a031 100644
--- a/linden/indra/newview/llfloaterbuycontents.cpp
+++ b/linden/indra/newview/llfloaterbuycontents.cpp
@@ -50,7 +50,7 @@
 #include "llscrolllistctrl.h"
 #include "llviewerobject.h"
 #include "llviewerregion.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 LLFloaterBuyContents* LLFloaterBuyContents::sInstance = NULL;
@@ -58,7 +58,7 @@ LLFloaterBuyContents* LLFloaterBuyContents::sInstance = NULL;
 LLFloaterBuyContents::LLFloaterBuyContents()
 :       LLFloater("floater_buy_contents", "FloaterBuyContentsRect", "")
 {
-        gUICtrlFactory->buildFloater(this, "floater_buy_contents.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_buy_contents.xml");
        childSetAction("cancel_btn", onClickCancel, this);
        childSetAction("buy_btn", onClickBuy, this);
@@ -79,7 +79,7 @@ LLFloaterBuyContents::~LLFloaterBuyContents()
 // static
 void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
 {
-        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
        if (selection->getRootObjectCount() != 1)
        {
@@ -90,7 +90,7 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
        // Create a new instance only if needed
        if (sInstance)
        {
-                LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(sInstance, "item_list");
+                LLScrollListCtrl* list = sInstance->getChild<LLScrollListCtrl>("item_list");
                if (list) list->deleteAllItems();
        }
        else
@@ -100,7 +100,7 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
        sInstance->open(); /*Flawfinder: ignore*/
        sInstance->setFocus(TRUE);
-        sInstance->mObjectSelection = gSelectMgr->getEditSelection();
+        sInstance->mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
        // Always center the dialog.  User can change the size,
        // but purchases are important and should be center screen.
@@ -110,7 +110,7 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
        LLUUID owner_id;
        LLString owner_name;
-        BOOL owners_identical = gSelectMgr->selectGetOwner(owner_id, owner_name);
+        BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
        if (!owners_identical)
        {
                gViewerWindow->alertXml("BuyContentsOneOwner");
@@ -223,13 +223,13 @@ void LLFloaterBuyContents::inventoryChanged(LLViewerObject* obj,
                        item_is_multi = TRUE;
                }
-                LLUUID icon_id = get_item_icon_uuid(inv_item->getType(), 
+                LLString icon_name = get_item_icon_name(inv_item->getType(), 
-                                                         inv_item->getInventoryType(),
+                                                                 inv_item->getInventoryType(),
-                                                         inv_item->getFlags(),
+                                                                 inv_item->getFlags(),
-                                                         item_is_multi);
+                                                                 item_is_multi);
                row["columns"][0]["column"] = "icon";
                row["columns"][0]["type"] = "icon";
-                row["columns"][0]["value"] = icon_id;
+                row["columns"][0]["value"] = icon_name;
                
                // Append the permissions that you will acquire (not the current
                // permissions).
@@ -291,7 +291,7 @@ void LLFloaterBuyContents::onClickBuy(void*)
        // *NOTE: doesn't work for multiple object buy, which UI does not
        // currently support sale info is used for verification only, if
        // it doesn't match region info then sale is canceled.
-        gSelectMgr->sendBuy(gAgent.getID(), category_id, sInstance->mSaleInfo);
+        LLSelectMgr::getInstance()->sendBuy(gAgent.getID(), category_id, sInstance->mSaleInfo);
        sInstance->close();
 }
diff --git a/linden/indra/newview/llfloaterbuycurrency.cpp b/linden/indra/newview/llfloaterbuycurrency.cpp
index dd7732d..0381b8f 100644
--- a/linden/indra/newview/llfloaterbuycurrency.cpp
+++ b/linden/indra/newview/llfloaterbuycurrency.cpp
@@ -40,7 +40,7 @@
 #include "lltextbox.h"
 #include "llviewchildren.h"
 #include "llviewerwindow.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llweb.h"
 #include "llwindow.h"
 #include "llappviewer.h"
@@ -97,7 +97,7 @@ LLFloaterBuyCurrencyUI* LLFloaterBuyCurrencyUI::soleInstance(bool createIfNeeded
        {
                sInstance = new LLFloaterBuyCurrencyUI();
-                gUICtrlFactory->buildFloater(sInstance, "floater_buy_currency.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_buy_currency.xml");
                sInstance->center();
        }
        
@@ -221,7 +221,7 @@ void LLFloaterBuyCurrencyUI::updateUI()
        {
                mChildren.setBadge("step_error", LLViewChildren::BADGE_ERROR);
                
-                LLTextBox* message = LLUICtrlFactory::getTextBoxByName(this, "error_message");
+                LLTextBox* message = getChild<LLTextBox>("error_message");
                if (message)
                {
                        message->setVisible(true);
diff --git a/linden/indra/newview/llfloaterbuyland.cpp b/linden/indra/newview/llfloaterbuyland.cpp
index 2786a34..ee78eaa 100644
--- a/linden/indra/newview/llfloaterbuyland.cpp
+++ b/linden/indra/newview/llfloaterbuyland.cpp
@@ -53,7 +53,7 @@
 #include "lltexturectrl.h"
 #include "llviewchildren.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "llviewertexteditor.h"
@@ -187,6 +187,7 @@ public:
        virtual void draw();
        virtual BOOL canClose();
        virtual void onClose(bool app_quitting);
+        /*virtual*/ void setMinimized(BOOL b);
        
 private:
        class SelectionObserver : public LLParcelObserver
@@ -290,7 +291,7 @@ LLFloaterBuyLandUI* LLFloaterBuyLandUI::soleInstance(bool createIfNeeded)
        {
                sInstance = new LLFloaterBuyLandUI();
-                gUICtrlFactory->buildFloater(sInstance, "floater_buy_land.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_buy_land.xml");
                sInstance->center();
                static bool observingCacheName = false;
@@ -304,7 +305,7 @@ LLFloaterBuyLandUI* LLFloaterBuyLandUI::soleInstance(bool createIfNeeded)
                if (!parcelSelectionObserver)
                {
                        parcelSelectionObserver = new SelectionObserver;
-                        gParcelMgr->addObserver(parcelSelectionObserver);
+                        LLViewerParcelMgr::getInstance()->addObserver(parcelSelectionObserver);
                }
        }
        
@@ -333,7 +334,7 @@ LLFloaterBuyLandUI::~LLFloaterBuyLandUI()
 {
        delete mTransaction;
-        gParcelMgr->deleteParcelBuy(mParcelBuyInfo);
+        LLViewerParcelMgr::getInstance()->deleteParcelBuy(mParcelBuyInfo);
        
        if (sInstance == this)
        {
@@ -346,14 +347,14 @@ void LLFloaterBuyLandUI::SelectionObserver::changed()
        LLFloaterBuyLandUI* ui = LLFloaterBuyLandUI::soleInstance(false);
        if (ui)
        {
-                if (gParcelMgr->selectionEmpty())
+                if (LLViewerParcelMgr::getInstance()->selectionEmpty())
                {
                        ui->close();
                }
                else {
                        ui->setParcel(
-                                gParcelMgr->getSelectionRegion(),
+                                LLViewerParcelMgr::getInstance()->getSelectionRegion(),
-                                gParcelMgr->getParcelSelection());
+                                LLViewerParcelMgr::getInstance()->getParcelSelection());
                }
        }
 }
@@ -430,7 +431,7 @@ void LLFloaterBuyLandUI::updateParcelInfo()
                parcel->getMaxPrimCapacity() * parcel->getParcelPrimBonus()); 
        // Can't have more than region max tasks, regardless of parcel 
        // object bonus factor. 
-        LLViewerRegion* region = gParcelMgr->getSelectionRegion(); 
+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); 
        if(region) 
        { 
                S32 max_tasks_per_region = (S32)region->getMaxTasks(); 
@@ -518,7 +519,7 @@ void LLFloaterBuyLandUI::updateParcelInfo()
 void LLFloaterBuyLandUI::updateCovenantInfo()
 {
-        LLViewerRegion* region = gParcelMgr->getSelectionRegion();
+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
        if(!region) return;
        LLTextBox* region_name = getChild<LLTextBox>("region_name_text");
@@ -728,7 +729,7 @@ void LLFloaterBuyLandUI::runWebSitePrep(const std::string& password)
        }
        
        BOOL remove_contribution = childGetValue("remove_contribution").asBoolean();
-        mParcelBuyInfo = gParcelMgr->setupParcelBuy(gAgent.getID(), gAgent.getSessionID(),
+        mParcelBuyInfo = LLViewerParcelMgr::getInstance()->setupParcelBuy(gAgent.getID(), gAgent.getSessionID(),
                                                gAgent.getGroupID(), mIsForGroup, mIsClaim, remove_contribution);
        if (mParcelBuyInfo
@@ -746,7 +747,7 @@ void LLFloaterBuyLandUI::runWebSitePrep(const std::string& password)
        
        if (mSiteMembershipUpgrade)
        {
-                LLComboBox* levels = LLUICtrlFactory::getComboBoxByName(this, "account_level");
+                LLComboBox* levels = getChild<LLComboBox>( "account_level");
                if (levels)
                {
                        mUserPlanChoice = levels->getCurrentIndex();
@@ -797,8 +798,8 @@ void LLFloaterBuyLandUI::sendBuyLand()
 {
        if (mParcelBuyInfo)
        {
-                gParcelMgr->sendParcelBuy(mParcelBuyInfo);
+                LLViewerParcelMgr::getInstance()->sendParcelBuy(mParcelBuyInfo);
-                gParcelMgr->deleteParcelBuy(mParcelBuyInfo);
+                LLViewerParcelMgr::getInstance()->deleteParcelBuy(mParcelBuyInfo);
                mBought = true;
        }
 }
@@ -968,9 +969,27 @@ void LLFloaterBuyLandUI::draw()
        }
 }
+// virtual
 BOOL LLFloaterBuyLandUI::canClose()
 {
-        return (mTransaction ? FALSE : TRUE) && mCurrency.canCancel();
+        bool can_close = (mTransaction ? FALSE : TRUE) && mCurrency.canCancel();
+        if (!can_close)
+        {
+                // explain to user why they can't do this, see DEV-9605
+                gViewerWindow->alertXml("CannotCloseFloaterBuyLand");
+        }
+        return can_close;
+}
+// virtual
+void LLFloaterBuyLandUI::setMinimized(BOOL minimize)
+{
+        bool restored = (isMinimized() && !minimize);
+        LLFloater::setMinimized(minimize);
+        if (restored)
+        {
+                refreshUI();
+        }
 }
 void LLFloaterBuyLandUI::onClose(bool app_quitting)
@@ -984,7 +1003,7 @@ void LLFloaterBuyLandUI::refreshUI()
 {
        // section zero: title area
        {
-                LLTextureCtrl* snapshot = LLViewerUICtrlFactory::getTexturePickerByName(this, "info_image");
+                LLTextureCtrl* snapshot = getChild<LLTextureCtrl>("info_image");
                if (snapshot)
                {
                        snapshot->setImageAssetID(
@@ -1042,7 +1061,7 @@ void LLFloaterBuyLandUI::refreshUI()
                                ? LLViewChildren::BADGE_ERROR
                                : LLViewChildren::BADGE_WARN);
                
-                LLTextBox* message = LLUICtrlFactory::getTextBoxByName(this, "error_message");
+                LLTextBox* message = getChild<LLTextBox>("error_message");
                if (message)
                {
                        message->setVisible(true);
@@ -1076,7 +1095,7 @@ void LLFloaterBuyLandUI::refreshUI()
                                :       getString("cant_own_land")
                        );
                
-                LLComboBox* levels = LLUICtrlFactory::getComboBoxByName(this, "account_level");
+                LLComboBox* levels = getChild<LLComboBox>( "account_level");
                if (levels)
                {
                        levels->setVisible(mSiteMembershipUpgrade);
@@ -1277,7 +1296,7 @@ void LLFloaterBuyLandUI::startBuyPreConfirm()
                action += mSiteMembershipAction;
                action += "\n";
-                LLComboBox* levels = LLUICtrlFactory::getComboBoxByName(this, "account_level");
+                LLComboBox* levels = getChild<LLComboBox>( "account_level");
                if (levels)
                {
                        action += " * ";
diff --git a/linden/indra/newview/llfloatercamera.cpp b/linden/indra/newview/llfloatercamera.cpp
new file mode 100644
index 0000000..b77b556
--- /dev/null
+++ b/linden/indra/newview/llfloatercamera.cpp
@@ -0,0 +1,119 @@
+/** 
+ * @file llfloatercamera.cpp
+ * @brief Container for camera control buttons (zoom, pan, orbit)
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+#include "llfloatercamera.h"
+// Library includes
+#include "lluictrlfactory.h"
+// Viewer includes
+#include "lljoystickbutton.h"
+#include "llviewercontrol.h"
+// Constants
+const F32 CAMERA_BUTTON_DELAY = 0.0f;
+//
+// Member functions
+//
+LLFloaterCamera::LLFloaterCamera(const LLSD& val)
+:       LLFloater("camera floater") // uses "FloaterCameraRect3"
+{
+        setIsChrome(TRUE);
+        
+        const BOOL DONT_OPEN = FALSE;
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_camera.xml", NULL, DONT_OPEN);
+        
+        S32 top = getRect().getHeight();
+        S32 bottom = 0;
+        S32 left = 16;
+        
+        const S32 ROTATE_WIDTH = 64;
+        mRotate = new LLJoystickCameraRotate("cam rotate stick", 
+                                                                                 LLRect( left, top, left + ROTATE_WIDTH, bottom ),
+                                                                                 "cam_rotate_out.tga",
+                                                                                 "cam_rotate_in.tga" );
+        mRotate->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
+        mRotate->setHeldDownDelay(CAMERA_BUTTON_DELAY);
+        mRotate->setToolTip( getString("rotate_tooltip") );
+        mRotate->setSoundFlags(MOUSE_DOWN | MOUSE_UP);
+        addChild(mRotate);
+        
+        left += ROTATE_WIDTH;
+        
+        const S32 ZOOM_WIDTH = 16;
+        mZoom = new LLJoystickCameraZoom( 
+                                                                         "zoom",
+                                                                         LLRect( left, top, left + ZOOM_WIDTH, bottom ),
+                                                                         "cam_zoom_out.tga",
+                                                                         "cam_zoom_plus_in.tga",
+                                                                         "cam_zoom_minus_in.tga");
+        mZoom->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
+        mZoom->setHeldDownDelay(CAMERA_BUTTON_DELAY);
+        mZoom->setToolTip( getString("zoom_tooltip") );
+        mZoom->setSoundFlags(MOUSE_DOWN | MOUSE_UP);
+        addChild(mZoom);
+        
+        left += ZOOM_WIDTH;
+        
+        const S32 TRACK_WIDTH = 64;
+        mTrack = new LLJoystickCameraTrack("cam track stick", 
+                                                                           LLRect( left, top, left + TRACK_WIDTH, bottom ),
+                                                                           "cam_tracking_out.tga",
+                                                                           "cam_tracking_in.tga");
+        mTrack->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
+        mTrack->setHeldDownDelay(CAMERA_BUTTON_DELAY);
+        mTrack->setToolTip( getString("move_tooltip") );
+        mTrack->setSoundFlags(MOUSE_DOWN | MOUSE_UP);
+        addChild(mTrack);
+}
+// virtual
+void LLFloaterCamera::onOpen()
+{
+        LLFloater::onOpen();
+        
+        gSavedSettings.setBOOL("ShowCameraControls", TRUE);
+}
+// virtual
+void LLFloaterCamera::onClose(bool app_quitting)
+{
+        LLFloater::onClose(app_quitting);
+        
+        if (!app_quitting)
+        {
+                gSavedSettings.setBOOL("ShowCameraControls", FALSE);
+        }
+}
+\ No newline at end of file
diff --git a/linden/indra/newview/llcameraview.h b/linden/indra/newview/llfloatercamera.h
index ebe3cc6..df90e77 100644
--- a/linden/indra/newview/llcameraview.h
+++ b/linden/indra/newview/llfloatercamera.h
@@ -1,6 +1,6 @@
 /** 
- * @file llcameraview.h
+ * @file llfloatercamera.h
- * @brief Container for buttons for walking, turning, flying
+ * @brief Container for camera control buttons (zoom, pan, orbit)
 *
 * $LicenseInfo:firstyear=2001&license=viewergpl$
 * 
@@ -29,64 +29,32 @@
 * $/LicenseInfo$
 */
-// llcameraview.h
+#ifndef LLFLOATERCAMERA_H
-//
+#define LLFLOATERCAMERA_H
-// Copyright 2001-2003, Linden Reserach, Inc.
-// 
-#ifndef LL_LLCAMERAVIEW_H
-#define LL_LLCAMERAVIEW_H
-// Library includes
 #include "llfloater.h"
-#include "llstatview.h"
 class LLJoystickCameraRotate;
 class LLJoystickCameraZoom;
 class LLJoystickCameraTrack;
-//
-// Classes
-//
 class LLFloaterCamera
-:       public LLFloater
+        :       public LLFloater,
+                public LLFloaterSingleton<LLFloaterCamera>
 {
-public:
+        friend class LLUISingleton<LLFloaterCamera, VisibilityPolicy<LLFloater> >;
-        LLFloaterCamera(const std::string& name);
+        
-        ~LLFloaterCamera();
+private:
+        LLFloaterCamera(const LLSD& val);
+        ~LLFloaterCamera() {};
+        
+        /*virtual*/ void onOpen();
        /*virtual*/ void onClose(bool app_quitting);
        
-        static void show(void*);
-        static void toggle(void*);
-        static BOOL visible(void*);
 public:
        LLJoystickCameraRotate* mRotate;
        LLJoystickCameraZoom*   mZoom;
        LLJoystickCameraTrack*  mTrack;
 };
-class LLFloaterJoystick
-:       public LLFloater
-{
-protected:
-        LLFloaterJoystick();
-        ~LLFloaterJoystick();
-public:
-        static void             show(void*);
-        static LLFloaterJoystick* getInstance();
-        static BOOL             visible(void*);
-        virtual void draw();
-        
-protected:
-        static LLFloaterJoystick*       sInstance;
-        LLStatView*             mAxisStats;
-        LLStat*                 mAxis[8];
-        LLStatBar*              mAxisBar[8];
-};
-extern LLFloaterCamera *gFloaterCamera;
 #endif
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index f9063ce..0394cd1 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -66,7 +66,7 @@
 #include "llviewermessage.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llchatbar.h"
 #include "lllogchat.h"
 #include "lltexteditor.h"
@@ -81,7 +81,6 @@ extern void AddNewChatToLCD(const LLString &newLine);
 //
 const F32 INSTANT_MSG_SIZE = 8.0f;
 const F32 CHAT_MSG_SIZE = 8.0f;
-const LLColor4 INSTANT_MSG_COLOR(1, 1, 1, 1);
 const LLColor4 MUTED_MSG_COLOR(0.5f, 0.5f, 0.5f, 1.f);
 const S32 MAX_CHATTER_COUNT = 16;
@@ -102,7 +101,7 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
        mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, NULL);
        // do not automatically open singleton floaters (as result of getInstance())
        BOOL no_open = FALSE;
-        gUICtrlFactory->buildFloater(this,"floater_chat_history.xml",&getFactoryMap(),no_open);
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_chat_history.xml",&getFactoryMap(),no_open);
        childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
        childSetVisible("Chat History Editor with mute",FALSE);
@@ -140,12 +139,12 @@ void LLFloaterChat::draw()
 BOOL LLFloaterChat::postBuild()
 {
-        mPanel = (LLPanelActiveSpeakers*)LLUICtrlFactory::getPanelByName(this, "active_speakers_panel");
+        mPanel = (LLPanelActiveSpeakers*)getChild<LLPanel>("active_speakers_panel");
        LLChatBar* chat_barp = getChild<LLChatBar>("chat_panel", TRUE);
        if (chat_barp)
        {
-                chat_barp->setGestureCombo(LLUICtrlFactory::getComboBoxByName(this, "Gesture"));
+                chat_barp->setGestureCombo(getChild<LLComboBox>( "Gesture"));
        }
        return TRUE;
 }
@@ -163,7 +162,7 @@ void LLFloaterChat::onClose(bool app_quitting)
 void LLFloaterChat::onVisibilityChange(BOOL new_visibility)
 {
        // Hide the chat overlay when our history is visible.
-        gConsole->setVisible( !new_visibility );
+        updateConsoleVisibility();
        // stop chat history tab from flashing when it appears
        if (new_visibility)
@@ -174,6 +173,21 @@ void LLFloaterChat::onVisibilityChange(BOOL new_visibility)
        LLFloater::onVisibilityChange(new_visibility);
 }
+void LLFloaterChat::setMinimized(BOOL minimized)
+{
+        LLFloater::setMinimized(minimized);
+        updateConsoleVisibility();
+}
+void LLFloaterChat::updateConsoleVisibility()
+{
+        // determine whether we should show console due to not being visible
+        gConsole->setVisible( !isInVisibleChain()                                                               // are we not in part of UI being drawn?
+                                                        || isMinimized()                                                                // are we minimized?
+                                                        || (getHost() && getHost()->isMinimized() ));   // are we hosted in a minimized floater?
+}
 void add_timestamped_line(LLViewerTextEditor* edit, const LLString& line, const LLColor4& color)
 {
        bool prepend_newline = true;
@@ -274,7 +288,7 @@ void LLFloaterChat::onClickMute(void *data)
 {
        LLFloaterChat* self = (LLFloaterChat*)data;
-        LLComboBox*     chatter_combo = LLUICtrlFactory::getComboBoxByName(self,"chatter combobox");
+        LLComboBox*     chatter_combo = self->getChild<LLComboBox>("chatter combobox");
        const LLString& name = chatter_combo->getSimple();
        LLUUID id = chatter_combo->getCurrentID();
@@ -283,12 +297,9 @@ void LLFloaterChat::onClickMute(void *data)
        LLMute mute(id);
        mute.setFromDisplayName(name);
-        gMuteListp->add(mute);
+        LLMuteList::getInstance()->add(mute);
        
-        if (gFloaterMute)
+        LLFloaterMute::showInstance();
-        {
-                LLFloaterMute::showInstance();
-        }
 }
 //static
@@ -298,7 +309,7 @@ void LLFloaterChat::onClickToggleShowMute(LLUICtrl* caller, void *data)
        //LLCheckBoxCtrl*       
-        BOOL show_mute = LLUICtrlFactory::getCheckBoxByName(floater,"show mutes")->get();
+        BOOL show_mute = floater->getChild<LLCheckBoxCtrl>("show mutes")->get();
        LLViewerTextEditor*     history_editor = floater->getChild<LLViewerTextEditor>("Chat History Editor");
        LLViewerTextEditor*     history_editor_with_mute = floater->getChild<LLViewerTextEditor>("Chat History Editor with mute");
@@ -351,9 +362,13 @@ void LLFloaterChat::addChat(const LLChat& chat,
                && !local_agent)
        {
                F32 size = CHAT_MSG_SIZE;
-                if(from_instant_message)
+                if (chat.mSourceType == CHAT_SOURCE_SYSTEM)
+                {
+                        text_color = gSavedSettings.getColor("SystemChatColor");
+                }
+                else if(from_instant_message)
                {
-                        text_color = INSTANT_MSG_COLOR;
+                        text_color = gSavedSettings.getColor("IMChatColor");
                        size = INSTANT_MSG_SIZE;
                }
                gConsole->addLine(chat.mText, size, text_color);
@@ -434,18 +449,31 @@ void LLFloaterChat::loadHistory()
 }
 //static
-void LLFloaterChat::chatFromLogFile(LLString line, void* userdata)
+void LLFloaterChat::chatFromLogFile(LLLogChat::ELogLineType type , LLString line, void* userdata)
 {
-        LLChat chat;
+        switch (type)
-                                
+        {
-        chat.mText = line;
+        case LLLogChat::LOG_EMPTY:
-        addChatHistory(chat,  FALSE);
+        case LLLogChat::LOG_END:
+                // *TODO: nice message from XML file here
+                break;
+        case LLLogChat::LOG_LINE:
+                {
+                        LLChat chat;                                    
+                        chat.mText = line;
+                        addChatHistory(chat,  FALSE);
+                }
+                break;
+        default:
+                // nothing
+                break;
+        }
 }
 //static
 void* LLFloaterChat::createSpeakersPanel(void* data)
 {
-        return new LLPanelActiveSpeakers(gLocalSpeakerMgr, TRUE);
+        return new LLPanelActiveSpeakers(LLLocalSpeakerMgr::getInstance(), TRUE);
 }
 //static
diff --git a/linden/indra/newview/llfloaterchat.h b/linden/indra/newview/llfloaterchat.h
index 04eb279..72147b8 100644
--- a/linden/indra/newview/llfloaterchat.h
+++ b/linden/indra/newview/llfloaterchat.h
@@ -38,7 +38,7 @@
 #define LL_LLFLOATERCHAT_H
 #include "llfloater.h"
+#include "lllogchat.h"
 class LLButton;
 class LLChat;
 class LLComboBox;
@@ -48,6 +48,7 @@ class LLMessageSystem;
 class LLUUID;
 class LLCheckBoxCtrl;
 class LLPanelActiveSpeakers;
+class LLLogChat;
 class LLFloaterChat
        :       public LLFloater, public LLUISingleton<LLFloaterChat, LLFloaterChat>
@@ -61,6 +62,8 @@ public:
        virtual BOOL postBuild();
        virtual void onClose(bool app_quitting);
        virtual void onVisibilityChange(BOOL cur_visibility);
+        virtual void setMinimized(BOOL);
+        void updateConsoleVisibility();
        static void setHistoryCursorAndScrollToEnd();
        
@@ -74,7 +77,7 @@ public:
        static void onClickMute(void *data);
        static void onClickToggleShowMute(LLUICtrl* caller, void *data);
        static void onClickToggleActiveSpeakers(void* userdata);
-        static void chatFromLogFile(LLString line, void* userdata);
+        static void chatFromLogFile(LLLogChat::ELogLineType type,LLString line, void* userdata);
        static void loadHistory();
        static void* createSpeakersPanel(void* data);
        static void* createChatPanel(void* data);
diff --git a/linden/indra/newview/llfloaterchatterbox.cpp b/linden/indra/newview/llfloaterchatterbox.cpp
index 88e0c5d..1114635 100644
--- a/linden/indra/newview/llfloaterchatterbox.cpp
+++ b/linden/indra/newview/llfloaterchatterbox.cpp
@@ -35,7 +35,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llfloaterchatterbox.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llfloaterchat.h"
 #include "llfloaterfriends.h"
 #include "llfloatergroups.h"
@@ -53,7 +53,7 @@ LLFloaterMyFriends::LLFloaterMyFriends(const LLSD& seed)
        mFactoryMap["groups_panel"] = LLCallbackMap(LLFloaterMyFriends::createGroupsPanel, NULL);
        // do not automatically open singleton floaters (as result of getInstance())
        BOOL no_open = FALSE;
-        gUICtrlFactory->buildFloater(this, "floater_my_friends.xml", &getFactoryMap(), no_open);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_my_friends.xml", &getFactoryMap(), no_open);
 }
 LLFloaterMyFriends::~LLFloaterMyFriends()
@@ -62,7 +62,7 @@ LLFloaterMyFriends::~LLFloaterMyFriends()
 BOOL LLFloaterMyFriends::postBuild()
 {
-        mTabs = LLUICtrlFactory::getTabContainerByName(this, "friends_and_groups");
+        mTabs = getChild<LLTabContainer>("friends_and_groups");
        return TRUE;
 }
@@ -93,7 +93,7 @@ LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) :
 {
        mAutoResize = FALSE;
-        gUICtrlFactory->buildFloater(this, "floater_chatterbox.xml", NULL, FALSE);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox.xml", NULL, FALSE);
        if (gSavedSettings.getBOOL("ContactsTornOff"))
        {
                LLFloaterMyFriends* floater_contacts = LLFloaterMyFriends::getInstance(0);
@@ -128,33 +128,29 @@ LLFloaterChatterBox::~LLFloaterChatterBox()
 {
 }
-BOOL LLFloaterChatterBox::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLFloaterChatterBox::handleKeyHere(KEY key, MASK mask)
 {
-        if (getEnabled()
+        if (key == 'W' && mask == MASK_CONTROL)
-                && mask == MASK_CONTROL)
        {
-                if (key == 'W')
+                LLFloater* floater = getActiveFloater();
+                // is user closeable and is system closeable
+                if (floater && floater->canClose())
                {
-                        LLFloater* floater = getActiveFloater();
+                        if (floater->isCloseable())
-                        // is user closeable and is system closeable
-                        if (floater && floater->canClose())
                        {
-                                if (floater->isCloseable())
+                                floater->close();
-                                {
+                        }
-                                        floater->close();
+                        else
-                                }
+                        {
-                                else
+                                // close chatterbox window if frontmost tab is reserved, non-closeable tab
-                                {
+                                // such as contacts or near me
-                                        // close chatterbox window if frontmost tab is reserved, non-closeable tab
+                                close();
-                                        // such as contacts or near me
-                                        close();
-                                }
                        }
-                        return TRUE;
                }
+                return TRUE;
        }
-        return LLMultiFloater::handleKeyHere(key, mask, called_from_parent);
+        return LLMultiFloater::handleKeyHere(key, mask);
 }
 void LLFloaterChatterBox::draw()
@@ -214,6 +210,13 @@ void LLFloaterChatterBox::onClose(bool app_quitting)
        gSavedSettings.setBOOL("ShowCommunicate", FALSE);
 }
+void LLFloaterChatterBox::setMinimized(BOOL minimized)
+{
+        LLFloater::setMinimized(minimized);
+        // HACK: potentially need to toggle console
+        LLFloaterChat::getInstance()->updateConsoleVisibility();
+}
 void LLFloaterChatterBox::removeFloater(LLFloater* floaterp)
 {
        if (floaterp->getName() == "chat floater")
@@ -247,7 +250,7 @@ void LLFloaterChatterBox::addFloater(LLFloater* floaterp,
        {
                mTabContainer->unlockTabs();
                // add chat history as second tab if contact window is present, first tab otherwise
-                if (getChildByName("floater_my_friends", TRUE))
+                if (getChildView("floater_my_friends"))
                {
                        // assuming contacts window is first tab, select it
                        mTabContainer->selectFirstTab();
diff --git a/linden/indra/newview/llfloaterchatterbox.h b/linden/indra/newview/llfloaterchatterbox.h
index 93601ea..ac494d1 100644
--- a/linden/indra/newview/llfloaterchatterbox.h
+++ b/linden/indra/newview/llfloaterchatterbox.h
@@ -47,10 +47,11 @@ public:
        LLFloaterChatterBox(const LLSD& seed);
        virtual ~LLFloaterChatterBox();
-        /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
        /*virtual*/ void draw();
        /*virtual*/ void onOpen();
        /*virtual*/ void onClose(bool app_quitting);
+        /*virtual*/ void setMinimized(BOOL minimized);
        /*virtual*/ void removeFloater(LLFloater* floaterp);
        /*virtual*/ void addFloater(LLFloater* floaterp, 
diff --git a/linden/indra/newview/llfloaterclassified.cpp b/linden/indra/newview/llfloaterclassified.cpp
index 914b202..b374f43 100644
--- a/linden/indra/newview/llfloaterclassified.cpp
+++ b/linden/indra/newview/llfloaterclassified.cpp
@@ -37,10 +37,10 @@
 // viewer project includes
 #include "llcommandhandler.h"
 #include "llpanelclassified.h"
-#include "llvieweruictrlfactory.h"
 // linden library includes
 #include "lluuid.h"
+#include "lluictrlfactory.h"
 //-----------------------------------------------------------------------------
 // Globals
@@ -82,7 +82,7 @@ LLFloaterClassifiedInfo::LLFloaterClassifiedInfo(const std::string& name, const
 mClassifiedID( id )
 {
        mFactoryMap["classified_details_panel"] = LLCallbackMap(LLFloaterClassifiedInfo::createClassifiedDetail, this);
-        gUICtrlFactory->buildFloater(this, "floater_preview_classified.xml", &getFactoryMap());
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_classified.xml", &getFactoryMap());
        gClassifiedInfoInstances.addData(id, this);
 }
diff --git a/linden/indra/newview/llfloaterclothing.cpp b/linden/indra/newview/llfloaterclothing.cpp
index 30b5b34..fd54fcf 100644
--- a/linden/indra/newview/llfloaterclothing.cpp
+++ b/linden/indra/newview/llfloaterclothing.cpp
@@ -43,7 +43,7 @@
 #include "llkeyboard.h"
 #include "llscrollbar.h"
 #include "llscrolllistctrl.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerinventory.h"
 #include "llvoavatar.h"
 #include "llviewercontrol.h"
@@ -74,7 +74,7 @@ LLFloaterClothing::LLFloaterClothing()
        mSelectedID(),
        mAllowSelection(FALSE)
 {
-        gUICtrlFactory->buildFloater(this, "floater_clothing.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_clothing.xml");
        sInstance = this;
@@ -87,7 +87,7 @@ LLFloaterClothing::LLFloaterClothing()
        childSetDoubleClickCallback("clothing_list", onClickWear);
        childSetCommitCallback("clothing_list", onCommitList, this);
-        LLScrollListCtrl* list = gUICtrlFactory->getScrollListByName(this, "clothing_list");
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("clothing_list");
        if (list)
        {
                list->addCommentText(LOADING_STRING);
@@ -244,8 +244,7 @@ void LLFloaterClothing::buildClothingList()
 {
        //llinfos << "buildClothingList" << llendl;
-        LLScrollListCtrl* list = gUICtrlFactory->getScrollListByName(this, "clothing_list");
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("clothing_list");
-        if (!list) return;
        list->operateOnAll(LLCtrlListInterface::OP_DELETE);
@@ -273,12 +272,12 @@ void LLFloaterClothing::buildClothingList()
                        item_is_multi = TRUE;
                }
-                LLUUID image_id = get_item_icon_uuid(item->getType(),
+                LLString icon_name = get_item_icon_name(item->getType(),
                                                                                         item->getInventoryType(),
                                                                                         item->getFlags(), item_is_multi);              // flags = wearable type
                row["columns"][0]["column"] = "icon";
                row["columns"][0]["type"] = "icon";
-                row["columns"][0]["value"] = image_id;
+                row["columns"][0]["value"] = icon_name;
                LLString text = item->getName();
                LLString style = "NORMAL";
diff --git a/linden/indra/newview/llfloatercolorpicker.cpp b/linden/indra/newview/llfloatercolorpicker.cpp
index 260db21..1a56597 100644
--- a/linden/indra/newview/llfloatercolorpicker.cpp
+++ b/linden/indra/newview/llfloatercolorpicker.cpp
@@ -47,7 +47,7 @@
 #include "v4coloru.h"
 #include "llbutton.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llgl.h"
 #include "llmemory.h"
@@ -138,7 +138,7 @@ LLFloaterColorPicker::
 createUI ()
 {
        // build the majority of the gui using the factory builder
-        gUICtrlFactory->buildFloater ( this, "floater_color_picker.xml" );
+        LLUICtrlFactory::getInstance()->buildFloater ( this, "floater_color_picker.xml" );
        setVisible ( FALSE );
        // create RGB type area (not really RGB but it's got R,G & B in it.,..
@@ -221,23 +221,23 @@ BOOL
 LLFloaterColorPicker::
 postBuild()
 {
-        mCancelBtn = LLViewerUICtrlFactory::getButtonByName( this, "cancel_btn" );
+        mCancelBtn = getChild<LLButton>( "cancel_btn" );
    mCancelBtn->setClickedCallback ( onClickCancel );
    mCancelBtn->setCallbackUserData ( this );
-        mSelectBtn = LLViewerUICtrlFactory::getButtonByName( this, "select_btn");
+        mSelectBtn = getChild<LLButton>( "select_btn");
    mSelectBtn->setClickedCallback ( onClickSelect );
    mSelectBtn->setCallbackUserData ( this );
        mSelectBtn->setFocus ( TRUE );
-        mPipetteBtn = LLViewerUICtrlFactory::getButtonByName ( this, "color_pipette" );
+        mPipetteBtn = getChild<LLButton>("color_pipette" );
        mPipetteBtn->setImages("eye_button_inactive.tga", "eye_button_active.tga");
        mPipetteBtn->setClickedCallback( onClickPipette );
        mPipetteBtn->setCallbackUserData ( this );
-        mApplyImmediateCheck = LLViewerUICtrlFactory::getCheckBoxByName( this, "apply_immediate");
+        mApplyImmediateCheck = getChild<LLCheckBoxCtrl>("apply_immediate");
        mApplyImmediateCheck->set(gSavedSettings.getBOOL("ApplyColorImmediately"));
        mApplyImmediateCheck->setCommitCallback(onImmediateCheck);
        mApplyImmediateCheck->setCallbackUserData(this);
@@ -468,18 +468,18 @@ void LLFloaterColorPicker::onClickPipette( void* data )
 {
        LLFloaterColorPicker* self = ( LLFloaterColorPicker* )data;
-        if ( self && gToolMgr)
+        if ( self)
        {
                BOOL pipette_active = self->mPipetteBtn->getToggleState();
                pipette_active = !pipette_active;
                if (pipette_active)
                {
-                        gToolPipette->setSelectCallback(onColorSelect, self);
+                        LLToolPipette::getInstance()->setSelectCallback(onColorSelect, self);
-                        gToolMgr->setTransientTool(gToolPipette);
+                        LLToolMgr::getInstance()->setTransientTool(LLToolPipette::getInstance());
                }
                else
                {
-                        gToolMgr->clearTransientTool();
+                        LLToolMgr::getInstance()->clearTransientTool();
                }
        }
 }
@@ -587,8 +587,7 @@ void LLFloaterColorPicker::draw()
                mContextConeOpacity = lerp(mContextConeOpacity, 0.f, LLCriticalDamp::getInterpolant(CONTEXT_FADE_TIME));
        }
-        mPipetteBtn->setEnabled(gToolMgr != NULL);
+        mPipetteBtn->setToggleState(LLToolMgr::getInstance()->getCurrentTool() == LLToolPipette::getInstance());
-        mPipetteBtn->setToggleState(gToolMgr && gToolMgr->getCurrentTool() == gToolPipette);
        mApplyImmediateCheck->setEnabled(mActive && mCanApplyImmediately);
        mSelectBtn->setEnabled(mActive);
@@ -903,9 +902,7 @@ BOOL
 LLFloaterColorPicker::
 handleMouseDown ( S32 x, S32 y, MASK mask )
 {
-        BOOL ret = LLFloater::handleMouseDown ( x, y, mask );
+        // make it the frontmost
-                // make it the frontmost
        gFloaterView->bringToFront(this);
        // rect containing RGB area
@@ -999,7 +996,8 @@ handleMouseDown ( S32 x, S32 y, MASK mask )
        }
        // dispatch to base class for the rest of things
-        return ret;
+        
+        return LLFloater::handleMouseDown ( x, y, mask );
 }
 //////////////////////////////////////////////////////////////////////////////
@@ -1227,8 +1225,8 @@ void LLFloaterColorPicker::setActive(BOOL active)
 void LLFloaterColorPicker::stopUsingPipette()
 {
-        if (gToolMgr && gToolMgr->getCurrentTool() == gToolPipette)
+        if (LLToolMgr::getInstance()->getCurrentTool() == LLToolPipette::getInstance())
        {
-                gToolMgr->clearTransientTool();
+                LLToolMgr::getInstance()->clearTransientTool();
        }
 }
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index f4baa9f..535ef52 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -73,7 +73,7 @@
 #include "llviewermessage.h"
 #include "llimagejpeg.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llfilepicker.h"
@@ -141,7 +141,7 @@ public:
                  mCommitCallback( commit_cb ),
                  mCallbackUserData( userdata )
        {
-                gUICtrlFactory->buildFloater(this, "floater_wearable_save_as.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_wearable_save_as.xml");
                
                childSetAction("Save", LLWearableSaveAsDialog::onSave, this );
                childSetAction("Cancel", LLWearableSaveAsDialog::onCancel, this );
@@ -151,7 +151,7 @@ public:
        virtual void startModal()
        {
                LLModalDialog::startModal();
-                LLLineEditor* edit = LLUICtrlFactory::getLineEditorByName(this, "name ed");
+                LLLineEditor* edit = getChild<LLLineEditor>("name ed");
                if (!edit) return;
                edit->setFocus(TRUE);
                edit->selectAll();
@@ -209,7 +209,7 @@ public:
                  mCommitCallback( commit_cb ),
                  mCallbackUserData( userdata )
        {
-                gUICtrlFactory->buildFloater(this, "floater_new_outfit_dialog.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_new_outfit_dialog.xml");
                
                // Build list of check boxes
                for( S32 i = 0; i < WT_COUNT; i++ )
@@ -453,10 +453,10 @@ LLPanelEditWearable::LLPanelEditWearable( EWearableType type )
 BOOL LLPanelEditWearable::postBuild()
 {
        LLAssetType::EType asset_type = LLWearable::typeToAssetType( mType );
-        LLUUID icon_id( gViewerArt.getString(asset_type == LLAssetType::AT_CLOTHING ?
+        LLString icon_name = (asset_type == LLAssetType::AT_CLOTHING ?
                                                                                 "inv_item_clothing.tga" :
-                                                                                 "inv_item_bodypart.tga" ) );
+                                                                                 "inv_item_skin.tga" );
-        childSetValue("icon", icon_id);
+        childSetValue("icon", icon_name);
        childSetAction("Create New", LLPanelEditWearable::onBtnCreateNew, this );
@@ -518,7 +518,7 @@ void LLPanelEditWearable::setSubpart( ESubpart subpart )
        for (std::map<ESubpart, LLSubpart*>::iterator iter = mSubpartList.begin();
                 iter != mSubpartList.end(); ++iter)
        {
-                LLButton* btn = LLUICtrlFactory::getButtonByName(this, iter->second->mButtonName);
+                LLButton* btn = getChild<LLButton>(iter->second->mButtonName);
                if (btn)
                {
                        btn->setToggleState( subpart == iter->first );
@@ -733,7 +733,7 @@ void LLPanelEditWearable::addTextureDropTarget( LLVOAvatar::ETextureIndex te, co
                                                                                                const LLUUID& default_image_id, BOOL allow_no_texture )
 {
        childSetCommitCallback(name, LLPanelEditWearable::onTextureCommit, this);
-        LLTextureCtrl* texture_ctrl = LLViewerUICtrlFactory::getTexturePickerByName(this, name);
+        LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(name);
        if (texture_ctrl)
        {
                texture_ctrl->setDefaultImageAssetID(default_image_id);
@@ -812,170 +812,167 @@ void LLPanelEditWearable::draw()
                return;
        }
-        if( getVisible() )
+        if( gFloaterCustomize->isFrontmost() && !gFocusMgr.getKeyboardFocus() )
        {
-                if( gFloaterCustomize->isFrontmost() && !gFocusMgr.getKeyboardFocus() )
+                // Route menu to this class
-                {
+                gEditMenuHandler = this;
-                        // Route menu to this class
+        }
-                        gEditMenuHandler = this;
-                }
-                LLWearable* wearable = gAgent.getWearable( mType );
+        LLWearable* wearable = gAgent.getWearable( mType );
-                BOOL has_wearable = (wearable != NULL );
+        BOOL has_wearable = (wearable != NULL );
-                BOOL is_dirty = isDirty();
+        BOOL is_dirty = isDirty();
-                BOOL is_modifiable = FALSE;
+        BOOL is_modifiable = FALSE;
-                BOOL is_copyable = FALSE;
+        BOOL is_copyable = FALSE;
-                BOOL is_complete = FALSE;
+        BOOL is_complete = FALSE;
-                LLViewerInventoryItem* item;
+        LLViewerInventoryItem* item;
-                item = (LLViewerInventoryItem*)gAgent.getWearableInventoryItem(mType);
+        item = (LLViewerInventoryItem*)gAgent.getWearableInventoryItem(mType);
-                if(item)
+        if(item)
-                {
+        {
-                        const LLPermissions& perm = item->getPermissions();
+                const LLPermissions& perm = item->getPermissions();
-                        is_modifiable = perm.allowModifyBy(gAgent.getID(), gAgent.getGroupID());
+                is_modifiable = perm.allowModifyBy(gAgent.getID(), gAgent.getGroupID());
-                        is_copyable = perm.allowCopyBy(gAgent.getID(), gAgent.getGroupID());
+                is_copyable = perm.allowCopyBy(gAgent.getID(), gAgent.getGroupID());
-                        is_complete = item->isComplete();
+                is_complete = item->isComplete();
-                }
+        }
-                childSetEnabled("Save", is_modifiable && is_complete && has_wearable && is_dirty);
+        childSetEnabled("Save", is_modifiable && is_complete && has_wearable && is_dirty);
-                childSetEnabled("Save As", is_copyable && is_complete && has_wearable);
+        childSetEnabled("Save As", is_copyable && is_complete && has_wearable);
-                childSetEnabled("Revert", has_wearable && is_dirty );
+        childSetEnabled("Revert", has_wearable && is_dirty );
-                childSetEnabled("Take Off",  has_wearable );
+        childSetEnabled("Take Off",  has_wearable );
-                childSetVisible("Take Off", mCanTakeOff  );
+        childSetVisible("Take Off", mCanTakeOff  );
-                childSetVisible("Create New", !has_wearable );
+        childSetVisible("Create New", !has_wearable );
-                childSetVisible("not worn instructions",  !has_wearable );
+        childSetVisible("not worn instructions",  !has_wearable );
-                childSetVisible("no modify instructions",  has_wearable && !is_modifiable);
+        childSetVisible("no modify instructions",  has_wearable && !is_modifiable);
-                for (std::map<ESubpart, LLSubpart*>::iterator iter = mSubpartList.begin();
+        for (std::map<ESubpart, LLSubpart*>::iterator iter = mSubpartList.begin();
-                         iter != mSubpartList.end(); ++iter)
+                 iter != mSubpartList.end(); ++iter)
+        {
+                if( has_wearable && is_complete && is_modifiable )
                {
-                        if( has_wearable && is_complete && is_modifiable )
+                        childSetEnabled(iter->second->mButtonName, iter->second->mSex & avatar->getSex() );
-                        {
-                                childSetEnabled(iter->second->mButtonName, iter->second->mSex & avatar->getSex() );
-                        }
-                        else
-                        {
-                                childSetEnabled(iter->second->mButtonName, FALSE );
-                        }
                }
+                else
+                {
+                        childSetEnabled(iter->second->mButtonName, FALSE );
+                }
+        }
-                childSetVisible("square", !is_modifiable);
+        childSetVisible("square", !is_modifiable);
-                childSetVisible("title", FALSE);
+        childSetVisible("title", FALSE);
-                childSetVisible("title_no_modify", FALSE);
+        childSetVisible("title_no_modify", FALSE);
-                childSetVisible("title_not_worn", FALSE);
+        childSetVisible("title_not_worn", FALSE);
-                childSetVisible("title_loading", FALSE);
+        childSetVisible("title_loading", FALSE);
-                childSetVisible("path", FALSE);
+        childSetVisible("path", FALSE);
+        
+        if(has_wearable && !is_modifiable)
+        {
+                // *TODO:Translate
+                childSetVisible("title_no_modify", TRUE);
+                childSetTextArg("title_no_modify", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
                
-                if(has_wearable && !is_modifiable)
+                for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
+                         iter != mTextureList.end(); ++iter )
                {
-                        // *TODO:Translate
+                        childSetVisible(iter->first, FALSE );
-                        childSetVisible("title_no_modify", TRUE);
-                        childSetTextArg("title_no_modify", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
-                        
-                        for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
-                                 iter != mTextureList.end(); ++iter )
-                        {
-                                childSetVisible(iter->first, FALSE );
-                        }
-                        for( std::map<LLString, S32>::iterator iter = mColorList.begin();
-                                 iter != mColorList.end(); ++iter )
-                        {
-                                childSetVisible(iter->first, FALSE );
-                        }
                }
-                else if(has_wearable && !is_complete)
+                for( std::map<LLString, S32>::iterator iter = mColorList.begin();
+                         iter != mColorList.end(); ++iter )
                {
-                        // *TODO:Translate
+                        childSetVisible(iter->first, FALSE );
-                        childSetVisible("title_loading", TRUE);
-                        childSetTextArg("title_loading", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
-                                
-                        LLString path;
-                        const LLUUID& item_id = gAgent.getWearableItem( wearable->getType() );
-                        gInventory.appendPath(item_id, path);
-                        childSetVisible("path", TRUE);
-                        childSetTextArg("path", "[PATH]", path);
-                        for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
-                                 iter != mTextureList.end(); ++iter )
-                        {
-                                childSetVisible(iter->first, FALSE );
-                        }
-                        for( std::map<LLString, S32>::iterator iter = mColorList.begin();
-                                 iter != mColorList.end(); ++iter )
-                        {
-                                childSetVisible(iter->first, FALSE );
-                        }
                }
-                else if(has_wearable && is_modifiable)
+        }
+        else if(has_wearable && !is_complete)
+        {
+                // *TODO:Translate
+                childSetVisible("title_loading", TRUE);
+                childSetTextArg("title_loading", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
+                        
+                LLString path;
+                const LLUUID& item_id = gAgent.getWearableItem( wearable->getType() );
+                gInventory.appendPath(item_id, path);
+                childSetVisible("path", TRUE);
+                childSetTextArg("path", "[PATH]", path);
+                for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
+                         iter != mTextureList.end(); ++iter )
                {
-                        childSetVisible("title", TRUE);
+                        childSetVisible(iter->first, FALSE );
-                        childSetTextArg("title", "[DESC]", wearable->getName() );
+                }
+                for( std::map<LLString, S32>::iterator iter = mColorList.begin();
+                         iter != mColorList.end(); ++iter )
+                {
+                        childSetVisible(iter->first, FALSE );
+                }
+        }
+        else if(has_wearable && is_modifiable)
+        {
+                childSetVisible("title", TRUE);
+                childSetTextArg("title", "[DESC]", wearable->getName() );
-                        LLString path;
+                LLString path;
-                        const LLUUID& item_id = gAgent.getWearableItem( wearable->getType() );
+                const LLUUID& item_id = gAgent.getWearableItem( wearable->getType() );
-                        gInventory.appendPath(item_id, path);
+                gInventory.appendPath(item_id, path);
-                        childSetVisible("path", TRUE);
+                childSetVisible("path", TRUE);
-                        childSetTextArg("path", "[PATH]", path);
+                childSetTextArg("path", "[PATH]", path);
-                        for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
+                for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
-                                 iter != mTextureList.end(); ++iter )
+                         iter != mTextureList.end(); ++iter )
+                {
+                        LLString name = iter->first;
+                        LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(name);
+                        S32 te_index = iter->second;
+                        childSetVisible(name, is_copyable && is_modifiable && is_complete );
+                        if (texture_ctrl)
                        {
-                                LLString name = iter->first;
+                                const LLTextureEntry* te = avatar->getTE(te_index);
-                                LLTextureCtrl* texture_ctrl = LLViewerUICtrlFactory::getTexturePickerByName(this, name);
+                                if( te && (te->getID() != IMG_DEFAULT_AVATAR) )
-                                S32 te_index = iter->second;
-                                childSetVisible(name, is_copyable && is_modifiable && is_complete );
-                                if (texture_ctrl)
                                {
-                                        const LLTextureEntry* te = avatar->getTE(te_index);
+                                        texture_ctrl->setImageAssetID( te->getID() );
-                                        if( te && (te->getID() != IMG_DEFAULT_AVATAR) )
-                                        {
-                                                texture_ctrl->setImageAssetID( te->getID() );
-                                        }
-                                        else
-                                        {
-                                                texture_ctrl->setImageAssetID( LLUUID::null );
-                                        }
                                }
-                        }
+                                else
-                        for( std::map<LLString, S32>::iterator iter = mColorList.begin();
-                                 iter != mColorList.end(); ++iter )
-                        {
-                                LLString name = iter->first;
-                                S32 te_index = iter->second;
-                                childSetVisible(name, is_modifiable && is_complete );
-                                childSetEnabled(name, is_modifiable && is_complete );
-                                LLColorSwatchCtrl* ctrl = LLViewerUICtrlFactory::getColorSwatchByName(this, name);
-                                if (ctrl)
                                {
-                                        ctrl->set(avatar->getClothesColor( (LLVOAvatar::ETextureIndex)te_index ) );
+                                        texture_ctrl->setImageAssetID( LLUUID::null );
                                }
                        }
                }
-                else
-                {
-                        // *TODO:Translate
-                        childSetVisible("title_not_worn", TRUE);
-                        childSetTextArg("title_not_worn", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
-                        for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
+                for( std::map<LLString, S32>::iterator iter = mColorList.begin();
-                                 iter != mTextureList.end(); ++iter )
+                         iter != mColorList.end(); ++iter )
-                        {
+                {
-                                childSetVisible(iter->first, FALSE );
+                        LLString name = iter->first;
-                        }
+                        S32 te_index = iter->second;
-                        for( std::map<LLString, S32>::iterator iter = mColorList.begin();
+                        childSetVisible(name, is_modifiable && is_complete );
-                                 iter != mColorList.end(); ++iter )
+                        childSetEnabled(name, is_modifiable && is_complete );
+                        LLColorSwatchCtrl* ctrl = getChild<LLColorSwatchCtrl>(name);
+                        if (ctrl)
                        {
-                                childSetVisible(iter->first, FALSE );
+                                ctrl->set(avatar->getClothesColor( (LLVOAvatar::ETextureIndex)te_index ) );
                        }
                }
-                
+        }
-                childSetVisible("icon", has_wearable && is_modifiable);
+        else
+        {
+                // *TODO:Translate
+                childSetVisible("title_not_worn", TRUE);
+                childSetTextArg("title_not_worn", "[DESC]", LLString(LLWearable::typeToTypeLabel( mType )));
-                LLPanel::draw();
+                for( std::map<LLString, S32>::iterator iter = mTextureList.begin();
+                         iter != mTextureList.end(); ++iter )
+                {
+                        childSetVisible(iter->first, FALSE );
+                }
+                for( std::map<LLString, S32>::iterator iter = mColorList.begin();
+                         iter != mColorList.end(); ++iter )
+                {
+                        childSetVisible(iter->first, FALSE );
+                }
        }
+        
+        childSetVisible("icon", has_wearable && is_modifiable);
+        LLPanel::draw();
 }
 void LLPanelEditWearable::setWearable(LLWearable* wearable, U32 perm_mask, BOOL is_complete)
@@ -1153,7 +1150,7 @@ LLScrollingPanelParam::LLScrollingPanelParam( const LLString& name,
          mParam(param),
          mAllowModify(allow_modify)
 {
-        gUICtrlFactory->buildPanel(this, "panel_scrolling_param.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_scrolling_param.xml");
        S32 pos_x = 2 * LLPANEL_BORDER_WIDTH;
        S32 pos_y = 3 * LLPANEL_BORDER_WIDTH + SLIDERCTRL_HEIGHT;
@@ -1177,7 +1174,7 @@ LLScrollingPanelParam::LLScrollingPanelParam( const LLString& name,
        childSetValue("min param text", min_name);
        childSetValue("max param text", max_name);
-        LLButton* less = LLUICtrlFactory::getButtonByName(this, "less");
+        LLButton* less = getChild<LLButton>("less");
        if (less)
        {
                less->setMouseDownCallback( LLScrollingPanelParam::onHintMinMouseDown );
@@ -1186,7 +1183,7 @@ LLScrollingPanelParam::LLScrollingPanelParam( const LLString& name,
                less->setHeldDownDelay( PARAM_STEP_TIME_THRESHOLD );
        }
-        LLButton* more = LLUICtrlFactory::getButtonByName(this, "more");
+        LLButton* more = getChild<LLButton>("more");
        if (more)
        {
                more->setMouseDownCallback( LLScrollingPanelParam::onHintMaxMouseDown );
@@ -1244,42 +1241,39 @@ void LLScrollingPanelParam::draw()
        childSetVisible("less", mHintMin->getVisible());
        childSetVisible("more", mHintMax->getVisible());
-        if( getVisible() )
+        // Draw all the children except for the labels
-        {
+        childSetVisible( "min param text", FALSE );
-                // Draw all the children except for the labels
+        childSetVisible( "max param text", FALSE );
-                childSetVisible( "min param text", FALSE );
+        LLPanel::draw();
-                childSetVisible( "max param text", FALSE );
-                LLPanel::draw();
-                // Draw the hints over the "less" and "more" buttons.
+        // Draw the hints over the "less" and "more" buttons.
-                glPushMatrix();
+        glPushMatrix();
-                {
+        {
-                        const LLRect& r = mHintMin->getRect();
+                const LLRect& r = mHintMin->getRect();
-                        F32 left = (F32)(r.mLeft + BTN_BORDER);
+                F32 left = (F32)(r.mLeft + BTN_BORDER);
-                        F32 bot  = (F32)(r.mBottom + BTN_BORDER);
+                F32 bot  = (F32)(r.mBottom + BTN_BORDER);
-                        glTranslatef(left, bot, 0.f);
+                glTranslatef(left, bot, 0.f);
-                        mHintMin->draw();
+                mHintMin->draw();
-                }
+        }
-                glPopMatrix();
+        glPopMatrix();
-                glPushMatrix();
+        glPushMatrix();
-                {
+        {
-                        const LLRect& r = mHintMax->getRect();
+                const LLRect& r = mHintMax->getRect();
-                        F32 left = (F32)(r.mLeft + BTN_BORDER);
+                F32 left = (F32)(r.mLeft + BTN_BORDER);
-                        F32 bot  = (F32)(r.mBottom + BTN_BORDER);
+                F32 bot  = (F32)(r.mBottom + BTN_BORDER);
-                        glTranslatef(left, bot, 0.f);
+                glTranslatef(left, bot, 0.f);
-                        mHintMax->draw();
+                mHintMax->draw();
-                }
+        }
-                glPopMatrix();
+        glPopMatrix();
-                // Draw labels on top of the buttons
+        // Draw labels on top of the buttons
-                childSetVisible( "min param text", TRUE );
+        childSetVisible( "min param text", TRUE );
-                drawChild(getChild<LLView>("min param text"), BTN_BORDER, BTN_BORDER);
+        drawChild(getChild<LLView>("min param text"), BTN_BORDER, BTN_BORDER);
-                childSetVisible( "max param text", TRUE );
+        childSetVisible( "max param text", TRUE );
-                drawChild(getChild<LLView>("max param text"), BTN_BORDER, BTN_BORDER);
+        drawChild(getChild<LLView>("max param text"), BTN_BORDER, BTN_BORDER);
-        }
 }
 // static
@@ -1403,7 +1397,7 @@ void LLScrollingPanelParam::onHintHeldDown( LLVisualParamHint* hint )
                // Make sure we're not taking the slider out of bounds
                // (this is where some simple UI limits are stored)
                F32 new_percent = weightToPercent(new_weight);
-                LLSliderCtrl* slider = LLUICtrlFactory::getSliderByName(this, "param slider");
+                LLSliderCtrl* slider = getChild<LLSliderCtrl>("param slider");
                if (slider)
                {
                        if (slider->getMinValue() < new_percent
@@ -1438,7 +1432,7 @@ void LLScrollingPanelParam::onHintMinMouseUp( void* userdata )
                        // step a fraction in the negative directiona
                        F32 new_weight = current_weight - (range / 10.f);
                        F32 new_percent = self->weightToPercent(new_weight);
-                        LLSliderCtrl* slider = LLUICtrlFactory::getSliderByName(self, "param slider");
+                        LLSliderCtrl* slider = self->getChild<LLSliderCtrl>("param slider");
                        if (slider)
                        {
                                if (slider->getMinValue() < new_percent
@@ -1476,7 +1470,7 @@ void LLScrollingPanelParam::onHintMaxMouseUp( void* userdata )
                        // step a fraction in the negative direction
                        F32 new_weight = current_weight + (range / 10.f);
                        F32 new_percent = self->weightToPercent(new_weight);
-                        LLSliderCtrl* slider = LLUICtrlFactory::getSliderByName(self, "param slider");
+                        LLSliderCtrl* slider = self->getChild<LLSliderCtrl>("param slider");
                        if (slider)
                        {
                                if (slider->getMinValue() < new_percent
@@ -1559,7 +1553,7 @@ LLFloaterCustomize::LLFloaterCustomize()
        factory_map["Underpants"] = LLCallbackMap(createWearablePanel, (void*)(new WearablePanelData(this, WT_UNDERPANTS) ) );
        factory_map["Skirt"] = LLCallbackMap(createWearablePanel, (void*)(new WearablePanelData(this, WT_SKIRT) ) );
        
-        gUICtrlFactory->buildFloater(this, "floater_customize.xml", &factory_map);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_customize.xml", &factory_map);
        
 }
@@ -1590,7 +1584,7 @@ BOOL LLFloaterCustomize::postBuild()
        // Remove underwear panels for teens
        if (gAgent.isTeen())
        {
-                LLTabContainer* tab_container = LLUICtrlFactory::getTabContainerByName(this, "customize tab container");
+                LLTabContainer* tab_container = getChild<LLTabContainer>("customize tab container");
                if (tab_container)
                {
                        LLPanel* panel;
@@ -2123,18 +2117,15 @@ void LLFloaterCustomize::draw()
        // only do this if we are in the customize avatar mode
        // and not transitioning into or out of it
-        if( getVisible() )
+        // *TODO: This is a sort of expensive call, which only needs
-        {
+        // to be called when the tabs change or an inventory item
-                // *TODO: This is a sort of expensive call, which only needs
+        // arrives. Figure out some way to avoid this if possible.
-                // to be called when the tabs change or an inventory item
+        updateInventoryUI();
-                // arrives. Figure out some way to avoid this if possible.
-                updateInventoryUI();
-                LLScrollingPanelParam::sUpdateDelayFrames = 0;
+        LLScrollingPanelParam::sUpdateDelayFrames = 0;
-                
+        
-                childSetEnabled("Save All",  isDirty() );
+        childSetEnabled("Save All",  isDirty() );
-                LLFloater::draw();
+        LLFloater::draw();
-        }
 }
 BOOL LLFloaterCustomize::isDirty() const
@@ -2179,7 +2170,7 @@ const S32 HEADER_HEIGHT = 3 * (LINE_HEIGHT + LLFLOATER_VPAD) + (2 * LLPANEL_BORD
 void LLFloaterCustomize::initScrollingPanelList()
 {
        LLScrollableContainerView* scroll_container =
-                LLUICtrlFactory::getScrollableContainerByName(this, "panel_container");
+                getChild<LLScrollableContainerView>("panel_container");
        // LLScrollingPanelList's do not import correctly 
 //      mScrollingPanelList = LLUICtrlFactory::getScrollingPanelList(this, "panel_list");
        mScrollingPanelList = new LLScrollingPanelList("panel_list", LLRect());
diff --git a/linden/indra/newview/llfloaterdaycycle.cpp b/linden/indra/newview/llfloaterdaycycle.cpp
index 29e4c37..f517439 100644
--- a/linden/indra/newview/llfloaterdaycycle.cpp
+++ b/linden/indra/newview/llfloaterdaycycle.cpp
@@ -41,7 +41,7 @@
 #include "llmultisliderctrl.h"
 #include "llspinctrl.h"
 #include "llcheckboxctrl.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewercamera.h"
 #include "llcombobox.h"
 #include "lllineeditor.h"
@@ -64,10 +64,10 @@ const F32 LLFloaterDayCycle::sHoursPerDay = 24.0f;
 LLFloaterDayCycle::LLFloaterDayCycle() : LLFloater("Day Cycle Floater")
 {
-        gUICtrlFactory->buildFloater(this, "floater_day_cycle_options.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_day_cycle_options.xml");
        
        // add the combo boxes
-        LLComboBox* keyCombo = LLUICtrlFactory::getComboBoxByName(this, "WLKeyPresets");
+        LLComboBox* keyCombo = getChild<LLComboBox>("WLKeyPresets");
        if(keyCombo != NULL) 
        {
@@ -83,8 +83,7 @@ LLFloaterDayCycle::LLFloaterDayCycle() : LLFloater("Day Cycle Floater")
        }
        // add the time slider
-        LLMultiSliderCtrl* sldr = LLUICtrlFactory::getMultiSliderByName(this, 
+        LLMultiSliderCtrl* sldr = getChild<LLMultiSliderCtrl>("WLTimeSlider");
-                "WLTimeSlider");
        sldr->addSlider();
@@ -148,16 +147,12 @@ void LLFloaterDayCycle::syncMenu()
 //      std::map<std::string, LLVector4> & currentParams = LLWLParamManager::instance()->mCurParams.mParamValues;
        
        // set time
-        LLMultiSliderCtrl* sldr = LLUICtrlFactory::getMultiSliderByName(LLFloaterDayCycle::sDayCycle, 
+        LLMultiSliderCtrl* sldr = LLFloaterDayCycle::sDayCycle->getChild<LLMultiSliderCtrl>("WLTimeSlider");
-                "WLTimeSlider");
        sldr->setCurSliderValue((F32)LLWLParamManager::instance()->mAnimator.getDayTime() * sHoursPerDay);
-        LLSpinCtrl* secSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
+        LLSpinCtrl* secSpin = sDayCycle->getChild<LLSpinCtrl>("WLLengthOfDaySec");
-                "WLLengthOfDaySec");
+        LLSpinCtrl* minSpin = sDayCycle->getChild<LLSpinCtrl>("WLLengthOfDayMin");
-        LLSpinCtrl* minSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
+        LLSpinCtrl* hourSpin = sDayCycle->getChild<LLSpinCtrl>("WLLengthOfDayHour");
-                "WLLengthOfDayMin");
-        LLSpinCtrl* hourSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
-                "WLLengthOfDayHour");
        F32 curRate;
        F32 hours, min, sec;
@@ -188,8 +183,7 @@ void LLFloaterDayCycle::syncMenu()
 void LLFloaterDayCycle::syncSliderTrack()
 {
        // clear the slider
-        LLMultiSliderCtrl* kSldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        LLMultiSliderCtrl* kSldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
-                "WLDayCycleKeys");
        kSldr->clear();
        sSliderToKey.clear();
@@ -212,12 +206,12 @@ void LLFloaterDayCycle::syncTrack()
        }
        
        LLMultiSliderCtrl* sldr;
-        sldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        sldr = sDayCycle->getChild<LLMultiSliderCtrl>( 
                "WLDayCycleKeys");
        llassert_always(sSliderToKey.size() == sldr->getValue().size());
        
        LLMultiSliderCtrl* tSldr;
-        tSldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        tSldr = sDayCycle->getChild<LLMultiSliderCtrl>( 
                "WLTimeSlider");
        // create a new animation track
@@ -267,7 +261,7 @@ void LLFloaterDayCycle::show()
        syncSliderTrack();
        // comment in if you want the menu to rebuild each time
-        //gUICtrlFactory->buildFloater(dayCycle, "floater_day_cycle_options.xml");
+        //LLUICtrlFactory::getInstance()->buildFloater(dayCycle, "floater_day_cycle_options.xml");
        //dayCycle->initCallbacks();
        dayCycle->open();
@@ -291,13 +285,11 @@ void LLFloaterDayCycle::onRunAnimSky(void* userData)
        }
        
        LLMultiSliderCtrl* sldr;
-        sldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        sldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
-                "WLDayCycleKeys");
        llassert_always(sSliderToKey.size() == sldr->getValue().size());
        LLMultiSliderCtrl* tSldr;
-        tSldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        tSldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLTimeSlider");
-                "WLTimeSlider");
        // turn off linden time
        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
@@ -324,7 +316,7 @@ void LLFloaterDayCycle::onStopAnimSky(void* userData)
 void LLFloaterDayCycle::onUseLindenTime(void* userData)
 {
        LLFloaterWindLight* wl = LLFloaterWindLight::instance();
-        LLComboBox* box = LLUICtrlFactory::getComboBoxByName(wl, "WLPresetsCombo");
+        LLComboBox* box = wl->getChild<LLComboBox>("WLPresetsCombo");
        box->selectByValue(""); 
        LLWLParamManager::instance()->mAnimator.mIsRunning = true;
@@ -341,7 +333,7 @@ void LLFloaterDayCycle::onLoadDayCycle(void* userData)
        // set the param manager's track to the new one
        LLMultiSliderCtrl* tSldr;
-        tSldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        tSldr = sDayCycle->getChild<LLMultiSliderCtrl>( 
                "WLTimeSlider");
        LLWLParamManager::instance()->resetAnimator(
                tSldr->getCurSliderValue() / sHoursPerDay, false);
@@ -359,7 +351,7 @@ void LLFloaterDayCycle::onSaveDayCycle(void* userData)
 void LLFloaterDayCycle::onTimeSliderMoved(LLUICtrl* ctrl, void* userData)
 {
-        LLMultiSliderCtrl* sldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>( 
                "WLTimeSlider");
        /// get the slider value
@@ -377,14 +369,10 @@ void LLFloaterDayCycle::onTimeSliderMoved(LLUICtrl* ctrl, void* userData)
 void LLFloaterDayCycle::onKeyTimeMoved(LLUICtrl* ctrl, void* userData)
 {
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(sDayCycle, 
+        LLComboBox* comboBox = sDayCycle->getChild<LLComboBox>("WLKeyPresets");
-                "WLKeyPresets");
+        LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
-        LLMultiSliderCtrl* sldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        LLSpinCtrl* hourSpin = sDayCycle->getChild<LLSpinCtrl>("WLCurKeyHour");
-                "WLDayCycleKeys");
+        LLSpinCtrl* minSpin = sDayCycle->getChild<LLSpinCtrl>("WLCurKeyMin");
-        LLSpinCtrl* hourSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
-                "WLCurKeyHour");
-        LLSpinCtrl* minSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
-                "WLCurKeyMin");
        if(sldr->getValue().size() == 0) {
                return;
@@ -429,11 +417,11 @@ void LLFloaterDayCycle::onKeyTimeChanged(LLUICtrl* ctrl, void* userData)
                return;
        }
-        LLMultiSliderCtrl* sldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>( 
                "WLDayCycleKeys");
-        LLSpinCtrl* hourSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
+        LLSpinCtrl* hourSpin = sDayCycle->getChild<LLSpinCtrl>( 
                "WLCurKeyHour");
-        LLSpinCtrl* minSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
+        LLSpinCtrl* minSpin = sDayCycle->getChild<LLSpinCtrl>( 
                "WLCurKeyMin");
        F32 hour = hourSpin->get();
@@ -454,9 +442,9 @@ void LLFloaterDayCycle::onKeyTimeChanged(LLUICtrl* ctrl, void* userData)
 void LLFloaterDayCycle::onKeyPresetChanged(LLUICtrl* ctrl, void* userData)
 {
        // get the time
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(sDayCycle, 
+        LLComboBox* comboBox = sDayCycle->getChild<LLComboBox>( 
                "WLKeyPresets");
-        LLMultiSliderCtrl* sldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>( 
                "WLDayCycleKeys");
        // do nothing if no sliders
@@ -481,13 +469,13 @@ void LLFloaterDayCycle::onKeyPresetChanged(LLUICtrl* ctrl, void* userData)
 void LLFloaterDayCycle::onTimeRateChanged(LLUICtrl* ctrl, void* userData)
 {
        // get the time
-        LLSpinCtrl* secSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
+        LLSpinCtrl* secSpin = sDayCycle->getChild<LLSpinCtrl>( 
                "WLLengthOfDaySec");
-        LLSpinCtrl* minSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
+        LLSpinCtrl* minSpin = sDayCycle->getChild<LLSpinCtrl>( 
                "WLLengthOfDayMin");
-        LLSpinCtrl* hourSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
+        LLSpinCtrl* hourSpin = sDayCycle->getChild<LLSpinCtrl>( 
                "WLLengthOfDayHour");
        F32 hour;
@@ -508,11 +496,11 @@ void LLFloaterDayCycle::onTimeRateChanged(LLUICtrl* ctrl, void* userData)
 void LLFloaterDayCycle::onAddKey(void* userData)
 {
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(sDayCycle, 
+        LLComboBox* comboBox = sDayCycle->getChild<LLComboBox>( 
                "WLKeyPresets");
-        LLMultiSliderCtrl* kSldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        LLMultiSliderCtrl* kSldr = sDayCycle->getChild<LLMultiSliderCtrl>( 
                "WLDayCycleKeys");
-        LLMultiSliderCtrl* tSldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        LLMultiSliderCtrl* tSldr = sDayCycle->getChild<LLMultiSliderCtrl>( 
                "WLTimeSlider");
        
        llassert_always(sSliderToKey.size() == kSldr->getValue().size());
@@ -528,7 +516,7 @@ void LLFloaterDayCycle::onAddKey(void* userData)
 void LLFloaterDayCycle::addSliderKey(F32 time, const LLString & presetName)
 {
-        LLMultiSliderCtrl* kSldr = LLUICtrlFactory::getMultiSliderByName(sDayCycle, 
+        LLMultiSliderCtrl* kSldr = sDayCycle->getChild<LLMultiSliderCtrl>( 
                "WLDayCycleKeys");
        // make a slider
@@ -553,8 +541,7 @@ void LLFloaterDayCycle::addSliderKey(F32 time, const LLString & presetName)
 void LLFloaterDayCycle::deletePreset(LLString& presetName)
 {
-        LLMultiSliderCtrl* sldr = LLUICtrlFactory::getMultiSliderByName(
+        LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
-                sDayCycle, "WLDayCycleKeys");
        /// delete any reference
        std::map<LLString, LLWLSkyKey>::iterator curr_preset, next_preset;
@@ -576,10 +563,9 @@ void LLFloaterDayCycle::onDeleteKey(void* userData)
                return;
        }
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(sDayCycle, 
+        LLComboBox* comboBox = sDayCycle->getChild<LLComboBox>( 
                "WLKeyPresets");
-        LLMultiSliderCtrl* sldr = LLUICtrlFactory::getMultiSliderByName(
+        LLMultiSliderCtrl* sldr = sDayCycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
-                sDayCycle, "WLDayCycleKeys");
        // delete from map
        const LLString& sldrName = sldr->getCurSlider();
@@ -596,10 +582,8 @@ void LLFloaterDayCycle::onDeleteKey(void* userData)
        comboBox->selectByValue(sSliderToKey[name].presetName);
        F32 time = sSliderToKey[name].time;
-        LLSpinCtrl* hourSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
+        LLSpinCtrl* hourSpin = sDayCycle->getChild<LLSpinCtrl>("WLCurKeyHour");
-                "WLCurKeyHour");
+        LLSpinCtrl* minSpin = sDayCycle->getChild<LLSpinCtrl>("WLCurKeyMin");
-        LLSpinCtrl* minSpin = LLUICtrlFactory::getSpinnerByName(sDayCycle, 
-                "WLCurKeyMin");
        // now set the spinners
        F32 hour = (F32)((S32)time);
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 7ac491e..42a3bae 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -62,7 +62,7 @@
 #include "llpaneldirland.h"
 #include "llfloateravatarinfo.h"
 #include "lldir.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 LLFloaterDirectory* LLFloaterDirectory::sInstance = NULL;
 //static
@@ -112,7 +112,7 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
        factory_map["Panel Avatar"] = LLCallbackMap(createPanelAvatar, this);
        
-        gUICtrlFactory->buildFloater(this, "floater_directory.xml", &factory_map);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_directory.xml", &factory_map);
        moveResizeHandlesToFront();
        if(mPanelAvatarp)
@@ -248,7 +248,7 @@ void* LLFloaterDirectory::createEventDetail(void* userdata)
 {
        LLFloaterDirectory *self = (LLFloaterDirectory*)userdata;
        self->mPanelEventp = new LLPanelEvent();
-        gUICtrlFactory->buildPanel(self->mPanelEventp, "panel_event.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(self->mPanelEventp, "panel_event.xml");
        self->mPanelEventp->setVisible(FALSE);
        return self->mPanelEventp;
 }
@@ -279,7 +279,7 @@ void* LLFloaterDirectory::createPlaceDetail(void* userdata)
 {
        LLFloaterDirectory *self = (LLFloaterDirectory*)userdata;
        self->mPanelPlacep = new LLPanelPlace();
-        gUICtrlFactory->buildPanel(self->mPanelPlacep, "panel_place.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(self->mPanelPlacep, "panel_place.xml");
        self->mPanelPlacep->setVisible(FALSE);
        return self->mPanelPlacep;
 }
@@ -289,7 +289,7 @@ void* LLFloaterDirectory::createPlaceDetailSmall(void* userdata)
 {
        LLFloaterDirectory *self = (LLFloaterDirectory*)userdata;
        self->mPanelPlaceSmallp = new LLPanelPlace();
-        gUICtrlFactory->buildPanel(self->mPanelPlaceSmallp, "panel_place_small.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(self->mPanelPlaceSmallp, "panel_place_small.xml");
        self->mPanelPlaceSmallp->setVisible(FALSE);
        return self->mPanelPlaceSmallp;
 }
@@ -378,7 +378,7 @@ void LLFloaterDirectory::refreshGroup(const LLUUID& group_id)
 void LLFloaterDirectory::focusCurrentPanel()
 {
-        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(this, "Directory Tabs");
+        LLTabContainer* tabs = getChild<LLTabContainer>("Directory Tabs");
        if (!tabs) return;
        LLPanel* panel = tabs->getCurrentPanel();
diff --git a/linden/indra/newview/llfloatereditui.cpp b/linden/indra/newview/llfloatereditui.cpp
index b68f696..83c69b5 100644
--- a/linden/indra/newview/llfloatereditui.cpp
+++ b/linden/indra/newview/llfloatereditui.cpp
@@ -273,32 +273,14 @@ void LLFloaterEditUI::refreshCore()
        mWidthSpin->set(width);
        mHeightSpin->set(height);
-        EWidgetType widget_type = view->getWidgetType();
+        LLButton* buttonp = dynamic_cast<LLButton*>(view);
-        switch (widget_type)
+        if (buttonp)
        {
-        default:
-        case WIDGET_TYPE_VIEW:
-                refreshView(view);
-                break;
-        case WIDGET_TYPE_BUTTON:
                refreshButton(view);
-                break;
+        }
-        case WIDGET_TYPE_CHECKBOX:
+        else
-        case WIDGET_TYPE_COLOR_SWATCH:
+        {
-        case WIDGET_TYPE_COMBO_BOX:
-        case WIDGET_TYPE_LINE_EDITOR:
-        case WIDGET_TYPE_SCROLL_LIST:
-        case WIDGET_TYPE_NAME_LIST:
-        case WIDGET_TYPE_SLIDER:
-        case WIDGET_TYPE_VOLUME_SLIDER:
-        case WIDGET_TYPE_SPINNER:
-        case WIDGET_TYPE_TEXT_EDITOR:
-        case WIDGET_TYPE_TEXTURE_PICKER:
-        case WIDGET_TYPE_TEXT_BOX:
-        case WIDGET_TYPE_RADIO_GROUP:
-        case WIDGET_TYPE_ICON:
                refreshView(view);
-                break;
        }
 }
@@ -327,7 +309,7 @@ void LLFloaterEditUI::show(void*)
 }
 // static
-BOOL LLFloaterEditUI::handleKeyEditUI(KEY key, MASK mask)
+BOOL LLFloaterEditUI::processKeystroke(KEY key, MASK mask)
 {
        if (!LLView::sEditingUIView) return FALSE;
@@ -400,9 +382,9 @@ void LLFloaterEditUI::onCommitLabel(LLUICtrl* ctrl, void* data)
        LLLineEditor* line = (LLLineEditor*)ctrl;
        const LLString& text = line->getText();
-        if (view->getWidgetType() == WIDGET_TYPE_BUTTON)
+        LLButton* btn = dynamic_cast<LLButton*>(view);
+        if (btn)
        {
-                LLButton* btn = (LLButton*)view;
                btn->setLabelUnselected(text);
                btn->setLabelSelected(text);
        }
diff --git a/linden/indra/newview/llfloatereditui.h b/linden/indra/newview/llfloatereditui.h
index 9012d23..610824d 100644
--- a/linden/indra/newview/llfloatereditui.h
+++ b/linden/indra/newview/llfloatereditui.h
@@ -53,7 +53,7 @@ public:
        static void     navigateHierarchyButtonPressed(void*    data);
        static void show(void* unused = NULL);
-        static BOOL handleKeyEditUI(KEY key, MASK mask);
+        static BOOL processKeystroke(KEY key, MASK mask);
        static void onCommitLabel(LLUICtrl* ctrl, void* data);
        static void onCommitHeight(LLUICtrl* ctrl, void* data);
diff --git a/linden/indra/newview/llfloaterenvsettings.cpp b/linden/indra/newview/llfloaterenvsettings.cpp
index 6a0400c..b16b48d 100644
--- a/linden/indra/newview/llfloaterenvsettings.cpp
+++ b/linden/indra/newview/llfloaterenvsettings.cpp
@@ -35,7 +35,7 @@
 #include "llfloaterwindlight.h"
 #include "llfloaterwater.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llsliderctrl.h"
 #include "llcombobox.h"
 #include "llcolorswatch.h"
@@ -55,7 +55,7 @@ LLFloaterEnvSettings* LLFloaterEnvSettings::sEnvSettings = NULL;
 LLFloaterEnvSettings::LLFloaterEnvSettings() : LLFloater("Environment Settings Floater")
 {
-        gUICtrlFactory->buildFloater(this, "floater_env_settings.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_env_settings.xml");
        
        // load it up
        initCallbacks();
@@ -106,24 +106,14 @@ void LLFloaterEnvSettings::initCallbacks(void)
 void LLFloaterEnvSettings::syncMenu()
 {
        LLSliderCtrl* sldr;
-        sldr = LLUICtrlFactory::getSliderByName(sEnvSettings, 
+        sldr = sEnvSettings->getChild<LLSliderCtrl>("EnvTimeSlider");
-                "EnvTimeSlider");
-        if(NULL == sldr)
-        {
-                return;
-        }
        // sync the clock
        F32 val = (F32)LLWLParamManager::instance()->mAnimator.getDayTime();
        LLString timeStr = timeToString(val);
        LLTextBox* textBox;
-        textBox = LLUICtrlFactory::getTextBoxByName(sEnvSettings, 
+        textBox = sEnvSettings->getChild<LLTextBox>("EnvTimeText");
-                "EnvTimeText");
-        if(NULL == textBox)
-        {
-                return;
-        }
        textBox->setValue(timeStr);
        
@@ -204,7 +194,7 @@ void LLFloaterEnvSettings::show()
        envSettings->syncMenu();
        // comment in if you want the menu to rebuild each time
-        //gUICtrlFactory->buildFloater(envSettings, "floater_env_settings.xml");
+        //LLUICtrlFactory::getInstance()->buildFloater(envSettings, "floater_env_settings.xml");
        //envSettings->initCallbacks();
        envSettings->open();
@@ -232,8 +222,7 @@ void LLFloaterEnvSettings::onClose(bool app_quitting)
 void LLFloaterEnvSettings::onChangeDayTime(LLUICtrl* ctrl, void* userData)
 {
        LLSliderCtrl* sldr;
-        sldr = LLUICtrlFactory::getSliderByName(sEnvSettings, 
+        sldr = sEnvSettings->getChild<LLSliderCtrl>("EnvTimeSlider");
-                "EnvTimeSlider");
        // deactivate animator
        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
@@ -253,8 +242,7 @@ void LLFloaterEnvSettings::onChangeDayTime(LLUICtrl* ctrl, void* userData)
 void LLFloaterEnvSettings::onChangeCloudCoverage(LLUICtrl* ctrl, void* userData)
 {
        LLSliderCtrl* sldr;
-        sldr = LLUICtrlFactory::getSliderByName(sEnvSettings, 
+        sldr = sEnvSettings->getChild<LLSliderCtrl>("EnvCloudSlider");
-                "EnvCloudSlider");
        
        // deactivate animator
        //LLWLParamManager::instance()->mAnimator.mIsRunning = false;
@@ -267,10 +255,9 @@ void LLFloaterEnvSettings::onChangeCloudCoverage(LLUICtrl* ctrl, void* userData)
 void LLFloaterEnvSettings::onChangeWaterFogDensity(LLUICtrl* ctrl, void* userData)
 {
        LLSliderCtrl* sldr;
-        sldr = LLUICtrlFactory::getSliderByName(sEnvSettings, 
+        sldr = sEnvSettings->getChild<LLSliderCtrl>("EnvWaterFogSlider");
-                "EnvWaterFogSlider");
        
-        if(NULL == sldr || NULL == userData)
+        if(NULL == userData)
        {
                return;
        }
@@ -313,7 +300,7 @@ void LLFloaterEnvSettings::onUseEstateTime(void* userData)
        {
                // select the blank value in 
                LLFloaterWindLight* wl = LLFloaterWindLight::instance();
-                LLComboBox* box = LLUICtrlFactory::getComboBoxByName(wl, "WLPresetsCombo");
+                LLComboBox* box = wl->getChild<LLComboBox>("WLPresetsCombo");
                box->selectByValue("");
        }
diff --git a/linden/indra/newview/llfloaterevent.cpp b/linden/indra/newview/llfloaterevent.cpp
index 71767c6..778a3d5 100644
--- a/linden/indra/newview/llfloaterevent.cpp
+++ b/linden/indra/newview/llfloaterevent.cpp
@@ -37,10 +37,10 @@
 // viewer project includes
 #include "llcommandhandler.h"
 #include "llpanelevent.h"
-#include "llvieweruictrlfactory.h"
 // linden library includes
 #include "lluuid.h"
+#include "lluictrlfactory.h"
 ////////////////////////////////////////////////////////////////////////////
 // LLFloaterEventInfo
@@ -79,7 +79,7 @@ LLFloaterEventInfo::LLFloaterEventInfo(const std::string& name, const U32 event_
 {
        mFactoryMap["event_details_panel"] = LLCallbackMap(LLFloaterEventInfo::createEventDetail, this);
-        gUICtrlFactory->buildFloater(this, "floater_preview_event.xml", &getFactoryMap());
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_event.xml", &getFactoryMap());
        gEventInfoInstances.addData(event_id, this);
 }
@@ -100,7 +100,7 @@ void* LLFloaterEventInfo::createEventDetail(void* userdata)
 {
        LLFloaterEventInfo *self = (LLFloaterEventInfo*)userdata;
        self->mPanelEventp = new LLPanelEvent();
-        gUICtrlFactory->buildPanel(self->mPanelEventp, "panel_event.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(self->mPanelEventp, "panel_event.xml");
        return self->mPanelEventp;
 }
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index 3d2e60a..97b7131 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -51,7 +51,7 @@
 #include "llnotify.h"
 #include "llresmgr.h"
 #include "llimview.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llmenucommands.h"
 #include "llviewercontrol.h"
 #include "llviewermessage.h"
@@ -178,7 +178,7 @@ void LLPanelFriends::updateFriends(U32 changed_mask)
 // virtual
 BOOL LLPanelFriends::postBuild()
 {
-        mFriendsList = LLUICtrlFactory::getScrollListByName(this, "friend_list");
+        mFriendsList = getChild<LLScrollListCtrl>("friend_list");
        mFriendsList->setMaxSelectable(MAX_FRIEND_SELECT);
        mFriendsList->setMaximumSelectCallback(onMaximumSelect);
        mFriendsList->setCommitOnSelectionChange(TRUE);
@@ -201,7 +201,7 @@ BOOL LLPanelFriends::postBuild()
        // primary sort = online status, secondary sort = name
        mFriendsList->sortByColumn("friend_name", TRUE);
-        mFriendsList->sortByColumn("icon_online_status", TRUE);
+        mFriendsList->sortByColumn("icon_online_status", FALSE);
        return TRUE;
 }
@@ -219,37 +219,46 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
        
        LLSD element;
        element["id"] = agent_id;
-        element["columns"][LIST_FRIEND_NAME]["column"] = "friend_name";
+        LLSD& friend_column = element["columns"][LIST_FRIEND_NAME];
-        element["columns"][LIST_FRIEND_NAME]["value"] = fullname;
+        friend_column["column"] = "friend_name";
-        element["columns"][LIST_FRIEND_NAME]["font"] = "SANSSERIF";
+        friend_column["value"] = fullname;
-        element["columns"][LIST_FRIEND_NAME]["font-style"] = "NORMAL";  
+        friend_column["font"] = "SANSSERIF";
-        element["columns"][LIST_ONLINE_STATUS]["column"] = "icon_online_status";
+        friend_column["font-style"] = "NORMAL"; 
-        element["columns"][LIST_ONLINE_STATUS]["type"] = "icon";
+        LLSD& online_status_column = element["columns"][LIST_ONLINE_STATUS];
+        online_status_column["column"] = "icon_online_status";
+        online_status_column["type"] = "icon";
        if (online)
        {
-                element["columns"][LIST_FRIEND_NAME]["font-style"] = "BOLD";    
+                friend_column["font-style"] = "BOLD";   
-                element["columns"][LIST_ONLINE_STATUS]["value"] = gViewerArt.getString("icon_avatar_online.tga");               
+                online_status_column["value"] = "icon_avatar_online.tga";
        }
-        element["columns"][LIST_VISIBLE_ONLINE]["column"] = "icon_visible_online";
+        LLSD& online_column = element["columns"][LIST_VISIBLE_ONLINE];
-        element["columns"][LIST_VISIBLE_ONLINE]["type"] = "checkbox";
+        online_column["column"] = "icon_visible_online";
-        element["columns"][LIST_VISIBLE_ONLINE]["value"] = relationInfo->isRightGrantedTo(LLRelationship::GRANT_ONLINE_STATUS);
+        online_column["type"] = "checkbox";
+        online_column["value"] = relationInfo->isRightGrantedTo(LLRelationship::GRANT_ONLINE_STATUS);
-        element["columns"][LIST_VISIBLE_MAP]["column"] = "icon_visible_map";
+        LLSD& visible_map_column = element["columns"][LIST_VISIBLE_MAP];
-        element["columns"][LIST_VISIBLE_MAP]["type"] = "checkbox";
+        visible_map_column["column"] = "icon_visible_map";
-        element["columns"][LIST_VISIBLE_MAP]["value"] = relationInfo->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION);
+        visible_map_column["type"] = "checkbox";
+        visible_map_column["value"] = relationInfo->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION);
-        element["columns"][LIST_EDIT_MINE]["column"] = "icon_edit_mine";
+        LLSD& edit_my_object_column = element["columns"][LIST_EDIT_MINE];
-        element["columns"][LIST_EDIT_MINE]["type"] = "checkbox";
+        edit_my_object_column["column"] = "icon_edit_mine";
-        element["columns"][LIST_EDIT_MINE]["value"] = relationInfo->isRightGrantedTo(LLRelationship::GRANT_MODIFY_OBJECTS);
+        edit_my_object_column["type"] = "checkbox";
+        edit_my_object_column["value"] = relationInfo->isRightGrantedTo(LLRelationship::GRANT_MODIFY_OBJECTS);
-        element["columns"][LIST_EDIT_THEIRS]["column"] = "icon_edit_theirs";
+        LLSD& edit_their_object_column = element["columns"][LIST_EDIT_THEIRS];
-        element["columns"][LIST_EDIT_THEIRS]["type"] = "checkbox";
+        edit_their_object_column["column"] = "icon_edit_theirs";
-        element["columns"][LIST_EDIT_THEIRS]["enabled"] = "";
+        edit_their_object_column["type"] = "checkbox";
-        element["columns"][LIST_EDIT_THEIRS]["value"] = relationInfo->isRightGrantedFrom(LLRelationship::GRANT_MODIFY_OBJECTS);
+        edit_their_object_column["enabled"] = "";
+        edit_their_object_column["value"] = relationInfo->isRightGrantedFrom(LLRelationship::GRANT_MODIFY_OBJECTS);
-        element["columns"][LIST_FRIEND_UPDATE_GEN]["column"] = "friend_last_update_generation";
+        LLSD& update_gen_column = element["columns"][LIST_FRIEND_UPDATE_GEN];
-        element["columns"][LIST_FRIEND_UPDATE_GEN]["value"] = have_name ? relationInfo->getChangeSerialNum() : -1;
+        update_gen_column["column"] = "friend_last_update_generation";
+        update_gen_column["value"] = have_name ? relationInfo->getChangeSerialNum() : -1;
        mFriendsList->addElement(element, ADD_BOTTOM);
        return have_name;
@@ -265,7 +274,7 @@ BOOL LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationsh
        std::string fullname;
        BOOL have_name = gCacheName->getFullName(agent_id, fullname);
-        itemp->getColumn(LIST_ONLINE_STATUS)->setValue(info->isOnline() ? gViewerArt.getString("icon_avatar_online.tga") : LLString());
+        itemp->getColumn(LIST_ONLINE_STATUS)->setValue(info->isOnline() ? "icon_avatar_online.tga" : LLString::null);
        itemp->getColumn(LIST_FRIEND_NAME)->setValue(fullname);
        // render name of online friends in bold text
        ((LLScrollListText*)itemp->getColumn(LIST_FRIEND_NAME))->setFontStyle(info->isOnline() ? LLFontGL::BOLD : LLFontGL::NORMAL);    
@@ -292,7 +301,7 @@ void LLPanelFriends::refreshRightsChangeList()
        bool can_offer_teleport = num_selected >= 1;
        bool selected_friends_online = true;
-        LLTextBox* processing_label = LLUICtrlFactory::getTextBoxByName(this, "process_rights_label");
+        LLTextBox* processing_label = getChild<LLTextBox>("process_rights_label");
        if(!mAllowRightsChange)
        {
diff --git a/linden/indra/newview/llfloatergesture.cpp b/linden/indra/newview/llfloatergesture.cpp
index addcf1d..e62a589 100644
--- a/linden/indra/newview/llfloatergesture.cpp
+++ b/linden/indra/newview/llfloatergesture.cpp
@@ -52,7 +52,7 @@
 #include "llscrollcontainer.h"
 #include "llscrolllistctrl.h"
 #include "lltextbox.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewergesture.h"
 #include "llviewerimagelist.h"
 #include "llviewerinventory.h"
@@ -99,7 +99,7 @@ LLFloaterGesture::~LLFloaterGesture()
        // Custom saving rectangle, since load must be done
        // after postBuild.
-        gSavedSettings.setRect("FloaterGestureRect", getRect());
+        gSavedSettings.setRect("FloaterGestureRect2", getRect());
 }
 // virtual
@@ -144,10 +144,10 @@ void LLFloaterGesture::show()
        LLFloaterGesture *self = new LLFloaterGesture();
        // Builds and adds to gFloaterView
-        gUICtrlFactory->buildFloater(self, "floater_gesture.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(self, "floater_gesture.xml");
        // Fix up rectangle
-        LLRect rect = gSavedSettings.getRect("FloaterGestureRect");
+        LLRect rect = gSavedSettings.getRect("FloaterGestureRect2");
        self->reshape(rect.getWidth(), rect.getHeight());
        self->setRect(rect);
@@ -156,7 +156,12 @@ void LLFloaterGesture::show()
        self->childSetFocus("gesture_list");
        LLCtrlListInterface *list = self->childGetListInterface("gesture_list");
-        if (list) list->selectFirstItem();
+        if (list)
+        {
+                const BOOL ascending = TRUE;
+                list->sortByColumn("name", ascending);
+                list->selectFirstItem();
+        }
        
        self->mSelectedID = LLUUID::null;
diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp
index bdfa09c..3965c8b 100644
--- a/linden/indra/newview/llfloatergodtools.cpp
+++ b/linden/indra/newview/llfloatergodtools.cpp
@@ -71,7 +71,7 @@
 #include "llvlcomposition.h"
 #include "llsurface.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "lltransfertargetfile.h"
 #include "lltransfersourcefile.h"
@@ -124,7 +124,7 @@ LLFloaterGodTools::LLFloaterGodTools()
        factory_map["region"] = LLCallbackMap(createPanelRegion, this);
        factory_map["objects"] = LLCallbackMap(createPanelObjects, this);
        factory_map["request"] = LLCallbackMap(createPanelRequest, this);
-        gUICtrlFactory->buildFloater(this, "floater_god_tools.xml", &factory_map);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_god_tools.xml", &factory_map);
        childSetTabChangeCallback("GodTools Tabs", "grid", onTabChanged, this);
        childSetTabChangeCallback("GodTools Tabs", "region", onTabChanged, this);
@@ -853,18 +853,14 @@ void LLPanelRegionTools::onSelectRegion(void* userdata)
 {
        llinfos << "LLPanelRegionTools::onSelectRegion" << llendl;
-        if (!gWorldp)
+        LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromPosGlobal(gAgent.getPositionGlobal());
-        {
-                return;
-        }
-        LLViewerRegion *regionp = gWorldp->getRegionFromPosGlobal(gAgent.getPositionGlobal());
        if (!regionp)
        {
                return;
        }
        LLVector3d north_east(REGION_WIDTH_METERS, REGION_WIDTH_METERS, 0);
-        gParcelMgr->selectLand(regionp->getOriginGlobal(), 
+        LLViewerParcelMgr::getInstance()->selectLand(regionp->getOriginGlobal(), 
                                                   regionp->getOriginGlobal() + north_east, FALSE);
        
 }
@@ -1261,12 +1257,12 @@ void LLPanelObjectTools::onClickSetBySelection(void* data)
        if (!panelp) return;
        const BOOL non_root_ok = TRUE; 
-        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode(NULL, non_root_ok);
+        LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(NULL, non_root_ok);
        if (!node) return;
        LLString owner_name;
        LLUUID owner_id;
-        gSelectMgr->selectGetOwner(owner_id, owner_name);
+        LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
        panelp->mTargetAvatar = owner_id;
        LLString name = "Object " + node->mName + " owned by " + owner_name;
@@ -1348,8 +1344,8 @@ void LLPanelRequestTools::refresh()
        list->operateOnAll(LLCtrlListInterface::OP_DELETE);
        list->addSimpleElement(SELECTION);
        list->addSimpleElement(AGENT_REGION);
-        for (LLWorld::region_list_t::iterator iter = gWorldp->mActiveRegionList.begin();
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                 iter != gWorldp->mActiveRegionList.end(); ++iter)
+                 iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
        {
                LLViewerRegion* regionp = *iter;
                LLString name = regionp->getName();
@@ -1400,7 +1396,7 @@ void LLPanelRequestTools::onClickRequest(void* data)
                std::string req = self->childGetValue("request");
                req = req.substr(0, req.find_first_of(" "));
                std::string param = self->childGetValue("parameter");
-                gSelectMgr->sendGodlikeRequest(req, param);
+                LLSelectMgr::getInstance()->sendGodlikeRequest(req, param);
        }
        else if(dest == AGENT_REGION)
        {
@@ -1409,8 +1405,8 @@ void LLPanelRequestTools::onClickRequest(void* data)
        else
        {
                // find region by name
-                for (LLWorld::region_list_t::iterator iter = gWorldp->mActiveRegionList.begin();
+                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                         iter != gWorldp->mActiveRegionList.end(); ++iter)
+                         iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
                {
                        LLViewerRegion* regionp = *iter;
                        if(dest == regionp->getName())
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index 4a89fae..7f32b24 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -52,7 +52,7 @@
 #include "llselectmgr.h"
 #include "llscrolllistctrl.h"
 #include "lltextbox.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llimview.h"
@@ -81,7 +81,7 @@ LLFloaterGroupPicker* LLFloaterGroupPicker::findInstance(const LLSD& seed)
 LLFloaterGroupPicker* LLFloaterGroupPicker::createInstance(const LLSD &seed)
 {
        LLFloaterGroupPicker* pickerp = new LLFloaterGroupPicker(seed);
-        gUICtrlFactory->buildFloater(pickerp, "floater_choose_group.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(pickerp, "floater_choose_group.xml");
        return pickerp;
 }
@@ -115,7 +115,7 @@ void LLFloaterGroupPicker::setPowersMask(U64 powers_mask)
 BOOL LLFloaterGroupPicker::postBuild()
 {
-        init_group_list(LLUICtrlFactory::getScrollListByName(this, "group list"), gAgent.getGroupID(), mPowersMask);
+        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), mPowersMask);
        childSetAction("OK", onBtnOK, this);
@@ -173,8 +173,7 @@ bool LLPanelGroups::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
                reset();
                return true;
        }
-        
+        return false;
-        return LLView::handleEvent(event, userdata);
 }
 // Default constructor
@@ -200,7 +199,7 @@ void LLPanelGroups::reset()
        childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
        childSetTextArg("groupcount", "[MAX]", llformat("%d",MAX_AGENT_GROUPS));
-        init_group_list(LLUICtrlFactory::getScrollListByName(this, "group list"), gAgent.getGroupID());
+        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID());
        enableButtons();
 }
@@ -211,7 +210,7 @@ BOOL LLPanelGroups::postBuild()
        childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
        childSetTextArg("groupcount", "[MAX]", llformat("%d",MAX_AGENT_GROUPS));
-        init_group_list(LLUICtrlFactory::getScrollListByName(this, "group list"), gAgent.getGroupID());
+        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID());
        childSetAction("Activate", onBtnActivate, this);
diff --git a/linden/indra/newview/llfloatergroups.h b/linden/indra/newview/llfloatergroups.h
index 3ceb1bd..5eda8ba 100644
--- a/linden/indra/newview/llfloatergroups.h
+++ b/linden/indra/newview/llfloatergroups.h
@@ -83,7 +83,7 @@ protected:
        static instance_map_t sInstances;
 };
-class LLPanelGroups : public LLPanel
+class LLPanelGroups : public LLPanel, public LLSimpleListener
 {
 public:
        LLPanelGroups();
diff --git a/linden/indra/newview/llfloaterhardwaresettings.cpp b/linden/indra/newview/llfloaterhardwaresettings.cpp
index 0d92764..1f0a68f 100644
--- a/linden/indra/newview/llfloaterhardwaresettings.cpp
+++ b/linden/indra/newview/llfloaterhardwaresettings.cpp
@@ -40,7 +40,7 @@
 #include "llstartup.h"
 #include "llradiogroup.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llimagegl.h"
 #include "pipeline.h"
@@ -49,7 +49,7 @@ LLFloaterHardwareSettings* LLFloaterHardwareSettings::sHardwareSettings = NULL;
 LLFloaterHardwareSettings::LLFloaterHardwareSettings() : LLFloater("Hardware Settings Floater")
 {
-        gUICtrlFactory->buildFloater(this, "floater_hardware_settings.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hardware_settings.xml");
        
        // load it up
        initCallbacks();
@@ -77,11 +77,13 @@ void LLFloaterHardwareSettings::refresh()
        mUseVBO = gSavedSettings.getBOOL("RenderVBOEnable");
        mUseAniso = gSavedSettings.getBOOL("RenderAnisotropic");
+        mFSAASamples = gSavedSettings.getU32("RenderFSAASamples");
        mGamma = gSavedSettings.getF32("RenderGamma");
        mVideoCardMem = gSavedSettings.getS32("TextureMemory");
        mFogRatio = gSavedSettings.getF32("RenderFogRatio");
        mProbeHardwareOnStartup = gSavedSettings.getBOOL("ProbeHardwareOnStartup");
+        childSetValue("fsaa", (LLSD::Integer) mFSAASamples);
        refreshEnabledState();
 }
@@ -92,7 +94,7 @@ void LLFloaterHardwareSettings::refreshEnabledState()
        childSetMinValue("GrapicsCardTextureMemory", min_tex_mem);
        childSetMaxValue("GrapicsCardTextureMemory", max_tex_mem);
-        if (!gFeatureManagerp->isFeatureAvailable("RenderVBOEnable") ||
+        if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
                !gGLManager.mHasVertexBufferObject)
        {
                childSetEnabled("vbo", FALSE);
@@ -122,7 +124,7 @@ void LLFloaterHardwareSettings::show()
        hardSettings->center();
        // comment in if you want the menu to rebuild each time
-        //gUICtrlFactory->buildFloater(hardSettings, "floater_hardware_settings.xml");
+        //LLUICtrlFactory::getInstance()->buildFloater(hardSettings, "floater_hardware_settings.xml");
        //hardSettings->initCallbacks();
        hardSettings->open();
@@ -151,17 +153,6 @@ void LLFloaterHardwareSettings::onClose(bool app_quitting)
 BOOL LLFloaterHardwareSettings::postBuild()
 {
-        requires("ani", WIDGET_TYPE_CHECKBOX);
-        requires("gamma", WIDGET_TYPE_SPINNER);
-        requires("vbo", WIDGET_TYPE_CHECKBOX);
-        requires("GrapicsCardTextureMemory", WIDGET_TYPE_SLIDER);
-        requires("fog", WIDGET_TYPE_SPINNER);
-        if (!checkRequirements())
-        {
-                return FALSE;
-        }
        childSetAction("OK", onBtnOK, this);
        refresh();
@@ -175,9 +166,25 @@ void LLFloaterHardwareSettings::apply()
        // Anisotropic rendering
        BOOL old_anisotropic = LLImageGL::sGlobalUseAnisotropic;
        LLImageGL::sGlobalUseAnisotropic = childGetValue("ani");
-        if (old_anisotropic != LLImageGL::sGlobalUseAnisotropic)
+        U32 fsaa = (U32) childGetValue("fsaa").asInteger();
+        U32 old_fsaa = gSavedSettings.getU32("RenderFSAASamples");
+        BOOL logged_in = (LLStartUp::getStartupState() >= STATE_STARTED);
+        if (old_fsaa != fsaa)
+        {
+                gSavedSettings.setU32("RenderFSAASamples", fsaa);
+                LLWindow* window = gViewerWindow->getWindow();
+                LLCoordScreen size;
+                window->getSize(&size);
+                gViewerWindow->changeDisplaySettings(window->getFullscreen(), 
+                                                                                                                size,
+                                                                                                                gSavedSettings.getBOOL("DisableVerticalSync"),
+                                                                                                                logged_in);
+        }
+        else if (old_anisotropic != LLImageGL::sGlobalUseAnisotropic)
        {
-                BOOL logged_in = (LLStartUp::getStartupState() >= STATE_STARTED);
                gViewerWindow->restartDisplay(logged_in);
        }
@@ -189,6 +196,7 @@ void LLFloaterHardwareSettings::cancel()
 {
        gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO);
        gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso);
+        gSavedSettings.setU32("RenderFSAASamples", mFSAASamples);
        gSavedSettings.setF32("RenderGamma", mGamma);
        gSavedSettings.setS32("TextureMemory", mVideoCardMem);
        gSavedSettings.setF32("RenderFogRatio", mFogRatio);
diff --git a/linden/indra/newview/llfloaterhardwaresettings.h b/linden/indra/newview/llfloaterhardwaresettings.h
index 600c30b..be78d81 100644
--- a/linden/indra/newview/llfloaterhardwaresettings.h
+++ b/linden/indra/newview/llfloaterhardwaresettings.h
@@ -88,6 +88,7 @@ protected:
        BOOL mUseVBO;
        BOOL mUseAniso;
+        U32 mFSAASamples;
        F32 mGamma;
        S32 mVideoCardMem;
        F32 mFogRatio;
diff --git a/linden/indra/newview/llfloaterhtml.cpp b/linden/indra/newview/llfloaterhtml.cpp
index 596202a..2ad9307 100644
--- a/linden/indra/newview/llfloaterhtml.cpp
+++ b/linden/indra/newview/llfloaterhtml.cpp
@@ -34,7 +34,7 @@
 #include "llfloaterhtml.h"
 // viewer includes
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 #include "lllineeditor.h"
 #include "llviewerwindow.h"
@@ -49,7 +49,7 @@ LLFloaterHtml* LLFloaterHtml::sInstance = 0;
 LLFloaterHtml* LLFloaterHtml::getInstance()
 {
    if ( ! sInstance )
-        sInstance = new LLFloaterHtml;
+        sInstance = new LLFloaterHtml();
        return sInstance;
 }
@@ -62,8 +62,7 @@ LLFloaterHtml::LLFloaterHtml()
        ,
        mWebBrowser( 0 )
 {
-        // create floater from its XML definition
+        LLUICtrlFactory::getInstance()->buildFloater( this, "floater_html.xml" );
-        gUICtrlFactory->buildFloater( this, "floater_html.xml" );
        childSetAction("back_btn", onClickBack, this);
        childSetAction("home_btn", onClickHome, this);
@@ -73,11 +72,11 @@ LLFloaterHtml::LLFloaterHtml()
        childSetAction("go_btn", onClickGo, this );
        // reposition floater from saved settings
-        LLRect rect = gSavedSettings.getRect( "HtmlFloaterRect" );
+        LLRect rect = gSavedSettings.getRect( "FloaterHtmlRect" );
        reshape( rect.getWidth(), rect.getHeight(), FALSE );
        setRect( rect );
-        mWebBrowser = LLViewerUICtrlFactory::getWebBrowserByName(this,  "html_floater_browser" );
+        mWebBrowser = getChild<LLWebBrowserCtrl>("html_floater_browser" );
        if ( mWebBrowser )
        {
                // open links in internal browser
@@ -90,7 +89,7 @@ LLFloaterHtml::LLFloaterHtml()
 LLFloaterHtml::~LLFloaterHtml()
 {
        // save position of floater
-        gSavedSettings.setRect( "HtmlFloaterRect", getRect() );
+        gSavedSettings.setRect( "FloaterHtmlRect", getRect() );
        sInstance = 0;
 }
@@ -114,7 +113,7 @@ void LLFloaterHtml::draw()
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLFloaterHtml::show( LLString content_id, bool open_app_slurls, bool open_link_external )
+void LLFloaterHtml::show( LLString content_id, bool open_link_external, bool open_app_slurls )
 {
        // calculate the XML labels we'll need (if only XML folders worked)
        LLString title_str = content_id + "_title";
@@ -122,12 +121,13 @@ void LLFloaterHtml::show( LLString content_id, bool open_app_slurls, bool open_l
        std::string title = getString( title_str );
        std::string url = getString( url_str );
-        show( url, title, open_app_slurls, open_link_external );
+        show( url, title, open_link_external, open_app_slurls );
 }
 ////////////////////////////////////////////////////////////////////////////////
 //
-void LLFloaterHtml::show( std::string start_url, std::string title, bool open_app_slurls, bool open_link_external )
+void LLFloaterHtml::show( std::string start_url, std::string title, bool open_link_external, bool open_app_slurls )
 {
        // set the title 
        setTitle( title );
@@ -149,6 +149,8 @@ void LLFloaterHtml::show( std::string start_url, std::string title, bool open_ap
 void LLFloaterHtml::onClose( bool app_quitting )
 {
        setVisible( false );
+        // HACK for fast XML iteration replace with:
+        // destroy();
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -156,8 +158,7 @@ void LLFloaterHtml::onClose( bool app_quitting )
 void LLFloaterHtml::onClickClose( void* data )
 {
        LLFloaterHtml* self = ( LLFloaterHtml* )data;
+        self->close();
-        self->setVisible( false );
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -243,4 +244,3 @@ void LLFloaterHtml::onClickGo( void* data )
                }
        }
 }
diff --git a/linden/indra/newview/llfloaterhtml.h b/linden/indra/newview/llfloaterhtml.h
index ffefdf4..9826988 100644
--- a/linden/indra/newview/llfloaterhtml.h
+++ b/linden/indra/newview/llfloaterhtml.h
@@ -49,13 +49,13 @@ class LLFloaterHtml :
                virtual void onClose( bool app_quitting );
                
                // Pass string like "in-world_help" or "additional help"
-                void show( LLString content_id, bool open_app_slurls, bool open_link_external );
+                void show( LLString content_id, bool open_link_external, bool open_app_slurls );
                // Pass raw URL and window title
                // Can be set to handle secondlife:///app/ URLs, but this should
                // usually be false.
-                void show( std::string start_url, std::string title, bool open_app_slurls, bool open_link_external );
+                void show( std::string start_url, std::string title, bool open_link_external, bool open_app_slurls );
+                
                static void onClickClose( void* data );
                static void onClickBack( void* data );
                static void onClickHome( void* data );
@@ -65,10 +65,10 @@ class LLFloaterHtml :
                
        private:
                LLFloaterHtml();
                LLWebBrowserCtrl* mWebBrowser;
                static LLFloaterHtml* sInstance;
                LLButton* mCloseButton;
 };
 #endif
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index f2a8374..0968734 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -34,7 +34,7 @@
 #include "llfloaterhtmlhelp.h"
 #include "llparcel.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llwebbrowserctrl.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
@@ -52,30 +52,27 @@
 LLFloaterMediaBrowser::LLFloaterMediaBrowser(const LLSD& media_data)
 {
-        gUICtrlFactory->buildFloater(this, "floater_media_browser.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_media_browser.xml");
 }
 void LLFloaterMediaBrowser::draw()
 {
        childSetEnabled("go", !mAddressCombo->getValue().asString().empty());
-        if ( gParcelMgr )       // this code can be called at login screen where gParcelMgr is NULL
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if(parcel)
        {
-                LLParcel* parcel = gParcelMgr->getAgentParcel();
+                childSetVisible("parcel_owner_controls", LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA));
-                if(parcel)
+                childSetEnabled("assign", !mAddressCombo->getValue().asString().empty());
-                {
+        }
-                        childSetVisible("parcel_owner_controls", LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA));
-                        childSetEnabled("assign", !mAddressCombo->getValue().asString().empty());
-                }
-        };
        LLFloater::draw();
 }
 BOOL LLFloaterMediaBrowser::postBuild()
 {
-        mBrowser = LLViewerUICtrlFactory::getWebBrowserByName(this, "browser");
+        mBrowser = getChild<LLWebBrowserCtrl>("browser");
        mBrowser->addObserver(this);
-        mAddressCombo = LLUICtrlFactory::getComboBoxByName(this, "address");
+        mAddressCombo = getChild<LLComboBox>("address");
        mAddressCombo->setCommitCallback(onEnterAddress);
        mAddressCombo->setCallbackUserData(this);
@@ -221,7 +218,7 @@ void LLFloaterMediaBrowser::onClickAssign(void* user_data)
 {
        LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
-        LLParcel* parcel = gParcelMgr->getAgentParcel();
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (!parcel)
        {
                return;
@@ -233,7 +230,7 @@ void LLFloaterMediaBrowser::onClickAssign(void* user_data)
        parcel->setMediaType("text/html");
        // Send current parcel data upstream to server 
-        gParcelMgr->sendParcelPropertiesUpdate( parcel, true );
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel, true );
        // now check for video
        LLViewerParcelMedia::update( parcel );
@@ -300,7 +297,7 @@ LLFloaterHtmlHelp::LLFloaterHtmlHelp(std::string start_url, std::string title)
        sInstance = this;
                
        // create floater from its XML definition
-        gUICtrlFactory->buildFloater( this, "floater_html_help.xml" );
+        LLUICtrlFactory::getInstance()->buildFloater( this, "floater_html_help.xml" );
                
        childSetAction("back_btn", onClickBack, this);
        childSetAction("home_btn", onClickHome, this);
@@ -311,7 +308,7 @@ LLFloaterHtmlHelp::LLFloaterHtmlHelp(std::string start_url, std::string title)
                setTitle(title);
        }
-        mWebBrowser = LLViewerUICtrlFactory::getWebBrowserByName(this,  "html_help_browser" );
+        mWebBrowser = getChild<LLWebBrowserCtrl>("html_help_browser" );
        if ( mWebBrowser )
        {
                // observe browser control events
@@ -476,7 +473,7 @@ void LLFloaterHtmlHelp::onClickHome( void* data )
        if ( self )
        {
                // get the home page URL (which can differ from the start URL) from XML and go there
-                LLWebBrowserCtrl* web_browser = LLViewerUICtrlFactory::getWebBrowserByName( self, "html_help_browser" );
+                LLWebBrowserCtrl* web_browser = self->getChild<LLWebBrowserCtrl>("html_help_browser" );
                if ( web_browser )
                {
                        web_browser->navigateHome();
@@ -527,14 +524,13 @@ LLViewerHtmlHelp::~LLViewerHtmlHelp()
        LLUI::setHtmlHelp(NULL);
 }
-void LLViewerHtmlHelp::show(std::string url, std::string title)
+void LLViewerHtmlHelp::show()
 {
-        LLFloaterHtmlHelp::show(url, title);
+        LLFloaterHtmlHelp::show("", "");
 }
-BOOL LLViewerHtmlHelp::getFloaterOpened()
+void LLViewerHtmlHelp::show(std::string url)
 {
-        return LLFloaterHtmlHelp::sFloaterOpened;
+        std::string title;      // empty
+        LLFloaterHtmlHelp::show(url, title);
 }
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/newview/llfloaterhtmlhelp.h
index 65ec093..7257566 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.h
+++ b/linden/indra/newview/llfloaterhtmlhelp.h
@@ -42,9 +42,8 @@ public:
        LLViewerHtmlHelp();
        virtual ~LLViewerHtmlHelp();
-        /*virtual*/ void show(std::string start_url, std::string title);
+        /*virtual*/ void show();
-        void show() { show("", ""); }
+        /*virtual*/ void show(std::string start_url);
-        /*virtual*/ BOOL getFloaterOpened();
 };
 class LLComboBox;
diff --git a/linden/indra/newview/llfloaterhud.cpp b/linden/indra/newview/llfloaterhud.cpp
new file mode 100644
index 0000000..2f192f7
--- /dev/null
+++ b/linden/indra/newview/llfloaterhud.cpp
@@ -0,0 +1,140 @@
+/** 
+ * @file llfloaterhud.cpp
+ * @brief Implementation of HUD floater
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+#include "llfloaterhud.h"
+#include "llviewercontrol.h"
+#include "lluictrlfactory.h"
+#include "llwebbrowserctrl.h"
+#include "llalertdialog.h"
+// statics 
+LLFloaterHUD* LLFloaterHUD::sInstance = 0; 
+std::string LLFloaterHUD::sTutorialUrl = "";
+///----------------------------------------------------------------------------
+/// Class LLFloaterHUD
+///----------------------------------------------------------------------------
+#define super LLFloater /* superclass */
+// Default constructor
+LLFloaterHUD::LLFloaterHUD()
+:       LLFloater("floater_hud"),
+        mWebBrowser(0)
+{
+        // Don't grab the focus as it will impede performing in-world actions
+        // while using the HUD
+        setAutoFocus(FALSE);
+        
+        // Opaque background since we never get the focus
+        setBackgroundOpaque(TRUE);
+        // Create floater from its XML definition
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hud.xml");
+        
+        // Position floater based on saved location
+        LLRect saved_position_rect = gSavedSettings.getRect("FloaterHUDRect");
+        reshape(saved_position_rect.getWidth(), saved_position_rect.getHeight(), FALSE);
+        setRect(saved_position_rect);
+        
+        mWebBrowser = getChild<LLWebBrowserCtrl>("floater_hud_browser" );
+        if (mWebBrowser)
+        {
+                // Always refresh the browser
+                mWebBrowser->setAlwaysRefresh(true);
+                // Open links in internal browser
+                mWebBrowser->setOpenInExternalBrowser(false);
+                LLString language(gSavedSettings.getString("Language"));
+                if(language == "default")
+                {
+                        language = gSavedSettings.getString("SystemLanguage");
+                }
+        
+                std::string url = sTutorialUrl + language + "/";
+                mWebBrowser->navigateTo(url);
+        }
+        // Remember the one instance
+        sInstance = this;
+}
+// Get the instance
+LLFloaterHUD* LLFloaterHUD::getInstance()
+{
+        if (!sInstance)
+        {
+                new LLFloaterHUD();
+        }
+        return sInstance;
+}
+// Destructor
+LLFloaterHUD::~LLFloaterHUD()
+{
+        // Save floater position
+        gSavedSettings.setRect("FloaterHUDRect", getRect() );
+        // Clear out the one instance if it's ours
+        if (sInstance == this)
+        {
+                sInstance = NULL;
+        }
+}
+// Show the HUD
+void LLFloaterHUD::show()
+{
+        // do not build the floater if there the url is empty
+        if (sTutorialUrl == "")
+        {
+                LLAlertDialog::showXml("TutorialNotFound");
+                return;
+        }
+        // Create the instance if necessary
+        LLFloaterHUD* hud = getInstance();
+        hud->open();
+        hud->setFrontmost(FALSE);
+}
+void LLFloaterHUD::close()
+{
+        if (sInstance) sInstance->close();
+}
+void LLFloaterHUD::onFocusReceived()
+{
+        // Never get the focus
+        setFocus(FALSE);
+}
diff --git a/linden/indra/newview/fakevoicesoundsignal.h b/linden/indra/newview/llfloaterhud.h
index bca6306..bd60d7b 100644
--- a/linden/indra/newview/fakevoicesoundsignal.h
+++ b/linden/indra/newview/llfloaterhud.h
@@ -1,12 +1,10 @@
 /** 
- * @file fakevoicesoundsignal.h
+ * @file llfloaterhud.h
- * @brief Fake Voice Sound Signal
+ * @brief The HUD floater
- * author: JJ Ventrella
- * THIS IS A TEMPORARY FILE FOR DEVELOPMENT PURPOSES ONLY
 *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2008, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -30,23 +28,39 @@
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
 */
-#ifndef FAKE_VOICE_SOUND_SIGNAL_H
-#define FAKE_VOICE_SOUND_SIGNAL_H
-//----------------------------------------------------------------------------
+#ifndef LL_LLFLOATERHUD_H
-// FakeVoiceSoundSignal
+#define LL_LLFLOATERHUD_H
-//----------------------------------------------------------------------------
-class FakeVoiceSoundSignal
+#include "llfloater.h"
+class LLWebBrowserCtrl;
+//=============================================================================
+//
+//      CLASS           LLFloaterHUD
+class LLFloaterHUD : public LLFloater
+/*!     @brief          A floater showing the HUD tutorial
+*/
 {
-        public:
+public:
-                FakeVoiceSoundSignal(); 
+        static LLFloaterHUD* getInstance(); ///< get instance creating if necessary
-                ~FakeVoiceSoundSignal();                
+        virtual ~LLFloaterHUD(); ///< virtual destructor
-                void    update();
-                F32             getAmplitude();
+        static std::string sTutorialUrl;
-                bool    getActive();
-                
+        static void show(); ///< show the HUD
-};//-----------------------------------------------------------------
+        static void close(); ///< close the HUD (destroys floater)
- //   end of class
-//------------------------------------------------------------------
+protected:
+        LLWebBrowserCtrl* mWebBrowser; ///< the actual web browser control
-#endif //FAKE_VOICE_SOUND_SIGNAL_H
+        LLFloaterHUD(); ///< default constructor
+        virtual void onFocusReceived(); ///< called when we get the focus
+private:
+        static LLFloaterHUD* sInstance;
+};
+#endif // LL_LLFLOATERHUD_H
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 926a117..7b1c8cc 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -52,7 +52,7 @@
 #include "llviewerwindow.h"
 #include "llvoavatar.h"
 #include "pipeline.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerimagelist.h"
 //static
@@ -617,7 +617,7 @@ LLImagePreviewAvatar::LLImagePreviewAvatar(S32 width, S32 height) : LLDynamicTex
        mDummyAvatar->slamPosition();
        mDummyAvatar->updateJointLODs();
        mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable);
-        // gPipeline.markVisible(mDummyAvatar->mDrawable, *gCamera);
+        // gPipeline.markVisible(mDummyAvatar->mDrawable, *LLViewerCamera::getInstance());
        mTextureName = 0;
 }
@@ -697,16 +697,16 @@ BOOL LLImagePreviewAvatar::render()
                LLQuaternion(mCameraYaw, LLVector3::z_axis);
        LLQuaternion av_rot = avatarp->mPelvisp->getWorldRotation() * camera_rot;
-        gCamera->setOriginAndLookAt(
+        LLViewerCamera::getInstance()->setOriginAndLookAt(
                target_pos + ((LLVector3(mCameraDistance, 0.f, 0.f) + mCameraOffset) * av_rot),         // camera
                LLVector3::z_axis,                                                                                                                                      // up
                target_pos + (mCameraOffset  * av_rot) );                                                                                       // point of interest
        stop_glerror();
-        gCamera->setAspect((F32)mWidth / mHeight);
+        LLViewerCamera::getInstance()->setAspect((F32)mWidth / mHeight);
-        gCamera->setView(gCamera->getDefaultFOV() / mCameraZoom);
+        LLViewerCamera::getInstance()->setView(LLViewerCamera::getInstance()->getDefaultFOV() / mCameraZoom);
-        gCamera->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
+        LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
        LLVertexBuffer::stopRender();
        avatarp->updateLOD();
@@ -788,7 +788,7 @@ LLImagePreviewSculpted::LLImagePreviewSculpted(S32 width, S32 height) : LLDynami
        mDummyAvatar->slamPosition();
        mDummyAvatar->updateJointLODs();
        mDummyAvatar->updateGeometry(mDummyAvatar->mDrawable);
-        gPipeline.markVisible(mDummyAvatar->mDrawable, *gCamera);
+        gPipeline.markVisible(mDummyAvatar->mDrawable, *LLViewerCamera::getInstance());
        mTextureName = 0;
        */
 }
@@ -857,16 +857,16 @@ BOOL LLImagePreviewSculpted::render()
                LLQuaternion(mCameraYaw, LLVector3::z_axis);
        LLQuaternion av_rot = camera_rot;
-        gCamera->setOriginAndLookAt(
+        LLViewerCamera::getInstance()->setOriginAndLookAt(
                target_pos + ((LLVector3(mCameraDistance, 0.f, 0.f) + mCameraOffset) * av_rot),         // camera
                LLVector3::z_axis,                                                                                                                                      // up
                target_pos + (mCameraOffset  * av_rot) );                                                                                       // point of interest
        stop_glerror();
-        gCamera->setAspect((F32) mWidth / mHeight);
+        LLViewerCamera::getInstance()->setAspect((F32) mWidth / mHeight);
-        gCamera->setView(gCamera->getDefaultFOV() / mCameraZoom);
+        LLViewerCamera::getInstance()->setView(LLViewerCamera::getInstance()->getDefaultFOV() / mCameraZoom);
-        gCamera->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
+        LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
        gPipeline.enableLightsAvatar();
                
@@ -907,7 +907,7 @@ BOOL LLImagePreviewSculpted::render()
                gGL.color3f(0.4f, 0.4f, 0.4f);
                glVertexPointer(3, GL_FLOAT, 0, (void *)vertices);
                glNormalPointer(GL_FLOAT, 0, (void *)normals);
-                glDrawRangeElements(GL_TRIANGLES, 0, num_indices-1, num_indices, GL_UNSIGNED_SHORT, (void *)indices);
+                glDrawRangeElements(GL_TRIANGLES, 0, num_vertices-1, num_indices, GL_UNSIGNED_SHORT, (void *)indices);
                
                gGL.popMatrix();
                glDisableClientState(GL_NORMAL_ARRAY);
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index cdca428..ff0a2ee 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -40,7 +40,7 @@
 #include "lltoolmgr.h"
 #include "llviewercontrol.h"
 #include "llviewerobject.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 LLFloaterInspect* LLFloaterInspect::sInstance = NULL;
@@ -49,19 +49,19 @@ LLFloaterInspect::LLFloaterInspect(void) :
        mDirty(FALSE)
 {
        sInstance = this;
-        gUICtrlFactory->buildFloater(this, "floater_inspect.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inspect.xml");
 }
 LLFloaterInspect::~LLFloaterInspect(void)
 {
        if(!gFloaterTools->getVisible())
        {
-                if(gToolMgr->getBaseTool() == gToolInspect)
+                if(LLToolMgr::getInstance()->getBaseTool() == LLToolCompInspect::getInstance())
                {
-                        gToolMgr->clearTransientTool();
+                        LLToolMgr::getInstance()->clearTransientTool();
                }
                // Switch back to basic toolset
-                gToolMgr->setCurrentToolset(gBasicToolset);     
+                LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);     
        }
        else
        {
@@ -80,7 +80,7 @@ void LLFloaterInspect::show(void* ignored)
        // setForceSelection ensures that the pie menu does not deselect things when it 
        // looses the focus (this can happen with "select own objects only" enabled
        // VWR-1471
-        BOOL forcesel = gSelectMgr->setForceSelection(TRUE);
+        BOOL forcesel = LLSelectMgr::getInstance()->setForceSelection(TRUE);
        if (!sInstance) // first use
        {
@@ -88,10 +88,10 @@ void LLFloaterInspect::show(void* ignored)
        }
        sInstance->open();
-        gToolMgr->setTransientTool(gToolInspect);
+        LLToolMgr::getInstance()->setTransientTool(LLToolCompInspect::getInstance());
-        gSelectMgr->setForceSelection(forcesel);        // restore previouis value
+        LLSelectMgr::getInstance()->setForceSelection(forcesel);        // restore previouis value
-        sInstance->mObjectSelection = gSelectMgr->getSelection();
+        sInstance->mObjectSelection = LLSelectMgr::getInstance()->getSelection();
        sInstance->refresh();
 }
@@ -152,7 +152,7 @@ void LLFloaterInspect::onClickOwnerProfile(void* ctrl)
 BOOL LLFloaterInspect::postBuild()
 {
-        mObjectList = LLUICtrlFactory::getScrollListByName(this, "object_list");
+        mObjectList = getChild<LLScrollListCtrl>("object_list");
        childSetAction("button owner",onClickOwnerProfile, this);
        childSetAction("button creator",onClickCreatorProfile, this);
        childSetCommitCallback("object_list", onSelectObject);
@@ -256,7 +256,7 @@ void LLFloaterInspect::refresh()
 void LLFloaterInspect::onFocusReceived()
 {
-        gToolMgr->setTransientTool(gToolInspect);
+        LLToolMgr::getInstance()->setTransientTool(LLToolCompInspect::getInstance());
        LLFloater::onFocusReceived();
 }
diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp
new file mode 100644
index 0000000..5323b35
--- /dev/null
+++ b/linden/indra/newview/llfloaterjoystick.cpp
@@ -0,0 +1,272 @@
+/** 
+ * @file llfloaterjoystick.cpp
+ * @brief Joystick preferences panel
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+// file include
+#include "llfloaterjoystick.h"
+// linden library includes
+#include "llerror.h"
+#include "llrect.h"
+#include "llstring.h"
+// project includes
+#include "lluictrlfactory.h"
+#include "llviewercontrol.h"
+#include "llappviewer.h"
+#include "llviewerjoystick.h"
+LLFloaterJoystick::LLFloaterJoystick(const LLSD& data)
+        : LLFloater("floater_joystick")
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_joystick.xml");
+        center();
+}
+void LLFloaterJoystick::draw()
+{
+        bool joystick_inited = LLViewerJoystick::getInstance()->isJoystickInitialized();
+        childSetEnabled("enable_joystick", joystick_inited);
+        childSetEnabled("joystick_type", joystick_inited);
+        std::string desc = LLViewerJoystick::getInstance()->getDescription();
+        if (desc.empty()) desc = getUIString("NoDevice");
+        childSetText("joystick_type", desc);
+        LLViewerJoystick* joystick(LLViewerJoystick::getInstance());
+        for (U32 i = 0; i < 6; i++)
+        {
+                F32 value = joystick->getJoystickAxis(i);
+                mAxisStats[i]->addValue(value * gFrameIntervalSeconds);
+                
+                if (mAxisStatsBar[i]->mMinBar > value)
+                {
+                        mAxisStatsBar[i]->mMinBar = value;
+                }
+                if (mAxisStatsBar[i]->mMaxBar < value)
+                {
+                        mAxisStatsBar[i]->mMaxBar = value;
+                }
+        }
+        LLFloater::draw();
+}
+BOOL LLFloaterJoystick::postBuild()
+{               
+        F32 range = gSavedSettings.getBOOL("Cursor3D") ? 1024.f : 2.f;
+        LLUIString axis = getUIString("Axis");
+        LLUIString joystick = getUIString("JoystickMonitor");
+        // use this child to get relative positioning info; we'll place the
+        // joystick monitor on its right, vertically aligned to it.
+        LLView* child = getChild<LLView>("FlycamAxisScale1");
+        LLRect rect;
+        if (child)
+        {
+                LLRect r = child->getRect();
+                LLRect f = getRect();
+                rect = LLRect(350, r.mTop, r.mRight + 200, 0);
+        }
+        mAxisStatsView = new LLStatView("axis values", joystick, "", rect);
+        mAxisStatsView->setDisplayChildren(TRUE);
+        for (U32 i = 0; i < 6; i++)
+        {
+                axis.setArg("[NUM]", llformat("%d", i));
+                mAxisStats[i] = new LLStat(4);
+                mAxisStatsBar[i] = mAxisStatsView->addStat(axis, mAxisStats[i]);
+                mAxisStatsBar[i]->mMinBar = -range;
+                mAxisStatsBar[i]->mMaxBar = range;
+                mAxisStatsBar[i]->mLabelSpacing = range * 0.5f;
+                mAxisStatsBar[i]->mTickSpacing = range * 0.25f;                 
+        }
+        addChild(mAxisStatsView);
+        
+        childSetAction("SpaceNavigatorDefaults", onClickRestoreSNDefaults, this);
+        refresh();
+        return TRUE;
+}
+LLFloaterJoystick::~LLFloaterJoystick()
+{
+        // Children all cleaned up by default view destructor.
+}
+void LLFloaterJoystick::apply()
+{
+}
+void LLFloaterJoystick::refresh()
+{
+        LLFloater::refresh();
+        mJoystickAxis[0] = gSavedSettings.getS32("JoystickAxis0");
+        mJoystickAxis[1] = gSavedSettings.getS32("JoystickAxis1");
+        mJoystickAxis[2] = gSavedSettings.getS32("JoystickAxis2");
+        mJoystickAxis[3] = gSavedSettings.getS32("JoystickAxis3");
+        mJoystickAxis[4] = gSavedSettings.getS32("JoystickAxis4");
+        mJoystickAxis[5] = gSavedSettings.getS32("JoystickAxis5");
+        mJoystickAxis[6] = gSavedSettings.getS32("JoystickAxis6");
+        
+        m3DCursor = gSavedSettings.getBOOL("Cursor3D");
+        mAutoLeveling = gSavedSettings.getBOOL("AutoLeveling");
+        mZoomDirect  = gSavedSettings.getBOOL("ZoomDirect");
+        mAvatarAxisScale[0] = gSavedSettings.getF32("AvatarAxisScale0");
+        mAvatarAxisScale[1] = gSavedSettings.getF32("AvatarAxisScale1");
+        mAvatarAxisScale[2] = gSavedSettings.getF32("AvatarAxisScale2");
+        mAvatarAxisScale[3] = gSavedSettings.getF32("AvatarAxisScale3");
+        mAvatarAxisScale[4] = gSavedSettings.getF32("AvatarAxisScale4");
+        mAvatarAxisScale[5] = gSavedSettings.getF32("AvatarAxisScale5");
+        mBuildAxisScale[0] = gSavedSettings.getF32("BuildAxisScale0");
+        mBuildAxisScale[1] = gSavedSettings.getF32("BuildAxisScale1");
+        mBuildAxisScale[2] = gSavedSettings.getF32("BuildAxisScale2");
+        mBuildAxisScale[3] = gSavedSettings.getF32("BuildAxisScale3");
+        mBuildAxisScale[4] = gSavedSettings.getF32("BuildAxisScale4");
+        mBuildAxisScale[5] = gSavedSettings.getF32("BuildAxisScale5");
+        mFlycamAxisScale[0] = gSavedSettings.getF32("FlycamAxisScale0");
+        mFlycamAxisScale[1] = gSavedSettings.getF32("FlycamAxisScale1");
+        mFlycamAxisScale[2] = gSavedSettings.getF32("FlycamAxisScale2");
+        mFlycamAxisScale[3] = gSavedSettings.getF32("FlycamAxisScale3");
+        mFlycamAxisScale[4] = gSavedSettings.getF32("FlycamAxisScale4");
+        mFlycamAxisScale[5] = gSavedSettings.getF32("FlycamAxisScale5");
+        mFlycamAxisScale[6] = gSavedSettings.getF32("FlycamAxisScale6");
+        mAvatarAxisDeadZone[0] = gSavedSettings.getF32("AvatarAxisDeadZone0");
+        mAvatarAxisDeadZone[1] = gSavedSettings.getF32("AvatarAxisDeadZone1");
+        mAvatarAxisDeadZone[2] = gSavedSettings.getF32("AvatarAxisDeadZone2");
+        mAvatarAxisDeadZone[3] = gSavedSettings.getF32("AvatarAxisDeadZone3");
+        mAvatarAxisDeadZone[4] = gSavedSettings.getF32("AvatarAxisDeadZone4");
+        mAvatarAxisDeadZone[5] = gSavedSettings.getF32("AvatarAxisDeadZone5");
+        mBuildAxisDeadZone[0] = gSavedSettings.getF32("BuildAxisDeadZone0");
+        mBuildAxisDeadZone[1] = gSavedSettings.getF32("BuildAxisDeadZone1");
+        mBuildAxisDeadZone[2] = gSavedSettings.getF32("BuildAxisDeadZone2");
+        mBuildAxisDeadZone[3] = gSavedSettings.getF32("BuildAxisDeadZone3");
+        mBuildAxisDeadZone[4] = gSavedSettings.getF32("BuildAxisDeadZone4");
+        mBuildAxisDeadZone[5] = gSavedSettings.getF32("BuildAxisDeadZone5");
+        mFlycamAxisDeadZone[0] = gSavedSettings.getF32("FlycamAxisDeadZone0");
+        mFlycamAxisDeadZone[1] = gSavedSettings.getF32("FlycamAxisDeadZone1");
+        mFlycamAxisDeadZone[2] = gSavedSettings.getF32("FlycamAxisDeadZone2");
+        mFlycamAxisDeadZone[3] = gSavedSettings.getF32("FlycamAxisDeadZone3");
+        mFlycamAxisDeadZone[4] = gSavedSettings.getF32("FlycamAxisDeadZone4");
+        mFlycamAxisDeadZone[5] = gSavedSettings.getF32("FlycamAxisDeadZone5");
+        mFlycamAxisDeadZone[6] = gSavedSettings.getF32("FlycamAxisDeadZone6");
+        mAvatarFeathering = gSavedSettings.getF32("AvatarFeathering");
+        mBuildFeathering = gSavedSettings.getF32("BuildFeathering");
+        mFlycamFeathering = gSavedSettings.getF32("FlycamFeathering");
+}
+void LLFloaterJoystick::cancel()
+{
+        llinfos << "reading from gSavedSettings->Cursor3D=" 
+                << gSavedSettings.getBOOL("Cursor3D") << "; m3DCursor=" 
+                << m3DCursor << llendl;
+        gSavedSettings.setS32("JoystickAxis0", mJoystickAxis[0]);
+        gSavedSettings.setS32("JoystickAxis1", mJoystickAxis[1]);
+        gSavedSettings.setS32("JoystickAxis2", mJoystickAxis[2]);
+        gSavedSettings.setS32("JoystickAxis3", mJoystickAxis[3]);
+        gSavedSettings.setS32("JoystickAxis4", mJoystickAxis[4]);
+        gSavedSettings.setS32("JoystickAxis5", mJoystickAxis[5]);
+        gSavedSettings.setS32("JoystickAxis6", mJoystickAxis[6]);
+        gSavedSettings.setBOOL("Cursor3D", m3DCursor);
+        gSavedSettings.setBOOL("AutoLeveling", mAutoLeveling);
+        gSavedSettings.setBOOL("ZoomDirect", mZoomDirect );
+        gSavedSettings.setF32("AvatarAxisScale0", mAvatarAxisScale[0]);
+        gSavedSettings.setF32("AvatarAxisScale1", mAvatarAxisScale[1]);
+        gSavedSettings.setF32("AvatarAxisScale2", mAvatarAxisScale[2]);
+        gSavedSettings.setF32("AvatarAxisScale3", mAvatarAxisScale[3]);
+        gSavedSettings.setF32("AvatarAxisScale4", mAvatarAxisScale[4]);
+        gSavedSettings.setF32("AvatarAxisScale5", mAvatarAxisScale[5]);
+        gSavedSettings.setF32("BuildAxisScale0", mBuildAxisScale[0]);
+        gSavedSettings.setF32("BuildAxisScale1", mBuildAxisScale[1]);
+        gSavedSettings.setF32("BuildAxisScale2", mBuildAxisScale[2]);
+        gSavedSettings.setF32("BuildAxisScale3", mBuildAxisScale[3]);
+        gSavedSettings.setF32("BuildAxisScale4", mBuildAxisScale[4]);
+        gSavedSettings.setF32("BuildAxisScale5", mBuildAxisScale[5]);
+        gSavedSettings.setF32("FlycamAxisScale0", mFlycamAxisScale[0]);
+        gSavedSettings.setF32("FlycamAxisScale1", mFlycamAxisScale[1]);
+        gSavedSettings.setF32("FlycamAxisScale2", mFlycamAxisScale[2]);
+        gSavedSettings.setF32("FlycamAxisScale3", mFlycamAxisScale[3]);
+        gSavedSettings.setF32("FlycamAxisScale4", mFlycamAxisScale[4]);
+        gSavedSettings.setF32("FlycamAxisScale5", mFlycamAxisScale[5]);
+        gSavedSettings.setF32("FlycamAxisScale6", mFlycamAxisScale[6]);
+        gSavedSettings.setF32("AvatarAxisDeadZone0", mAvatarAxisDeadZone[0]);
+        gSavedSettings.setF32("AvatarAxisDeadZone1", mAvatarAxisDeadZone[1]);
+        gSavedSettings.setF32("AvatarAxisDeadZone2", mAvatarAxisDeadZone[2]);
+        gSavedSettings.setF32("AvatarAxisDeadZone3", mAvatarAxisDeadZone[3]);
+        gSavedSettings.setF32("AvatarAxisDeadZone4", mAvatarAxisDeadZone[4]);
+        gSavedSettings.setF32("AvatarAxisDeadZone5", mAvatarAxisDeadZone[5]);
+        gSavedSettings.setF32("BuildAxisDeadZone0", mBuildAxisDeadZone[0]);
+        gSavedSettings.setF32("BuildAxisDeadZone1", mBuildAxisDeadZone[1]);
+        gSavedSettings.setF32("BuildAxisDeadZone2", mBuildAxisDeadZone[2]);
+        gSavedSettings.setF32("BuildAxisDeadZone3", mBuildAxisDeadZone[3]);
+        gSavedSettings.setF32("BuildAxisDeadZone4", mBuildAxisDeadZone[4]);
+        gSavedSettings.setF32("BuildAxisDeadZone5", mBuildAxisDeadZone[5]);
+        gSavedSettings.setF32("FlycamAxisDeadZone0", mFlycamAxisDeadZone[0]);
+        gSavedSettings.setF32("FlycamAxisDeadZone1", mFlycamAxisDeadZone[1]);
+        gSavedSettings.setF32("FlycamAxisDeadZone2", mFlycamAxisDeadZone[2]);
+        gSavedSettings.setF32("FlycamAxisDeadZone3", mFlycamAxisDeadZone[3]);
+        gSavedSettings.setF32("FlycamAxisDeadZone4", mFlycamAxisDeadZone[4]);
+        gSavedSettings.setF32("FlycamAxisDeadZone5", mFlycamAxisDeadZone[5]);
+        gSavedSettings.setF32("FlycamAxisDeadZone6", mFlycamAxisDeadZone[6]);
+        gSavedSettings.setF32("AvatarFeathering", mAvatarFeathering);
+        gSavedSettings.setF32("BuildFeathering", mBuildFeathering);
+        gSavedSettings.setF32("FlycamFeathering", mFlycamFeathering);
+}
+void LLFloaterJoystick::onClickRestoreSNDefaults(void *joy_panel)
+{
+        setSNDefaults();
+}
+void LLFloaterJoystick::setSNDefaults()
+{
+        LLViewerJoystick::getInstance()->setSNDefaults();
+}
diff --git a/linden/indra/newview/llfloaterjoystick.h b/linden/indra/newview/llfloaterjoystick.h
new file mode 100644
index 0000000..b35b39f
--- /dev/null
+++ b/linden/indra/newview/llfloaterjoystick.h
@@ -0,0 +1,78 @@
+/** 
+ * @file llfloaterjoystick.h
+ * @brief Joystick preferences panel
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LL_LLFLOATERJOYSTICK_H
+#define LL_LLFLOATERJOYSTICK_H
+#include "llfloater.h"
+#include "llstatview.h"
+class LLFloaterJoystick : public LLFloater, public LLFloaterSingleton<LLFloaterJoystick >
+{
+public:
+        LLFloaterJoystick(const LLSD& data);
+        virtual ~LLFloaterJoystick();
+        virtual BOOL postBuild();
+        virtual void refresh();
+        virtual void apply();   // Apply the changed values.
+        virtual void cancel();  // Cancel the changed values.
+        virtual void draw();
+        static  void setSNDefaults();
+private:
+        static void onClickRestoreSNDefaults(void*);
+private:
+        // Device prefs
+        S32 mJoystickAxis[7];
+        bool m3DCursor;
+        bool mAutoLeveling;
+        bool mZoomDirect;
+        // Modes prefs
+        F32 mAvatarAxisScale[6];
+        F32 mBuildAxisScale[6];
+        F32 mFlycamAxisScale[7];
+        F32 mAvatarAxisDeadZone[6];
+        F32 mBuildAxisDeadZone[6];
+        F32 mFlycamAxisDeadZone[7];
+        F32 mAvatarFeathering;
+        F32 mBuildFeathering;
+        F32 mFlycamFeathering;
+        // stats view 
+        LLStatView*             mAxisStatsView;
+        LLStat*                 mAxisStats[6];
+        LLStatBar*              mAxisStatsBar[6];
+};
+#endif
diff --git a/linden/indra/newview/llfloaterlagmeter.cpp b/linden/indra/newview/llfloaterlagmeter.cpp
index 4acc524..f43427c 100644
--- a/linden/indra/newview/llfloaterlagmeter.cpp
+++ b/linden/indra/newview/llfloaterlagmeter.cpp
@@ -33,7 +33,7 @@
 #include "llfloaterlagmeter.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerstats.h"
 #include "llviewerimage.h"
 #include "llviewercontrol.h"
@@ -49,28 +49,26 @@ const LLString LAG_CRITICAL_IMAGE_NAME = "lag_status_critical.tga";
 const LLString LAG_WARNING_IMAGE_NAME  = "lag_status_warning.tga";
 const LLString LAG_GOOD_IMAGE_NAME     = "lag_status_good.tga";
-LLFloaterLagMeter * LLFloaterLagMeter::sInstance = NULL;
+LLFloaterLagMeter::LLFloaterLagMeter(const LLSD& key)
-LLFloaterLagMeter::LLFloaterLagMeter()
        :       LLFloater("floater_lagmeter")
 {
-        gUICtrlFactory->buildFloater(this, "floater_lagmeter.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_lagmeter.xml");
        // Don't let this window take keyboard focus -- it's confusing to
        // lose arrow-key driving when testing lag.
        setIsChrome(TRUE);
-        mClientButton = LLUICtrlFactory::getButtonByName(this, "client_lagmeter");
+        mClientButton = getChild<LLButton>("client_lagmeter");
-        mClientText = LLUICtrlFactory::getTextBoxByName(this, "client_text");
+        mClientText = getChild<LLTextBox>("client_text");
-        mClientCause = LLUICtrlFactory::getTextBoxByName(this, "client_lag_cause");
+        mClientCause = getChild<LLTextBox>("client_lag_cause");
-        mNetworkButton = LLUICtrlFactory::getButtonByName(this, "network_lagmeter");
+        mNetworkButton = getChild<LLButton>("network_lagmeter");
-        mNetworkText = LLUICtrlFactory::getTextBoxByName(this, "network_text");
+        mNetworkText = getChild<LLTextBox>("network_text");
-        mNetworkCause = LLUICtrlFactory::getTextBoxByName(this, "network_lag_cause");
+        mNetworkCause = getChild<LLTextBox>("network_lag_cause");
-        mServerButton = LLUICtrlFactory::getButtonByName(this, "server_lagmeter");
+        mServerButton = getChild<LLButton>("server_lagmeter");
-        mServerText = LLUICtrlFactory::getTextBoxByName(this, "server_text");
+        mServerText = getChild<LLTextBox>("server_text");
-        mServerCause = LLUICtrlFactory::getTextBoxByName(this, "server_lag_cause");
+        mServerCause = getChild<LLTextBox>("server_lag_cause");
        LLString config_string = getString("client_frame_rate_critical_fps", mStringArgs);
        mClientFrameTimeCritical = 1.0f / (float)atof( config_string.c_str() );
@@ -127,8 +125,6 @@ LLFloaterLagMeter::LLFloaterLagMeter()
 LLFloaterLagMeter::~LLFloaterLagMeter()
 {
-        sInstance = NULL;
        // save shrunk status for next time
        gSavedSettings.setBOOL("LagMeterShrunk", mShrunk);
        // expand so we save the large window rectangle
@@ -147,16 +143,9 @@ void LLFloaterLagMeter::draw()
        LLFloater::draw();
 }
-//static
-void LLFloaterLagMeter::show(void *data)
-{
-        if(!sInstance) sInstance = new LLFloaterLagMeter();
-        sInstance->open();
-}
 void LLFloaterLagMeter::determineClient()
 {
-        F32 client_frame_time = gViewerStats->mFPSStat.getMeanDuration();
+        F32 client_frame_time = LLViewerStats::getInstance()->mFPSStat.getMeanDuration();
        bool find_cause = false;
        if (!gFocusMgr.getAppHasFocus())
@@ -207,8 +196,8 @@ void LLFloaterLagMeter::determineClient()
 void LLFloaterLagMeter::determineNetwork()
 {
-        F32 packet_loss = gViewerStats->mPacketsLostPercentStat.getMean();
+        F32 packet_loss = LLViewerStats::getInstance()->mPacketsLostPercentStat.getMean();
-        F32 ping_time = gViewerStats->mSimPingStat.getMean();
+        F32 ping_time = LLViewerStats::getInstance()->mSimPingStat.getMean();
        bool find_cause_loss = false;
        bool find_cause_ping = false;
@@ -258,7 +247,7 @@ void LLFloaterLagMeter::determineNetwork()
 void LLFloaterLagMeter::determineServer()
 {
-        F32 sim_frame_time = gViewerStats->mSimFrameMsec.getCurrent();
+        F32 sim_frame_time = LLViewerStats::getInstance()->mSimFrameMsec.getCurrent();
        bool find_cause = false;
        if(sim_frame_time >= mServerFrameTimeCritical)
@@ -282,23 +271,23 @@ void LLFloaterLagMeter::determineServer()
        if(find_cause)
        {
-                if(gViewerStats->mSimSimPhysicsMsec.getCurrent() > mServerSingleProcessMaxTime)
+                if(LLViewerStats::getInstance()->mSimSimPhysicsMsec.getCurrent() > mServerSingleProcessMaxTime)
                {
                        mServerCause->setText( getString("server_physics_cause_msg", mStringArgs) );
                }
-                else if(gViewerStats->mSimScriptMsec.getCurrent() > mServerSingleProcessMaxTime)
+                else if(LLViewerStats::getInstance()->mSimScriptMsec.getCurrent() > mServerSingleProcessMaxTime)
                {
                        mServerCause->setText( getString("server_scripts_cause_msg", mStringArgs) );
                }
-                else if(gViewerStats->mSimNetMsec.getCurrent() > mServerSingleProcessMaxTime)
+                else if(LLViewerStats::getInstance()->mSimNetMsec.getCurrent() > mServerSingleProcessMaxTime)
                {
                        mServerCause->setText( getString("server_net_cause_msg", mStringArgs) );
                }
-                else if(gViewerStats->mSimAgentMsec.getCurrent() > mServerSingleProcessMaxTime)
+                else if(LLViewerStats::getInstance()->mSimAgentMsec.getCurrent() > mServerSingleProcessMaxTime)
                {
                        mServerCause->setText( getString("server_agent_cause_msg", mStringArgs) );
                }
-                else if(gViewerStats->mSimImagesMsec.getCurrent() > mServerSingleProcessMaxTime)
+                else if(LLViewerStats::getInstance()->mSimImagesMsec.getCurrent() > mServerSingleProcessMaxTime)
                {
                        mServerCause->setText( getString("server_images_cause_msg", mStringArgs) );
                }
diff --git a/linden/indra/newview/llfloaterlagmeter.h b/linden/indra/newview/llfloaterlagmeter.h
index ab29193..fe22bff 100644
--- a/linden/indra/newview/llfloaterlagmeter.h
+++ b/linden/indra/newview/llfloaterlagmeter.h
@@ -34,14 +34,15 @@
 #include "llfloater.h"
-class LLFloaterLagMeter : public LLFloater
+class LLFloaterLagMeter : public LLFloater, public LLFloaterSingleton<LLFloaterLagMeter>
 {
+        friend class LLUISingleton<LLFloaterLagMeter, VisibilityPolicy<LLFloater> >;
+        
 public:
        /*virtual*/ void draw();
-        static void show(void*);
 private:
-        LLFloaterLagMeter();
+        LLFloaterLagMeter(const LLSD& key);
        /*virtual*/ ~LLFloaterLagMeter();
        void determineClient();
@@ -75,8 +76,6 @@ private:
        LLTextBox * mServerCause;
        LLString::format_map_t mStringArgs;
-        static LLFloaterLagMeter * sInstance;
 };
 #endif
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index c75917b..0150f44 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -60,7 +60,7 @@
 #include "lltextbox.h"
 #include "lltexturectrl.h"
 #include "lluiconstants.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewermessage.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
@@ -130,12 +130,12 @@ void send_parcel_select_objects(S32 parcel_local_id, S32 return_type,
 {
        LLMessageSystem *msg = gMessageSystem;
-        LLViewerRegion* region = gParcelMgr->getSelectionRegion();
+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
        if (!region) return;
        // Since new highlight will be coming in, drop any highlights
        // that exist right now.
-        gSelectMgr->unhighlightAll();
+        LLSelectMgr::getInstance()->unhighlightAll();
        msg->newMessageFast(_PREHASH_ParcelSelectObjects);
        msg->nextBlockFast(_PREHASH_AgentData);
@@ -191,9 +191,9 @@ void LLFloaterLand::onOpen()
 {
        // Done automatically when the selected parcel's properties arrive
        // (and hence we have the local id).
-        // gParcelMgr->sendParcelAccessListRequest(AL_ACCESS | AL_BAN | AL_RENTER);
+        // LLViewerParcelMgr::getInstance()->sendParcelAccessListRequest(AL_ACCESS | AL_BAN | AL_RENTER);
-        mParcel = gParcelMgr->getFloatingParcelSelection();
+        mParcel = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection();
        
        // Refresh even if not over a region so we don't get an
        // uninitialized dialog. The dialog is 0-region aware.
@@ -204,12 +204,12 @@ void LLFloaterLand::onOpen()
 // virtual
 void LLFloaterLand::onClose(bool app_quitting)
 {
-        gParcelMgr->removeObserver( sObserver );
+        LLViewerParcelMgr::getInstance()->removeObserver( sObserver );
        delete sObserver;
        sObserver = NULL;
        // Might have been showing owned objects
-        gSelectMgr->unhighlightAll();
+        LLSelectMgr::getInstance()->unhighlightAll();
        // Save which panel we had open
        sLastTab = mTabLand->getCurrentPanelIndex();
@@ -233,19 +233,18 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed)
        factory_map["land_media_panel"] =       LLCallbackMap(createPanelLandMedia, this);
        factory_map["land_access_panel"] =      LLCallbackMap(createPanelLandAccess, this);
-        gUICtrlFactory->buildFloater(this, "floater_about_land.xml", &factory_map, false);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_about_land.xml", &factory_map, false);
        sObserver = new LLParcelSelectionObserver();
-        gParcelMgr->addObserver( sObserver );
+        LLViewerParcelMgr::getInstance()->addObserver( sObserver );
 }
 BOOL LLFloaterLand::postBuild()
 {
-        LLTabContainer* tab = LLUICtrlFactory::getTabContainerByName(this, "landtab");
+        LLTabContainer* tab = getChild<LLTabContainer>("landtab");
        mTabLand = (LLTabContainer*) tab;
        if (tab)
        {
                tab->selectTab(sLastTab);
@@ -280,8 +279,6 @@ void* LLFloaterLand::createPanelLandGeneral(void* data)
 }
 // static
 void* LLFloaterLand::createPanelLandCovenant(void* data)
 {
        LLFloaterLand* self = (LLFloaterLand*)data;
@@ -337,96 +334,96 @@ LLPanelLandGeneral::LLPanelLandGeneral(LLParcelSelectionHandle& parcel)
 BOOL LLPanelLandGeneral::postBuild()
 {
-        mEditName = LLUICtrlFactory::getLineEditorByName(this, "Name");
+        mEditName = getChild<LLLineEditor>("Name");
        mEditName->setCommitCallback(onCommitAny);      
        childSetPrevalidate("Name", LLLineEditor::prevalidatePrintableNotPipe);
        childSetUserData("Name", this);
-        mEditDesc = LLUICtrlFactory::getTextEditorByName(this, "Description");
+        mEditDesc = getChild<LLTextEditor>("Description");
        mEditDesc->setCommitOnFocusLost(TRUE);
        mEditDesc->setCommitCallback(onCommitAny);      
        childSetPrevalidate("Description", LLLineEditor::prevalidatePrintableNotPipe);
        childSetUserData("Description", this);
        
-        mTextSalePending = LLUICtrlFactory::getTextBoxByName(this, "SalePending");
+        mTextSalePending = getChild<LLTextBox>("SalePending");
-        mTextOwnerLabel = LLUICtrlFactory::getTextBoxByName(this, "Owner:");
+        mTextOwnerLabel = getChild<LLTextBox>("Owner:");
-        mTextOwner = LLUICtrlFactory::getTextBoxByName(this, "OwnerText");
+        mTextOwner = getChild<LLTextBox>("OwnerText");
        
-        mBtnProfile = LLUICtrlFactory::getButtonByName(this, "Profile...");
+        mBtnProfile = getChild<LLButton>("Profile...");
        mBtnProfile->setClickedCallback(onClickProfile, this);
        
-        mTextGroupLabel = LLUICtrlFactory::getTextBoxByName(this, "Group:");
+        mTextGroupLabel = getChild<LLTextBox>("Group:");
-        mTextGroup = LLUICtrlFactory::getTextBoxByName(this, "GroupText");
+        mTextGroup = getChild<LLTextBox>("GroupText");
        
-        mBtnSetGroup = LLUICtrlFactory::getButtonByName(this, "Set...");
+        mBtnSetGroup = getChild<LLButton>("Set...");
        mBtnSetGroup->setClickedCallback(onClickSetGroup, this);
        
-        mCheckDeedToGroup = LLUICtrlFactory::getCheckBoxByName(this, "check deed");
+        mCheckDeedToGroup = getChild<LLCheckBoxCtrl>( "check deed");
        childSetCommitCallback("check deed", onCommitAny, this);
        
-        mBtnDeedToGroup = LLUICtrlFactory::getButtonByName(this, "Deed...");
+        mBtnDeedToGroup = getChild<LLButton>("Deed...");
        mBtnDeedToGroup->setClickedCallback(onClickDeed, this);
        
-        mCheckContributeWithDeed = LLUICtrlFactory::getCheckBoxByName(this, "check contrib");
+        mCheckContributeWithDeed = getChild<LLCheckBoxCtrl>( "check contrib");
        childSetCommitCallback("check contrib", onCommitAny, this);
        
        
-        mSaleInfoNotForSale = LLUICtrlFactory::getTextBoxByName(this, "Not for sale.");
+        mSaleInfoNotForSale = getChild<LLTextBox>("Not for sale.");
        
-        mSaleInfoForSale1 = LLUICtrlFactory::getTextBoxByName(this, "For Sale: Price L$[PRICE].");
+        mSaleInfoForSale1 = getChild<LLTextBox>("For Sale: Price L$[PRICE].");
        
-        mBtnSellLand = LLUICtrlFactory::getButtonByName(this, "Sell Land...");
+        mBtnSellLand = getChild<LLButton>("Sell Land...");
        mBtnSellLand->setClickedCallback(onClickSellLand, this);
        
-        mSaleInfoForSale2 = LLUICtrlFactory::getTextBoxByName(this, "For sale to");
+        mSaleInfoForSale2 = getChild<LLTextBox>("For sale to");
        
-        mSaleInfoForSaleObjects = LLUICtrlFactory::getTextBoxByName(this, "Sell with landowners objects in parcel.");
+        mSaleInfoForSaleObjects = getChild<LLTextBox>("Sell with landowners objects in parcel.");
        
-        mSaleInfoForSaleNoObjects = LLUICtrlFactory::getTextBoxByName(this, "Selling with no objects in parcel.");
+        mSaleInfoForSaleNoObjects = getChild<LLTextBox>("Selling with no objects in parcel.");
        
-        mBtnStopSellLand = LLUICtrlFactory::getButtonByName(this, "Cancel Land Sale");
+        mBtnStopSellLand = getChild<LLButton>("Cancel Land Sale");
        mBtnStopSellLand->setClickedCallback(onClickStopSellLand, this);
        
-        mTextClaimDateLabel = LLUICtrlFactory::getTextBoxByName(this, "Claimed:");
+        mTextClaimDateLabel = getChild<LLTextBox>("Claimed:");
-        mTextClaimDate = LLUICtrlFactory::getTextBoxByName(this, "DateClaimText");
+        mTextClaimDate = getChild<LLTextBox>("DateClaimText");
        
-        mTextPriceLabel = LLUICtrlFactory::getTextBoxByName(this, "PriceLabel");
+        mTextPriceLabel = getChild<LLTextBox>("PriceLabel");
-        mTextPrice = LLUICtrlFactory::getTextBoxByName(this, "PriceText");
+        mTextPrice = getChild<LLTextBox>("PriceText");
        
-        mTextDwell = LLUICtrlFactory::getTextBoxByName(this, "DwellText");
+        mTextDwell = getChild<LLTextBox>("DwellText");
        
-        mBtnBuyLand = LLUICtrlFactory::getButtonByName(this, "Buy Land...");
+        mBtnBuyLand = getChild<LLButton>("Buy Land...");
        mBtnBuyLand->setClickedCallback(onClickBuyLand, (void*)&BUY_PERSONAL_LAND);
        
-        mBtnBuyGroupLand = LLUICtrlFactory::getButtonByName(this, "Buy For Group...");
+        mBtnBuyGroupLand = getChild<LLButton>("Buy For Group...");
        mBtnBuyGroupLand->setClickedCallback(onClickBuyLand, (void*)&BUY_GROUP_LAND);
        
        
-        mBtnBuyPass = LLUICtrlFactory::getButtonByName(this, "Buy Pass...");
+        mBtnBuyPass = getChild<LLButton>("Buy Pass...");
        mBtnBuyPass->setClickedCallback(onClickBuyPass, this);
-        mBtnReleaseLand = LLUICtrlFactory::getButtonByName(this, "Abandon Land...");
+        mBtnReleaseLand = getChild<LLButton>("Abandon Land...");
        mBtnReleaseLand->setClickedCallback(onClickRelease, NULL);
-        mBtnReclaimLand = LLUICtrlFactory::getButtonByName(this, "Reclaim Land...");
+        mBtnReclaimLand = getChild<LLButton>("Reclaim Land...");
        mBtnReclaimLand->setClickedCallback(onClickReclaim, NULL);
        
-        mBtnStartAuction = LLUICtrlFactory::getButtonByName(this, "Linden Sale...");
+        mBtnStartAuction = getChild<LLButton>("Linden Sale...");
        mBtnStartAuction->setClickedCallback(onClickStartAuction, NULL);
        return TRUE;
@@ -445,7 +442,7 @@ void LLPanelLandGeneral::refresh()
        LLParcel *parcel = mParcel->getParcel();
        bool region_owner = false;
-        LLViewerRegion* regionp = gParcelMgr->getSelectionRegion();
+        LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion();
        if(regionp && (regionp->getOwner() == gAgent.getID()))
        {
                region_owner = true;
@@ -672,16 +669,16 @@ void LLPanelLandGeneral::refresh()
                refreshNames();
                mBtnBuyLand->setEnabled(
-                        gParcelMgr->canAgentBuyParcel(parcel, false));
+                        LLViewerParcelMgr::getInstance()->canAgentBuyParcel(parcel, false));
                mBtnBuyGroupLand->setEnabled(
-                        gParcelMgr->canAgentBuyParcel(parcel, true));
+                        LLViewerParcelMgr::getInstance()->canAgentBuyParcel(parcel, true));
                // show pricing information
                S32 area;
                S32 claim_price;
                S32 rent_price;
                F32 dwell;
-                gParcelMgr->getDisplayInfo(&area,
+                LLViewerParcelMgr::getInstance()->getDisplayInfo(&area,
                                                                   &claim_price,
                                                                   &rent_price,
                                                                   &for_sale,
@@ -710,7 +707,7 @@ void LLPanelLandGeneral::refresh()
                        mBtnReleaseLand->setEnabled( can_release );
                }
-                BOOL use_pass = parcel->getParcelFlag(PF_USE_PASS_LIST) && !gParcelMgr->isCollisionBanned();;
+                BOOL use_pass = parcel->getParcelFlag(PF_USE_PASS_LIST) && !LLViewerParcelMgr::getInstance()->isCollisionBanned();;
                mBtnBuyPass->setEnabled(use_pass);
        }
 }
@@ -827,7 +824,7 @@ void LLPanelLandGeneral::setGroup(const LLUUID& group_id)
        //mTextGroup->setText(group_name);
        // Send update
-        gParcelMgr->sendParcelPropertiesUpdate(parcel);
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate(parcel);
        // Update UI
        refresh();
@@ -837,7 +834,7 @@ void LLPanelLandGeneral::setGroup(const LLUUID& group_id)
 void LLPanelLandGeneral::onClickBuyLand(void* data)
 {
        BOOL* for_group = (BOOL*)data;
-        gParcelMgr->startBuyLand(*for_group);
+        LLViewerParcelMgr::getInstance()->startBuyLand(*for_group);
 }
 BOOL LLPanelLandGeneral::enableDeedToGroup(void* data)
@@ -853,29 +850,29 @@ void LLPanelLandGeneral::onClickDeed(void*)
        //LLParcel* parcel = mParcel->getParcel();
        //if (parcel)
        //{
-        gParcelMgr->startDeedLandToGroup();
+        LLViewerParcelMgr::getInstance()->startDeedLandToGroup();
        //}
 }
 // static
 void LLPanelLandGeneral::onClickRelease(void*)
 {
-        gParcelMgr->startReleaseLand();
+        LLViewerParcelMgr::getInstance()->startReleaseLand();
 }
 // static
 void LLPanelLandGeneral::onClickReclaim(void*)
 {
        lldebugs << "LLPanelLandGeneral::onClickReclaim()" << llendl;
-        gParcelMgr->reclaimParcel();
+        LLViewerParcelMgr::getInstance()->reclaimParcel();
 }
 // static
 BOOL LLPanelLandGeneral::enableBuyPass(void* data)
 {
        LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)data;
-        LLParcel* parcel = panelp != NULL ? panelp->mParcel->getParcel() : gParcelMgr->getParcelSelection()->getParcel();
+        LLParcel* parcel = panelp != NULL ? panelp->mParcel->getParcel() : LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel();
-        return (parcel != NULL) && (parcel->getParcelFlag(PF_USE_PASS_LIST) && !gParcelMgr->isCollisionBanned());
+        return (parcel != NULL) && (parcel->getParcelFlag(PF_USE_PASS_LIST) && !LLViewerParcelMgr::getInstance()->isCollisionBanned());
 }
@@ -883,7 +880,7 @@ BOOL LLPanelLandGeneral::enableBuyPass(void* data)
 void LLPanelLandGeneral::onClickBuyPass(void* data)
 {
        LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)data;
-        LLParcel* parcel = panelp != NULL ? panelp->mParcel->getParcel() : gParcelMgr->getParcelSelection()->getParcel();
+        LLParcel* parcel = panelp != NULL ? panelp->mParcel->getParcel() : LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel();
        if (!parcel) return;
@@ -927,7 +924,7 @@ void LLPanelLandGeneral::cbBuyPass(S32 option, void* data)
        if (0 == option)
        {
                // User clicked OK
-                gParcelMgr->buyPass();
+                LLViewerParcelMgr::getInstance()->buyPass();
        }
 }
@@ -965,7 +962,7 @@ void LLPanelLandGeneral::onCommitAny(LLUICtrl *ctrl, void *userdata)
        parcel->setContributeWithDeed(contribute_with_deed);
        // Send update to server
-        gParcelMgr->sendParcelPropertiesUpdate( parcel );
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
        // Might have changed properties, so let's redraw!
        panelp->refresh();
@@ -974,7 +971,7 @@ void LLPanelLandGeneral::onCommitAny(LLUICtrl *ctrl, void *userdata)
 // static
 void LLPanelLandGeneral::onClickSellLand(void* data)
 {
-        gParcelMgr->startSellLand();
+        LLViewerParcelMgr::getInstance()->startSellLand();
 }
 // static
@@ -987,7 +984,7 @@ void LLPanelLandGeneral::onClickStopSellLand(void* data)
        parcel->setSalePrice(0);
        parcel->setAuthorizedBuyerID(LLUUID::null);
-        gParcelMgr->sendParcelPropertiesUpdate(parcel);
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate(parcel);
 }
 //---------------------------------------------------------------------------
@@ -1004,34 +1001,34 @@ BOOL LLPanelLandObjects::postBuild()
 {
        
        mFirstReply = TRUE;
-        mParcelObjectBonus = LLUICtrlFactory::getTextBoxByName(this, "parcel_object_bonus");
+        mParcelObjectBonus = getChild<LLTextBox>("parcel_object_bonus");
-        mSWTotalObjects = LLUICtrlFactory::getTextBoxByName(this, "objects_available");
+        mSWTotalObjects = getChild<LLTextBox>("objects_available");
-        mObjectContribution = LLUICtrlFactory::getTextBoxByName(this, "object_contrib_text");
+        mObjectContribution = getChild<LLTextBox>("object_contrib_text");
-        mTotalObjects = LLUICtrlFactory::getTextBoxByName(this, "total_objects_text");
+        mTotalObjects = getChild<LLTextBox>("total_objects_text");
-        mOwnerObjects = LLUICtrlFactory::getTextBoxByName(this, "owner_objects_text");
+        mOwnerObjects = getChild<LLTextBox>("owner_objects_text");
        
-        mBtnShowOwnerObjects = LLUICtrlFactory::getButtonByName(this, "ShowOwner");
+        mBtnShowOwnerObjects = getChild<LLButton>("ShowOwner");
        mBtnShowOwnerObjects->setClickedCallback(onClickShowOwnerObjects, this);
        
-        mBtnReturnOwnerObjects = LLUICtrlFactory::getButtonByName(this, "ReturnOwner...");
+        mBtnReturnOwnerObjects = getChild<LLButton>("ReturnOwner...");
        mBtnReturnOwnerObjects->setClickedCallback(onClickReturnOwnerObjects, this);
        
-        mGroupObjects = LLUICtrlFactory::getTextBoxByName(this, "group_objects_text");
+        mGroupObjects = getChild<LLTextBox>("group_objects_text");
-        mBtnShowGroupObjects = LLUICtrlFactory::getButtonByName(this, "ShowGroup");
+        mBtnShowGroupObjects = getChild<LLButton>("ShowGroup");
        mBtnShowGroupObjects->setClickedCallback(onClickShowGroupObjects, this);
        
-        mBtnReturnGroupObjects = LLUICtrlFactory::getButtonByName(this, "ReturnGroup...");
+        mBtnReturnGroupObjects = getChild<LLButton>("ReturnGroup...");
        mBtnReturnGroupObjects->setClickedCallback(onClickReturnGroupObjects, this);
        
-        mOtherObjects = LLUICtrlFactory::getTextBoxByName(this, "other_objects_text");
+        mOtherObjects = getChild<LLTextBox>("other_objects_text");
-        mBtnShowOtherObjects = LLUICtrlFactory::getButtonByName(this, "ShowOther");
+        mBtnShowOtherObjects = getChild<LLButton>("ShowOther");
        mBtnShowOtherObjects->setClickedCallback(onClickShowOtherObjects, this);
        
-        mBtnReturnOtherObjects = LLUICtrlFactory::getButtonByName(this, "ReturnOther...");
+        mBtnReturnOtherObjects = getChild<LLButton>("ReturnOther...");
        mBtnReturnOtherObjects->setClickedCallback(onClickReturnOtherObjects, this);
        
-        mSelectedObjects = LLUICtrlFactory::getTextBoxByName(this, "selected_objects_text");
+        mSelectedObjects = getChild<LLTextBox>("selected_objects_text");
-        mCleanOtherObjectsTime = LLUICtrlFactory::getLineEditorByName(this, "clean other time");
+        mCleanOtherObjectsTime = getChild<LLLineEditor>("clean other time");
        mCleanOtherObjectsTime->setFocusLostCallback(onLostFocus, this);
        mCleanOtherObjectsTime->setCommitCallback(onCommitClean);
@@ -1039,22 +1036,15 @@ BOOL LLPanelLandObjects::postBuild()
        childSetPrevalidate("clean other time", LLLineEditor::prevalidateNonNegativeS32);
        childSetUserData("clean other time", this);
        
-        mBtnRefresh = LLUICtrlFactory::getButtonByName(this, "Refresh List");
+        mBtnRefresh = getChild<LLButton>("Refresh List");
        mBtnRefresh->setClickedCallback(onClickRefresh, this);
        
-        mBtnReturnOwnerList = LLUICtrlFactory::getButtonByName(this, "Return objects...");
+        mBtnReturnOwnerList = getChild<LLButton>("Return objects...");
        mBtnReturnOwnerList->setClickedCallback(onClickReturnOwnerList, this);
-        LLUUID image_id;
+        mIconAvatarOnline = LLUIImageList::getInstance()->getUIImage("icon_avatar_online.tga");
+        mIconAvatarOffline = LLUIImageList::getInstance()->getUIImage("icon_avatar_offline.tga");
-        image_id.set( gViewerArt.getString("icon_avatar_online.tga") );
+        mIconGroup = LLUIImageList::getInstance()->getUIImage("icon_group.tga");
-        mIconAvatarOnline = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
-        
-        image_id.set( gViewerArt.getString("icon_avatar_offline.tga") );
-        mIconAvatarOffline = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
-        image_id.set( gViewerArt.getString("icon_group.tga") );
-        mIconGroup = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
        mOwnerList = getChild<LLNameListCtrl>("owner list");
        mOwnerList->sortByColumn(3, FALSE);
@@ -1146,7 +1136,7 @@ void LLPanelLandObjects::refresh()
                // Can't have more than region max tasks, regardless of parcel
                // object bonus factor.
-                LLViewerRegion* region = gParcelMgr->getSelectionRegion();
+                LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
                if (region)
                {
                        S32 max_tasks_per_region = (S32)region->getMaxTasks();
@@ -1223,7 +1213,7 @@ void send_other_clean_time_message(S32 parcel_local_id, S32 other_clean_time)
 {
        LLMessageSystem *msg = gMessageSystem;
-        LLViewerRegion* region = gParcelMgr->getSelectionRegion();
+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
        if (!region) return;
        msg->newMessageFast(_PREHASH_ParcelSetOtherCleanTime);
@@ -1242,7 +1232,7 @@ void send_return_objects_message(S32 parcel_local_id, S32 return_type,
 {
        LLMessageSystem *msg = gMessageSystem;
-        LLViewerRegion* region = gParcelMgr->getSelectionRegion();
+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
        if (!region) return;
        msg->newMessageFast(_PREHASH_ParcelReturnObjects);
@@ -1306,8 +1296,8 @@ void LLPanelLandObjects::callbackReturnOwnerObjects(S32 option, void* userdata)
                }
        }
-        gSelectMgr->unhighlightAll();
+        LLSelectMgr::getInstance()->unhighlightAll();
-        gParcelMgr->sendParcelPropertiesUpdate( parcel );
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
        lop->refresh();
 }
@@ -1328,8 +1318,8 @@ void LLPanelLandObjects::callbackReturnGroupObjects(S32 option, void* userdata)
                        send_return_objects_message(parcel->getLocalID(), RT_GROUP);
                }
        }
-        gSelectMgr->unhighlightAll();
+        LLSelectMgr::getInstance()->unhighlightAll();
-        gParcelMgr->sendParcelPropertiesUpdate( parcel );
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
        lop->refresh();
 }
@@ -1346,8 +1336,8 @@ void LLPanelLandObjects::callbackReturnOtherObjects(S32 option, void* userdata)
                        send_return_objects_message(parcel->getLocalID(), RT_OTHER);
                }
        }
-        gSelectMgr->unhighlightAll();
+        LLSelectMgr::getInstance()->unhighlightAll();
-        gParcelMgr->sendParcelPropertiesUpdate( parcel );
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
        lop->refresh();
 }
@@ -1380,8 +1370,8 @@ void LLPanelLandObjects::callbackReturnOwnerList(S32 option, void* userdata)
                        }
                }
        }
-        gSelectMgr->unhighlightAll();
+        LLSelectMgr::getInstance()->unhighlightAll();
-        gParcelMgr->sendParcelPropertiesUpdate( parcel );
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
        self->refresh();
 }
@@ -1428,7 +1418,7 @@ void LLPanelLandObjects::onClickRefresh(void* userdata)
        LLParcel* parcel = self->mParcel->getParcel();
        if (!parcel) return;
-        LLViewerRegion* region = gParcelMgr->getSelectionRegion();
+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
        if (!region) return;
        // ready the list for results
@@ -1494,17 +1484,17 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
                LLScrollListItem *row = new LLScrollListItem( TRUE, NULL, owner_id);
                if (is_group_owned)
                {
-                        row->addColumn(self->mIconGroup.notNull() ? self->mIconGroup->getID() : LLUUID::null);
+                        row->addColumn(self->mIconGroup);
                        row->addColumn(OWNER_GROUP, FONT);
                }
                else if (is_online)
                {
-                        row->addColumn(self->mIconAvatarOnline.notNull() ? self->mIconAvatarOnline->getID() : LLUUID::null);
+                        row->addColumn(self->mIconAvatarOnline);
                        row->addColumn(OWNER_ONLINE, FONT);
                }
                else  // offline
                {
-                        row->addColumn(self->mIconAvatarOffline.notNull() ? self->mIconAvatarOffline->getID() : LLUUID::null);
+                        row->addColumn(self->mIconAvatarOffline);
                        row->addColumn(OWNER_OFFLINE, FONT);
                }
                // Placeholder for name.
@@ -1749,56 +1739,56 @@ BOOL LLPanelLandOptions::postBuild()
 {
        
-        mCheckEditObjects = LLUICtrlFactory::getCheckBoxByName(this, "edit objects check");
+        mCheckEditObjects = getChild<LLCheckBoxCtrl>( "edit objects check");
        childSetCommitCallback("edit objects check", onCommitAny, this);
        
-        mCheckEditGroupObjects = LLUICtrlFactory::getCheckBoxByName(this, "edit group objects check");
+        mCheckEditGroupObjects = getChild<LLCheckBoxCtrl>( "edit group objects check");
        childSetCommitCallback("edit group objects check", onCommitAny, this);
-        mCheckAllObjectEntry = LLUICtrlFactory::getCheckBoxByName(this, "all object entry check");
+        mCheckAllObjectEntry = getChild<LLCheckBoxCtrl>( "all object entry check");
        childSetCommitCallback("all object entry check", onCommitAny, this);
-        mCheckGroupObjectEntry = LLUICtrlFactory::getCheckBoxByName(this, "group object entry check");
+        mCheckGroupObjectEntry = getChild<LLCheckBoxCtrl>( "group object entry check");
        childSetCommitCallback("group object entry check", onCommitAny, this);
        
-        mCheckEditLand = LLUICtrlFactory::getCheckBoxByName(this, "edit land check");
+        mCheckEditLand = getChild<LLCheckBoxCtrl>( "edit land check");
        childSetCommitCallback("edit land check", onCommitAny, this);
        
-        mCheckLandmark = LLUICtrlFactory::getCheckBoxByName(this, "check landmark");
+        mCheckLandmark = getChild<LLCheckBoxCtrl>( "check landmark");
        childSetCommitCallback("check landmark", onCommitAny, this);
        
-        mCheckGroupScripts = LLUICtrlFactory::getCheckBoxByName(this, "check group scripts");
+        mCheckGroupScripts = getChild<LLCheckBoxCtrl>( "check group scripts");
        childSetCommitCallback("check group scripts", onCommitAny, this);
        
-        mCheckFly = LLUICtrlFactory::getCheckBoxByName(this, "check fly");
+        mCheckFly = getChild<LLCheckBoxCtrl>( "check fly");
        childSetCommitCallback("check fly", onCommitAny, this);
        
-        mCheckOtherScripts = LLUICtrlFactory::getCheckBoxByName(this, "check other scripts");
+        mCheckOtherScripts = getChild<LLCheckBoxCtrl>( "check other scripts");
        childSetCommitCallback("check other scripts", onCommitAny, this);
        
-        mCheckSafe = LLUICtrlFactory::getCheckBoxByName(this, "check safe");
+        mCheckSafe = getChild<LLCheckBoxCtrl>( "check safe");
        childSetCommitCallback("check safe", onCommitAny, this);
        
-        mPushRestrictionCtrl = LLUICtrlFactory::getCheckBoxByName(this, "PushRestrictCheck");
+        mPushRestrictionCtrl = getChild<LLCheckBoxCtrl>( "PushRestrictCheck");
        childSetCommitCallback("PushRestrictCheck", onCommitAny, this);
-        mCheckShowDirectory = LLUICtrlFactory::getCheckBoxByName(this, "ShowDirectoryCheck");
+        mCheckShowDirectory = getChild<LLCheckBoxCtrl>( "ShowDirectoryCheck");
        childSetCommitCallback("ShowDirectoryCheck", onCommitAny, this);
        
-        mCategoryCombo = LLUICtrlFactory::getComboBoxByName(this, "land category");
+        mCategoryCombo = getChild<LLComboBox>( "land category");
        childSetCommitCallback("land category", onCommitAny, this);
-        mMatureCtrl = LLUICtrlFactory::getCheckBoxByName(this, "MatureCheck");
+        mMatureCtrl = getChild<LLCheckBoxCtrl>( "MatureCheck");
        childSetCommitCallback("MatureCheck", onCommitAny, this);
        
-        mPublishHelpButton = LLUICtrlFactory::getButtonByName(this, "?");
+        mPublishHelpButton = getChild<LLButton>("?");
        mPublishHelpButton->setClickedCallback(onClickPublishHelp, this);
@@ -1847,17 +1837,17 @@ BOOL LLPanelLandOptions::postBuild()
        }
-        mLocationText = LLUICtrlFactory::getTextBoxByName(this, "landing_point");
+        mLocationText = getChild<LLTextBox>("landing_point");
-        mSetBtn = LLUICtrlFactory::getButtonByName(this, "Set");
+        mSetBtn = getChild<LLButton>("Set");
        mSetBtn->setClickedCallback(onClickSet, this);
        
-        mClearBtn = LLUICtrlFactory::getButtonByName(this, "Clear");
+        mClearBtn = getChild<LLButton>("Clear");
        mClearBtn->setClickedCallback(onClickClear, this);
-        mLandingTypeCombo = LLUICtrlFactory::getComboBoxByName(this, "landing type");
+        mLandingTypeCombo = getChild<LLComboBox>( "landing type");
        childSetCommitCallback("landing type", onCommitAny, this);
        return TRUE;
@@ -2031,12 +2021,12 @@ void LLPanelLandOptions::refresh()
 // virtual
 void LLPanelLandOptions::draw()
 {
-        LLParcel *parcel = gParcelMgr->getFloatingParcelSelection()->getParcel();
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection()->getParcel();
        
        if(parcel)
        {
                LLViewerRegion* region;
-                region = gParcelMgr->getSelectionRegion();
+                region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
                llassert(region); // Region should never be null.
                BOOL can_change_identity = region ? 
@@ -2091,7 +2081,7 @@ void LLPanelLandOptions::onCommitAny(LLUICtrl *ctrl, void *userdata)
        S32  landing_type_index = self->mLandingTypeCombo->getCurrentIndex();
        LLUUID snapshot_id              = self->mSnapshotCtrl->getImageAssetID();
        LLViewerRegion* region;
-        region = gParcelMgr->getSelectionRegion();
+        region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
        if (!allow_other_scripts && region && region->getAllowDamage())
        {
@@ -2120,7 +2110,7 @@ void LLPanelLandOptions::onCommitAny(LLUICtrl *ctrl, void *userdata)
        parcel->setSnapshotID(snapshot_id);
        // Send current parcel data upstream to server
-        gParcelMgr->sendParcelPropertiesUpdate( parcel );
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
        // Might have changed properties, so let's redraw!
        self->refresh();
@@ -2135,7 +2125,7 @@ void LLPanelLandOptions::onClickSet(void* userdata)
        LLParcel* selected_parcel = self->mParcel->getParcel();
        if (!selected_parcel) return;
-        LLParcel* agent_parcel = gParcelMgr->getAgentParcel();
+        LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (!agent_parcel) return;
        if (agent_parcel->getLocalID() != selected_parcel->getLocalID())
@@ -2148,7 +2138,7 @@ void LLPanelLandOptions::onClickSet(void* userdata)
        selected_parcel->setUserLocation(pos_region);
        selected_parcel->setUserLookAt(gAgent.getFrameAgent().getAtAxis());
-        gParcelMgr->sendParcelPropertiesUpdate(selected_parcel);
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate(selected_parcel);
        self->refresh();
 }
@@ -2165,7 +2155,7 @@ void LLPanelLandOptions::onClickClear(void* userdata)
        selected_parcel->setUserLocation(zero_vec);
        selected_parcel->setUserLookAt(zero_vec);
-        gParcelMgr->sendParcelPropertiesUpdate(selected_parcel);
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate(selected_parcel);
        self->refresh();
 }
@@ -2173,8 +2163,8 @@ void LLPanelLandOptions::onClickClear(void* userdata)
 // static
 void LLPanelLandOptions::onClickPublishHelp(void*)
 {
-        LLViewerRegion* region = gParcelMgr->getSelectionRegion();
+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
-        LLParcel *parcel = gParcelMgr->getFloatingParcelSelection()->getParcel();
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection()->getParcel();
        llassert(region); // Region should never be null.
        bool can_change_identity = region && parcel ? 
@@ -2585,7 +2575,7 @@ void LLPanelLandAccess::onCommitAny(LLUICtrl *ctrl, void *userdata)
        parcel->setPassHours( pass_hours );
        // Send current parcel data upstream to server
-        gParcelMgr->sendParcelPropertiesUpdate( parcel );
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
        // Might have changed properties, so let's redraw!
        self->refresh();
@@ -2612,7 +2602,7 @@ void LLPanelLandAccess::callbackAvatarCBAccess(const std::vector<std::string>& n
                if (parcel)
                {
                        parcel->addToAccessList(id, 0);
-                        gParcelMgr->sendParcelAccessListUpdate(AL_ACCESS);
+                        LLViewerParcelMgr::getInstance()->sendParcelAccessListUpdate(AL_ACCESS);
                        panelp->refresh();
                }
        }
@@ -2635,7 +2625,7 @@ void LLPanelLandAccess::onClickRemoveAccess(void* data)
                                const LLUUID& agent_id = item->getUUID();
                                parcel->removeFromAccessList(agent_id);
                        }
-                        gParcelMgr->sendParcelAccessListUpdate(AL_ACCESS);
+                        LLViewerParcelMgr::getInstance()->sendParcelAccessListUpdate(AL_ACCESS);
                        panelp->refresh();
                }
        }
@@ -2659,7 +2649,7 @@ void LLPanelLandAccess::callbackAvatarCBBanned(const std::vector<std::string>& n
                if (parcel)
                {
                        parcel->addToBanList(id, 0);
-                        gParcelMgr->sendParcelAccessListUpdate(AL_BAN);
+                        LLViewerParcelMgr::getInstance()->sendParcelAccessListUpdate(AL_BAN);
                        panelp->refresh();
                }
        }
@@ -2682,7 +2672,7 @@ void LLPanelLandAccess::onClickRemoveBanned(void* data)
                                const LLUUID& agent_id = item->getUUID();
                                parcel->removeFromBanList(agent_id);
                        }
-                        gParcelMgr->sendParcelAccessListUpdate(AL_BAN);
+                        LLViewerParcelMgr::getInstance()->sendParcelAccessListUpdate(AL_BAN);
                        panelp->refresh();
                }
        }
@@ -2709,7 +2699,7 @@ BOOL LLPanelLandCovenant::postBuild()
 // virtual
 void LLPanelLandCovenant::refresh()
 {
-        LLViewerRegion* region = gParcelMgr->getSelectionRegion();
+        LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
        if(!region) return;
                
        LLTextBox* region_name = getChild<LLTextBox>("region_name_text");
diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index e9198cb..b0dcd04 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -68,7 +68,7 @@ class LLPanelLandRenters;
 class LLPanelLandCovenant;
 class LLFloaterLand
-:       public LLFloater, public LLUISingleton<LLFloaterLand, VisibilityPolicy<LLFloater> >
+:       public LLFloater, public LLFloaterSingleton<LLFloaterLand>
 {
        friend class LLUISingleton<LLFloaterLand, VisibilityPolicy<LLFloater> >;
 public:
@@ -281,9 +281,9 @@ protected:
        LLButton                *mBtnReturnOwnerList;
        LLNameListCtrl  *mOwnerList;
-        LLPointer<LLViewerImage>        mIconAvatarOnline;
+        LLUIImagePtr    mIconAvatarOnline;
-        LLPointer<LLViewerImage>        mIconAvatarOffline;
+        LLUIImagePtr    mIconAvatarOffline;
-        LLPointer<LLViewerImage>        mIconGroup;
+        LLUIImagePtr    mIconGroup;
        BOOL                    mFirstReply;
diff --git a/linden/indra/newview/llfloaterlandholdings.cpp b/linden/indra/newview/llfloaterlandholdings.cpp
index 32d077c..01bad70 100644
--- a/linden/indra/newview/llfloaterlandholdings.cpp
+++ b/linden/indra/newview/llfloaterlandholdings.cpp
@@ -49,7 +49,7 @@
 #include "llbutton.h"
 #include "lluiconstants.h"
 #include "llviewermessage.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 // statics
 LLFloaterLandHoldings* LLFloaterLandHoldings::sInstance = NULL;
@@ -59,7 +59,7 @@ LLFloaterLandHoldings* LLFloaterLandHoldings::sInstance = NULL;
 void LLFloaterLandHoldings::show(void*)
 {
        LLFloaterLandHoldings* floater = new LLFloaterLandHoldings();
-        gUICtrlFactory->buildFloater(floater, "floater_land_holdings.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(floater, "floater_land_holdings.xml");
        floater->center();
        // query_id null is known to be us
@@ -250,7 +250,7 @@ void LLFloaterLandHoldings::processPlacesReply(LLMessageSystem* msg, void**)
 void LLFloaterLandHoldings::buttonCore(S32 which)
 {
-        LLScrollListCtrl *list = LLUICtrlFactory::getScrollListByName(this, "parcel list");
+        LLScrollListCtrl *list = getChild<LLScrollListCtrl>("parcel list");
        if (!list) return;
        S32 index = list->getFirstSelectedIndex();
diff --git a/linden/indra/newview/llfloaterlandmark.cpp b/linden/indra/newview/llfloaterlandmark.cpp
index 0011daf..e10dec9 100644
--- a/linden/indra/newview/llfloaterlandmark.cpp
+++ b/linden/indra/newview/llfloaterlandmark.cpp
@@ -64,7 +64,7 @@
 #include "llviewerobject.h"
 #include "llviewercontrol.h"
 #include "llglheaders.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "roles_constants.h"
@@ -111,20 +111,20 @@ LLFloaterLandmark::LLFloaterLandmark(const LLSD& data)
        mSearchEdit(NULL),
        mContextConeOpacity(0.f)
 {
-        gUICtrlFactory->buildFloater(this,"floater_landmark_ctrl.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_landmark_ctrl.xml");
-        mTentativeLabel = LLUICtrlFactory::getTextBoxByName(this,"Multiple");
+        mTentativeLabel = getChild<LLTextBox>("Multiple");
-        mResolutionLabel = LLUICtrlFactory::getTextBoxByName(this,"unknown");
+        mResolutionLabel = getChild<LLTextBox>("unknown");
                
        childSetCommitCallback("show_folders_check", onShowFolders, this);
        childSetVisible("show_folders_check", FALSE);
        
-        mSearchEdit = (LLSearchEditor*)getCtrlByNameAndType("inventory search editor", WIDGET_TYPE_SEARCH_EDITOR);
+        mSearchEdit = getChild<LLSearchEditor>("inventory search editor");
        mSearchEdit->setSearchCallback(onSearchEdit, this);
                
-        mInventoryPanel = (LLInventoryPanel*)this->getCtrlByNameAndType("inventory panel", WIDGET_TYPE_INVENTORY_PANEL);
+        mInventoryPanel = getChild<LLInventoryPanel>("inventory panel");
        if(mInventoryPanel)
        {
@@ -221,13 +221,13 @@ BOOL LLFloaterLandmark::handleDragAndDrop(
        return handled;
 }
-BOOL LLFloaterLandmark::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLFloaterLandmark::handleKeyHere(KEY key, MASK mask)
 {
        LLFolderView* root_folder = mInventoryPanel->getRootFolder();
        if (root_folder && mSearchEdit)
        {
-                if (!called_from_parent && mSearchEdit->hasFocus() &&
+                if (mSearchEdit->hasFocus() &&
                    (key == KEY_RETURN || key == KEY_DOWN) &&
                    mask == MASK_NONE)
                {
@@ -253,7 +253,7 @@ BOOL LLFloaterLandmark::handleKeyHere(KEY key, MASK mask, BOOL called_from_paren
                }
        }
-        return LLFloater::handleKeyHere(key, mask, called_from_parent);
+        return LLFloater::handleKeyHere(key, mask);
 }
 // virtual
@@ -329,7 +329,7 @@ void LLFloaterLandmark::onBtnNew(void* userdata)
                llwarns << "No agent region" << llendl;
                return;
        }
-        LLParcel* agent_parcel = gParcelMgr->getAgentParcel();
+        LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (!agent_parcel)
        {
                llwarns << "No agent parcel" << llendl;
diff --git a/linden/indra/newview/llfloaterlandmark.h b/linden/indra/newview/llfloaterlandmark.h
index 027cf21..7b5dc80 100644
--- a/linden/indra/newview/llfloaterlandmark.h
+++ b/linden/indra/newview/llfloaterlandmark.h
@@ -67,7 +67,7 @@ public:
                BOOL drop, EDragAndDropType cargo_type, void *cargo_data, 
                EAcceptance *accept,
                LLString& tooltip_msg);
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleKeyHere(KEY key, MASK mask);
        // LLFloater overrides
        virtual void    onClose(bool app_quitting);
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 232055a..36a9ab0 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -184,23 +184,20 @@ BOOL LLFloaterMap::canClose()
 // virtual
 void LLFloaterMap::draw()
 {
-        if( getVisible() )
+        // Note: we can't just gAgent.check cameraMouselook() because the transition states are wrong.
+        if( gAgent.cameraMouselook())
        {
-                // Note: we can't just gAgent.check cameraMouselook() because the transition states are wrong.
+                setMouseOpaque(FALSE);
-                if( gAgent.cameraMouselook())
+                getDragHandle()->setMouseOpaque(FALSE);
-                {
-                        setMouseOpaque(FALSE);
-                        getDragHandle()->setMouseOpaque(FALSE);
-                        drawChild(mMap);
+                drawChild(mMap);
-                }
+        }
-                else
+        else
-                {
+        {
-                        setMouseOpaque(TRUE);
+                setMouseOpaque(TRUE);
-                        getDragHandle()->setMouseOpaque(TRUE);
+                getDragHandle()->setMouseOpaque(TRUE);
-                        LLFloater::draw();
+                LLFloater::draw();
-                }
        }
 }
diff --git a/linden/indra/newview/llfloatermute.cpp b/linden/indra/newview/llfloatermute.cpp
index db88d46..d519791 100644
--- a/linden/indra/newview/llfloatermute.cpp
+++ b/linden/indra/newview/llfloatermute.cpp
@@ -50,7 +50,7 @@
 #include "lltextbox.h"
 #include "llviewertexteditor.h"
 #include "llviewerwindow.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llfocusmgr.h"
 //
@@ -65,10 +65,6 @@ const S32 LINE = 16;
 const S32 LEFT = 2;
 const S32 VPAD = 4;
 const S32 HPAD = 4;
-//
-// Global statics
-//
-LLFloaterMute* gFloaterMute = NULL;
 //-----------------------------------------------------------------------------
 // LLFloaterMuteObjectUI()
@@ -86,7 +82,7 @@ public:
 protected:
        LLFloaterMuteObjectUI();
        virtual ~LLFloaterMuteObjectUI();
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
 private:
        // UI Callbacks
@@ -107,7 +103,7 @@ LLFloaterMuteObjectUI::LLFloaterMuteObjectUI()
          mCallback(NULL),
          mCallbackUserData(NULL)
 {
-        gUICtrlFactory->buildFloater(this, "floater_mute_object.xml", NULL);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_mute_object.xml", NULL);
 }
 // Destroys the object
@@ -166,7 +162,7 @@ void LLFloaterMuteObjectUI::onBtnCancel(void* userdata)
        self->close();
 }
-BOOL LLFloaterMuteObjectUI::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLFloaterMuteObjectUI::handleKeyHere(KEY key, MASK mask)
 {
        if (key == KEY_RETURN && mask == MASK_NONE)
        {
@@ -179,7 +175,7 @@ BOOL LLFloaterMuteObjectUI::handleKeyHere(KEY key, MASK mask, BOOL called_from_p
                return TRUE;
        }
-        return LLFloater::handleKeyHere(key, mask, called_from_parent);
+        return LLFloater::handleKeyHere(key, mask);
 }
 //
@@ -194,7 +190,13 @@ LLFloaterMute::LLFloaterMute(const LLSD& seed)
                          RESIZE_YES, 220, 140, DRAG_ON_TOP, MINIMIZE_YES, CLOSE_YES)
 {
-        gUICtrlFactory->buildFloater(this, "floater_mute.xml", NULL, FALSE);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_mute.xml", NULL, FALSE);
+}
+// LLMuteListObserver callback interface implementation.
+/* virtual */ void LLFloaterMute::onChange()
+{
+        refreshMuteList();
 }
 BOOL LLFloaterMute::postBuild()
@@ -204,8 +206,10 @@ BOOL LLFloaterMute::postBuild()
        childSetAction("Mute object by name...", onClickMuteByName, this);
        childSetAction("Unmute", onClickRemove, this);
-        mMuteList = LLUICtrlFactory::getScrollListByName(this, "mutes");
+        mMuteList = getChild<LLScrollListCtrl>("mutes");
        mMuteList->setCommitOnSelectionChange(TRUE);
+        LLMuteList::getInstance()->addObserver(this);
        
        refreshMuteList();
@@ -226,15 +230,12 @@ void LLFloaterMute::refreshMuteList()
 {
        mMuteList->deleteAllItems();
-        if (gMuteListp)
+        std::vector<LLMute> mutes = LLMuteList::getInstance()->getMutes();
+        std::vector<LLMute>::iterator it;
+        for (it = mutes.begin(); it != mutes.end(); ++it)
        {
-                std::vector<LLMute> mutes = gMuteListp->getMutes();
+                LLString display_name = it->getDisplayName();
-                std::vector<LLMute>::iterator it;
+                mMuteList->addStringUUIDItem(display_name, it->mID);
-                for (it = mutes.begin(); it != mutes.end(); ++it)
-                {
-                        LLString display_name = it->getDisplayName();
-                        mMuteList->addStringUUIDItem(display_name, it->mID);
-                }
        }
        updateButtons();
@@ -285,7 +286,7 @@ void LLFloaterMute::onClickRemove(void *data)
        // now mute.mName has the suffix trimmed off
        
        S32 last_selected = floater->mMuteList->getFirstSelectedIndex();
-        if (gMuteListp->remove(mute))
+        if (LLMuteList::getInstance()->remove(mute))
        {
                // Above removals may rebuild this dialog.
                
@@ -325,7 +326,7 @@ void LLFloaterMute::onPickUser(const std::vector<std::string>& names, const std:
        if (names.empty() || ids.empty()) return;
        LLMute mute(ids[0], names[0], LLMute::AGENT);
-        gMuteListp->add(mute);
+        LLMuteList::getInstance()->add(mute);
        floaterp->updateButtons();
 }
@@ -344,7 +345,7 @@ void LLFloaterMute::callbackMuteByName(const LLString& text, void* data)
        if (text.empty()) return;
        LLMute mute(LLUUID::null, text, LLMute::BY_NAME);
-        BOOL success = gMuteListp->add(mute);
+        BOOL success = LLMuteList::getInstance()->add(mute);
        if (!success)
        {
                gViewerWindow->alertXml("MuteByNameFailed");
diff --git a/linden/indra/newview/llfloatermute.h b/linden/indra/newview/llfloatermute.h
index 801392e..9c7a6f8 100644
--- a/linden/indra/newview/llfloatermute.h
+++ b/linden/indra/newview/llfloatermute.h
@@ -33,6 +33,7 @@
 #define LL_LLFLOATERMUTE_H
 #include "llfloater.h"
+#include "llmutelist.h"
 #include <vector>
 class LLButton;
@@ -42,7 +43,7 @@ class LLUUID;
 class LLScrollListCtrl;
 class LLFloaterMute
-        :       public LLFloater, public LLFloaterSingleton<LLFloaterMute>
+        :       public LLFloater, public LLMuteListObserver, public LLFloaterSingleton<LLFloaterMute>
 {
 public:
        LLFloaterMute(const LLSD& seed);
@@ -58,6 +59,9 @@ public:
        void updateButtons();
+        // LLMuteListObserver callback interface implementation.
+        /* virtual */ void onChange();
 private:
        // UI callbacks
        static void onClickRemove(void *data);
@@ -71,6 +75,5 @@ private:
        LLScrollListCtrl*                       mMuteList;
 };
-extern LLFloaterMute* gFloaterMute;
 #endif
diff --git a/linden/indra/newview/llfloaternamedesc.cpp b/linden/indra/newview/llfloaternamedesc.cpp
index f49c951..eddb4b3 100644
--- a/linden/indra/newview/llfloaternamedesc.cpp
+++ b/linden/indra/newview/llfloaternamedesc.cpp
@@ -45,7 +45,7 @@
 #include "lldir.h"
 #include "llviewercontrol.h"
 #include "llviewermenufile.h"   // upload_new_resource()
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 // linden includes
 #include "llassetstorage.h"
@@ -119,7 +119,7 @@ BOOL LLFloaterNameDesc::postBuild()
        childSetCommitCallback("name_form", doCommit, this);
        childSetValue("name_form", LLSD(asset_name));
-        LLLineEditor *NameEditor = LLViewerUICtrlFactory::getLineEditorByName(this, "name_form");
+        LLLineEditor *NameEditor = getChild<LLLineEditor>("name_form");
        if (NameEditor)
        {
                NameEditor->setMaxTextLength(DB_INV_ITEM_NAME_STR_LEN);
@@ -131,7 +131,7 @@ BOOL LLFloaterNameDesc::postBuild()
        r.setLeftTopAndSize( PREVIEW_HPAD, y, line_width, PREVIEW_LINE_HEIGHT );  
        childSetCommitCallback("description_form", doCommit, this);
-        LLLineEditor *DescEditor = LLViewerUICtrlFactory::getLineEditorByName(this, "description_form");
+        LLLineEditor *DescEditor = getChild<LLLineEditor>("description_form");
        if (DescEditor)
        {
                DescEditor->setMaxTextLength(DB_INV_ITEM_DESC_STR_LEN);
diff --git a/linden/indra/newview/llfloaternewim.cpp b/linden/indra/newview/llfloaternewim.cpp
index 6363b4e..dc9fabf 100644
--- a/linden/indra/newview/llfloaternewim.cpp
+++ b/linden/indra/newview/llfloaternewim.cpp
@@ -30,29 +30,13 @@
 */
 #include "llviewerprecompiledheaders.h"
 #include "llfloaternewim.h"
+#include "lluictrlfactory.h"
-#include "llvieweruictrlfactory.h"
-#include "llinstantmessage.h"
-#include "sound_ids.h"
-#include "audioengine.h"
-#include "llfontgl.h"
-#include "llnamevalue.h"
-#include "llagent.h"
-#include "llbutton.h"
-#include "llfloater.h"
-#include "llfontgl.h"
-#include "llimpanel.h"
-#include "llkeyboard.h"
 #include "llnamelistctrl.h"
 #include "llresmgr.h"
 #include "lltabcontainer.h"
 #include "llimview.h"
-#include "lltextbox.h"
-extern LLAudioEngine*   gAudiop;
 S32 COL_1_WIDTH = 200;
 static LLString sOnlineDescriptor = "*";
@@ -60,20 +44,20 @@ static LLString sNameFormat = "[FIRST] [LAST]";
 LLFloaterNewIM::LLFloaterNewIM()
 {
-        gUICtrlFactory->buildFloater(this, "floater_new_im.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_new_im.xml");
 }
 BOOL LLFloaterNewIM::postBuild()
 {
-        requires("start_btn", WIDGET_TYPE_BUTTON);
+        requires<LLButton>("start_btn");
-        requires("close_btn", WIDGET_TYPE_BUTTON);
+        requires<LLButton>("close_btn");
-        requires("user_list", WIDGET_TYPE_NAME_LIST);
+        requires<LLNameListCtrl>("user_list");
        if (checkRequirements())
        {
                childSetAction("start_btn", &LLFloaterNewIM::onStart, this);
                childSetAction("close_btn", &LLFloaterNewIM::onClickClose, this);
-                mSelectionList = LLViewerUICtrlFactory::getNameListByName(this, "user_list");
+                mSelectionList = getChild<LLNameListCtrl>("user_list");
                if (mSelectionList)
                {
                        mSelectionList->setDoubleClickCallback(&LLFloaterNewIM::onStart);
@@ -81,7 +65,7 @@ BOOL LLFloaterNewIM::postBuild()
                }
                else
                {
-                        llwarns << "LLViewerUICtrlFactory::getNameListByName() returned NULL for 'user_list'" << llendl;
+                        llwarns << "LLUICtrlFactory::getNameListByName() returned NULL for 'user_list'" << llendl;
                }
                sOnlineDescriptor = getString("online_descriptor");
                sNameFormat = getString("name_format");
@@ -224,17 +208,14 @@ void LLFloaterNewIM::onClickClose(void *userdata)
 }
-BOOL LLFloaterNewIM::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLFloaterNewIM::handleKeyHere(KEY key, MASK mask)
 {
-        BOOL handled = LLFloater::handleKeyHere(key, mask, called_from_parent);
+        BOOL handled = LLFloater::handleKeyHere(key, mask);
-        if (getVisible() && getEnabled() && !called_from_parent)
+        if ( KEY_ESCAPE == key )
        {
-                if ( KEY_ESCAPE == key )
+                handled = TRUE;
-                {
+                // Close talk panel on escape
-                        handled = TRUE;
+                gIMMgr->toggle(NULL);
-                        // Close talk panel on escape
-                        gIMMgr->toggle(NULL);
-                }
        }
        // Might need to call base class here if not handled
diff --git a/linden/indra/newview/llfloaternewim.h b/linden/indra/newview/llfloaternewim.h
index 8636e90..e4a7717 100644
--- a/linden/indra/newview/llfloaternewim.h
+++ b/linden/indra/newview/llfloaternewim.h
@@ -44,7 +44,7 @@ public:
        /*virtual*/ BOOL postBuild();
-        /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
        virtual BOOL canClose();
        virtual void close(bool app_quitting);
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index bd7bca8..13230a9 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -50,7 +50,7 @@
 #include "llselectmgr.h"
 #include "lluiconstants.h"
 #include "llviewerobject.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
@@ -63,7 +63,7 @@ LLFloaterOpenObject::LLFloaterOpenObject()
 {
        LLCallbackMap::map_t factory_map;
        factory_map["object_contents"] = LLCallbackMap(createPanelInventory, this);
-        gUICtrlFactory->buildFloater(this,"floater_openobject.xml",&factory_map);
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_openobject.xml",&factory_map);
        childSetAction("copy_to_inventory_button", onClickMoveToInventory, this);
        childSetAction("copy_and_wear_button", onClickMoveAndWear, this);
@@ -106,7 +106,7 @@ void LLFloaterOpenObject::dirty()
 // static
 void LLFloaterOpenObject::show()
 {
-        LLObjectSelectionHandle object_selection = gSelectMgr->getSelection();
+        LLObjectSelectionHandle object_selection = LLSelectMgr::getInstance()->getSelection();
        if (object_selection->getRootObjectCount() != 1)
        {
                gViewerWindow->alertXml("UnableToViewContentsMoreThanOne");
@@ -123,7 +123,7 @@ void LLFloaterOpenObject::show()
        sInstance->open();              /* Flawfinder: ignore */
        sInstance->setFocus(TRUE);
-        sInstance->mObjectSelection = gSelectMgr->getEditSelection();
+        sInstance->mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
 }
diff --git a/linden/indra/newview/llfloaterparcel.cpp b/linden/indra/newview/llfloaterparcel.cpp
index e3189a9..6288782 100644
--- a/linden/indra/newview/llfloaterparcel.cpp
+++ b/linden/indra/newview/llfloaterparcel.cpp
@@ -37,10 +37,10 @@
 // viewer project includes
 #include "llcommandhandler.h"
 #include "llpanelplace.h"
-#include "llvieweruictrlfactory.h"
 // linden library includes
 #include "lluuid.h"
+#include "lluictrlfactory.h"
 //-----------------------------------------------------------------------------
 // Globals
@@ -84,7 +84,7 @@ void*	LLFloaterParcelInfo::createPanelPlace(void*	data)
 {
        LLFloaterParcelInfo* self = (LLFloaterParcelInfo*)data;
        self->mPanelParcelp = new LLPanelPlace(); // allow edit self
-        gUICtrlFactory->buildPanel(self->mPanelParcelp, "panel_place.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(self->mPanelParcelp, "panel_place.xml");
        return self->mPanelParcelp;
 }
@@ -96,7 +96,7 @@ LLFloaterParcelInfo::LLFloaterParcelInfo(const std::string& name, const LLUUID &
        mParcelID( parcel_id )
 {
        mFactoryMap["place_details_panel"] = LLCallbackMap(LLFloaterParcelInfo::createPanelPlace, this);
-        gUICtrlFactory->buildFloater(this, "floater_preview_url.xml", &getFactoryMap());
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml", &getFactoryMap());
        gPlaceInfoInstances.addData(parcel_id, this);
 }
diff --git a/linden/indra/newview/llfloaterpermissionsmgr.cpp b/linden/indra/newview/llfloaterpermissionsmgr.cpp
index 9cc223e..cd9a1de 100644
--- a/linden/indra/newview/llfloaterpermissionsmgr.cpp
+++ b/linden/indra/newview/llfloaterpermissionsmgr.cpp
@@ -102,16 +102,6 @@ LLPermissionsView::LLPermissionsView(const LLRect &rect) : LLView("permissions_v
 {
 }
-EWidgetType LLPermissionsView::getWidgetType() const
-{
-        return WIDGET_TYPE_PERMISSIONS_VIEW;
-}
-LLString LLPermissionsView::getWidgetTag() const
-{
-        return LL_PERMISSIONS_VIEW_TAG;
-}
 void LLPermissionsView::clearPermissionsData() 
 {
        deleteAllChildren();
diff --git a/linden/indra/newview/llfloaterpermissionsmgr.h b/linden/indra/newview/llfloaterpermissionsmgr.h
index acd4b5e..01e1ecc 100644
--- a/linden/indra/newview/llfloaterpermissionsmgr.h
+++ b/linden/indra/newview/llfloaterpermissionsmgr.h
@@ -78,9 +78,6 @@ public:
        LLPermissionsView(const LLRect& rect);
        virtual ~LLPermissionsView() {};
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
 public:
        void clearPermissionsData();
        void addPermissionsData(const LLString& object_name, const LLUUID& object_id, U32 permissions_flags);
diff --git a/linden/indra/newview/llfloaterpostcard.cpp b/linden/indra/newview/llfloaterpostcard.cpp
index 47f59a6..b140b1c 100644
--- a/linden/indra/newview/llfloaterpostcard.cpp
+++ b/linden/indra/newview/llfloaterpostcard.cpp
@@ -46,7 +46,7 @@
 #include "llbutton.h"
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "lluploaddialog.h"
 #include "llviewerstats.h"
 #include "llviewerwindow.h"
@@ -119,7 +119,7 @@ BOOL LLFloaterPostcard::postBuild()
        gAgent.buildFullname(name_string);
        childSetValue("name_form", LLSD(name_string));
-        LLTextEditor* MsgField = LLUICtrlFactory::getTextEditorByName(this, "msg_form");
+        LLTextEditor* MsgField = getChild<LLTextEditor>("msg_form");
        if (MsgField)
        {
                MsgField->setWordWrap(TRUE);
@@ -142,7 +142,7 @@ LLFloaterPostcard* LLFloaterPostcard::showFromSnapshot(LLImageJPEG *jpeg, LLImag
        // It's now our job to clean them up
        LLFloaterPostcard *instance = new LLFloaterPostcard(jpeg, img, image_scale, pos_taken_global);
-        gUICtrlFactory->buildFloater(instance, "floater_postcard.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(instance, "floater_postcard.xml");
        S32 left, top;
        gFloaterView->getNewFloaterPosition(&left, &top);
@@ -158,7 +158,7 @@ void LLFloaterPostcard::draw()
        LLGLSUIDefault gls_ui;
        LLFloater::draw();
-        if(getVisible() && !isMinimized() && mViewerImage.notNull() && mJPEGImage.notNull()) 
+        if(!isMinimized() && mViewerImage.notNull() && mJPEGImage.notNull()) 
        {
                LLRect rect(getRect());
@@ -332,7 +332,7 @@ void LLFloaterPostcard::onMsgFormFocusRecieved(LLFocusableElement* receiver, voi
        LLFloaterPostcard* self = (LLFloaterPostcard *)data;
        if(self) 
        {
-                LLTextEditor* msgForm = LLUICtrlFactory::getTextEditorByName(self, "msg_form");
+                LLTextEditor* msgForm = self->getChild<LLTextEditor>("msg_form");
                if(msgForm && msgForm == receiver && msgForm->hasFocus() && !(self->mHasFirstMsgFocus))
                {
                        self->mHasFirstMsgFocus = true;
diff --git a/linden/indra/newview/llfloaterpostprocess.cpp b/linden/indra/newview/llfloaterpostprocess.cpp
index 999ad5d..40589fb 100644
--- a/linden/indra/newview/llfloaterpostprocess.cpp
+++ b/linden/indra/newview/llfloaterpostprocess.cpp
@@ -35,7 +35,7 @@
 #include "llsliderctrl.h"
 #include "llcheckboxctrl.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerdisplay.h"
 #include "llpostprocess.h"
 #include "llcombobox.h"
@@ -48,7 +48,7 @@ LLFloaterPostProcess* LLFloaterPostProcess::sPostProcess = NULL;
 LLFloaterPostProcess::LLFloaterPostProcess() : LLFloater("Post-Process Floater")
 {
-        gUICtrlFactory->buildFloater(this, "floater_post_process.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_post_process.xml");
        /// Color Filter Callbacks
        childSetCommitCallback("ColorFilterToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_color_filter");
@@ -75,11 +75,11 @@ LLFloaterPostProcess::LLFloaterPostProcess() : LLFloater("Post-Process Floater")
        childSetCommitCallback("BloomStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_strength");
        // Effect loading and saving.
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(this, "PPEffectsCombo");
+        LLComboBox* comboBox = getChild<LLComboBox>("PPEffectsCombo");
        childSetAction("PPLoadEffect", &LLFloaterPostProcess::onLoadEffect, comboBox);
        comboBox->setCommitCallback(onChangeEffectName);
-        LLLineEditor* editBox = LLUICtrlFactory::getLineEditorByName(this, "PPEffectNameEditor");
+        LLLineEditor* editBox = getChild<LLLineEditor>("PPEffectNameEditor");
        childSetAction("PPSaveEffect", &LLFloaterPostProcess::onSaveEffect, editBox);
        syncMenu();
@@ -186,8 +186,7 @@ void LLFloaterPostProcess::onChangeEffectName(LLUICtrl* ctrl, void * userData)
 {
        // get the combo box and name
        LLComboBox * comboBox = static_cast<LLComboBox*>(ctrl);
-        LLLineEditor* editBox = LLUICtrlFactory::getLineEditorByName(sPostProcess, 
+        LLLineEditor* editBox = sPostProcess->getChild<LLLineEditor>("PPEffectNameEditor");
-                "PPEffectNameEditor");
        // set the parameter's new name
        editBox->setValue(comboBox->getSelectedValue());
@@ -231,23 +230,21 @@ void LLFloaterPostProcess::onClose(bool app_quitting)
 void LLFloaterPostProcess::syncMenu()
 {
        // add the combo boxe contents
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(this, "PPEffectsCombo");
+        LLComboBox* comboBox = getChild<LLComboBox>("PPEffectsCombo");
-        if(comboBox != NULL) {
+        comboBox->removeall();
-                comboBox->removeall();
-        
+        LLSD::map_const_iterator currEffect;
-                LLSD::map_const_iterator currEffect;
+        for(currEffect = gPostProcess->mAllEffects.beginMap();
-                for(currEffect = gPostProcess->mAllEffects.beginMap();
+                currEffect != gPostProcess->mAllEffects.endMap();
-                        currEffect != gPostProcess->mAllEffects.endMap();
+                ++currEffect) 
-                        ++currEffect) 
+        {
-                {
+                comboBox->add(currEffect->first);
-                        comboBox->add(currEffect->first);
-                }
-                // set the current effect as selected.
-                comboBox->selectByValue(gPostProcess->getSelectedEffect());
        }
+        // set the current effect as selected.
+        comboBox->selectByValue(gPostProcess->getSelectedEffect());
        /// Sync Color Filter Menu
        childSetValue("ColorFilterToggle", gPostProcess->tweaks.useColorFilter());
        //childSetValue("ColorFilterGamma", gPostProcess->tweaks.gamma());
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index ff57b5c..f267a2d 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -69,7 +69,7 @@
 #include "llagent.h"
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llkeyboard.h"
 #include "llscrollcontainer.h"
@@ -192,7 +192,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
        mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
        mMsgPanel->setDefaultBtn(default_btn);
-        mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab"));
+        if (!mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
+        {
+                mTabContainer->selectFirstTab();
+        }
 }
 LLPreferenceCore::~LLPreferenceCore()
@@ -326,36 +329,36 @@ void LLPreferenceCore::refreshEnabledGraphics()
 LLFloaterPreference::LLFloaterPreference()
 {
-        gUICtrlFactory->buildFloater(this, "floater_preferences.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preferences.xml");
 }
 BOOL LLFloaterPreference::postBuild()
 {
-        requires("About...", WIDGET_TYPE_BUTTON);
+        requires<LLButton>("About...");
-        requires("OK", WIDGET_TYPE_BUTTON);
+        requires<LLButton>("OK");
-        requires("Cancel", WIDGET_TYPE_BUTTON);
+        requires<LLButton>("Cancel");
-        requires("Apply", WIDGET_TYPE_BUTTON);
+        requires<LLButton>("Apply");
-        requires("pref core", WIDGET_TYPE_TAB_CONTAINER);
+        requires<LLTabContainer>("pref core");
        if (!checkRequirements())
        {
                return FALSE;
        }
-        mAboutBtn = LLUICtrlFactory::getButtonByName(this, "About...");
+        mAboutBtn = getChild<LLButton>("About...");
        mAboutBtn->setClickedCallback(onClickAbout, this);
        
-        mApplyBtn = LLUICtrlFactory::getButtonByName(this, "Apply");
+        mApplyBtn = getChild<LLButton>("Apply");
        mApplyBtn->setClickedCallback(onBtnApply, this);
                
-        mCancelBtn = LLUICtrlFactory::getButtonByName(this, "Cancel");
+        mCancelBtn = getChild<LLButton>("Cancel");
        mCancelBtn->setClickedCallback(onBtnCancel, this);
-        mOKBtn = LLUICtrlFactory::getButtonByName(this, "OK");
+        mOKBtn = getChild<LLButton>("OK");
        mOKBtn->setClickedCallback(onBtnOK, this);
                        
        mPreferenceCore = new LLPreferenceCore(
-                LLUICtrlFactory::getTabContainerByName(this, "pref core"),
+                getChild<LLTabContainer>("pref core"),
                getChild<LLButton>("OK")
                );
        
@@ -371,16 +374,6 @@ LLFloaterPreference::~LLFloaterPreference()
        delete mPreferenceCore;
 }
-void LLFloaterPreference::draw()
-{
-        if( getVisible() )
-        {
-                LLFloater::draw();
-        }
-}
 void LLFloaterPreference::apply()
 {
        this->mPreferenceCore->apply();
@@ -446,7 +439,7 @@ void LLFloaterPreference::onBtnOK( void* userdata )
                fp->apply();
                fp->close(false);
-                gSavedSettings.saveToFile( gSettingsFileName, TRUE );
+                gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
                
                std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
                // save all settings, even if equals defaults
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index ad4b3b8..4db42a7 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -118,7 +118,6 @@ public:
 protected:
        LLPreferenceCore                *mPreferenceCore;
-        /*virtual*/ void                draw();
        /*virtual*/ void                onClose(bool app_quitting);
        LLButton*       mAboutBtn;
diff --git a/linden/indra/newview/llfloaterproperties.cpp b/linden/indra/newview/llfloaterproperties.cpp
index 3519520..0d2cd5f 100644
--- a/linden/indra/newview/llfloaterproperties.cpp
+++ b/linden/indra/newview/llfloaterproperties.cpp
@@ -56,7 +56,7 @@
 #include "llviewerregion.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -65,7 +65,7 @@
 // helper class to watch the inventory. 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLPropertiesObserver : public LLInventoryObserver
+class LLPropertiesObserver : public LLInventoryObserver, public LLSingleton<LLPropertiesObserver>
 {
 public:
        LLPropertiesObserver() {}
@@ -73,7 +73,6 @@ public:
        virtual void changed(U32 mask);
 };
-LLPropertiesObserver* gPropertiesObserver = NULL;
 void LLPropertiesObserver::changed(U32 mask)
 {
        // if there's a change we're interested in.
@@ -144,13 +143,13 @@ LLFloaterProperties::LLFloaterProperties(const std::string& name, const LLRect&
        mObjectID(object_id),
        mDirty(TRUE)
 {
-        gUICtrlFactory->buildFloater(this,"floater_inventory_item_properties.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_inventory_item_properties.xml");
        // hack to make sure these floaters are observing the inventory.
-        if(!gPropertiesObserver)
+        if(!gInventory.containsObserver(LLPropertiesObserver::getInstance()))
        {
-                gPropertiesObserver = new LLPropertiesObserver;
+                // Note: this is where gPropertiesObserver used to be constructed.
-                gInventory.addObserver(gPropertiesObserver);
+                gInventory.addObserver(LLPropertiesObserver::getInstance());
        }
        // add the object to the static structure
        LLUUID key = mItemID ^ mObjectID;
@@ -473,7 +472,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
        {
                childSetValue("CheckShareWithGroup",LLSD((BOOL)TRUE));
-                LLCheckBoxCtrl* ctl = LLUICtrlFactory::getCheckBoxByName(this,"CheckShareWithGroup");
+                LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
                if(ctl)
                {
                        ctl->setTentative(FALSE);
@@ -482,7 +481,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
        else if (!is_group_copy && !is_group_modify && !is_group_move)
        {
                childSetValue("CheckShareWithGroup",LLSD((BOOL)FALSE));
-                LLCheckBoxCtrl* ctl = LLUICtrlFactory::getCheckBoxByName(this,"CheckShareWithGroup");
+                LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
                if(ctl)
                {
                        ctl->setTentative(FALSE);
@@ -490,7 +489,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
        }
        else
        {
-                LLCheckBoxCtrl* ctl = LLUICtrlFactory::getCheckBoxByName(this,"CheckShareWithGroup");
+                LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
                if(ctl)
                {
                        ctl->setTentative(TRUE);
@@ -543,7 +542,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
        childSetValue("CheckNextOwnerCopy",LLSD(BOOL(next_owner_mask & PERM_COPY)));
        childSetValue("CheckNextOwnerTransfer",LLSD(BOOL(next_owner_mask & PERM_TRANSFER)));
-        LLRadioGroup* radioSaleType = LLUICtrlFactory::getRadioGroupByName(this,"RadioSaleType");
+        LLRadioGroup* radioSaleType = getChild<LLRadioGroup>("RadioSaleType");
        if (is_for_sale)
        {
                radioSaleType->setSelectedIndex((S32)sale_info.getSaleType() - 1);
@@ -605,7 +604,7 @@ void LLFloaterProperties::onCommitName(LLUICtrl* ctrl, void* data)
        {
                return;
        }
-        LLLineEditor* labelItemName = LLUICtrlFactory::getLineEditorByName(self,"LabelItemName");
+        LLLineEditor* labelItemName = self->getChild<LLLineEditor>("LabelItemName");
        if(labelItemName&&
           (item->getName() != labelItemName->getText()) && 
@@ -642,7 +641,7 @@ void LLFloaterProperties::onCommitDescription(LLUICtrl* ctrl, void* data)
        LLViewerInventoryItem* item = (LLViewerInventoryItem*)self->findItem();
        if(!item) return;
-        LLLineEditor* labelItemDesc = LLUICtrlFactory::getLineEditorByName(self,"LabelItemDesc");
+        LLLineEditor* labelItemDesc = self->getChild<LLLineEditor>("LabelItemDesc");
        if(!labelItemDesc)
        {
                return;
@@ -684,7 +683,7 @@ void LLFloaterProperties::onCommitPermissions(LLUICtrl* ctrl, void* data)
        LLPermissions perm(item->getPermissions());
-        LLCheckBoxCtrl* CheckShareWithGroup = LLUICtrlFactory::getCheckBoxByName(self,"CheckShareWithGroup");
+        LLCheckBoxCtrl* CheckShareWithGroup = self->getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
        if(CheckShareWithGroup)
        {
@@ -692,26 +691,26 @@ void LLFloaterProperties::onCommitPermissions(LLUICtrl* ctrl, void* data)
                                                CheckShareWithGroup->get(),
                                                PERM_MODIFY | PERM_MOVE | PERM_COPY);
        }
-        LLCheckBoxCtrl* CheckEveryoneCopy = LLUICtrlFactory::getCheckBoxByName(self,"CheckEveryoneCopy");
+        LLCheckBoxCtrl* CheckEveryoneCopy = self->getChild<LLCheckBoxCtrl>("CheckEveryoneCopy");
        if(CheckEveryoneCopy)
        {
                perm.setEveryoneBits(gAgent.getID(), gAgent.getGroupID(),
                                                 CheckEveryoneCopy->get(), PERM_COPY);
        }
-        LLCheckBoxCtrl* CheckNextOwnerModify = LLUICtrlFactory::getCheckBoxByName(self,"CheckNextOwnerModify");
+        LLCheckBoxCtrl* CheckNextOwnerModify = self->getChild<LLCheckBoxCtrl>("CheckNextOwnerModify");
        if(CheckNextOwnerModify)
        {
                perm.setNextOwnerBits(gAgent.getID(), gAgent.getGroupID(),
                                                        CheckNextOwnerModify->get(), PERM_MODIFY);
        }
-        LLCheckBoxCtrl* CheckNextOwnerCopy = LLUICtrlFactory::getCheckBoxByName(self,"CheckNextOwnerCopy");
+        LLCheckBoxCtrl* CheckNextOwnerCopy = self->getChild<LLCheckBoxCtrl>("CheckNextOwnerCopy");
        if(CheckNextOwnerCopy)
        {
                perm.setNextOwnerBits(gAgent.getID(), gAgent.getGroupID(),
                                                        CheckNextOwnerCopy->get(), PERM_COPY);
        }
-        LLCheckBoxCtrl* CheckNextOwnerTransfer = LLUICtrlFactory::getCheckBoxByName(self,"CheckNextOwnerTransfer");
+        LLCheckBoxCtrl* CheckNextOwnerTransfer = self->getChild<LLCheckBoxCtrl>("CheckNextOwnerTransfer");
        if(CheckNextOwnerTransfer)
        {
                perm.setNextOwnerBits(gAgent.getID(), gAgent.getGroupID(),
@@ -805,7 +804,7 @@ void LLFloaterProperties::updateSaleInfo()
                // turn on sale info
                LLSaleInfo::EForSale sale_type = LLSaleInfo::FS_COPY;
        
-                LLRadioGroup* RadioSaleType = LLUICtrlFactory::getRadioGroupByName(this,"RadioSaleType");
+                LLRadioGroup* RadioSaleType = getChild<LLRadioGroup>("RadioSaleType");
                if(RadioSaleType)
                {
                        switch (RadioSaleType->getSelectedIndex())
@@ -832,7 +831,7 @@ void LLFloaterProperties::updateSaleInfo()
                        sale_type = LLSaleInfo::FS_ORIGINAL;
                }
-                LLLineEditor* EditPrice = LLUICtrlFactory::getLineEditorByName(this,"EditPrice");
+                LLLineEditor* EditPrice = getChild<LLLineEditor>("EditPrice");
                
                S32 price = -1;
                if(EditPrice)
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 8043fe0..12834b3 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -68,7 +68,7 @@
 #include "llinventory.h"
 #include "lltexturectrl.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerimage.h"
 #include "llviewerimagelist.h"
 #include "llviewerregion.h"
@@ -85,20 +85,6 @@ const S32 CORNER_COUNT = 4;
 /// Local class declaration
 ///----------------------------------------------------------------------------
-/*
-class LLDispatchSetEstateOwner : public LLDispatchHandler
-{
-public:
-        LLDispatchSetEstateOwner() {}
-        virtual ~LLDispatchSetEstateOwner() {}
-        virtual bool operator()(
-                const LLDispatcher* dispatcher,
-                const std::string& key,
-                const sparam_t& strings,
-                const iparam_t& integers);
-};
-*/
 class LLDispatchEstateUpdateInfo : public LLDispatchHandler
 {
 public:
@@ -168,43 +154,43 @@ LLUUID LLFloaterRegionInfo::sRequestInvoice;
 LLFloaterRegionInfo::LLFloaterRegionInfo(const LLSD& seed)
 {
-        gUICtrlFactory->buildFloater(this, "floater_region_info.xml", NULL, FALSE);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_info.xml", NULL, FALSE);
 }
 BOOL LLFloaterRegionInfo::postBuild()
 {
-        mTab = gUICtrlFactory->getTabContainerByName(this, "region_panels");
+        mTab = getChild<LLTabContainer>("region_panels");
        // contruct the panels
        LLPanelRegionInfo* panel;
        panel = new LLPanelRegionGeneralInfo;
        mInfoPanels.push_back(panel);
-        gUICtrlFactory->buildPanel(panel, "panel_region_general.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_general.xml");
        mTab->addTabPanel(panel, panel->getLabel(), TRUE);
        panel = new LLPanelRegionDebugInfo;
        mInfoPanels.push_back(panel);
-        gUICtrlFactory->buildPanel(panel, "panel_region_debug.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_debug.xml");
        mTab->addTabPanel(panel, panel->getLabel(), FALSE);
        panel = new LLPanelRegionTextureInfo;
        mInfoPanels.push_back(panel);
-        gUICtrlFactory->buildPanel(panel, "panel_region_texture.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_texture.xml");
        mTab->addTabPanel(panel, panel->getLabel(), FALSE);
        panel = new LLPanelRegionTerrainInfo;
        mInfoPanels.push_back(panel);
-        gUICtrlFactory->buildPanel(panel, "panel_region_terrain.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_terrain.xml");
        mTab->addTabPanel(panel, panel->getLabel(), FALSE);
        panel = new LLPanelEstateInfo;
        mInfoPanels.push_back(panel);
-        gUICtrlFactory->buildPanel(panel, "panel_region_estate.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_estate.xml");
        mTab->addTabPanel(panel, panel->getLabel(), FALSE);
        panel = new LLPanelEstateCovenant;
        mInfoPanels.push_back(panel);
-        gUICtrlFactory->buildPanel(panel, "panel_region_covenant.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_covenant.xml");
        mTab->addTabPanel(panel, panel->getLabel(), FALSE);
        gMessageSystem->setHandlerFunc(
@@ -225,14 +211,21 @@ void LLFloaterRegionInfo::onOpen()
        gFloaterView->getNewFloaterPosition(&left, &top);
        rect.translate(left,top);
-        requestRegionInfo();
        refreshFromRegion(gAgent.getRegion());
+        requestRegionInfo();
        LLFloater::onOpen();
 }
 // static
 void LLFloaterRegionInfo::requestRegionInfo()
 {
+        LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
+        tab->getChild<LLPanel>("General")->setCtrlsEnabled(FALSE);
+        tab->getChild<LLPanel>("Debug")->setCtrlsEnabled(FALSE);
+        tab->getChild<LLPanel>("Terrain")->setCtrlsEnabled(FALSE);
+        tab->getChild<LLPanel>("Estate")->setCtrlsEnabled(FALSE);
        // Must allow anyone to request the RegionInfo data
        // so non-owners/non-gods can see the values. 
        // Therefore can't use an EstateOwnerMessage JC
@@ -242,7 +235,6 @@ void LLFloaterRegionInfo::requestRegionInfo()
        msg->addUUID("AgentID", gAgent.getID());
        msg->addUUID("SessionID", gAgent.getSessionID());
        gAgent.sendReliableMessage();
 }
 // static
@@ -259,11 +251,8 @@ void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
                LLPanelEstateInfo::initDispatch(dispatch);
        }
-        LLTabContainer* tab = LLUICtrlFactory::getTabContainerByName(findInstance(), "region_panels");
+        LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
-        if (!tab) return;
+        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
-        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)LLUICtrlFactory::getPanelByName(tab, "Estate");
-        if (!panel) return;
        // unpack the message
        std::string request;
@@ -278,6 +267,11 @@ void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
        //dispatch the message
        dispatch.dispatch(request, invoice, strings);
+        LLViewerRegion* region = gAgent.getRegion();
+        BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
+        panel->setCtrlsEnabled(allow_modify);
 }
@@ -292,8 +286,10 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
                return;
        }
        
-        LLTabContainer* tab = LLUICtrlFactory::getTabContainerByName(findInstance(), "region_panels");
+        LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
-        if(!tab) return;
+        LLViewerRegion* region = gAgent.getRegion();
+        BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
        // extract message
        char sim_name[MAX_STRING];              /* Flawfinder: ignore*/
@@ -319,8 +315,7 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
        msg->getF32("RegionInfo", "SunHour", sun_hour);
        // GENERAL PANEL
-        panel = LLUICtrlFactory::getPanelByName(tab, "General");
+        panel = tab->getChild<LLPanel>("General");
-        if(!panel) return;
        panel->childSetValue("region_text", LLSD(sim_name));
        panel->childSetValue("block_terraform_check", (region_flags & REGION_FLAGS_BLOCK_TERRAFORM) ? TRUE : FALSE );
@@ -335,27 +330,26 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
        panel->childSetValue("access_combo", LLSD(LLViewerRegion::accessToString(sim_access)) );
-        // detect teen grid for maturity
+        // 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));
+        panel->setCtrlsEnabled(allow_modify);
        
        // DEBUG PANEL
-        panel = LLUICtrlFactory::getPanelByName(tab, "Debug");
+        panel = tab->getChild<LLPanel>("Debug");
-        if(!panel) return;
        panel->childSetValue("region_text", LLSD(sim_name) );
        panel->childSetValue("disable_scripts_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_SCRIPTS)) );
        panel->childSetValue("disable_collisions_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_COLLISIONS)) );
        panel->childSetValue("disable_physics_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_PHYSICS)) );
+        panel->setCtrlsEnabled(allow_modify);
        // TERRAIN PANEL
-        panel = LLUICtrlFactory::getPanelByName(tab, "Terrain");
+        panel = tab->getChild<LLPanel>("Terrain");
-        if(!panel) return;
        panel->childSetValue("region_text", LLSD(sim_name));
        panel->childSetValue("water_height_spin", LLSD(water_height));
@@ -363,11 +357,11 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
        panel->childSetValue("terrain_lower_spin", LLSD(terrain_lower_limit));
        panel->childSetValue("use_estate_sun_check", LLSD(use_estate_sun));
-        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);
        panel->childSetValue("sun_hour_slider", LLSD(sun_hour));
        panel->childSetEnabled("sun_hour_slider", allow_modify && !use_estate_sun);
+        panel->setCtrlsEnabled(allow_modify);
        getInstance()->refreshFromRegion( gAgent.getRegion() );
 }
@@ -377,9 +371,8 @@ LLPanelEstateInfo* LLFloaterRegionInfo::getPanelEstate()
 {
        LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
        if (!floater) return NULL;
-        LLTabContainer* tab = LLUICtrlFactory::getTabContainerByName(floater, "region_panels");
+        LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
-        if (!tab) return NULL;
+        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
-        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)LLUICtrlFactory::getPanelByName(tab,"Estate");
        return panel;
 }
@@ -388,9 +381,8 @@ LLPanelEstateCovenant* LLFloaterRegionInfo::getPanelCovenant()
 {
        LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
        if (!floater) return NULL;
-        LLTabContainer* tab = LLUICtrlFactory::getTabContainerByName(floater, "region_panels");
+        LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
-        if (!tab) return NULL;
+        LLPanelEstateCovenant* panel = (LLPanelEstateCovenant*)tab->getChild<LLPanel>("Covenant");
-        LLPanelEstateCovenant* panel = (LLPanelEstateCovenant*)LLUICtrlFactory::getPanelByName(tab, "Covenant");
        return panel;
 }
@@ -584,7 +576,7 @@ BOOL LLPanelRegionGeneralInfo::postBuild()
        initCtrl("block_terraform_check");
        initCtrl("block_fly_check");
        initCtrl("allow_damage_check");
-    initCtrl("allow_land_resell_check");
+        initCtrl("allow_land_resell_check");
        initCtrl("allow_parcel_changes_check");
        initCtrl("agent_limit_spin");
        initCtrl("object_bonus_spin");
@@ -1027,7 +1019,7 @@ bool LLPanelRegionTextureInfo::refreshFromRegion(LLViewerRegion* region)
        for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
        {
                snprintf(buffer, MAX_STRING, "texture_detail_%d", i);                   /* Flawfinder: ignore */
-                texture_ctrl = LLViewerUICtrlFactory::getTexturePickerByName(this, buffer);
+                texture_ctrl = getChild<LLTextureCtrl>(buffer);
                if(texture_ctrl)
                {
                        lldebugs << "Detail Texture " << i << ": "
@@ -1075,14 +1067,6 @@ BOOL LLPanelRegionTextureInfo::postBuild()
        return LLPanelRegionInfo::postBuild();
 }
-void LLPanelRegionTextureInfo::draw()
-{
-        if(getVisible())
-        {
-                LLPanel::draw();
-        }
-}
 BOOL LLPanelRegionTextureInfo::sendUpdate()
 {
        llinfos << "LLPanelRegionTextureInfo::sendUpdate()" << llendl;
@@ -1105,7 +1089,7 @@ BOOL LLPanelRegionTextureInfo::sendUpdate()
        for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
        {
                snprintf(buffer, MAX_STRING, "texture_detail_%d", i);                   /* Flawfinder: ignore */
-                texture_ctrl = LLViewerUICtrlFactory::getTexturePickerByName(this, buffer);
+                texture_ctrl = getChild<LLTextureCtrl>(buffer);
                if(texture_ctrl)
                {
                        LLUUID tmp_id(texture_ctrl->getImageAssetID());
@@ -1135,7 +1119,7 @@ BOOL LLPanelRegionTextureInfo::validateTextureSizes()
        {
                char buffer[MAX_STRING];                /* Flawfinder: ignore */
                snprintf(buffer, MAX_STRING, "texture_detail_%d", i);                   /* Flawfinder: ignore */
-                LLTextureCtrl* texture_ctrl = LLViewerUICtrlFactory::getTexturePickerByName(this, buffer);
+                LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(buffer);
                if (!texture_ctrl) continue;
                LLUUID image_asset_id = texture_ctrl->getImageAssetID();
@@ -1257,10 +1241,10 @@ BOOL LLPanelRegionTerrainInfo::sendUpdate()
        LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
        if (!floater) return true;
-        LLTabContainer* tab = LLUICtrlFactory::getTabContainerByName(floater, "region_panels");
+        LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
        if (!tab) return true;
-        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)LLUICtrlFactory::getPanelByName(tab, "Estate");
+        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
        if (!panel) return true;
        BOOL estate_global_time = panel->getGlobalTime();
@@ -1690,11 +1674,12 @@ bool LLPanelEstateInfo::isLindenEstate()
        return (estate_id <= ESTATE_LAST_LINDEN);
 }
+typedef std::vector<LLUUID> AgentOrGroupIDsVector;
 struct LLEstateAccessChangeInfo
 {
        U32 mOperationFlag;     // ESTATE_ACCESS_BANNED_AGENT_ADD, _REMOVE, etc.
        LLString mDialogName;
-        LLUUID mAgentOrGroupID;
+        AgentOrGroupIDsVector mAgentOrGroupIDs; // List of agent IDs to apply to this change
 };
 // Special case callback for groups, since it has different callback format than names
@@ -1704,7 +1689,7 @@ void LLPanelEstateInfo::addAllowedGroup2(LLUUID id, void* user_data)
        LLEstateAccessChangeInfo* change_info = new LLEstateAccessChangeInfo;
        change_info->mOperationFlag = ESTATE_ACCESS_ALLOWED_GROUP_ADD;
        change_info->mDialogName = "EstateAllowedGroupAdd";
-        change_info->mAgentOrGroupID = id;
+        change_info->mAgentOrGroupIDs.push_back(id);
        if (isLindenEstate())
        {
@@ -1749,8 +1734,8 @@ void LLPanelEstateInfo::accessAddCore2(S32 option, void* data)
                return;
        }
-        // avatar picker no multi-select, yes close-on-select
+        // avatar picker yes multi-select, yes close-on-select
-        LLFloaterAvatarPicker::show(accessAddCore3, (void*)change_info, FALSE, TRUE);
+        LLFloaterAvatarPicker::show(accessAddCore3, (void*)change_info, TRUE, TRUE);
 }
 // static
@@ -1766,21 +1751,44 @@ void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, co
                return;
        }
        // User did select a name.
-        change_info->mAgentOrGroupID = ids[0];
+        change_info->mAgentOrGroupIDs = ids;
        // Can't put estate owner on ban list
        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
        if (!panel) return;
        LLViewerRegion* region = gAgent.getRegion();
        if (!region) return;
+        
-        if ((change_info->mOperationFlag & ESTATE_ACCESS_BANNED_AGENT_ADD)
+        if (change_info->mOperationFlag & ESTATE_ACCESS_ALLOWED_AGENT_ADD)
-                && (region->getOwner() == change_info->mAgentOrGroupID))
        {
-                gViewerWindow->alertXml("OwnerCanNotBeDenied");
+                LLCtrlListInterface *list = panel->childGetListInterface("allowed_avatar_name_list");
-                delete change_info;
+                int currentCount = (list ? list->getItemCount() : 0);
-                change_info = NULL;
+                if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
-                return;
+                {
+                        LLString::format_map_t args;
+                        args["[NUM_ADDED]"] = llformat("%d",ids.size());
+                        args["[MAX_AGENTS]"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
+                        args["[LIST_TYPE]"] = "Allowed Residents";
+                        args["[NUM_EXCESS]"] = llformat("%d",(ids.size()+currentCount)-ESTATE_MAX_ACCESS_IDS);
+                        gViewerWindow->alertXml("MaxAgentOnRegionBatch", args);
+                        delete change_info;
+                        return;
+                }
+        }
+        if (change_info->mOperationFlag & ESTATE_ACCESS_BANNED_AGENT_ADD)
+        {
+                LLCtrlListInterface *list = panel->childGetListInterface("banned_avatar_name_list");
+                int currentCount = (list ? list->getItemCount() : 0);
+                if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
+                {
+                        LLString::format_map_t args;
+                        args["[NUM_ADDED]"] = llformat("%d",ids.size());
+                        args["[MAX_AGENTS]"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
+                        args["[LIST_TYPE]"] = "Banned Residents";
+                        args["[NUM_EXCESS]"] = llformat("%d",(ids.size()+currentCount)-ESTATE_MAX_ACCESS_IDS);
+                        gViewerWindow->alertXml("MaxAgentOnRegionBatch", args);
+                        delete change_info;
+                        return;
+                }
        }
        if (isLindenEstate())
@@ -1802,23 +1810,31 @@ void LLPanelEstateInfo::accessRemoveCore(U32 operation_flag, const char* dialog_
 {
        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
        if (!panel) return;
-        LLNameListCtrl* name_list = LLViewerUICtrlFactory::getNameListByName(panel, list_ctrl_name);
+        LLNameListCtrl* name_list = panel->getChild<LLNameListCtrl>(list_ctrl_name);
        if (!name_list) return;
-        LLScrollListItem* item = name_list->getFirstSelected();
-        if (!item) return;
+        std::vector<LLScrollListItem*> list_vector = name_list->getAllSelected();
-        LLUUID agent_id = item->getUUID();
+        if (list_vector.size() == 0)
+                return;
        LLEstateAccessChangeInfo* change_info = new LLEstateAccessChangeInfo;
-        change_info->mAgentOrGroupID = agent_id;
        change_info->mOperationFlag = operation_flag;
        change_info->mDialogName = dialog_name;
+        
+        for (std::vector<LLScrollListItem*>::const_iterator iter = list_vector.begin();
+             iter != list_vector.end();
+             iter++)
+        {
+                LLScrollListItem *item = (*iter);
+                change_info->mAgentOrGroupIDs.push_back(item->getUUID());
+        }
+        
        if (isLindenEstate())
        {
                // warn on change linden estate
                gViewerWindow->alertXml("ChangeLindenAccess", 
-                                                           accessRemoveCore2,
+                                        accessRemoveCore2,
-                                                           (void*)change_info);
+                                        (void*)change_info);
        }
        else
        {
@@ -1850,9 +1866,9 @@ void LLPanelEstateInfo::accessRemoveCore2(S32 option, void* data)
                LLString::format_map_t args;
                args["[ALL_ESTATES]"] = all_estates_text();
                gViewerWindow->alertXml(change_info->mDialogName, 
-                                                           args, 
+                                        args, 
-                                                           accessCoreConfirm, 
+                                        accessCoreConfirm, 
-                                                           (void*)change_info);
+                                        (void*)change_info);
        }
 }
@@ -1862,35 +1878,54 @@ void LLPanelEstateInfo::accessRemoveCore2(S32 option, void* data)
 void LLPanelEstateInfo::accessCoreConfirm(S32 option, void* data)
 {
        LLEstateAccessChangeInfo* change_info = (LLEstateAccessChangeInfo*)data;
-        U32 flags = change_info->mOperationFlag;
+        const U32 originalFlags = change_info->mOperationFlag;
-        switch(option)
+        AgentOrGroupIDsVector& ids = change_info->mAgentOrGroupIDs;
+        LLViewerRegion* region = gAgent.getRegion();
+        
+        for (AgentOrGroupIDsVector::const_iterator iter = ids.begin();
+             iter != ids.end();
+             iter++)
        {
-        case 0:
+                U32 flags = originalFlags;
-                // This estate
+                if (iter + 1 != ids.end())
-                sendEstateAccessDelta(flags, change_info->mAgentOrGroupID);
+                        flags |= ESTATE_ACCESS_NO_REPLY;
-                break;
-        case 1:
+                const LLUUID id = (*iter);
+                if ((change_info->mOperationFlag & ESTATE_ACCESS_BANNED_AGENT_ADD)
+                    && region && (region->getOwner() == id))
                {
-                        // All estates, either than I own or manage for this owner.  
+                        gViewerWindow->alertXml("OwnerCanNotBeDenied");
-                        // This will be verified on simulator. JC
+                        break;
-                        LLViewerRegion* region = gAgent.getRegion();
+                }
-                        if (!region) break;
+                switch(option)
-                        if (region->getOwner() == gAgent.getID()
+                {
-                                || gAgent.isGodlike())
+                        case 0:
-                        {
+                            // This estate
-                                flags |= ESTATE_ACCESS_APPLY_TO_ALL_ESTATES;
+                            sendEstateAccessDelta(flags, id);
-                                sendEstateAccessDelta(flags, change_info->mAgentOrGroupID);
+                            break;
-                        }
+                        case 1:
-                        else if (region->isEstateManager())
                        {
-                                flags |= ESTATE_ACCESS_APPLY_TO_MANAGED_ESTATES;
+                                // All estates, either than I own or manage for this owner.  
-                                sendEstateAccessDelta(flags, change_info->mAgentOrGroupID);
+                                // This will be verified on simulator. JC
+                                if (!region) break;
+                                if (region->getOwner() == gAgent.getID()
+                                    || gAgent.isGodlike())
+                                {
+                                        flags |= ESTATE_ACCESS_APPLY_TO_ALL_ESTATES;
+                                        sendEstateAccessDelta(flags, id);
+                                }
+                                else if (region->isEstateManager())
+                                {
+                                        flags |= ESTATE_ACCESS_APPLY_TO_MANAGED_ESTATES;
+                                        sendEstateAccessDelta(flags, id);
+                                }
+                                break;
                        }
-                        break;
+                        case 2:
+                        default:
+                            break;
                }
-        case 2:
-        default:
-                break;
        }
        delete change_info;
        change_info = NULL;
@@ -2041,7 +2076,7 @@ BOOL LLPanelEstateInfo::postBuild()
        childSetCommitCallback("sun_hour_slider", onChangeChildCtrl, this);
        childSetCommitCallback("allowed_avatar_name_list", onChangeChildCtrl, this);
-        LLNameListCtrl *avatar_name_list = LLViewerUICtrlFactory::getNameListByName(this, "allowed_avatar_name_list");
+        LLNameListCtrl *avatar_name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
        if (avatar_name_list)
        {
                avatar_name_list->setCommitOnSelectionChange(TRUE);
@@ -2052,7 +2087,7 @@ BOOL LLPanelEstateInfo::postBuild()
        childSetAction("remove_allowed_avatar_btn", onClickRemoveAllowedAgent, this);
        childSetCommitCallback("allowed_group_name_list", onChangeChildCtrl, this);
-        LLNameListCtrl* group_name_list = LLViewerUICtrlFactory::getNameListByName(this, "allowed_group_name_list");
+        LLNameListCtrl* group_name_list = getChild<LLNameListCtrl>("allowed_group_name_list");
        if (group_name_list)
        {
                group_name_list->setCommitOnSelectionChange(TRUE);
@@ -2063,7 +2098,7 @@ BOOL LLPanelEstateInfo::postBuild()
        childSetAction("remove_allowed_group_btn", onClickRemoveAllowedGroup, this);
        childSetCommitCallback("banned_avatar_name_list", onChangeChildCtrl, this);
-        LLNameListCtrl* banned_name_list = LLViewerUICtrlFactory::getNameListByName(this, "banned_avatar_name_list");
+        LLNameListCtrl* banned_name_list = getChild<LLNameListCtrl>("banned_avatar_name_list");
        if (banned_name_list)
        {
                banned_name_list->setCommitOnSelectionChange(TRUE);
@@ -2074,7 +2109,7 @@ BOOL LLPanelEstateInfo::postBuild()
        childSetAction("remove_banned_avatar_btn", onClickRemoveBannedAgent, this);
        childSetCommitCallback("estate_manager_name_list", onChangeChildCtrl, this);
-        LLNameListCtrl* manager_name_list = LLViewerUICtrlFactory::getNameListByName(this, "estate_manager_name_list");
+        LLNameListCtrl* manager_name_list = getChild<LLNameListCtrl>("estate_manager_name_list");
        if (manager_name_list)
        {
                manager_name_list->setCommitOnSelectionChange(TRUE);
@@ -2477,13 +2512,13 @@ void LLPanelEstateInfo::callbackCacheName(
 void LLPanelEstateInfo::clearAccessLists() 
 {
-        LLNameListCtrl* name_list = LLViewerUICtrlFactory::getNameListByName(this, "allowed_avatar_name_list");
+        LLNameListCtrl* name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
        if (name_list)
        {
                name_list->deleteAllItems();
        }
-        name_list = LLViewerUICtrlFactory::getNameListByName(this, "banned_avatar_name_list");
+        name_list = getChild<LLNameListCtrl>("banned_avatar_name_list");
        if (name_list)
        {
                name_list->deleteAllItems();
@@ -2517,7 +2552,7 @@ BOOL LLPanelEstateInfo::checkRemovalButton(std::string name)
        }
        // enable the remove button if something is selected
-        LLNameListCtrl* name_list = LLViewerUICtrlFactory::getNameListByName(this, name);
+        LLNameListCtrl* name_list = getChild<LLNameListCtrl>(name);
        childSetEnabled(btn_name.c_str(), name_list && name_list->getFirstSelected() ? TRUE : FALSE);
        return (btn_name != "");
@@ -2790,10 +2825,7 @@ void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs,
                }
                else
                {
-                        if( gViewerStats )
+                        LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                        {
-                                gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                        }
                        if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
                                LL_ERR_FILE_EMPTY == status)
@@ -2914,33 +2946,6 @@ void LLPanelEstateCovenant::setCovenantTextEditor(const std::string& text)
        mEditor->setText(text);
 }
-/*
-// AgentData = agent_id
-// RequestData = "setowner"
-// StringData[0] = compressed owner id
-// IntegerData[0] = serial
-bool LLDispatchSetEstateOwner::operator()(
-                const LLDispatcher* dispatcher,
-                const std::string& key,
-                const sparam_t& strings,
-                const iparam_t& integers)
-{
-        LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
-        if (!floater) return true;
-        LLTabContainer* tab = (LLTabContainer*)(floater->getChildByName("region_panels"));
-        if (!tab) return true;
-        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)(tab->getChildByName("Estate"));
-        if (!panel) return true;
-        // TODO -- check owner, and disable floater if owner
-        // does not match
-        return true;
-}
-*/
 // key = "estateupdateinfo"
 // strings[0] = estate name
 // strings[1] = str(owner_id)
@@ -3073,7 +3078,7 @@ bool LLDispatchSetEstateAccess::operator()(
        if (access_flags & ESTATE_ACCESS_ALLOWED_AGENTS)
        {
                LLNameListCtrl* allowed_agent_name_list;
-                allowed_agent_name_list = LLViewerUICtrlFactory::getNameListByName(panel, "allowed_avatar_name_list");
+                allowed_agent_name_list = panel->getChild<LLNameListCtrl>("allowed_avatar_name_list");
                int totalAllowedAgents = num_allowed_agents;
                
@@ -3104,7 +3109,7 @@ bool LLDispatchSetEstateAccess::operator()(
        if (access_flags & ESTATE_ACCESS_ALLOWED_GROUPS)
        {
                LLNameListCtrl* allowed_group_name_list;
-                allowed_group_name_list = LLViewerUICtrlFactory::getNameListByName(panel, "allowed_group_name_list");
+                allowed_group_name_list = panel->getChild<LLNameListCtrl>("allowed_group_name_list");
                std::string msg = llformat("Allowed groups: (%d, max %d)",
                                                                        num_allowed_groups,
@@ -3128,7 +3133,7 @@ bool LLDispatchSetEstateAccess::operator()(
        if (access_flags & ESTATE_ACCESS_BANNED_AGENTS)
        {
                LLNameListCtrl* banned_agent_name_list;
-                banned_agent_name_list = LLViewerUICtrlFactory::getNameListByName(panel, "banned_avatar_name_list");
+                banned_agent_name_list = panel->getChild<LLNameListCtrl>("banned_avatar_name_list");
                int totalBannedAgents = num_banned_agents;
                
@@ -3165,7 +3170,7 @@ bool LLDispatchSetEstateAccess::operator()(
                panel->childSetValue("estate_manager_label", LLSD(msg));
                LLNameListCtrl* estate_manager_name_list =
-                        LLViewerUICtrlFactory::getNameListByName(panel, "estate_manager_name_list");
+                        panel->getChild<LLNameListCtrl>("estate_manager_name_list");
                if (estate_manager_name_list)
                {       
                        estate_manager_name_list->deleteAllItems();             // Clear existing entries
diff --git a/linden/indra/newview/llfloaterregioninfo.h b/linden/indra/newview/llfloaterregioninfo.h
index 096c78b..5e8ca1e 100644
--- a/linden/indra/newview/llfloaterregioninfo.h
+++ b/linden/indra/newview/llfloaterregioninfo.h
@@ -212,7 +212,6 @@ public:
        
        // LLPanel && LLView
        virtual BOOL postBuild();
-        virtual void draw();
        
 protected:
        virtual BOOL sendUpdate();
diff --git a/linden/indra/newview/llfloaterreleasemsg.cpp b/linden/indra/newview/llfloaterreleasemsg.cpp
index 4f122f5..fc35e5c 100644
--- a/linden/indra/newview/llfloaterreleasemsg.cpp
+++ b/linden/indra/newview/llfloaterreleasemsg.cpp
@@ -31,7 +31,7 @@
 #include "llviewerprecompiledheaders.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
 #include "llfloaterreleasemsg.h"
@@ -64,7 +64,7 @@ LLFloaterReleaseMsg::LLFloaterReleaseMsg()
        mWebBrowser( 0 )
 {
        // create floater from its XML definition
-        gUICtrlFactory->buildFloater( this, "floater_sim_release_message.xml" );
+        LLUICtrlFactory::getInstance()->buildFloater( this, "floater_sim_release_message.xml" );
        mTitleBase = getTitle();
@@ -73,7 +73,7 @@ LLFloaterReleaseMsg::LLFloaterReleaseMsg()
        reshape( rect.getWidth(), rect.getHeight(), FALSE );
        setRect( rect );
-        mWebBrowser = LLViewerUICtrlFactory::getWebBrowserByName(this,  "release_message_floater_browser" );
+        mWebBrowser = getChild<LLWebBrowserCtrl>("release_message_floater_browser" );
        if ( mWebBrowser )
        {
                // observe browser events
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 5c076f0..0c1b9ee 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -80,7 +80,7 @@
 #include "lldir.h"
 #include "llselectmgr.h"
 #include "llviewerbuild.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llappviewer.h"
 #include "llassetuploadresponders.h"
@@ -124,16 +124,16 @@ LLFloaterReporter::LLFloaterReporter(
 {
        if (report_type == BUG_REPORT)
        {
-                gUICtrlFactory->buildFloater(this, "floater_report_bug.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_report_bug.xml");
        }
        else
        {
-                gUICtrlFactory->buildFloater(this, "floater_report_abuse.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_report_abuse.xml");
        }
        childSetText("abuse_location_edit", gAgent.getSLURL() );
-        LLButton* pick_btn = LLUICtrlFactory::getButtonByName(this, "pick_btn");
+        LLButton* pick_btn = getChild<LLButton>("pick_btn");
        if (pick_btn)
        {
                // XUI: Why aren't these in viewerart.ini?
@@ -145,7 +145,7 @@ LLFloaterReporter::LLFloaterReporter(
        if (report_type != BUG_REPORT)
        {
                // abuser name is selected from a list
-                LLLineEditor* le = (LLLineEditor*)getCtrlByNameAndType("abuser_name_edit", WIDGET_TYPE_LINE_EDITOR);
+                LLLineEditor* le = getChild<LLLineEditor>("abuser_name_edit");
                le->setEnabled( FALSE );
        }
@@ -454,12 +454,12 @@ void LLFloaterReporter::onClickCancel(void *userdata)
 void LLFloaterReporter::onClickObjPicker(void *userdata)
 {
        LLFloaterReporter *self = (LLFloaterReporter *)userdata;
-        gToolObjPicker->setExitCallback(LLFloaterReporter::closePickTool, self);
+        LLToolObjPicker::getInstance()->setExitCallback(LLFloaterReporter::closePickTool, self);
-        gToolMgr->setTransientTool(gToolObjPicker);
+        LLToolMgr::getInstance()->setTransientTool(LLToolObjPicker::getInstance());
        self->mPicking = TRUE;
        self->childSetText("object_name", LLString::null);
        self->childSetText("owner_name", LLString::null);
-        LLButton* pick_btn = LLUICtrlFactory::getButtonByName(self, "pick_btn");
+        LLButton* pick_btn = self->getChild<LLButton>("pick_btn");
        if (pick_btn) pick_btn->setToggleState(TRUE);
 }
@@ -469,12 +469,12 @@ void LLFloaterReporter::closePickTool(void *userdata)
 {
        LLFloaterReporter *self = (LLFloaterReporter *)userdata;
-        LLUUID object_id = gToolObjPicker->getObjectID();
+        LLUUID object_id = LLToolObjPicker::getInstance()->getObjectID();
        self->getObjectInfo(object_id);
-        gToolMgr->clearTransientTool();
+        LLToolMgr::getInstance()->clearTransientTool();
        self->mPicking = FALSE;
-        LLButton* pick_btn = LLUICtrlFactory::getButtonByName(self, "pick_btn");
+        LLButton* pick_btn = self->getChild<LLButton>("pick_btn");
        if (pick_btn) pick_btn->setToggleState(FALSE);
 }
@@ -662,7 +662,7 @@ LLSD LLFloaterReporter::gatherReport()
        }
        LLString category_name;
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(this, "category_combo");
+        LLComboBox* combo = getChild<LLComboBox>( "category_combo");
        if (combo)
        {
                category_name = combo->getSelectedItemLabel(); // want label, not value
@@ -1003,7 +1003,7 @@ void LLFloaterReporter::addDescription(const LLString& description, LLMeanCollis
        LLFloaterReporter *self = gReporterInstances[COMPLAINT_REPORT];
        if (self)
        {
-                LLTextEditor* text = LLUICtrlFactory::getTextEditorByName(self, "details_edit");
+                LLTextEditor* text = self->getChild<LLTextEditor>("details_edit");
                if (text)
                {       
                        text->insertText(description);
diff --git a/linden/indra/newview/llfloaterscriptdebug.cpp b/linden/indra/newview/llfloaterscriptdebug.cpp
index e25468b..3115b69 100644
--- a/linden/indra/newview/llfloaterscriptdebug.cpp
+++ b/linden/indra/newview/llfloaterscriptdebug.cpp
@@ -31,7 +31,7 @@
 #include "llviewerprecompiledheaders.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llfloaterscriptdebug.h"
 #include "llfontgl.h"
@@ -84,7 +84,7 @@ BOOL LLFloaterScriptDebug::postBuild()
        if (mTabContainer)
        {
                // *FIX: apparantly fails for tab containers?
-//              mTabContainer->requires("all_scripts", WIDGET_TYPE_FLOATER);
+//              mTabContainer->requires<LLFloater>("all_scripts");
 //              mTabContainer->checkRequirements();
                return TRUE;
        }
@@ -104,7 +104,7 @@ LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id)
                sInstance = new LLFloaterScriptDebug();
                LLCallbackMap::map_t factory_map;
                factory_map["all_scripts"] = LLCallbackMap(getOutputWindow, NULL);
-                gUICtrlFactory->buildFloater(sInstance, "floater_script_debug.xml", &factory_map);
+                LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_script_debug.xml", &factory_map);
                sInstance->setVisible(FALSE);
        }
@@ -128,7 +128,7 @@ void LLFloaterScriptDebug::addScriptLine(const std::string &utf8mesg, const std:
        if (objectp)
        {
-                objectp->setIcon(gImageList.getImage(LLUUID(gViewerArt.getString("script_error.tga"))));
+                objectp->setIcon(gImageList.getImageFromFile("script_error.j2c", TRUE, TRUE));
                floater_label = llformat("%s(%.2f, %.2f)", user_name.c_str(), objectp->getPositionRegion().mV[VX], objectp->getPositionRegion().mV[VY]);
        }
        else
diff --git a/linden/indra/newview/llfloatersellland.cpp b/linden/indra/newview/llfloatersellland.cpp
index 0be9246..90e4dd3 100644
--- a/linden/indra/newview/llfloatersellland.cpp
+++ b/linden/indra/newview/llfloatersellland.cpp
@@ -42,7 +42,7 @@
 #include "lltexturectrl.h"
 #include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 // defined in llfloaterland.cpp
@@ -122,7 +122,7 @@ LLFloaterSellLandUI* LLFloaterSellLandUI::soleInstance(bool createIfNeeded)
        {
                sInstance = new LLFloaterSellLandUI();
-                gUICtrlFactory->buildFloater(sInstance, "floater_sell_land.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_sell_land.xml");
                sInstance->center();
        }
        
@@ -131,7 +131,7 @@ LLFloaterSellLandUI* LLFloaterSellLandUI::soleInstance(bool createIfNeeded)
        if (!parcelSelectionObserver)
        {
                parcelSelectionObserver = new SelectionObserver;
-                gParcelMgr->addObserver(parcelSelectionObserver);
+                LLViewerParcelMgr::getInstance()->addObserver(parcelSelectionObserver);
        }
        return sInstance;
@@ -156,14 +156,14 @@ void LLFloaterSellLandUI::SelectionObserver::changed()
        LLFloaterSellLandUI* ui = LLFloaterSellLandUI::soleInstance(false);
        if (ui)
        {
-                if (gParcelMgr->selectionEmpty())
+                if (LLViewerParcelMgr::getInstance()->selectionEmpty())
                {
                        ui->close();
                }
                else {
                        ui->setParcel(
-                                gParcelMgr->getSelectionRegion(),
+                                LLViewerParcelMgr::getInstance()->getSelectionRegion(),
-                                gParcelMgr->getParcelSelection());
+                                LLViewerParcelMgr::getInstance()->getParcelSelection());
                }
        }
 }
@@ -251,22 +251,22 @@ void LLFloaterSellLandUI::updateParcelInfo()
 void LLFloaterSellLandUI::setBadge(const char* id, Badge badge)
 {
-        static LLUUID badgeOK(gViewerArt.getString("badge_ok.tga"));
+        static LLString badgeOK("badge_ok.j2c");
-        static LLUUID badgeNote(gViewerArt.getString("badge_note.tga"));
+        static LLString badgeNote("badge_note.j2c");
-        static LLUUID badgeWarn(gViewerArt.getString("badge_warn.tga"));
+        static LLString badgeWarn("badge_warn.j2c");
-        static LLUUID badgeError(gViewerArt.getString("badge_error.tga"));
+        static LLString badgeError("badge_error.j2c");
        
-        LLUUID badgeUUID;
+        LLString badgeName;
        switch (badge)
        {
                default:
-                case BADGE_OK:          badgeUUID = badgeOK;    break;
+                case BADGE_OK:          badgeName = badgeOK;    break;
-                case BADGE_NOTE:        badgeUUID = badgeNote;  break;
+                case BADGE_NOTE:        badgeName = badgeNote;  break;
-                case BADGE_WARN:        badgeUUID = badgeWarn;  break;
+                case BADGE_WARN:        badgeName = badgeWarn;  break;
-                case BADGE_ERROR:       badgeUUID = badgeError; break;
+                case BADGE_ERROR:       badgeName = badgeError; break;
        }
        
-        childSetValue(id, badgeUUID);
+        childSetValue(id, badgeName);
 }
 void LLFloaterSellLandUI::refreshUI()
@@ -274,7 +274,7 @@ void LLFloaterSellLandUI::refreshUI()
        LLParcel* parcelp = mParcelSelection->getParcel();
        if (!parcelp) return;
-        LLTextureCtrl* snapshot = LLViewerUICtrlFactory::getTexturePickerByName(this, "info_image");
+        LLTextureCtrl* snapshot = getChild<LLTextureCtrl>("info_image");
        if (snapshot)
        {
                snapshot->setImageAssetID(mParcelSnapshot);
@@ -451,7 +451,7 @@ void LLFloaterSellLandUI::doShowObjects(void *userdata)
 // static
 void LLFloaterSellLandUI::callbackHighlightTransferable(S32 option, void* userdata)
 {
-        gSelectMgr->unhighlightAll();
+        LLSelectMgr::getInstance()->unhighlightAll();
 }
 // static
@@ -546,7 +546,7 @@ void LLFloaterSellLandUI::onConfirmSale(S32 option, void *userdata)
        }
        // Send update to server
-        gParcelMgr->sendParcelPropertiesUpdate( parcel );
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
        self->close();
 }
diff --git a/linden/indra/newview/llfloatersettingsdebug.cpp b/linden/indra/newview/llfloatersettingsdebug.cpp
new file mode 100644
index 0000000..2e14aac
--- /dev/null
+++ b/linden/indra/newview/llfloatersettingsdebug.cpp
@@ -0,0 +1,492 @@
+/** 
+ * @file llfloatersettingsdebug.cpp
+ * @brief floater for debugging internal viewer settings
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+#include "llfloatersettingsdebug.h"
+#include "llfloater.h"
+#include "lluictrlfactory.h"
+#include "llfirstuse.h"
+#include "llcombobox.h"
+#include "llspinctrl.h"
+#include "llcolorswatch.h"
+#include "llviewercontrol.h"
+LLFloaterSettingsDebug* LLFloaterSettingsDebug::sInstance = NULL;
+LLFloaterSettingsDebug::LLFloaterSettingsDebug() : LLFloater("Configuration Editor")
+{
+}
+LLFloaterSettingsDebug::~LLFloaterSettingsDebug()
+{
+        sInstance = NULL;
+}
+BOOL LLFloaterSettingsDebug::postBuild()
+{
+        LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
+        struct f : public LLControlGroup::ApplyFunctor
+        {
+                LLComboBox* combo;
+                f(LLComboBox* c) : combo(c) {}
+                virtual void apply(const LLString& name, LLControlVariable* control)
+                {
+                        combo->add(name, (void*)control);
+                }
+        } func(settings_combo);
+        gSavedSettings.applyToAll(&func);
+        gSavedPerAccountSettings.applyToAll(&func);
+        gColors.applyToAll(&func);
+        settings_combo->sortByName();
+        settings_combo->setCommitCallback(onSettingSelect);
+        settings_combo->setCallbackUserData(this);
+        settings_combo->updateSelection();
+        childSetCommitCallback("val_spinner_1", onCommitSettings);
+        childSetUserData("val_spinner_1", this);
+        childSetCommitCallback("val_spinner_2", onCommitSettings);
+        childSetUserData("val_spinner_2", this);
+        childSetCommitCallback("val_spinner_3", onCommitSettings);
+        childSetUserData("val_spinner_3", this);
+        childSetCommitCallback("val_spinner_4", onCommitSettings);
+        childSetUserData("val_spinner_4", this);
+        childSetCommitCallback("val_text", onCommitSettings);
+        childSetUserData("val_text", this);
+        childSetCommitCallback("boolean_combo", onCommitSettings);
+        childSetUserData("boolean_combo", this);
+        childSetCommitCallback("color_swatch", onCommitSettings);
+        childSetUserData("color_swatch", this);
+        childSetAction("default_btn", onClickDefault, this);
+        mComment = getChild<LLTextEditor>("comment_text");
+        return TRUE;
+}
+void LLFloaterSettingsDebug::draw()
+{
+        LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
+        LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
+        updateControl(controlp);
+        LLFloater::draw();
+}
+//static
+void LLFloaterSettingsDebug::show(void*)
+{
+        if (sInstance == NULL)
+        {
+                sInstance = new LLFloaterSettingsDebug();
+                LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_settings_debug.xml");
+        }
+        sInstance->open();              /* Flawfinder: ignore */
+}
+//static 
+void LLFloaterSettingsDebug::onSettingSelect(LLUICtrl* ctrl, void* user_data)
+{
+        LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
+        LLComboBox* combo_box = (LLComboBox*)ctrl;
+        LLControlVariable* controlp = (LLControlVariable*)combo_box->getCurrentUserdata();
+        floaterp->updateControl(controlp);
+}
+//static
+void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
+{
+        LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
+        LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
+        LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
+        LLVector3 vector;
+        LLVector3d vectord;
+        LLRect rect;
+        LLColor4 col4;
+        LLColor3 col3;
+        LLColor4U col4U;
+        LLColor4 color_with_alpha;
+        switch(controlp->type())
+        {               
+          case TYPE_U32:
+                controlp->set(floaterp->childGetValue("val_spinner_1"));
+                break;
+          case TYPE_S32:
+                controlp->set(floaterp->childGetValue("val_spinner_1"));
+                break;
+          case TYPE_F32:
+                controlp->set(LLSD(floaterp->childGetValue("val_spinner_1").asReal()));
+                break;
+          case TYPE_BOOLEAN:
+                controlp->set(floaterp->childGetValue("boolean_combo"));
+                break;
+          case TYPE_STRING:
+                controlp->set(LLSD(floaterp->childGetValue("val_text").asString()));
+                break;
+          case TYPE_VEC3:
+                vector.mV[VX] = (F32)floaterp->childGetValue("val_spinner_1").asReal();
+                vector.mV[VY] = (F32)floaterp->childGetValue("val_spinner_2").asReal();
+                vector.mV[VZ] = (F32)floaterp->childGetValue("val_spinner_3").asReal();
+                controlp->set(vector.getValue());
+                break;
+          case TYPE_VEC3D:
+                vectord.mdV[VX] = floaterp->childGetValue("val_spinner_1").asReal();
+                vectord.mdV[VY] = floaterp->childGetValue("val_spinner_2").asReal();
+                vectord.mdV[VZ] = floaterp->childGetValue("val_spinner_3").asReal();
+                controlp->set(vectord.getValue());
+                break;
+          case TYPE_RECT:
+                rect.mLeft = floaterp->childGetValue("val_spinner_1").asInteger();
+                rect.mRight = floaterp->childGetValue("val_spinner_2").asInteger();
+                rect.mBottom = floaterp->childGetValue("val_spinner_3").asInteger();
+                rect.mTop = floaterp->childGetValue("val_spinner_4").asInteger();
+                controlp->set(rect.getValue());
+                break;
+          case TYPE_COL4:
+                col3.setValue(floaterp->childGetValue("color_swatch"));
+                col4 = LLColor4(col3, (F32)floaterp->childGetValue("val_spinner_4").asReal());
+                controlp->set(col4.getValue());
+                break;
+          case TYPE_COL3:
+                controlp->set(floaterp->childGetValue("color_swatch"));
+                //col3.mV[VRED] = (F32)floaterp->childGetValue("val_spinner_1").asC();
+                //col3.mV[VGREEN] = (F32)floaterp->childGetValue("val_spinner_2").asReal();
+                //col3.mV[VBLUE] = (F32)floaterp->childGetValue("val_spinner_3").asReal();
+                //controlp->set(col3.getValue());
+                break;
+          case TYPE_COL4U:
+                col3.setValue(floaterp->childGetValue("color_swatch"));
+                col4U.setVecScaleClamp(col3);
+                col4U.mV[VALPHA] = floaterp->childGetValue("val_spinner_4").asInteger();
+                controlp->set(col4U.getValue());
+                break;
+          default:
+                break;
+        }
+}
+// static
+void LLFloaterSettingsDebug::onClickDefault(void* user_data)
+{
+        LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
+        LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
+        LLControlVariable* controlp = (LLControlVariable*)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(LLControlVariable* controlp)
+{
+        LLSpinCtrl* spinner1 = getChild<LLSpinCtrl>("val_spinner_1");
+        LLSpinCtrl* spinner2 = getChild<LLSpinCtrl>("val_spinner_2");
+        LLSpinCtrl* spinner3 = getChild<LLSpinCtrl>("val_spinner_3");
+        LLSpinCtrl* spinner4 = getChild<LLSpinCtrl>("val_spinner_4");
+        LLColorSwatchCtrl* color_swatch = getChild<LLColorSwatchCtrl>("color_swatch");
+        if (!spinner1 || !spinner2 || !spinner3 || !spinner4 || !color_swatch)
+        {
+                llwarns << "Could not find all desired controls by name"
+                        << llendl;
+                return;
+        }
+        spinner1->setVisible(FALSE);
+        spinner2->setVisible(FALSE);
+        spinner3->setVisible(FALSE);
+        spinner4->setVisible(FALSE);
+        color_swatch->setVisible(FALSE);
+        childSetVisible("val_text", FALSE);
+        mComment->setText(LLString::null);
+        if (controlp)
+        {
+                eControlType type = controlp->type();
+                //hide combo box only for non booleans, otherwise this will result in the combo box closing every frame
+                childSetVisible("boolean_combo", type == TYPE_BOOLEAN);
+                
+                mComment->setText(controlp->getComment());
+                spinner1->setMaxValue(F32_MAX);
+                spinner2->setMaxValue(F32_MAX);
+                spinner3->setMaxValue(F32_MAX);
+                spinner4->setMaxValue(F32_MAX);
+                spinner1->setMinValue(-F32_MAX);
+                spinner2->setMinValue(-F32_MAX);
+                spinner3->setMinValue(-F32_MAX);
+                spinner4->setMinValue(-F32_MAX);
+                if (!spinner1->hasFocus())
+                {
+                        spinner1->setIncrement(0.1f);
+                }
+                if (!spinner2->hasFocus())
+                {
+                        spinner2->setIncrement(0.1f);
+                }
+                if (!spinner3->hasFocus())
+                {
+                        spinner3->setIncrement(0.1f);
+                }
+                if (!spinner4->hasFocus())
+                {
+                        spinner4->setIncrement(0.1f);
+                }
+                LLSD sd = controlp->get();
+                switch(type)
+                {
+                  case TYPE_U32:
+                        spinner1->setVisible(TRUE);
+                        spinner1->setLabel(LLString("value")); // Debug, don't translate
+                        if (!spinner1->hasFocus())
+                        {
+                                spinner1->setValue(sd);
+                                spinner1->setMinValue((F32)U32_MIN);
+                                spinner1->setMaxValue((F32)U32_MAX);
+                                spinner1->setIncrement(1.f);
+                                spinner1->setPrecision(0);
+                        }
+                        break;
+                  case TYPE_S32:
+                        spinner1->setVisible(TRUE);
+                        spinner1->setLabel(LLString("value")); // Debug, don't translate
+                        if (!spinner1->hasFocus())
+                        {
+                                spinner1->setValue(sd);
+                                spinner1->setMinValue((F32)S32_MIN);
+                                spinner1->setMaxValue((F32)S32_MAX);
+                                spinner1->setIncrement(1.f);
+                                spinner1->setPrecision(0);
+                        }
+                        break;
+                  case TYPE_F32:
+                        spinner1->setVisible(TRUE);
+                        spinner1->setLabel(LLString("value")); // Debug, don't translate
+                        if (!spinner1->hasFocus())
+                        {
+                                spinner1->setPrecision(3);
+                                spinner1->setValue(sd);
+                        }
+                        break;
+                  case TYPE_BOOLEAN:
+                        if (!childHasFocus("boolean_combo"))
+                        {
+                                if (sd.asBoolean())
+                                {
+                                        childSetValue("boolean_combo", LLSD("true"));
+                                }
+                                else
+                                {
+                                        childSetValue("boolean_combo", LLSD(""));
+                                }
+                        }
+                        break;
+                  case TYPE_STRING:
+                        childSetVisible("val_text", TRUE);
+                        if (!childHasFocus("val_text"))
+                        {
+                                childSetValue("val_text", sd);
+                        }
+                        break;
+                  case TYPE_VEC3:
+                  {
+                        LLVector3 v;
+                        v.setValue(sd);
+                        spinner1->setVisible(TRUE);
+                        spinner1->setLabel(LLString("X"));
+                        spinner2->setVisible(TRUE);
+                        spinner2->setLabel(LLString("Y"));
+                        spinner3->setVisible(TRUE);
+                        spinner3->setLabel(LLString("Z"));
+                        if (!spinner1->hasFocus())
+                        {
+                                spinner1->setPrecision(3);
+                                spinner1->setValue(v[VX]);
+                        }
+                        if (!spinner2->hasFocus())
+                        {
+                                spinner2->setPrecision(3);
+                                spinner2->setValue(v[VY]);
+                        }
+                        if (!spinner3->hasFocus())
+                        {
+                                spinner3->setPrecision(3);
+                                spinner3->setValue(v[VZ]);
+                        }
+                        break;
+                  }
+                  case TYPE_VEC3D:
+                  {
+                        LLVector3d v;
+                        v.setValue(sd);
+                        spinner1->setVisible(TRUE);
+                        spinner1->setLabel(LLString("X"));
+                        spinner2->setVisible(TRUE);
+                        spinner2->setLabel(LLString("Y"));
+                        spinner3->setVisible(TRUE);
+                        spinner3->setLabel(LLString("Z"));
+                        if (!spinner1->hasFocus())
+                        {
+                                spinner1->setPrecision(3);
+                                spinner1->setValue(v[VX]);
+                        }
+                        if (!spinner2->hasFocus())
+                        {
+                                spinner2->setPrecision(3);
+                                spinner2->setValue(v[VY]);
+                        }
+                        if (!spinner3->hasFocus())
+                        {
+                                spinner3->setPrecision(3);
+                                spinner3->setValue(v[VZ]);
+                        }
+                        break;
+                  }
+                  case TYPE_RECT:
+                  {
+                        LLRect r;
+                        r.setValue(sd);
+                        spinner1->setVisible(TRUE);
+                        spinner1->setLabel(LLString("Left"));
+                        spinner2->setVisible(TRUE);
+                        spinner2->setLabel(LLString("Right"));
+                        spinner3->setVisible(TRUE);
+                        spinner3->setLabel(LLString("Bottom"));
+                        spinner4->setVisible(TRUE);
+                        spinner4->setLabel(LLString("Top"));
+                        if (!spinner1->hasFocus())
+                        {
+                                spinner1->setPrecision(0);
+                                spinner1->setValue(r.mLeft);
+                        }
+                        if (!spinner2->hasFocus())
+                        {
+                                spinner2->setPrecision(0);
+                                spinner2->setValue(r.mRight);
+                        }
+                        if (!spinner3->hasFocus())
+                        {
+                                spinner3->setPrecision(0);
+                                spinner3->setValue(r.mBottom);
+                        }
+                        if (!spinner4->hasFocus())
+                        {
+                                spinner4->setPrecision(0);
+                                spinner4->setValue(r.mTop);
+                        }
+                        spinner1->setMinValue((F32)S32_MIN);
+                        spinner1->setMaxValue((F32)S32_MAX);
+                        spinner1->setIncrement(1.f);
+                        spinner2->setMinValue((F32)S32_MIN);
+                        spinner2->setMaxValue((F32)S32_MAX);
+                        spinner2->setIncrement(1.f);
+                        spinner3->setMinValue((F32)S32_MIN);
+                        spinner3->setMaxValue((F32)S32_MAX);
+                        spinner3->setIncrement(1.f);
+                        spinner4->setMinValue((F32)S32_MIN);
+                        spinner4->setMaxValue((F32)S32_MAX);
+                        spinner4->setIncrement(1.f);
+                        break;
+                  }
+                  case TYPE_COL4:
+                  {
+                        LLColor4 clr;
+                        clr.setValue(sd);
+                        color_swatch->setVisible(TRUE);
+                        // only set if changed so color picker doesn't update
+                        if(clr != LLColor4(color_swatch->getValue()))
+                        {
+                                color_swatch->set(LLColor4(sd), TRUE, FALSE);
+                        }
+                        spinner4->setVisible(TRUE);
+                        spinner4->setLabel(LLString("Alpha"));
+                        if (!spinner4->hasFocus())
+                        {
+                                spinner4->setPrecision(3);
+                                spinner4->setMinValue(0.0);
+                                spinner4->setMaxValue(1.f);
+                                spinner4->setValue(clr.mV[VALPHA]);
+                        }
+                        break;
+                  }
+                  case TYPE_COL3:
+                  {
+                        LLColor3 clr;
+                        clr.setValue(sd);
+                        color_swatch->setVisible(TRUE);
+                        color_swatch->setValue(sd);
+                        break;
+                  }
+                  case TYPE_COL4U:
+                  {
+                        LLColor4U clr;
+                        clr.setValue(sd);
+                        color_swatch->setVisible(TRUE);
+                        if(LLColor4(clr) != LLColor4(color_swatch->getValue()))
+                        {
+                                color_swatch->set(LLColor4(clr), TRUE, FALSE);
+                        }
+                        spinner4->setVisible(TRUE);
+                        spinner4->setLabel(LLString("Alpha"));
+                        if(!spinner4->hasFocus())
+                        {
+                                spinner4->setPrecision(0);
+                                spinner4->setValue(clr.mV[VALPHA]);
+                        }
+                        spinner4->setMinValue(0);
+                        spinner4->setMaxValue(255);
+                        spinner4->setIncrement(1.f);
+                        break;
+                  }
+                  default:
+                        mComment->setText(LLString("unknown"));
+                        break;
+                }
+        }
+}
diff --git a/linden/indra/newview/head.h b/linden/indra/newview/llfloatersettingsdebug.h
index 7bb8fd1..7aba482 100644
--- a/linden/indra/newview/head.h
+++ b/linden/indra/newview/llfloatersettingsdebug.h
@@ -1,10 +1,10 @@
 /** 
- * @file head.h
+ * @file llfloatersettingsdebug.h
- * @brief Head class definition
+ * @brief floater for debugging internal viewer settings
 *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
 * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2008, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -29,35 +29,33 @@
 * $/LicenseInfo$
 */
-// description of a class that models the motion of a human head.
+#ifndef LLFLOATERDEBUGSETTINGS_H
-// The physics isn't quite right, but it will suffice for right now.
+#define LLFLOATERDEBUGSETTINGS_H
-#ifndef LL_HEAD_H
+#include "llcontrol.h"
-#define LL_HEAD_H
+#include "llfloater.h"
+#include "lltexteditor.h"
-class Head {
+class LLFloaterSettingsDebug : public LLFloater
-  public:
+{
+public:
+        LLFloaterSettingsDebug();
+        virtual ~LLFloaterSettingsDebug();
-  Head();
+        virtual BOOL postBuild();
-  Head(F32 m, F32 r);
+        virtual void draw();
-  F32 setMass(F32 m);
+        void updateControl(LLControlVariable* control);
-  F32 setRadius(F32 r);
-  F32 getMass();
+        static void show(void*);
-  F32 getRadius();
+        static void onSettingSelect(LLUICtrl* ctrl, void* user_data);
-  F32 getInertia();
+        static void onCommitSettings(LLUICtrl* ctrl, void* user_data);
+        static void onClickDefault(void* user_data);
-  void propagate(F32 horizontal_force, F32 vertical_force, F32 dt);
+protected:
+        static LLFloaterSettingsDebug* sInstance;
-  F32 phi, theta;                    // azimuth and elevation
+        LLTextEditor* mComment;
-  //struct timeval t;
-  //struct timezone tz;
-  private:
-  F32 mass, radius, inertia;
 };
-#endif
+#endif //LLFLOATERDEBUGSETTINGS_H
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 88e9235..20b4510 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -53,7 +53,7 @@
 #include "llsliderctrl.h"
 #include "llspinctrl.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerstats.h"
 #include "llviewercamera.h"
 #include "llviewerwindow.h"
@@ -75,10 +75,14 @@
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
+S32 LLFloaterSnapshot::sUIWinHeightLong = 526 ;
+S32 LLFloaterSnapshot::sUIWinHeightShort = LLFloaterSnapshot::sUIWinHeightLong - 230 ;
+S32 LLFloaterSnapshot::sUIWinWidth = 215 ;
 LLSnapshotFloaterView* gSnapshotFloaterView = NULL;
 LLFloaterSnapshot* LLFloaterSnapshot::sInstance = NULL;
 const F32 SNAPSHOT_TIME_DELAY = 1.f;
 F32 SHINE_TIME = 0.5f;
@@ -88,7 +92,7 @@ F32 FALL_TIME = 0.6f;
 S32 BORDER_WIDTH = 6;
 const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte
-#define MAX_TEXTURE_SIZE 512 //max upload texture size 512 * 512
+const S32 MAX_TEXTURE_SIZE = 512 ; //max upload texture size 512 * 512
 ///----------------------------------------------------------------------------
 /// Class LLSnapshotLivePreview 
 ///----------------------------------------------------------------------------
@@ -105,9 +109,6 @@ public:
        LLSnapshotLivePreview(const LLRect& rect);
        ~LLSnapshotLivePreview();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        /*virtual*/ void draw();
        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
        
@@ -120,19 +121,30 @@ public:
        ESnapshotType getSnapshotType() const { return mSnapshotType; }
        BOOL getSnapshotUpToDate() const { return mSnapshotUpToDate; }
        BOOL isSnapshotActive() { return mSnapshotActive; }
+        LLImageGL* getThumbnailImage() const { return mThumbnailImage ; }
+        S32  getThumbnailWidth() const { return mThumbnailWidth ; }
+        S32  getThumbnailHeight() const { return mThumbnailHeight ; }
+        BOOL getThumbnailLock() const { return mThumbnailUpdateLock ; }
+        BOOL getThumbnailUpToDate() const { return mThumbnailUpToDate ;}
        LLImageGL* getCurrentImage();
        F32 getImageAspect();
+        F32 getAspect() ;
        LLRect getImageRect();
        BOOL isImageScaled();
        
        void setSnapshotType(ESnapshotType type) { mSnapshotType = type; }
        void setSnapshotQuality(S32 quality);
        void setSnapshotBufferType(LLViewerWindow::ESnapshotType type) { mSnapshotBufferType = type; }
-        void updateSnapshot(BOOL new_snapshot);
+        void updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail = FALSE);
        LLFloaterPostcard* savePostcard();
        void saveTexture();
        BOOL saveLocal();
+        BOOL setThumbnailImageSize() ;
+        void generateThumbnailImage(BOOL force_update = FALSE) ;
+        void resetThumbnailImage() { mThumbnailImage = NULL ; }
+        void drawPreviewRect(S32 offset_x, S32 offset_y) ;
        static void onIdle( void* snapshot_preview );
 protected:
@@ -144,6 +156,14 @@ protected:
        BOOL                                            mImageScaled[2];
        S32                         mMaxImageSize ;
        
+        //thumbnail image
+        LLPointer<LLImageGL>            mThumbnailImage ;
+        S32                         mThumbnailWidth ;
+        S32                         mThumbnailHeight ;
+        LLRect                      mPreviewRect ;
+        BOOL                        mThumbnailUpdateLock ;
+        BOOL                        mThumbnailUpToDate ;
        S32                                                     mCurImageIndex;
        LLPointer<LLImageRaw>           mRawImage;
        LLPointer<LLImageRaw>           mRawImageEncoded;
@@ -170,12 +190,12 @@ public:
 };
 std::set<LLSnapshotLivePreview*> LLSnapshotLivePreview::sList;
 LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) : 
        LLView("snapshot_live_preview", rect, FALSE), 
        mColor(1.f, 0.f, 0.f, 0.5f), 
        mCurImageIndex(0),
        mRawImage(NULL),
+        mThumbnailImage(NULL) ,
        mRawImageEncoded(NULL),
        mJPEGImage(NULL),
        mShineCountdown(0),
@@ -185,8 +205,8 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) :
        mDataSize(0),
        mSnapshotType(SNAPSHOT_POSTCARD),
        mSnapshotUpToDate(FALSE),
-        mCameraPos(gCamera->getOrigin()),
+        mCameraPos(LLViewerCamera::getInstance()->getOrigin()),
-        mCameraRot(gCamera->getQuaternion()),
+        mCameraRot(LLViewerCamera::getInstance()->getQuaternion()),
        mSnapshotActive(FALSE),
        mSnapshotBufferType(LLViewerWindow::SNAPSHOT_TYPE_COLOR)
 {
@@ -204,6 +224,8 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) :
        mMaxImageSize = MAX_IMAGE_SIZE ;
        mKeepAspectRatio = gSavedSettings.getBOOL("KeepAspectForSnapshot") ;
+        mThumbnailUpdateLock = FALSE ;
+        mThumbnailUpToDate   = FALSE ;
 }
 LLSnapshotLivePreview::~LLSnapshotLivePreview()
@@ -234,13 +256,8 @@ LLImageGL* LLSnapshotLivePreview::getCurrentImage()
        return mViewerImage[mCurImageIndex];
 }
-F32 LLSnapshotLivePreview::getImageAspect()
+F32 LLSnapshotLivePreview::getAspect()
 {
-        if (!mViewerImage[mCurImageIndex])
-        {
-                return 0.f;
-        }
        F32 image_aspect_ratio = ((F32)mWidth[mCurImageIndex]) / ((F32)mHeight[mCurImageIndex]);
        F32 window_aspect_ratio = ((F32)getRect().getWidth()) / ((F32)getRect().getHeight());
@@ -254,6 +271,16 @@ F32 LLSnapshotLivePreview::getImageAspect()
        }
 }
+F32 LLSnapshotLivePreview::getImageAspect()
+{
+        if (!mViewerImage[mCurImageIndex])
+        {
+                return 0.f;
+        }
+        return getAspect() ;    
+}
 LLRect LLSnapshotLivePreview::getImageRect()
 {
        return mImageRect[mCurImageIndex];
@@ -264,7 +291,7 @@ BOOL LLSnapshotLivePreview::isImageScaled()
        return mImageScaled[mCurImageIndex];
 }
-void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot) 
+void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail) 
 { 
        if (mSnapshotUpToDate)
        {
@@ -272,15 +299,9 @@ void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot)
                mCurImageIndex = (mCurImageIndex + 1) % 2; 
                mWidth[mCurImageIndex] = mWidth[old_image_index];
                mHeight[mCurImageIndex] = mHeight[old_image_index];
-                mFallAnimTimer.start();
+                mFallAnimTimer.start();         
-        }
-        mSnapshotUpToDate = FALSE; 
-        mShineAnimTimer.stop();
-        if (new_snapshot)
-        {
-                mSnapshotDelayTimer.start();
-                mSnapshotDelayTimer.setTimerExpirySec(SNAPSHOT_TIME_DELAY);
        }
+        mSnapshotUpToDate = FALSE;              
        LLRect& rect = mImageRect[mCurImageIndex];
        rect.set(0, getRect().getHeight(), getRect().getWidth(), 0);
@@ -305,6 +326,21 @@ void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot)
                        rect.mRight -= (getRect().getWidth() - new_width) / 2;
                }
        }
+        mShineAnimTimer.stop();
+        if (new_snapshot)
+        {
+                mSnapshotDelayTimer.start();
+                mSnapshotDelayTimer.setTimerExpirySec(SNAPSHOT_TIME_DELAY);
+        }
+        else if(new_thumbnail)
+        {
+                mThumbnailUpToDate = FALSE ;
+        }
+        else
+        {
+                setThumbnailImageSize() ;
+        }
 }
 void LLSnapshotLivePreview::setSnapshotQuality(S32 quality)
@@ -316,198 +352,224 @@ void LLSnapshotLivePreview::setSnapshotQuality(S32 quality)
        }
 }
-EWidgetType LLSnapshotLivePreview::getWidgetType() const
+void LLSnapshotLivePreview::drawPreviewRect(S32 offset_x, S32 offset_y)
 {
-        return WIDGET_TYPE_SNAPSHOT_LIVE_PREVIEW;
+        F32 line_width ; 
-}
+        glGetFloatv(GL_LINE_WIDTH, &line_width) ;
+        glLineWidth(2.0f * line_width) ;
+        LLColor4 color(0.0f, 0.0f, 0.0f, 1.0f) ;
+        gl_rect_2d( mPreviewRect.mLeft + offset_x, mPreviewRect.mTop + offset_y,
+                        mPreviewRect.mRight + offset_x, mPreviewRect.mBottom + offset_y, color, FALSE ) ;
+        glLineWidth(line_width) ;
+        //draw four alpha rectangles to cover areas outside of the snapshot image
+        if(!mKeepAspectRatio)
+        {
+                LLColor4 alpha_color(0.5f, 0.5f, 0.5f, 0.8f) ;
+                S32 dwl = 0, dwr = 0 ;
+                if(mThumbnailWidth > mPreviewRect.getWidth())
+                {
+                        dwl = (mThumbnailWidth - mPreviewRect.getWidth()) >> 1 ;
+                        dwr = mThumbnailWidth - mPreviewRect.getWidth() - dwl ;
-LLString LLSnapshotLivePreview::getWidgetTag() const
+                        gl_rect_2d(mPreviewRect.mLeft + offset_x - dwl, mPreviewRect.mTop + offset_y,
-{
+                        mPreviewRect.mLeft + offset_x, mPreviewRect.mBottom + offset_y, alpha_color, TRUE ) ;
-        return LL_SNAPSHOT_LIVE_PREVIEW_TAG;
+                        gl_rect_2d( mPreviewRect.mRight + offset_x, mPreviewRect.mTop + offset_y,
+                        mPreviewRect.mRight + offset_x + dwr, mPreviewRect.mBottom + offset_y, alpha_color, TRUE ) ;
+                }
+                if(mThumbnailHeight > mPreviewRect.getHeight())
+                {
+                        S32 dh = (mThumbnailHeight - mPreviewRect.getHeight()) >> 1 ;
+                        gl_rect_2d(mPreviewRect.mLeft + offset_x - dwl, mPreviewRect.mBottom + offset_y ,
+                        mPreviewRect.mRight + offset_x + dwr, mPreviewRect.mBottom + offset_y - dh, alpha_color, TRUE ) ;
+                        dh = mThumbnailHeight - mPreviewRect.getHeight() - dh ;
+                        gl_rect_2d( mPreviewRect.mLeft + offset_x - dwl, mPreviewRect.mTop + offset_y + dh,
+                        mPreviewRect.mRight + offset_x + dwr, mPreviewRect.mTop + offset_y, alpha_color, TRUE ) ;
+                }
+        }
 }
 void LLSnapshotLivePreview::draw()
 {
-        if(getVisible()) 
+        if (mViewerImage[mCurImageIndex].notNull() &&
-        {
+            mRawImageEncoded.notNull() &&
-                if (mViewerImage[mCurImageIndex].notNull() &&
+            mSnapshotUpToDate)
-                    mRawImageEncoded.notNull() &&
+        {
-                    mSnapshotUpToDate)
+                LLColor4 bg_color(0.f, 0.f, 0.3f, 0.4f);
+                gl_rect_2d(getRect(), bg_color);
+                LLRect &rect = mImageRect[mCurImageIndex];
+                LLRect shadow_rect = mImageRect[mCurImageIndex];
+                shadow_rect.stretch(BORDER_WIDTH);
+                gl_drop_shadow(shadow_rect.mLeft, shadow_rect.mTop, shadow_rect.mRight, shadow_rect.mBottom, LLColor4(0.f, 0.f, 0.f, mNeedsFlash ? 0.f :0.5f), 10);
+                LLColor4 image_color(1.f, 1.f, 1.f, 1.f);
+                gGL.color4fv(image_color.mV);
+                LLViewerImage::bindTexture(mViewerImage[mCurImageIndex]);
+                // calculate UV scale
+                F32 uv_width = mImageScaled[mCurImageIndex] ? 1.f : llmin((F32)mWidth[mCurImageIndex] / (F32)mViewerImage[mCurImageIndex]->getWidth(), 1.f);
+                F32 uv_height = mImageScaled[mCurImageIndex] ? 1.f : llmin((F32)mHeight[mCurImageIndex] / (F32)mViewerImage[mCurImageIndex]->getHeight(), 1.f);
+                glPushMatrix();
                {
-                        LLColor4 bg_color(0.f, 0.f, 0.3f, 0.4f);
+                        glTranslatef((F32)rect.mLeft, (F32)rect.mBottom, 0.f);
-                        gl_rect_2d(getRect(), bg_color);
+                        gGL.begin(GL_QUADS);
-                        LLRect &rect = mImageRect[mCurImageIndex];
-                        LLRect shadow_rect = mImageRect[mCurImageIndex];
-                        shadow_rect.stretch(BORDER_WIDTH);
-                        gl_drop_shadow(shadow_rect.mLeft, shadow_rect.mTop, shadow_rect.mRight, shadow_rect.mBottom, LLColor4(0.f, 0.f, 0.f, mNeedsFlash ? 0.f :0.5f), 10);
-                        LLColor4 image_color(1.f, 1.f, 1.f, 1.f);
-                        gGL.color4fv(image_color.mV);
-                        LLViewerImage::bindTexture(mViewerImage[mCurImageIndex]);
-                        // calculate UV scale
-                        F32 uv_width = mImageScaled[mCurImageIndex] ? 1.f : llmin((F32)mWidth[mCurImageIndex] / (F32)mViewerImage[mCurImageIndex]->getWidth(), 1.f);
-                        F32 uv_height = mImageScaled[mCurImageIndex] ? 1.f : llmin((F32)mHeight[mCurImageIndex] / (F32)mViewerImage[mCurImageIndex]->getHeight(), 1.f);
-                        glPushMatrix();
                        {
-                                glTranslatef((F32)rect.mLeft, (F32)rect.mBottom, 0.f);
+                                gGL.texCoord2f(uv_width, uv_height);
-                                gGL.begin(GL_QUADS);
+                                gGL.vertex2i(rect.getWidth(), rect.getHeight() );
-                                {
-                                        gGL.texCoord2f(uv_width, uv_height);
-                                        gGL.vertex2i(rect.getWidth(), rect.getHeight() );
-                                        gGL.texCoord2f(0.f, uv_height);
+                                gGL.texCoord2f(0.f, uv_height);
-                                        gGL.vertex2i(0, rect.getHeight() );
+                                gGL.vertex2i(0, rect.getHeight() );
-                                        gGL.texCoord2f(0.f, 0.f);
+                                gGL.texCoord2f(0.f, 0.f);
-                                        gGL.vertex2i(0, 0);
+                                gGL.vertex2i(0, 0);
-                                        gGL.texCoord2f(uv_width, 0.f);
+                                gGL.texCoord2f(uv_width, 0.f);
-                                        gGL.vertex2i(rect.getWidth(), 0);
+                                gGL.vertex2i(rect.getWidth(), 0);
-                                }
-                                gGL.end();
                        }
-                        glPopMatrix();
+                        gGL.end();
+                }
+                glPopMatrix();
-                        gGL.color4f(1.f, 1.f, 1.f, mFlashAlpha);
+                gGL.color4f(1.f, 1.f, 1.f, mFlashAlpha);
-                        gl_rect_2d(getRect());
+                gl_rect_2d(getRect());
-                        if (mNeedsFlash)
+                if (mNeedsFlash)
+                {
+                        if (mFlashAlpha < 1.f)
                        {
-                                if (mFlashAlpha < 1.f)
+                                mFlashAlpha = lerp(mFlashAlpha, 1.f, LLCriticalDamp::getInterpolant(0.02f));
-                                {
-                                        mFlashAlpha = lerp(mFlashAlpha, 1.f, LLCriticalDamp::getInterpolant(0.02f));
-                                }
-                                else
-                                {
-                                        mNeedsFlash = FALSE;
-                                }
                        }
                        else
                        {
-                                mFlashAlpha = lerp(mFlashAlpha, 0.f, LLCriticalDamp::getInterpolant(0.15f));
+                                mNeedsFlash = FALSE;
                        }
+                }
+                else
+                {
+                        mFlashAlpha = lerp(mFlashAlpha, 0.f, LLCriticalDamp::getInterpolant(0.15f));
+                }
-                        if (mShineCountdown > 0)
+                if (mShineCountdown > 0)
+                {
+                        mShineCountdown--;
+                        if (mShineCountdown == 0)
                        {
-                                mShineCountdown--;
+                                mShineAnimTimer.start();
-                                if (mShineCountdown == 0)
-                                {
-                                        mShineAnimTimer.start();
-                                }
                        }
-                        else if (mShineAnimTimer.getStarted())
+                }
+                else if (mShineAnimTimer.getStarted())
+                {
+                        //LLDebugVarMessageBox::show("Shine time", &SHINE_TIME, 10.f, 0.1f);
+                        //LLDebugVarMessageBox::show("Shine width", &SHINE_WIDTH, 2.f, 0.05f);
+                        //LLDebugVarMessageBox::show("Shine opacity", &SHINE_OPACITY, 1.f, 0.05f);
+                        F32 shine_interp = llmin(1.f, mShineAnimTimer.getElapsedTimeF32() / SHINE_TIME);
+                        
+                        // draw "shine" effect
+                        LLLocalClipRect clip(getLocalRect());
                        {
-                                //LLDebugVarMessageBox::show("Shine time", &SHINE_TIME, 10.f, 0.1f);
+                                // draw diagonal stripe with gradient that passes over screen
-                                //LLDebugVarMessageBox::show("Shine width", &SHINE_WIDTH, 2.f, 0.05f);
+                                S32 x1 = gViewerWindow->getWindowWidth() * llround((clamp_rescale(shine_interp, 0.f, 1.f, -1.f - SHINE_WIDTH, 1.f)));
-                                //LLDebugVarMessageBox::show("Shine opacity", &SHINE_OPACITY, 1.f, 0.05f);
+                                S32 x2 = x1 + llround(gViewerWindow->getWindowWidth() * SHINE_WIDTH);
+                                S32 x3 = x2 + llround(gViewerWindow->getWindowWidth() * SHINE_WIDTH);
-                                F32 shine_interp = llmin(1.f, mShineAnimTimer.getElapsedTimeF32() / SHINE_TIME);
+                                S32 y1 = 0;
-                                
+                                S32 y2 = gViewerWindow->getWindowHeight();
-                                // draw "shine" effect
-                                LLLocalClipRect clip(getLocalRect());
+                                LLGLSNoTexture no_texture;
+                                gGL.begin(GL_QUADS);
                                {
-                                        // draw diagonal stripe with gradient that passes over screen
+                                        gGL.color4f(1.f, 1.f, 1.f, 0.f);
-                                        S32 x1 = gViewerWindow->getWindowWidth() * llround((clamp_rescale(shine_interp, 0.f, 1.f, -1.f - SHINE_WIDTH, 1.f)));
+                                        gGL.vertex2i(x1, y1);
-                                        S32 x2 = x1 + llround(gViewerWindow->getWindowWidth() * SHINE_WIDTH);
+                                        gGL.vertex2i(x1 + gViewerWindow->getWindowWidth(), y2);
-                                        S32 x3 = x2 + llround(gViewerWindow->getWindowWidth() * SHINE_WIDTH);
+                                        gGL.color4f(1.f, 1.f, 1.f, SHINE_OPACITY);
-                                        S32 y1 = 0;
+                                        gGL.vertex2i(x2 + gViewerWindow->getWindowWidth(), y2);
-                                        S32 y2 = gViewerWindow->getWindowHeight();
+                                        gGL.vertex2i(x2, y1);
-                                        LLGLSNoTexture no_texture;
+                                        gGL.color4f(1.f, 1.f, 1.f, SHINE_OPACITY);
-                                        gGL.begin(GL_QUADS);
+                                        gGL.vertex2i(x2, y1);
-                                        {
+                                        gGL.vertex2i(x2 + gViewerWindow->getWindowWidth(), y2);
-                                                gGL.color4f(1.f, 1.f, 1.f, 0.f);
+                                        gGL.color4f(1.f, 1.f, 1.f, 0.f);
-                                                gGL.vertex2i(x1, y1);
+                                        gGL.vertex2i(x3 + gViewerWindow->getWindowWidth(), y2);
-                                                gGL.vertex2i(x1 + gViewerWindow->getWindowWidth(), y2);
+                                        gGL.vertex2i(x3, y1);
-                                                gGL.color4f(1.f, 1.f, 1.f, SHINE_OPACITY);
-                                                gGL.vertex2i(x2 + gViewerWindow->getWindowWidth(), y2);
-                                                gGL.vertex2i(x2, y1);
-                                                gGL.color4f(1.f, 1.f, 1.f, SHINE_OPACITY);
-                                                gGL.vertex2i(x2, y1);
-                                                gGL.vertex2i(x2 + gViewerWindow->getWindowWidth(), y2);
-                                                gGL.color4f(1.f, 1.f, 1.f, 0.f);
-                                                gGL.vertex2i(x3 + gViewerWindow->getWindowWidth(), y2);
-                                                gGL.vertex2i(x3, y1);
-                                        }
-                                        gGL.end();
                                }
+                                gGL.end();
+                        }
-                                if (mShineAnimTimer.getElapsedTimeF32() > SHINE_TIME)
+                        if (mShineAnimTimer.getElapsedTimeF32() > SHINE_TIME)
-                                {
+                        {
-                                        mShineAnimTimer.stop();
+                                mShineAnimTimer.stop();
-                                }
                        }
                }
+        }
-                // draw framing rectangle
+        // draw framing rectangle
+        {
+                LLGLSNoTexture no_texture;
+                gGL.color4f(1.f, 1.f, 1.f, 1.f);
+                LLRect outline_rect = mImageRect[mCurImageIndex];
+                gGL.begin(GL_QUADS);
                {
-                        LLGLSNoTexture no_texture;
+                        gGL.vertex2i(outline_rect.mLeft - BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH);
-                        gGL.color4f(1.f, 1.f, 1.f, 1.f);
+                        gGL.vertex2i(outline_rect.mRight + BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH);
-                        LLRect outline_rect = mImageRect[mCurImageIndex];
+                        gGL.vertex2i(outline_rect.mRight, outline_rect.mTop);
-                        gGL.begin(GL_QUADS);
+                        gGL.vertex2i(outline_rect.mLeft, outline_rect.mTop);
-                        {
-                                gGL.vertex2i(outline_rect.mLeft - BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH);
+                        gGL.vertex2i(outline_rect.mLeft, outline_rect.mBottom);
-                                gGL.vertex2i(outline_rect.mRight + BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH);
+                        gGL.vertex2i(outline_rect.mRight, outline_rect.mBottom);
-                                gGL.vertex2i(outline_rect.mRight, outline_rect.mTop);
+                        gGL.vertex2i(outline_rect.mRight + BORDER_WIDTH, outline_rect.mBottom - BORDER_WIDTH);
-                                gGL.vertex2i(outline_rect.mLeft, outline_rect.mTop);
+                        gGL.vertex2i(outline_rect.mLeft - BORDER_WIDTH, outline_rect.mBottom - BORDER_WIDTH);
-                                gGL.vertex2i(outline_rect.mLeft, outline_rect.mBottom);
+                        gGL.vertex2i(outline_rect.mLeft, outline_rect.mTop);
-                                gGL.vertex2i(outline_rect.mRight, outline_rect.mBottom);
+                        gGL.vertex2i(outline_rect.mLeft, outline_rect.mBottom);
-                                gGL.vertex2i(outline_rect.mRight + BORDER_WIDTH, outline_rect.mBottom - BORDER_WIDTH);
+                        gGL.vertex2i(outline_rect.mLeft - BORDER_WIDTH, outline_rect.mBottom - BORDER_WIDTH);
-                                gGL.vertex2i(outline_rect.mLeft - BORDER_WIDTH, outline_rect.mBottom - BORDER_WIDTH);
+                        gGL.vertex2i(outline_rect.mLeft - BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH);
-                                gGL.vertex2i(outline_rect.mLeft, outline_rect.mTop);
+                        gGL.vertex2i(outline_rect.mRight, outline_rect.mBottom);
-                                gGL.vertex2i(outline_rect.mLeft, outline_rect.mBottom);
+                        gGL.vertex2i(outline_rect.mRight, outline_rect.mTop);
-                                gGL.vertex2i(outline_rect.mLeft - BORDER_WIDTH, outline_rect.mBottom - BORDER_WIDTH);
+                        gGL.vertex2i(outline_rect.mRight + BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH);
-                                gGL.vertex2i(outline_rect.mLeft - BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH);
+                        gGL.vertex2i(outline_rect.mRight + BORDER_WIDTH, outline_rect.mBottom - BORDER_WIDTH);
-                                gGL.vertex2i(outline_rect.mRight, outline_rect.mBottom);
-                                gGL.vertex2i(outline_rect.mRight, outline_rect.mTop);
-                                gGL.vertex2i(outline_rect.mRight + BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH);
-                                gGL.vertex2i(outline_rect.mRight + BORDER_WIDTH, outline_rect.mBottom - BORDER_WIDTH);
-                        }
-                        gGL.end();
                }
+                gGL.end();
+        }
-                // draw old image dropping away
+        // draw old image dropping away
-                if (mFallAnimTimer.getStarted())
+        if (mFallAnimTimer.getStarted())
+        {
+                S32 old_image_index = (mCurImageIndex + 1) % 2;
+                if (mViewerImage[old_image_index].notNull() && mFallAnimTimer.getElapsedTimeF32() < FALL_TIME)
                {
-                        S32 old_image_index = (mCurImageIndex + 1) % 2;
+                        F32 fall_interp = mFallAnimTimer.getElapsedTimeF32() / FALL_TIME;
-                        if (mViewerImage[old_image_index].notNull() && mFallAnimTimer.getElapsedTimeF32() < FALL_TIME)
+                        F32 alpha = clamp_rescale(fall_interp, 0.f, 1.f, 0.8f, 0.4f);
+                        LLColor4 image_color(1.f, 1.f, 1.f, alpha);
+                        gGL.color4fv(image_color.mV);
+                        LLViewerImage::bindTexture(mViewerImage[old_image_index]);
+                        // calculate UV scale
+                        // *FIX get this to work with old image
+                        BOOL rescale = !mImageScaled[old_image_index] && mViewerImage[mCurImageIndex].notNull();
+                        F32 uv_width = rescale ? llmin((F32)mWidth[old_image_index] / (F32)mViewerImage[mCurImageIndex]->getWidth(), 1.f) : 1.f;
+                        F32 uv_height = rescale ? llmin((F32)mHeight[old_image_index] / (F32)mViewerImage[mCurImageIndex]->getHeight(), 1.f) : 1.f;
+                        glPushMatrix();
                        {
-                                F32 fall_interp = mFallAnimTimer.getElapsedTimeF32() / FALL_TIME;
+                                LLRect& rect = mImageRect[old_image_index];
-                                F32 alpha = clamp_rescale(fall_interp, 0.f, 1.f, 0.8f, 0.4f);
+                                glTranslatef((F32)rect.mLeft, (F32)rect.mBottom - llround(getRect().getHeight() * 2.f * (fall_interp * fall_interp)), 0.f);
-                                LLColor4 image_color(1.f, 1.f, 1.f, alpha);
+                                glRotatef(-45.f * fall_interp, 0.f, 0.f, 1.f);
-                                gGL.color4fv(image_color.mV);
+                                gGL.begin(GL_QUADS);
-                                LLViewerImage::bindTexture(mViewerImage[old_image_index]);
-                                // calculate UV scale
-                                // *FIX get this to work with old image
-                                BOOL rescale = !mImageScaled[old_image_index] && mViewerImage[mCurImageIndex].notNull();
-                                F32 uv_width = rescale ? llmin((F32)mWidth[old_image_index] / (F32)mViewerImage[mCurImageIndex]->getWidth(), 1.f) : 1.f;
-                                F32 uv_height = rescale ? llmin((F32)mHeight[old_image_index] / (F32)mViewerImage[mCurImageIndex]->getHeight(), 1.f) : 1.f;
-                                glPushMatrix();
                                {
-                                        LLRect& rect = mImageRect[old_image_index];
+                                        gGL.texCoord2f(uv_width, uv_height);
-                                        glTranslatef((F32)rect.mLeft, (F32)rect.mBottom - llround(getRect().getHeight() * 2.f * (fall_interp * fall_interp)), 0.f);
+                                        gGL.vertex2i(rect.getWidth(), rect.getHeight() );
-                                        glRotatef(-45.f * fall_interp, 0.f, 0.f, 1.f);
-                                        gGL.begin(GL_QUADS);
+                                        gGL.texCoord2f(0.f, uv_height);
-                                        {
+                                        gGL.vertex2i(0, rect.getHeight() );
-                                                gGL.texCoord2f(uv_width, uv_height);
-                                                gGL.vertex2i(rect.getWidth(), rect.getHeight() );
+                                        gGL.texCoord2f(0.f, 0.f);
+                                        gGL.vertex2i(0, 0);
-                                                gGL.texCoord2f(0.f, uv_height);
-                                                gGL.vertex2i(0, rect.getHeight() );
+                                        gGL.texCoord2f(uv_width, 0.f);
+                                        gGL.vertex2i(rect.getWidth(), 0);
-                                                gGL.texCoord2f(0.f, 0.f);
-                                                gGL.vertex2i(0, 0);
-                                                gGL.texCoord2f(uv_width, 0.f);
-                                                gGL.vertex2i(rect.getWidth(), 0);
-                                        }
-                                        gGL.end();
                                }
-                                glPopMatrix();
+                                gGL.end();
                        }
+                        glPopMatrix();
                }
        }
 }
@@ -519,17 +581,140 @@ void LLSnapshotLivePreview::reshape(S32 width, S32 height, BOOL called_from_pare
        LLView::reshape(width, height, called_from_parent);
        if (old_rect.getWidth() != width || old_rect.getHeight() != height)
        {
-                updateSnapshot(getSnapshotUpToDate());
+                updateSnapshot(FALSE, TRUE);
        }
 }
+BOOL LLSnapshotLivePreview::setThumbnailImageSize()
+{
+        if(mWidth[mCurImageIndex] < 10 || mHeight[mCurImageIndex] < 10)
+        {
+                return FALSE ;
+        }
+        S32 window_width = gViewerWindow->getWindowDisplayWidth() ;
+        S32 window_height = gViewerWindow->getWindowDisplayHeight() ;
+        F32 window_aspect_ratio = ((F32)window_width) / ((F32)window_height);
+        // UI size for thumbnail
+        S32 max_width = LLFloaterSnapshot::getUIWinWidth() - 20;
+        S32 max_height = 90;
+        if (window_aspect_ratio > (F32)max_width / max_height)
+        {
+                // image too wide, shrink to width
+                mThumbnailWidth = max_width;
+                mThumbnailHeight = llround((F32)max_width / window_aspect_ratio);
+        }
+        else
+        {
+                // image too tall, shrink to height
+                mThumbnailHeight = max_height;
+                mThumbnailWidth = llround((F32)max_height * window_aspect_ratio);
+        }
+        
+        if(mThumbnailWidth > window_width || mThumbnailHeight > window_height)
+        {
+                return FALSE ;//if the window is too small, ignore thumbnail updating.
+        }
+        S32 left = 0 , top = mThumbnailHeight, right = mThumbnailWidth, bottom = 0 ;
+        if(!mKeepAspectRatio)
+        {
+                F32 ratio_x = (F32)mWidth[mCurImageIndex] / window_width ;
+                F32 ratio_y = (F32)mHeight[mCurImageIndex] / window_height ;
+                //if(mWidth[mCurImageIndex] > window_width ||
+                //      mHeight[mCurImageIndex] > window_height )
+                {
+                        if(ratio_x > ratio_y)
+                        {
+                                top = (S32)(top * ratio_y / ratio_x) ;
+                        }
+                        else
+                        {
+                                right = (S32)(right * ratio_x / ratio_y) ;
+                        }                       
+                }
+                //else
+                //{
+                //      right = (S32)(right * ratio_x) ;
+                //      top = (S32)(top * ratio_y) ;
+                //}
+                left = (S32)((mThumbnailWidth - right) * 0.5f) ;
+                bottom = (S32)((mThumbnailHeight - top) * 0.5f) ;
+                top += bottom ;
+                right += left ;
+        }
+        mPreviewRect.set(left - 1, top + 1, right + 1, bottom - 1) ;
+        return TRUE ;
+}
+void LLSnapshotLivePreview::generateThumbnailImage(BOOL force_update)
+{       
+        if(mThumbnailUpdateLock) //in the process of updating
+        {
+                return ;
+        }
+        if(mThumbnailUpToDate && !force_update)//already updated
+        {
+                return ;
+        }
+        if(mWidth[mCurImageIndex] < 10 || mHeight[mCurImageIndex] < 10)
+        {
+                return ;
+        }
+        ////lock updating
+        mThumbnailUpdateLock = TRUE ;
+        if(!setThumbnailImageSize())
+        {
+                mThumbnailUpdateLock = FALSE ;
+                mThumbnailUpToDate = TRUE ;
+                return ;
+        }
+        if(mThumbnailImage)
+        {
+                resetThumbnailImage() ;
+        }               
+        LLPointer<LLImageRaw> raw = NULL ;
+        S32 w , h ;
+        w = get_nearest_power_two(mThumbnailWidth, 512) * 2 ;
+        h = get_nearest_power_two(mThumbnailHeight, 512) * 2 ;
+        {
+                raw = new LLImageRaw ;
+                if(!gViewerWindow->thumbnailSnapshot(raw,
+                                                                w, h,
+                                                                gSavedSettings.getBOOL("RenderUIInSnapshot"),
+                                                                FALSE,
+                                                                mSnapshotBufferType) )                                                          
+                {
+                        raw = NULL ;
+                }
+        }
+        if(raw)
+        {
+                mThumbnailImage = new LLImageGL(raw, FALSE);            
+                mThumbnailUpToDate = TRUE ;
+        }
+        //unlock updating
+        mThumbnailUpdateLock = FALSE ;          
+}
 //static 
 void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
 {
-        LLSnapshotLivePreview* previewp = (LLSnapshotLivePreview*)snapshot_preview;
+        LLSnapshotLivePreview* previewp = (LLSnapshotLivePreview*)snapshot_preview;     
-        LLVector3 new_camera_pos = gCamera->getOrigin();
+        LLVector3 new_camera_pos = LLViewerCamera::getInstance()->getOrigin();
-        LLQuaternion new_camera_rot = gCamera->getQuaternion();
+        LLQuaternion new_camera_rot = LLViewerCamera::getInstance()->getQuaternion();
        if (gSavedSettings.getBOOL("FreezeTime") && 
                (new_camera_pos != previewp->mCameraPos || dot(new_camera_rot, previewp->mCameraRot) < 0.995f))
        {
@@ -543,7 +728,7 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                                                                 previewp->mSnapshotDelayTimer.hasExpired());
        // don't take snapshots while ALT-zoom active
-        if (gToolCamera->hasMouseCapture())
+        if (LLToolCamera::getInstance()->hasMouseCapture())
        {
                previewp->mSnapshotActive = FALSE;
        }
@@ -637,6 +822,7 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                        previewp->mViewerImage[previewp->mCurImageIndex]->setClamp(TRUE, TRUE);
                        previewp->mSnapshotUpToDate = TRUE;
+                        previewp->generateThumbnailImage(TRUE) ;
                        previewp->mPosTakenGlobal = gAgent.getCameraPositionGlobal();
                        previewp->mShineCountdown = 4; // wait a few frames to avoid animation glitch due to readback this frame
@@ -647,6 +833,10 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                previewp->mSnapshotDelayTimer.stop();
                previewp->mSnapshotActive = FALSE;
        }
+        if(!previewp->getThumbnailUpToDate())
+        {
+                previewp->generateThumbnailImage() ;
+        }
 }
 void LLSnapshotLivePreview::setSize(S32 w, S32 h)
@@ -718,7 +908,7 @@ void LLSnapshotLivePreview::saveTexture()
                llwarns << "Error encoding snapshot" << llendl;
        }
-        gViewerStats->incStat(LLViewerStats::ST_SNAPSHOT_COUNT );       
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_SNAPSHOT_COUNT );       
 }
 BOOL LLSnapshotLivePreview::saveLocal()
@@ -759,7 +949,8 @@ public:
        static void onCommitLayerTypes(LLUICtrl* ctrl, void*data);
        static void onCommitSnapshotType(LLUICtrl* ctrl, void* data);
        static void onCommitCustomResolution(LLUICtrl *ctrl, void* data);
-        static void checkImageSize(LLSnapshotLivePreview* previewp, S32& width, S32& height, BOOL isWidthChanged, S32 max_value);
+        static void resetSnapshotSizeOnUI(LLFloaterSnapshot *view, S32 width, S32 height) ;
+        static BOOL checkImageSize(LLSnapshotLivePreview* previewp, S32& width, S32& height, BOOL isWidthChanged, S32 max_value);
        static LLSnapshotLivePreview* getPreviewView(LLFloaterSnapshot *floater);
        static void setResolution(LLFloaterSnapshot* floater, const std::string& comboname);
@@ -773,7 +964,7 @@ private:
        static LLSnapshotLivePreview::ESnapshotType getTypeIndex(LLFloaterSnapshot* floater);
        static LLViewerWindow::ESnapshotType getLayerType(LLFloaterSnapshot* floater);
        static void comboSetCustom(LLFloaterSnapshot *floater, const std::string& comboname);
-        static void checkAutoSnapshot(LLSnapshotLivePreview* floater);
+        static void checkAutoSnapshot(LLSnapshotLivePreview* floater, BOOL update_thumbnail = FALSE);
        static void checkAspectRatio(LLFloaterSnapshot *view, S32 index) ;
 public:
@@ -827,7 +1018,7 @@ LLViewerWindow::ESnapshotType LLFloaterSnapshot::Impl::getLayerType(LLFloaterSna
 // static
 void LLFloaterSnapshot::Impl::setResolution(LLFloaterSnapshot* floater, const std::string& comboname)
 {
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(floater, comboname);
+        LLComboBox* combo = floater->getChild<LLComboBox>(comboname);
        if (combo)
        {
                combo->setVisible(TRUE);
@@ -840,22 +1031,22 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
 {
        LLSnapshotLivePreview* previewp = getPreviewView(floaterp);
-        S32 delta_height = gSavedSettings.getBOOL("AdvanceSnapshot") ? 0 : -230 ;
+        S32 delta_height = gSavedSettings.getBOOL("AdvanceSnapshot") ? 0 : floaterp->getUIWinHeightShort() - floaterp->getUIWinHeightLong() ;
        LLComboBox* combo;
        if(!gSavedSettings.getBOOL("AdvanceSnapshot")) //set to original window resolution
        {
                previewp->mKeepAspectRatio = TRUE ;
-                combo = LLUICtrlFactory::getComboBoxByName(floaterp, "postcard_size_combo");
+                combo = floaterp->getChild<LLComboBox>("postcard_size_combo");
                combo->setCurrentByIndex(0) ;
                gSavedSettings.setS32("SnapshotPostcardLastResolution", 0) ;
-                combo = LLUICtrlFactory::getComboBoxByName(floaterp, "texture_size_combo");
+                combo = floaterp->getChild<LLComboBox>("texture_size_combo");
                combo->setCurrentByIndex(0) ;
                gSavedSettings.setS32("SnapshotTextureLastResolution", 0) ;
-                combo = LLUICtrlFactory::getComboBoxByName(floaterp, "local_size_combo");
+                combo = floaterp->getChild<LLComboBox>("local_size_combo");
                combo->setCurrentByIndex(0) ;
                gSavedSettings.setS32("SnapshotLocalLastResolution", 0) ;
@@ -869,7 +1060,7 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
                floaterp->getParent()->setMouseOpaque(TRUE);
                
                // shrink to smaller layout
-                floaterp->reshape(floaterp->getRect().getWidth(), 526 + delta_height);
+                floaterp->reshape(floaterp->getRect().getWidth(), floaterp->getUIWinHeightLong() + delta_height);
                // can see and interact with fullscreen preview now
                if (previewp)
@@ -890,19 +1081,16 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
                // freeze everything else
                gSavedSettings.setBOOL("FreezeTime", TRUE);
-                if (gToolMgr->getCurrentToolset() != gCameraToolset)
+                if (LLToolMgr::getInstance()->getCurrentToolset() != gCameraToolset)
                {
-                        sInstance->impl.mLastToolset = gToolMgr->getCurrentToolset();
+                        sInstance->impl.mLastToolset = LLToolMgr::getInstance()->getCurrentToolset();
-                        if (gToolMgr)
+                        LLToolMgr::getInstance()->setCurrentToolset(gCameraToolset);
-                        {
-                                gToolMgr->setCurrentToolset(gCameraToolset);
-                        }
                }
        }
        else // turning off freeze frame mode
        {
                floaterp->getParent()->setMouseOpaque(FALSE);
-                floaterp->reshape(floaterp->getRect().getWidth(), 526 + delta_height);
+                floaterp->reshape(floaterp->getRect().getWidth(), floaterp->getUIWinHeightLong() + delta_height);
                if (previewp)
                {
                        previewp->setVisible(FALSE);
@@ -918,10 +1106,7 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
                // restore last tool (e.g. pie menu, etc)
                if (sInstance->impl.mLastToolset)
                {
-                        if (gToolMgr)
+                        LLToolMgr::getInstance()->setCurrentToolset(sInstance->impl.mLastToolset);
-                        {
-                                gToolMgr->setCurrentToolset(sInstance->impl.mLastToolset);
-                        }
                }
        }
 }
@@ -931,8 +1116,7 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
 void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 {
        BOOL is_advance = gSavedSettings.getBOOL("AdvanceSnapshot") ;
+        LLRadioGroup* snapshot_type_radio = floater->getChild<LLRadioGroup>("snapshot_type_radio");
-        LLRadioGroup* snapshot_type_radio = LLUICtrlFactory::getRadioGroupByName(floater, "snapshot_type_radio");
        snapshot_type_radio->setSelectedIndex(gSavedSettings.getS32("LastSnapshotType"));
        LLSnapshotLivePreview::ESnapshotType shot_type = getTypeIndex(floater);
        LLViewerWindow::ESnapshotType layer_type = getLayerType(floater);
@@ -942,11 +1126,11 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
        floater->childSetVisible("local_size_combo", FALSE);
        LLComboBox* combo;
-        combo = LLUICtrlFactory::getComboBoxByName(floater, "postcard_size_combo");
+        combo = floater->getChild<LLComboBox>("postcard_size_combo");
        if (combo) combo->selectNthItem(gSavedSettings.getS32("SnapshotPostcardLastResolution"));
-        combo = LLUICtrlFactory::getComboBoxByName(floater, "texture_size_combo");
+        combo = floater->getChild<LLComboBox>("texture_size_combo");
        if (combo) combo->selectNthItem(gSavedSettings.getS32("SnapshotTextureLastResolution"));
-        combo = LLUICtrlFactory::getComboBoxByName(floater, "local_size_combo");
+        combo = floater->getChild<LLComboBox>("local_size_combo");
        if (combo) combo->selectNthItem(gSavedSettings.getS32("SnapshotLocalLastResolution"));
        floater->childSetVisible("upload_btn", FALSE);
@@ -1051,11 +1235,11 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 }
 // static
-void LLFloaterSnapshot::Impl::checkAutoSnapshot(LLSnapshotLivePreview* previewp)
+void LLFloaterSnapshot::Impl::checkAutoSnapshot(LLSnapshotLivePreview* previewp, BOOL update_thumbnail)
 {
        if (previewp)
        {               
-                previewp->updateSnapshot(gSavedSettings.getBOOL("AutoSnapshot"));
+                previewp->updateSnapshot(gSavedSettings.getBOOL("AutoSnapshot"), update_thumbnail);
        }
 }
@@ -1143,16 +1327,13 @@ void LLFloaterSnapshot::Impl::onClickAutoSnap(LLUICtrl *ctrl, void* data)
 void LLFloaterSnapshot::Impl::onClickMore(void* data)
 {
-        //floater->childSetVisible("more_btn", FALSE);
-        //floater->childSetVisible("less_btn", TRUE);
        gSavedSettings.setBOOL( "AdvanceSnapshot", TRUE );
        
        LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;            
        if (view)
        {
-                view->translate( 0, -230 );
+                view->translate( 0, view->getUIWinHeightShort() - view->getUIWinHeightLong() );
-                view->reshape(view->getRect().getWidth(), 526);
+                view->reshape(view->getRect().getWidth(), view->getUIWinHeightLong());
                updateControls(view) ;
                updateLayout(view) ;
@@ -1160,40 +1341,24 @@ void LLFloaterSnapshot::Impl::onClickMore(void* data)
 }
 void LLFloaterSnapshot::Impl::onClickLess(void* data)
 {
-        //floater->childSetVisible("less_btn", FALSE);
-        //floater->childSetVisible("more_btn", TRUE);
        gSavedSettings.setBOOL( "AdvanceSnapshot", FALSE );
        
        LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;            
        if (view)
        {
-                view->translate( 0, 230 );
+                view->translate( 0, view->getUIWinHeightLong() - view->getUIWinHeightShort() );
-                view->reshape(view->getRect().getWidth(), 294);
+                view->reshape(view->getRect().getWidth(), view->getUIWinHeightShort());
                updateControls(view) ;
                updateLayout(view) ;
+                if(getPreviewView(view))
+                {
+                        getPreviewView(view)->setThumbnailImageSize() ;
+                }
        }
 }
-//void LLFloaterSnapshot::Impl::onClickAdvanceSnap(LLUICtrl *ctrl, void* data)
-//{
-//      LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
-//      gSavedSettings.setBOOL( "AdvanceSnapshot", check->get() );
-//      
-//      LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;            
-//      if (view)
-//      {
-//              S32 delta_height = gSavedSettings.getBOOL("AdvanceSnapshot") ? 0 : -230 ;
-//
-//              view->translate( 0, delta_height ? 230 : -230 );
-//              view->reshape(view->getRect().getWidth(), 526 + delta_height);
-//
-//              updateControls(view) ;
-//              updateLayout(view) ;
-//      }
-//}
 // static
 void LLFloaterSnapshot::Impl::onClickUICheck(LLUICtrl *ctrl, void* data)
 {
@@ -1203,7 +1368,7 @@ void LLFloaterSnapshot::Impl::onClickUICheck(LLUICtrl *ctrl, void* data)
        LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
        if (view)
        {
-                checkAutoSnapshot(getPreviewView(view));
+                checkAutoSnapshot(getPreviewView(view), TRUE);
        }
 }
@@ -1216,7 +1381,7 @@ void LLFloaterSnapshot::Impl::onClickHUDCheck(LLUICtrl *ctrl, void* data)
        LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
        if (view)
        {
-                checkAutoSnapshot(getPreviewView(view));
+                checkAutoSnapshot(getPreviewView(view), TRUE);
        }
 }
@@ -1244,23 +1409,13 @@ void LLFloaterSnapshot::Impl::onClickKeepAspectCheck(LLUICtrl* ctrl, void* data)
                        S32 w, h ;
                        previewp->getSize(w, h) ;
-                        checkImageSize(previewp, w, h, TRUE, previewp->getMaxImageSize()) ;
+                        if(checkImageSize(previewp, w, h, TRUE, previewp->getMaxImageSize()))
-                        previewp->setSize(w, h) ;
-                        //update textbox
-                        LLSpinCtrl *sctrl = LLViewerUICtrlFactory::getSpinnerByName(view, "snapshot_width") ;
-                        if(sctrl)
                        {
-                                sctrl->setValue(w) ;
+                                resetSnapshotSizeOnUI(view, w, h) ;
                        }
-                        sctrl = LLViewerUICtrlFactory::getSpinnerByName(view, "snapshot_height") ;
+                        previewp->setSize(w, h) ;
-                        if(sctrl)
+                        checkAutoSnapshot(previewp, TRUE);
-                        {
-                                sctrl->setValue(h) ;
-                        }
-                        checkAutoSnapshot(previewp);
                }
        }
 }
@@ -1276,7 +1431,7 @@ void LLFloaterSnapshot::Impl::onCommitQuality(LLUICtrl* ctrl, void* data)
        {
                previewp->setSnapshotQuality(quality_val);
        }
-        checkAutoSnapshot(previewp);
+        checkAutoSnapshot(previewp, TRUE);
 }
 // static
@@ -1300,6 +1455,12 @@ void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 inde
 {
        LLSnapshotLivePreview *previewp = getPreviewView(view) ;
        
+        if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == getTypeIndex(view))
+        {
+                previewp->mKeepAspectRatio = FALSE ;
+                return ;
+        }
        if(!index) //current window size
        {
                sAspectRatioCheckOff = TRUE ;
@@ -1350,11 +1511,11 @@ void LLFloaterSnapshot::Impl::onCommitResolution(LLUICtrl* ctrl, void* data)
        // save off all selected resolution values
        LLComboBox* combo;
-        combo = LLUICtrlFactory::getComboBoxByName(view, "postcard_size_combo");
+        combo = view->getChild<LLComboBox>("postcard_size_combo");
        gSavedSettings.setS32("SnapshotPostcardLastResolution", combo->getCurrentIndex());
-        combo = LLUICtrlFactory::getComboBoxByName(view, "texture_size_combo");
+        combo = view->getChild<LLComboBox>("texture_size_combo");
        gSavedSettings.setS32("SnapshotTextureLastResolution", combo->getCurrentIndex());
-        combo = LLUICtrlFactory::getComboBoxByName(view, "local_size_combo");
+        combo = view->getChild<LLComboBox>("local_size_combo");
        gSavedSettings.setS32("SnapshotLocalLastResolution", combo->getCurrentIndex());
        std::string sdstring = combobox->getSelectedValue();
@@ -1385,13 +1546,17 @@ void LLFloaterSnapshot::Impl::onCommitResolution(LLUICtrl* ctrl, void* data)
                checkAspectRatio(view, width) ;
                previewp->getSize(width, height);
-                checkImageSize(previewp, width, height, TRUE, previewp->getMaxImageSize()) ;
+        
+                if(checkImageSize(previewp, width, height, TRUE, previewp->getMaxImageSize()))
+                {
+                        resetSnapshotSizeOnUI(view, width, height) ;
+                }
                previewp->setSize(width, height);
                view->childSetValue("snapshot_width", width);
                view->childSetValue("snapshot_height", height);
                // hide old preview as the aspect ratio could be wrong
-                checkAutoSnapshot(previewp);
+                checkAutoSnapshot(previewp, FALSE);
        }
 }
@@ -1409,7 +1574,7 @@ void LLFloaterSnapshot::Impl::onCommitLayerTypes(LLUICtrl* ctrl, void*data)
                {
                        previewp->setSnapshotBufferType((LLViewerWindow::ESnapshotType)combobox->getCurrentIndex());
                }
-                checkAutoSnapshot(previewp);
+                checkAutoSnapshot(previewp, TRUE);
        }
 }
@@ -1428,7 +1593,7 @@ void LLFloaterSnapshot::Impl::onCommitSnapshotType(LLUICtrl* ctrl, void* data)
 // static
 void LLFloaterSnapshot::Impl::comboSetCustom(LLFloaterSnapshot* floater, const std::string& comboname)
 {
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(floater, comboname);
+        LLComboBox* combo = floater->getChild<LLComboBox>(comboname);
        if (combo)
        {
                combo->setCurrentByIndex(combo->getItemCount() - 1);
@@ -1440,8 +1605,11 @@ void LLFloaterSnapshot::Impl::comboSetCustom(LLFloaterSnapshot* floater, const s
 //static
-void LLFloaterSnapshot::Impl::checkImageSize(LLSnapshotLivePreview* previewp, S32& width, S32& height, BOOL isWidthChanged, S32 max_value)
+BOOL LLFloaterSnapshot::Impl::checkImageSize(LLSnapshotLivePreview* previewp, S32& width, S32& height, BOOL isWidthChanged, S32 max_value)
 {
+        S32 w = width ;
+        S32 h = height ;
        //if texture, ignore aspect ratio setting, round image size to power of 2.
        if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE == gSavedSettings.getS32("LastSnapshotType"))
        {
@@ -1457,15 +1625,12 @@ void LLFloaterSnapshot::Impl::checkImageSize(LLSnapshotLivePreview* previewp, S3
                //round to nearest power of 2
                width = get_nearest_power_two(width, MAX_TEXTURE_SIZE) ;
                height = get_nearest_power_two(height, MAX_TEXTURE_SIZE) ;
-                return ;
        }
+        else if(previewp && previewp->mKeepAspectRatio)
-        if(previewp && previewp->mKeepAspectRatio)
        {
                if(gViewerWindow->getWindowDisplayWidth() < 1 || gViewerWindow->getWindowDisplayHeight() < 1)
                {
-                        return ;
+                        return FALSE ;
                }
                //aspect ratio of the current window
@@ -1499,7 +1664,27 @@ void LLFloaterSnapshot::Impl::checkImageSize(LLSnapshotLivePreview* previewp, S3
        else
        {
        }
-        return ;
+        return (w != width || h != height) ;
+}
+//static
+void LLFloaterSnapshot::Impl::resetSnapshotSizeOnUI(LLFloaterSnapshot *view, S32 width, S32 height)
+{
+        LLSpinCtrl *sctrl = view->getChild<LLSpinCtrl>("snapshot_width") ;
+        if(sctrl)
+        {
+                sctrl->setValue(width) ;
+        }
+        sctrl = view->getChild<LLSpinCtrl>("snapshot_height") ;
+        if(sctrl)
+        {
+                sctrl->setValue(height) ;
+        }
+        gSavedSettings.setS32("LastSnapshotWidth", width);
+        gSavedSettings.setS32("LastSnapshotHeight", height);
 }
 //static
@@ -1522,35 +1707,14 @@ void LLFloaterSnapshot::Impl::onCommitCustomResolution(LLUICtrl *ctrl, void* dat
                        
                        if (w != curw || h != curh)
                        {
-                                S32 width = w ;
-                                S32 height = h ;
-                                
                                previewp->setMaxImageSize((S32)((LLSpinCtrl *)ctrl)->getMaxValue()) ;
-                                checkImageSize(previewp, width, height, width != curw, previewp->getMaxImageSize()) ;
+                                if(checkImageSize(previewp, w, h, w != curw, previewp->getMaxImageSize()))
-                                if(width != w || height != h)
                                {
-                                        LLSpinCtrl *sctrl = LLViewerUICtrlFactory::getSpinnerByName(view, "snapshot_width") ;
+                                        resetSnapshotSizeOnUI(view, w, h) ;
-                                        if(sctrl)
-                                        {
-                                                sctrl->setValue(width) ;
-                                        }
-                                        sctrl = LLViewerUICtrlFactory::getSpinnerByName(view, "snapshot_height") ;
-                                        if(sctrl)
-                                        {
-                                                sctrl->setValue(height) ;
-                                        }
-                                        w = width ;
-                                        h = height ;
-                                        gSavedSettings.setS32("LastSnapshotWidth", w);
-                                        gSavedSettings.setS32("LastSnapshotHeight", h);
                                }
                                previewp->setSize(w,h);
-                                checkAutoSnapshot(previewp);
+                                checkAutoSnapshot(previewp, FALSE);
                                comboSetCustom(view, "postcard_size_combo");
                                comboSetCustom(view, "texture_size_combo");
                                comboSetCustom(view, "local_size_combo");
@@ -1585,10 +1749,7 @@ LLFloaterSnapshot::~LLFloaterSnapshot()
        if (impl.mLastToolset)
        {
-                if (gToolMgr)
+                LLToolMgr::getInstance()->setCurrentToolset(impl.mLastToolset);
-                {
-                        gToolMgr->setCurrentToolset(impl.mLastToolset);
-                }
        }
        delete &impl;
@@ -1664,13 +1825,13 @@ void LLFloaterSnapshot::draw()
 {
        LLSnapshotLivePreview* previewp = impl.getPreviewView(this);
-        if (previewp && previewp->isSnapshotActive())
+        if (previewp && (previewp->isSnapshotActive() || previewp->getThumbnailLock()))
        {
                // don't render snapshot window in snapshot, even if "show ui" is turned on
                return;
        }
-        if(getVisible() && !isMinimized())
+        if(!isMinimized())
        {
                if (previewp && previewp->getDataSize() > 0)
                {
@@ -1692,7 +1853,7 @@ void LLFloaterSnapshot::draw()
                        if (previewp->getSnapshotUpToDate())
                        {
                                LLString bytes_string;
-                                gResMgr->getIntegerString(bytes_string, (previewp->getDataSize()) >> 10 );
+                                LLResMgr::getInstance()->getIntegerString(bytes_string, (previewp->getDataSize()) >> 10 );
                                childSetTextArg("file_size_label", "[SIZE]", bytes_string);
                        }
                        else
@@ -1720,7 +1881,7 @@ void LLFloaterSnapshot::draw()
        LLFloater::draw();
        // draw snapshot thumbnail if not in fullscreen preview mode
-        if (/*!gSavedSettings.getBOOL("UseFreezeFrame") &&*/ previewp && previewp->getCurrentImage() && previewp->getSnapshotUpToDate())
+        /*if (previewp && previewp->getCurrentImage() && previewp->getSnapshotUpToDate())
        {
                F32 aspect = previewp->getImageAspect();
                // UI size for thumbnail
@@ -1757,6 +1918,21 @@ void LLFloaterSnapshot::draw()
                glMatrixMode(GL_TEXTURE);
                glPopMatrix();
                glMatrixMode(GL_MODELVIEW);
+        }*/
+        if (previewp)
+        {               
+                if(previewp->getThumbnailImage())
+                {
+                        S32 offset_x = (getRect().getWidth() - previewp->getThumbnailWidth()) / 2 ;
+                        S32 offset_y = getRect().getHeight() - 205 + (90 - previewp->getThumbnailHeight()) / 2 ;
+                        glMatrixMode(GL_MODELVIEW);
+                        gl_draw_scaled_image(offset_x, offset_y, 
+                                        previewp->getThumbnailWidth(), previewp->getThumbnailHeight(), 
+                                        previewp->getThumbnailImage(), LLColor4::white);        
+                        previewp->drawPreviewRect(offset_x, offset_y) ;
+                }
        }
 }
@@ -1773,7 +1949,7 @@ void LLFloaterSnapshot::show(void*)
        {
                sInstance = new LLFloaterSnapshot();
-                gUICtrlFactory->buildFloater(sInstance, "floater_snapshot.xml", NULL, FALSE);
+                LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_snapshot.xml", NULL, FALSE);
                //move snapshot floater to special purpose snapshotfloaterview
                gFloaterView->removeChild(sInstance);
                gSnapshotFloaterView->addChild(sInstance);
@@ -1825,24 +2001,17 @@ BOOL LLSnapshotFloaterView::handleKey(KEY key, MASK mask, BOOL called_from_paren
                return LLFloaterView::handleKey(key, mask, called_from_parent);
        }
-        if (!getEnabled())
+        if (called_from_parent)
        {
-                return FALSE;
+                // pass all keystrokes down
+                LLFloaterView::handleKey(key, mask, called_from_parent);
        }
        else
        {
-                if (called_from_parent)
+                // bounce keystrokes back down
-                {
+                LLFloaterView::handleKey(key, mask, TRUE);
-                        // pass all keystrokes down
-                        LLFloaterView::handleKey(key, mask, called_from_parent);
-                }
-                else
-                {
-                        // bounce keystrokes back down
-                        LLFloaterView::handleKey(key, mask, TRUE);
-                }
-                return TRUE;
        }
+        return TRUE;
 }
 BOOL LLSnapshotFloaterView::handleMouseDown(S32 x, S32 y, MASK mask)
@@ -1855,7 +2024,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()->handleMouseDown( x, y, mask );
+                LLToolMgr::getInstance()->getCurrentTool()->handleMouseDown( x, y, mask );
        }
        return TRUE;
 }
@@ -1870,7 +2039,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()->handleMouseUp( x, y, mask );
+                LLToolMgr::getInstance()->getCurrentTool()->handleMouseUp( x, y, mask );
        }
        return TRUE;
 }
@@ -1885,7 +2054,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()->handleHover( x, y, mask );
+                LLToolMgr::getInstance()->getCurrentTool()->handleHover( x, y, mask );
        }
        return TRUE;
 }
diff --git a/linden/indra/newview/llfloatersnapshot.h b/linden/indra/newview/llfloatersnapshot.h
index 973cebf..3948a0f 100644
--- a/linden/indra/newview/llfloatersnapshot.h
+++ b/linden/indra/newview/llfloatersnapshot.h
@@ -50,14 +50,20 @@ public:
        static void show(void*);
        static void hide(void*);
        static void update();
-        
+        static S32  getUIWinHeightLong()  {return sUIWinHeightLong ;}
+        static S32  getUIWinHeightShort() {return sUIWinHeightShort ;}
+        static S32  getUIWinWidth()       {return sUIWinWidth ;}
 private:
        class Impl;
        Impl& impl;
        static LLFloaterSnapshot* sInstance;
+        static S32    sUIWinHeightLong ;
+        static S32    sUIWinHeightShort ;
+        static S32    sUIWinWidth ;
 };
 class LLSnapshotFloaterView : public LLFloaterView
diff --git a/linden/indra/newview/llfloaterstats.cpp b/linden/indra/newview/llfloaterstats.cpp
new file mode 100644
index 0000000..7b2acd4
--- /dev/null
+++ b/linden/indra/newview/llfloaterstats.cpp
@@ -0,0 +1,87 @@
+/**
+ * @file llfloaterstats.cpp
+ * @brief Container for statistics view
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "llviewerprecompiledheaders.h"
+#include "llfloaterstats.h"
+#include "llcontainerview.h"
+#include "llfloater.h"
+#include "llstatview.h"
+#include "llscrollcontainer.h"
+const S32 LL_SCROLL_BORDER = 1;
+LLFloaterStats::LLFloaterStats(const LLRect& rect)
+        :   LLFloater("floater_stats", rect, "Statistics", TRUE, rect.getWidth())
+{
+        LLRect stats_rect(0, rect.getHeight() - LLFLOATER_HEADER_SIZE,
+                                        rect.getWidth() - LLFLOATER_CLOSE_BOX_SIZE, 0);
+        mStatsContainer = new LLContainerView("statistics_view", stats_rect);
+        mStatsContainer->showLabel(FALSE);
+        LLRect scroll_rect(LL_SCROLL_BORDER, rect.getHeight() - LLFLOATER_HEADER_SIZE - LL_SCROLL_BORDER,
+                                           rect.getWidth() - LL_SCROLL_BORDER, LL_SCROLL_BORDER);
+                mScrollContainer = new LLScrollableContainerView("statistics_scroll", scroll_rect, mStatsContainer);
+        mScrollContainer->setFollowsAll();
+        mScrollContainer->setReserveScrollCorner(TRUE);
+        mStatsContainer->setScrollContainer(mScrollContainer);
+        
+        addChild(mScrollContainer);
+}
+LLFloaterStats::~LLFloaterStats()
+{
+}
+void LLFloaterStats::reshape(S32 width, S32 height)
+{
+        LLRect rect = mStatsContainer->getRect();
+        mStatsContainer->reshape(rect.getWidth() - 2, rect.getHeight(), TRUE);
+        LLFloater::reshape(width, height);
+}
+void LLFloaterStats::addStatView(LLStatView* stat)
+{
+        mStatsContainer->addChildAtEnd(stat);
+}
+void LLFloaterStats::onClose(bool app_quitting)
+{
+        setVisible(FALSE);
+}
diff --git a/linden/indra/newview/audiosettings.h b/linden/indra/newview/llfloaterstats.h
index 1d2ccc5..0b6feb0 100644
--- a/linden/indra/newview/audiosettings.h
+++ b/linden/indra/newview/llfloaterstats.h
@@ -1,10 +1,10 @@
-/** 
+/**
- * @file audiosettings.h
+ * @file llfloaterstats.h
- * @brief AudioSettings definitions
+ * @brief Container for statistics view
 *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
 * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2008, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -29,13 +29,28 @@
 * $/LicenseInfo$
 */
-#ifndef LL_AUDIOSETTINGS_H
+#ifndef LL_LLFLOATERSTATS_H
-#define LL_AUDIOSETTINGS_H
+#define LL_LLFLOATERSTATS_H
-// comment out to turn off wind
+         
-#define kAUDIO_ENABLE_WIND 
+#include "llfloater.h"
-//#define kAUDIO_ENABLE_WATER 1 // comment out to turn off water
-#define kAUDIO_NUM_BUFFERS 30
+class LLContainerView;
-#define kAUDIO_NUM_SOURCES 30 
+class LLStatView;
+class LLScrollableContainerView;
+class LLFloaterStats : public LLFloater
+{
+ public:
+        LLFloaterStats(const LLRect& rect);
+        virtual ~LLFloaterStats();
+        void addStatView(LLStatView* stat);
+        void reshape(S32 width, S32 height);
+        void onClose(bool app_quitting);
+        
+ private:
+        LLContainerView* mStatsContainer;
+        LLScrollableContainerView* mScrollContainer;
+};
 #endif
diff --git a/linden/indra/newview/llfloatertelehub.cpp b/linden/indra/newview/llfloatertelehub.cpp
index f36fd0f..3ea9c80 100644
--- a/linden/indra/newview/llfloatertelehub.cpp
+++ b/linden/indra/newview/llfloatertelehub.cpp
@@ -45,7 +45,7 @@
 #include "lltoolmgr.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 LLFloaterTelehub* LLFloaterTelehub::sInstance = NULL;
@@ -62,8 +62,8 @@ void LLFloaterTelehub::show()
        sInstance = new LLFloaterTelehub();
        // Show tools floater by selecting translate (select) tool
-        gToolMgr->setCurrentToolset(gBasicToolset);
+        LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
-        gToolMgr->getCurrentToolset()->selectTool( gToolTranslate );
+        LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCompTranslate::getInstance() );
        // Find tools floater, glue to bottom
        if (gFloaterTools)
@@ -92,21 +92,21 @@ LLFloaterTelehub::LLFloaterTelehub()
        gMessageSystem->setHandlerFunc("TelehubInfo", processTelehubInfo);
-        gUICtrlFactory->buildFloater(sInstance, "floater_telehub.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_telehub.xml");
        childSetAction("connect_btn", onClickConnect, this);
        childSetAction("disconnect_btn", onClickDisconnect, this);
        childSetAction("add_spawn_point_btn", onClickAddSpawnPoint, this);
        childSetAction("remove_spawn_point_btn", onClickRemoveSpawnPoint, this);
-        LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "spawn_points_list");
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("spawn_points_list");
        if (list)
        {
                // otherwise you can't walk with arrow keys while floater is up
                list->setAllowKeyboardMovement(FALSE);
        }
-        mObjectSelection = gSelectMgr->getEditSelection();
+        mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
 }
 LLFloaterTelehub::~LLFloaterTelehub()
@@ -119,7 +119,7 @@ LLFloaterTelehub::~LLFloaterTelehub()
 void LLFloaterTelehub::draw()
 {
-        if (getVisible() && !isMinimized())
+        if (!isMinimized())
        {
                refresh();
        }
@@ -133,7 +133,7 @@ void LLFloaterTelehub::refresh()
        LLViewerObject* object = mObjectSelection->getFirstRootObject(children_ok);
        
        BOOL have_selection = (object != NULL);
-        BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
+        BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME );
        childSetEnabled("connect_btn", have_selection && all_volume);
        BOOL have_telehub = mTelehubObjectID.notNull();
@@ -142,7 +142,7 @@ void LLFloaterTelehub::refresh()
        BOOL space_avail = (mNumSpawn < MAX_SPAWNPOINTS_PER_TELEHUB);
        childSetEnabled("add_spawn_point_btn", have_selection && all_volume && space_avail);
-        LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "spawn_points_list");
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("spawn_points_list");
        if (list)
        {
                BOOL enable_remove = (list->getFirstSelected() != NULL);
@@ -175,7 +175,7 @@ void LLFloaterTelehub::addBeacons()
        // Draw nice thick 3-pixel lines.
        gObjectList.addDebugBeacon(hub_pos_region, "", LLColor4::yellow, LLColor4::white, 4);
-        LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(sInstance, "spawn_points_list");
+        LLScrollListCtrl* list = sInstance->getChild<LLScrollListCtrl>("spawn_points_list");
        if (list)
        {
                S32 spawn_index = list->getFirstSelectedIndex();
@@ -189,26 +189,26 @@ void LLFloaterTelehub::addBeacons()
 void LLFloaterTelehub::sendTelehubInfoRequest()
 {
-        gSelectMgr->sendGodlikeRequest("telehub", "info ui");
+        LLSelectMgr::getInstance()->sendGodlikeRequest("telehub", "info ui");
 }
 // static 
 void LLFloaterTelehub::onClickConnect(void* data)
 {
-        gSelectMgr->sendGodlikeRequest("telehub", "connect");
+        LLSelectMgr::getInstance()->sendGodlikeRequest("telehub", "connect");
 }
 // static 
 void LLFloaterTelehub::onClickDisconnect(void* data)
 {
-        gSelectMgr->sendGodlikeRequest("telehub", "delete");
+        LLSelectMgr::getInstance()->sendGodlikeRequest("telehub", "delete");
 }
 // static 
 void LLFloaterTelehub::onClickAddSpawnPoint(void* data)
 {
-        gSelectMgr->sendGodlikeRequest("telehub", "spawnpoint add");
+        LLSelectMgr::getInstance()->sendGodlikeRequest("telehub", "spawnpoint add");
-        gSelectMgr->deselectAll();
+        LLSelectMgr::getInstance()->deselectAll();
 }
 // static 
@@ -216,7 +216,7 @@ void LLFloaterTelehub::onClickRemoveSpawnPoint(void* data)
 {
        if (!sInstance) return;
-        LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(sInstance, "spawn_points_list");
+        LLScrollListCtrl* list = sInstance->getChild<LLScrollListCtrl>("spawn_points_list");
        if (!list) return;
        S32 spawn_index = list->getFirstSelectedIndex();
@@ -295,7 +295,7 @@ void LLFloaterTelehub::unpackTelehubInfo(LLMessageSystem* msg)
                childSetVisible("help_text_not_connected", false);
        }
-        LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "spawn_points_list");
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("spawn_points_list");
        if (list)
        {
                list->deleteAllItems();
diff --git a/linden/indra/newview/llfloatertest.cpp b/linden/indra/newview/llfloatertest.cpp
index 2346e3e..b18dabb 100644
--- a/linden/indra/newview/llfloatertest.cpp
+++ b/linden/indra/newview/llfloatertest.cpp
@@ -52,7 +52,7 @@
 #include "llviewborder.h"
 #include "llnamelistctrl.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 class LLFloaterTestImpl : public LLFloater
@@ -254,11 +254,7 @@ LLFloaterTestImpl::LLFloaterTestImpl()
                onCommitLine,
                onKeyLine,
                onFocusLostLine,
-                this,
+                this);
-                NULL,   // prevalidate func
-                LLViewBorder::BEVEL_IN,
-                LLViewBorder::STYLE_LINE,
-                1);             // border thickness
        line->setHandleEditKeysDirectly(true);
        panel->addChild(line);
@@ -386,5 +382,5 @@ LLFloaterTest::~LLFloaterTest()
 LLFloaterSimple::LLFloaterSimple(const std::string& xml_filename)
 {
-        gUICtrlFactory->buildFloater(this, xml_filename);
+        LLUICtrlFactory::getInstance()->buildFloater(this, xml_filename);
 }
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index ba4ff50..ec0d46a 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -69,15 +69,14 @@
 #include "lltoolpie.h"
 #include "lltoolpipette.h"
 #include "lltoolplacer.h"
-#include "lltoolselect.h"
 #include "lltoolselectland.h"
 #include "llui.h"
 #include "llviewermenu.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
+#include "llviewerjoystick.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 // Globals
 LLFloaterTools *gFloaterTools = NULL;
@@ -184,50 +183,50 @@ BOOL	LLFloaterTools::postBuild()
        getDragHandle()->setEnabled( !gSavedSettings.getBOOL("ToolboxAutoMove") );
        LLRect rect;
-        mBtnFocus = LLUICtrlFactory::getButtonByName(this,"button focus");//btn;
+        mBtnFocus = getChild<LLButton>("button focus");//btn;
-        childSetAction("button focus",LLFloaterTools::setEditTool, (void*)gToolCamera);
+        childSetAction("button focus",LLFloaterTools::setEditTool, (void*)LLToolCamera::getInstance());
-        mBtnMove = LLUICtrlFactory::getButtonByName(this,"button move");
+        mBtnMove = getChild<LLButton>("button move");
-        childSetAction("button move",LLFloaterTools::setEditTool, (void*)gToolGrab);
+        childSetAction("button move",LLFloaterTools::setEditTool, (void*)LLToolGrab::getInstance());
-        mBtnEdit = LLUICtrlFactory::getButtonByName(this,"button edit");
+        mBtnEdit = getChild<LLButton>("button edit");
-        childSetAction("button edit",LLFloaterTools::setEditTool, (void*)gToolTranslate);
+        childSetAction("button edit",LLFloaterTools::setEditTool, (void*)LLToolCompTranslate::getInstance());
-        mBtnCreate = LLUICtrlFactory::getButtonByName(this,"button create");
+        mBtnCreate = getChild<LLButton>("button create");
-        childSetAction("button create",LLFloaterTools::setEditTool, (void*)gToolCreate);
+        childSetAction("button create",LLFloaterTools::setEditTool, (void*)LLToolCompCreate::getInstance());
-        mBtnLand = LLUICtrlFactory::getButtonByName(this, "button land" );
+        mBtnLand = getChild<LLButton>("button land" );
-        childSetAction("button land",LLFloaterTools::setEditTool, (void*)gToolParcel);
+        childSetAction("button land",LLFloaterTools::setEditTool, (void*)LLToolSelectLand::getInstance());
-        mTextStatus = LLUICtrlFactory::getTextBoxByName(this,"text status");
+        mTextStatus = getChild<LLTextBox>("text status");
-        mRadioZoom = LLUICtrlFactory::getCheckBoxByName(this,"radio zoom");
+        mRadioZoom = getChild<LLCheckBoxCtrl>("radio zoom");
        childSetCommitCallback("slider zoom",commit_slider_zoom,this);
-        mRadioOrbit = LLUICtrlFactory::getCheckBoxByName(this,"radio orbit");
+        mRadioOrbit = getChild<LLCheckBoxCtrl>("radio orbit");
        childSetCommitCallback("radio orbit",commit_radio_orbit,this);
-        mRadioPan = LLUICtrlFactory::getCheckBoxByName(this,"radio pan");
+        mRadioPan = getChild<LLCheckBoxCtrl>("radio pan");
        childSetCommitCallback("radio pan",commit_radio_pan,this);
-        mRadioMove = LLUICtrlFactory::getCheckBoxByName(this,"radio move");
+        mRadioMove = getChild<LLCheckBoxCtrl>("radio move");
        childSetCommitCallback("radio move",click_popup_grab_drag,this);
-        mRadioLift = LLUICtrlFactory::getCheckBoxByName(this,"radio lift");
+        mRadioLift = getChild<LLCheckBoxCtrl>("radio lift");
        childSetCommitCallback("radio lift",click_popup_grab_lift,this);
-        mRadioSpin = LLUICtrlFactory::getCheckBoxByName(this,"radio spin");
+        mRadioSpin = getChild<LLCheckBoxCtrl>("radio spin");
        childSetCommitCallback("radio spin",click_popup_grab_spin,NULL);
-        mRadioPosition = LLUICtrlFactory::getCheckBoxByName(this,"radio position");
+        mRadioPosition = getChild<LLCheckBoxCtrl>("radio position");
-        childSetCommitCallback("radio position",commit_select_tool,gToolTranslate);
+        childSetCommitCallback("radio position",commit_select_tool,LLToolCompTranslate::getInstance());
-        mRadioRotate = LLUICtrlFactory::getCheckBoxByName(this,"radio rotate");
+        mRadioRotate = getChild<LLCheckBoxCtrl>("radio rotate");
-        childSetCommitCallback("radio rotate",commit_select_tool,gToolRotate);
+        childSetCommitCallback("radio rotate",commit_select_tool,LLToolCompRotate::getInstance());
-        mRadioStretch = LLUICtrlFactory::getCheckBoxByName(this,"radio stretch");
+        mRadioStretch = getChild<LLCheckBoxCtrl>("radio stretch");
-        childSetCommitCallback("radio stretch",commit_select_tool,gToolStretch);
+        childSetCommitCallback("radio stretch",commit_select_tool,LLToolCompScale::getInstance());
-        mRadioSelectFace = LLUICtrlFactory::getCheckBoxByName(this,"radio select face");
+        mRadioSelectFace = getChild<LLCheckBoxCtrl>("radio select face");
-        childSetCommitCallback("radio select face",commit_select_tool,gToolFace);
+        childSetCommitCallback("radio select face",commit_select_tool,LLToolFace::getInstance());
-        mCheckSelectIndividual = LLUICtrlFactory::getCheckBoxByName(this,"checkbox edit linked parts");
+        mCheckSelectIndividual = getChild<LLCheckBoxCtrl>("checkbox edit linked parts");
        childSetValue("checkbox edit linked parts",(BOOL)gSavedSettings.getBOOL("EditLinkedParts"));
        childSetCommitCallback("checkbox edit linked parts",commit_select_component,this);
-        mCheckSnapToGrid = LLUICtrlFactory::getCheckBoxByName(this,"checkbox snap to grid");
+        mCheckSnapToGrid = getChild<LLCheckBoxCtrl>("checkbox snap to grid");
        childSetValue("checkbox snap to grid",(BOOL)gSavedSettings.getBOOL("SnapEnabled"));
-        mBtnGridOptions = LLUICtrlFactory::getButtonByName(this,"Options...");
+        mBtnGridOptions = getChild<LLButton>("Options...");
        childSetAction("Options...",onClickGridOptions, this);
-        mCheckStretchUniform = LLUICtrlFactory::getCheckBoxByName(this,"checkbox uniform");
+        mCheckStretchUniform = getChild<LLCheckBoxCtrl>("checkbox uniform");
        childSetValue("checkbox uniform",(BOOL)gSavedSettings.getBOOL("ScaleUniform"));
-        mCheckStretchTexture = LLUICtrlFactory::getCheckBoxByName(this,"checkbox stretch textures");
+        mCheckStretchTexture = getChild<LLCheckBoxCtrl>("checkbox stretch textures");
        childSetValue("checkbox stretch textures",(BOOL)gSavedSettings.getBOOL("ScaleStretchTextures"));
-        mTextGridMode = LLUICtrlFactory::getTextBoxByName(this,"text ruler mode");
+        mTextGridMode = getChild<LLTextBox>("text ruler mode");
-        mComboGridMode = LLUICtrlFactory::getComboBoxByName(this,"combobox grid mode");
+        mComboGridMode = getChild<LLComboBox>("combobox grid mode");
        childSetCommitCallback("combobox grid mode",commit_grid_mode, this);
        //
        // Create Buttons
@@ -267,7 +266,7 @@ BOOL	LLFloaterTools::postBuild()
                        &LLToolPlacerPanel::sGrass};
        for(size_t t=0; t<sizeof(toolNames)/sizeof(toolNames[0]); ++t)
        {
-                LLButton *found = LLViewerUICtrlFactory::getButtonByName(this,toolNames[t]);
+                LLButton *found = getChild<LLButton>(toolNames[t]);
                if(found)
                {
                        found->setClickedCallback(setObjectType,toolData[t]);
@@ -276,38 +275,38 @@ BOOL	LLFloaterTools::postBuild()
                        llwarns << "Tool button not found! DOA Pending." << llendl;
                }
        }
-        mCheckCopySelection = LLUICtrlFactory::getCheckBoxByName(this,"checkbox copy selection");
+        mCheckCopySelection = getChild<LLCheckBoxCtrl>("checkbox copy selection");
        childSetValue("checkbox copy selection",(BOOL)gSavedSettings.getBOOL("CreateToolCopySelection"));
-        mCheckSticky = LLUICtrlFactory::getCheckBoxByName(this,"checkbox sticky");
+        mCheckSticky = getChild<LLCheckBoxCtrl>("checkbox sticky");
        childSetValue("checkbox sticky",(BOOL)gSavedSettings.getBOOL("CreateToolKeepSelected"));
-        mCheckCopyCenters = LLUICtrlFactory::getCheckBoxByName(this,"checkbox copy centers");
+        mCheckCopyCenters = getChild<LLCheckBoxCtrl>("checkbox copy centers");
        childSetValue("checkbox copy centers",(BOOL)gSavedSettings.getBOOL("CreateToolCopyCenters"));
-        mCheckCopyRotates = LLUICtrlFactory::getCheckBoxByName(this,"checkbox copy rotates");
+        mCheckCopyRotates = getChild<LLCheckBoxCtrl>("checkbox copy rotates");
        childSetValue("checkbox copy rotates",(BOOL)gSavedSettings.getBOOL("CreateToolCopyRotates"));
-        mRadioSelectLand = LLUICtrlFactory::getCheckBoxByName(this,"radio select land");
+        mRadioSelectLand = getChild<LLCheckBoxCtrl>("radio select land");
-        childSetCommitCallback("radio select land",commit_select_tool, gToolParcel);
+        childSetCommitCallback("radio select land",commit_select_tool, LLToolSelectLand::getInstance());
-        mRadioDozerFlatten = LLUICtrlFactory::getCheckBoxByName(this,"radio flatten");
+        mRadioDozerFlatten = getChild<LLCheckBoxCtrl>("radio flatten");
        childSetCommitCallback("radio flatten",click_popup_dozer_mode,  (void*)0);
-        mRadioDozerRaise = LLUICtrlFactory::getCheckBoxByName(this,"radio raise");
+        mRadioDozerRaise = getChild<LLCheckBoxCtrl>("radio raise");
        childSetCommitCallback("radio raise",click_popup_dozer_mode,  (void*)1);
-        mRadioDozerLower = LLUICtrlFactory::getCheckBoxByName(this,"radio lower");
+        mRadioDozerLower = getChild<LLCheckBoxCtrl>("radio lower");
        childSetCommitCallback("radio lower",click_popup_dozer_mode,  (void*)2);
-        mRadioDozerSmooth = LLUICtrlFactory::getCheckBoxByName(this,"radio smooth");
+        mRadioDozerSmooth = getChild<LLCheckBoxCtrl>("radio smooth");
        childSetCommitCallback("radio smooth",click_popup_dozer_mode,  (void*)3);
-        mRadioDozerNoise = LLUICtrlFactory::getCheckBoxByName(this,"radio noise");
+        mRadioDozerNoise = getChild<LLCheckBoxCtrl>("radio noise");
        childSetCommitCallback("radio noise",click_popup_dozer_mode,  (void*)4);
-        mRadioDozerRevert = LLUICtrlFactory::getCheckBoxByName(this,"radio revert");
+        mRadioDozerRevert = getChild<LLCheckBoxCtrl>("radio revert");
        childSetCommitCallback("radio revert",click_popup_dozer_mode,  (void*)5);
-        mComboDozerSize = LLUICtrlFactory::getComboBoxByName(this,"combobox brush size");
+        mComboDozerSize = getChild<LLComboBox>("combobox brush size");
        childSetCommitCallback("combobox brush size",click_dozer_size,  (void*)0);
        if(mComboDozerSize) mComboDozerSize->setCurrentByIndex(0);
-        mBtnApplyToSelection = LLUICtrlFactory::getButtonByName(this,"button apply to selection");
+        mBtnApplyToSelection = getChild<LLButton>("button apply to selection");
        childSetAction("button apply to selection",click_apply_to_selection,  (void*)0);
-        mCheckShowOwners = LLUICtrlFactory::getCheckBoxByName(this,"checkbox show owners");
+        mCheckShowOwners = getChild<LLCheckBoxCtrl>("checkbox show owners");
        childSetValue("checkbox show owners",gSavedSettings.getBOOL("ShowParcelOwners"));
        childSetAction("button more", click_show_more, this);
        childSetAction("button less", click_show_more, this);
-        mTab = LLUICtrlFactory::getTabContainerByName(this,"Object Info Tabs");
+        mTab = getChild<LLTabContainer>("Object Info Tabs");
        if(mTab)
        {
                mTab->setVisible( gSavedSettings.getBOOL("ToolboxShowMore") );
@@ -406,7 +405,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,FALSE);
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_tools.xml",&factory_map,FALSE);
        mLargeHeight = getRect().getHeight();
        mSmallHeight = mLargeHeight;
@@ -445,7 +444,7 @@ void LLFloaterTools::refresh()
        const S32 INFO_WIDTH = getRect().getWidth();
        const S32 INFO_HEIGHT = 384;
        LLRect object_info_rect(0, 0, INFO_WIDTH, -INFO_HEIGHT);
-        BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
+        BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME );
        S32 idx_features = mTab->getPanelIndexByTitle(PANEL_NAMES[PANEL_FEATURES]);
        S32 idx_face = mTab->getPanelIndexByTitle(PANEL_NAMES[PANEL_FACE]);
@@ -502,7 +501,7 @@ void LLFloaterTools::resetToolState()
 void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 {
-        LLTool *tool = gToolMgr->getCurrentTool();
+        LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
        // HACK to allow seeing the buttons when you have the app in a window.
        // Keep the visibility the same as it 
@@ -517,7 +516,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
        }
        
        // Focus buttons
-        BOOL focus_visible = (  tool == gToolCamera );
+        BOOL focus_visible = (  tool == LLToolCamera::getInstance() );
        mBtnFocus       ->setToggleState( focus_visible );
@@ -545,7 +544,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
        childSetValue( "slider zoom", gAgent.getCameraZoomFraction() * 0.5f);
        // Move buttons
-        BOOL move_visible = (tool == gToolGrab);
+        BOOL move_visible = (tool == LLToolGrab::getInstance());
        if (mBtnMove) mBtnMove  ->setToggleState( move_visible );
@@ -574,12 +573,12 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
        }
        // Edit buttons
-        BOOL edit_visible = tool == gToolTranslate ||
+        BOOL edit_visible = tool == LLToolCompTranslate::getInstance() ||
-                                                tool == gToolRotate ||
+                                                tool == LLToolCompRotate::getInstance() ||
-                                                tool == gToolStretch ||
+                                                tool == LLToolCompScale::getInstance() ||
-                                                tool == gToolFace ||
+                                                tool == LLToolFace::getInstance() ||
-                                                tool == gToolIndividual ||
+                                                tool == LLToolIndividual::getInstance() ||
-                                                tool == gToolPipette;
+                                                tool == LLToolPipette::getInstance();
        mBtnEdit        ->setToggleState( edit_visible );
@@ -589,7 +588,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
        if (mRadioSelectFace)
        {
                mRadioSelectFace->setVisible( edit_visible );
-                mRadioSelectFace->set( tool == gToolFace );
+                mRadioSelectFace->set( tool == LLToolFace::getInstance() );
        }
        if (mCheckSelectIndividual)
@@ -598,9 +597,9 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                //mCheckSelectIndividual->set(gSavedSettings.getBOOL("EditLinkedParts"));
        }
-        mRadioPosition  ->set( tool == gToolTranslate );
+        mRadioPosition  ->set( tool == LLToolCompTranslate::getInstance() );
-        mRadioRotate    ->set( tool == gToolRotate );
+        mRadioRotate    ->set( tool == LLToolCompRotate::getInstance() );
-        mRadioStretch   ->set( tool == gToolStretch );
+        mRadioStretch   ->set( tool == LLToolCompScale::getInstance() );
        if (mComboGridMode) 
        {
@@ -632,17 +631,17 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
        if (mTextGridMode) mTextGridMode->setVisible( edit_visible );
        // Snap to grid disabled for grab tool - very confusing
-        if (mCheckSnapToGrid) mCheckSnapToGrid->setVisible( edit_visible /* || tool == gToolGrab */ );
+        if (mCheckSnapToGrid) mCheckSnapToGrid->setVisible( edit_visible /* || tool == LLToolGrab::getInstance() */ );
-        if (mBtnGridOptions) mBtnGridOptions->setVisible( edit_visible /* || tool == gToolGrab */ );
+        if (mBtnGridOptions) mBtnGridOptions->setVisible( edit_visible /* || tool == LLToolGrab::getInstance() */ );
        //mCheckSelectLinked    ->setVisible( edit_visible );
        if (mCheckStretchUniform) mCheckStretchUniform->setVisible( edit_visible );
        if (mCheckStretchTexture) mCheckStretchTexture->setVisible( edit_visible );
        // Create buttons
-        BOOL create_visible = (tool == gToolCreate);
+        BOOL create_visible = (tool == LLToolCompCreate::getInstance());
-        mBtnCreate      ->setToggleState(       tool == gToolCreate );
+        mBtnCreate      ->setToggleState(       tool == LLToolCompCreate::getInstance() );
        if (mCheckCopySelection
                && mCheckCopySelection->get())
@@ -678,12 +677,12 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
        if (mCheckCopyRotates) mCheckCopyRotates->setEnabled( mCheckCopySelection->get() );
        // Land buttons
-        BOOL land_visible = (tool == gToolLand || tool == gToolParcel );
+        BOOL land_visible = (tool == LLToolBrushLand::getInstance() || tool == LLToolSelectLand::getInstance() );
        if (mBtnLand)   mBtnLand        ->setToggleState( land_visible );
-        //      mRadioEditLand  ->set( tool == gToolLand );
+        //      mRadioEditLand  ->set( tool == LLToolBrushLand::getInstance() );
-        if (mRadioSelectLand)   mRadioSelectLand->set( tool == gToolParcel );
+        if (mRadioSelectLand)   mRadioSelectLand->set( tool == LLToolSelectLand::getInstance() );
        //      mRadioEditLand  ->setVisible( land_visible );
        if (mRadioSelectLand)   mRadioSelectLand->setVisible( land_visible );
@@ -693,44 +692,44 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
        if (mRadioDozerFlatten)
        {
-                mRadioDozerFlatten      ->set( tool == gToolLand && dozer_mode == 0);
+                mRadioDozerFlatten      ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 0);
                mRadioDozerFlatten      ->setVisible( land_visible );
        }
        if (mRadioDozerRaise)
        {
-                mRadioDozerRaise        ->set( tool == gToolLand && dozer_mode == 1);
+                mRadioDozerRaise        ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 1);
                mRadioDozerRaise        ->setVisible( land_visible );
        }
        if (mRadioDozerLower)
        {
-                mRadioDozerLower        ->set( tool == gToolLand && dozer_mode == 2);
+                mRadioDozerLower        ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 2);
                mRadioDozerLower        ->setVisible( land_visible );
        }
        if (mRadioDozerSmooth)
        {
-                mRadioDozerSmooth       ->set( tool == gToolLand && dozer_mode == 3);
+                mRadioDozerSmooth       ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 3);
                mRadioDozerSmooth       ->setVisible( land_visible );
        }
        if (mRadioDozerNoise)
        {
-                mRadioDozerNoise        ->set( tool == gToolLand && dozer_mode == 4);
+                mRadioDozerNoise        ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 4);
                mRadioDozerNoise        ->setVisible( land_visible );
        }
        if (mRadioDozerRevert)
        {
-                mRadioDozerRevert       ->set( tool == gToolLand && dozer_mode == 5);
+                mRadioDozerRevert       ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 5);
                mRadioDozerRevert       ->setVisible( land_visible );
        }
        if (mComboDozerSize)
        {
                mComboDozerSize         ->setCurrentByIndex(dozer_size);
                mComboDozerSize         ->setVisible( land_visible );
-                mComboDozerSize         ->setEnabled( tool == gToolLand );
+                mComboDozerSize         ->setEnabled( tool == LLToolBrushLand::getInstance() );
        }
        if (mBtnApplyToSelection)
        {
                mBtnApplyToSelection->setVisible( land_visible );
-                mBtnApplyToSelection->setEnabled( land_visible && !gParcelMgr->selectionEmpty() && tool != gToolParcel);
+                mBtnApplyToSelection->setEnabled( land_visible && !LLViewerParcelMgr::getInstance()->selectionEmpty() && tool != LLToolSelectLand::getInstance());
        }
        if (mCheckShowOwners)
        {
@@ -742,8 +741,8 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
        //
        BOOL show_more = gSavedSettings.getBOOL("ToolboxShowMore");
-        mTab->setVisible(show_more && tool != gToolLand && tool != gToolParcel);
+        mTab->setVisible(show_more && tool != LLToolBrushLand::getInstance() && tool != LLToolSelectLand::getInstance());
-        mPanelLandInfo->setVisible(show_more && (tool == gToolLand || tool == gToolParcel));
+        mPanelLandInfo->setVisible(show_more && (tool == LLToolBrushLand::getInstance() || tool == LLToolSelectLand::getInstance()));
 }
@@ -757,8 +756,11 @@ BOOL LLFloaterTools::canClose()
 // virtual
 void LLFloaterTools::onOpen()
 {
-        mParcelSelection = gParcelMgr->getFloatingParcelSelection();
+        mParcelSelection = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection();
-        mObjectSelection = gSelectMgr->getEditSelection();
+        mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
+        
+        gMenuBarView->setItemVisible("Tools", TRUE);
+        gMenuBarView->arrange();
 }
 // virtual
@@ -768,12 +770,14 @@ void LLFloaterTools::onClose(bool app_quitting)
        setVisible(FALSE);
        mTab->setVisible(FALSE);
+        LLViewerJoystick::getInstance()->moveAvatar(true);
    // Different from handle_reset_view in that it doesn't actually 
        //   move the camera if EditCameraMovement is not set.
        gAgent.resetView(gSavedSettings.getBOOL("EditCameraMovement"));
        
        // exit component selection mode
-        gSelectMgr->promoteSelectionToRoot();
+        LLSelectMgr::getInstance()->promoteSelectionToRoot();
        gSavedSettings.setBOOL("EditLinkedParts", FALSE);
        gViewerWindow->showCursor();
@@ -784,10 +788,13 @@ void LLFloaterTools::onClose(bool app_quitting)
        mObjectSelection = NULL;
        // Switch back to basic toolset
-        gToolMgr->setCurrentToolset(gBasicToolset);
+        LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
        // we were already in basic toolset, using build tools
        // so manually reset tool to default (pie menu tool)
-        gToolMgr->getCurrentToolset()->selectFirstTool();
+        LLToolMgr::getInstance()->getCurrentToolset()->selectFirstTool();
+        gMenuBarView->setItemVisible("Tools", FALSE);
+        gMenuBarView->arrange();
 }
 void LLFloaterTools::showMore(BOOL show_more)
@@ -885,19 +892,19 @@ void commit_slider_zoom(LLUICtrl *ctrl, void*)
 void click_popup_rotate_left(void*)
 {
-        gSelectMgr->selectionRotateAroundZ( 45.f );
+        LLSelectMgr::getInstance()->selectionRotateAroundZ( 45.f );
        dialog_refresh_all();
 }
 void click_popup_rotate_reset(void*)
 {
-        gSelectMgr->selectionResetRotation();
+        LLSelectMgr::getInstance()->selectionResetRotation();
        dialog_refresh_all();
 }
 void click_popup_rotate_right(void*)
 {
-        gSelectMgr->selectionRotateAroundZ( -45.f );
+        LLSelectMgr::getInstance()->selectionRotateAroundZ( -45.f );
        dialog_refresh_all();
 }
@@ -906,7 +913,7 @@ void click_popup_dozer_mode(LLUICtrl *, void *user)
 {
        S32 show_owners = gSavedSettings.getBOOL("ShowParcelOwners");
        S32 mode = (S32)(intptr_t) user;
-        gFloaterTools->setEditTool( gToolLand );
+        gFloaterTools->setEditTool( LLToolBrushLand::getInstance() );
        gSavedSettings.setS32("RadioLandBrushAction", mode);
        gSavedSettings.setBOOL("ShowParcelOwners", show_owners);
 }
@@ -925,7 +932,7 @@ void click_dozer_size(LLUICtrl *ctrl, void *user)
 void click_apply_to_selection(void* user)
 {
-        gToolLand->modifyLandInSelectionGlobal();
+        LLToolBrushLand::getInstance()->modifyLandInSelectionGlobal();
 }
 void commit_select_tool(LLUICtrl *ctrl, void *data)
@@ -951,11 +958,11 @@ void commit_select_component(LLUICtrl *ctrl, void *data)
        if (select_individuals)
        {
-                gSelectMgr->demoteSelectionToIndividuals();
+                LLSelectMgr::getInstance()->demoteSelectionToIndividuals();
        }
        else
        {
-                gSelectMgr->promoteSelectionToRoot();
+                LLSelectMgr::getInstance()->promoteSelectionToRoot();
        }
 }
@@ -963,7 +970,7 @@ void commit_grid_mode(LLUICtrl *ctrl, void *data)
 {   
        LLComboBox* combo = (LLComboBox*)ctrl;   
    
-        gSelectMgr->setGridMode((EGridMode)combo->getCurrentIndex());
+        LLSelectMgr::getInstance()->setGridMode((EGridMode)combo->getCurrentIndex());
 } 
 // static 
@@ -991,6 +998,6 @@ void LLFloaterTools::setEditTool(void* tool_pointer)
 void LLFloaterTools::onFocusReceived()
 {
-        gToolMgr->setCurrentToolset(gBasicToolset);
+        LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
        LLFloater::onFocusReceived();
 }
diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp
index 04f00bd..a6efb06 100644
--- a/linden/indra/newview/llfloatertopobjects.cpp
+++ b/linden/indra/newview/llfloatertopobjects.cpp
@@ -46,7 +46,7 @@
 #include "lltracker.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 LLFloaterTopObjects* LLFloaterTopObjects::sInstance = NULL;
@@ -62,7 +62,7 @@ void LLFloaterTopObjects::show()
        }
        sInstance = new LLFloaterTopObjects();
-        gUICtrlFactory->buildFloater(sInstance, "floater_top_objects.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_top_objects.xml");
        sInstance->center();
 }
@@ -85,7 +85,7 @@ BOOL LLFloaterTopObjects::postBuild()
        childSetCommitCallback("objects_list", onCommitObjectsList, this);
        childSetDoubleClickCallback("objects_list", onDoubleClickObjectsList);
        childSetFocus("objects_list");
-        LLScrollListCtrl *objects_list = LLUICtrlFactory::getScrollListByName(this, "objects_list");
+        LLScrollListCtrl *objects_list = getChild<LLScrollListCtrl>("objects_list");
        if (objects_list)
        {
                objects_list->setCommitOnSelectionChange(TRUE);
@@ -106,7 +106,7 @@ BOOL LLFloaterTopObjects::postBuild()
        /*
-        LLLineEditor* line_editor = LLUICtrlFactory::getLineEditorByName(this, "owner_name_editor");
+        LLLineEditor* line_editor = getChild<LLLineEditor>("owner_name_editor");
        if (line_editor)
        {
                line_editor->setCommitOnFocusLost(FALSE);
@@ -114,7 +114,7 @@ BOOL LLFloaterTopObjects::postBuild()
                line_editor->setCallbackUserData(this);
        }
-        line_editor = LLUICtrlFactory::getLineEditorByName(this, "object_name_editor");
+        line_editor = getChild<LLLineEditor>("object_name_editor");
        if (line_editor)
        {
                line_editor->setCommitOnFocusLost(FALSE);
@@ -247,7 +247,7 @@ void LLFloaterTopObjects::onCommitObjectsList(LLUICtrl* ctrl, void* data)
 void LLFloaterTopObjects::updateSelectionInfo()
 {
-        LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "objects_list");
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("objects_list");
        if (!list) return;
@@ -445,7 +445,7 @@ void LLFloaterTopObjects::onGetByOwnerName(LLUICtrl* ctrl, void* data)
 void LLFloaterTopObjects::showBeacon()
 {       
-        LLScrollListCtrl* list = LLUICtrlFactory::getScrollListByName(this, "objects_list");
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("objects_list");
        if (!list) return;
        LLScrollListItem* first_selected = list->getFirstSelected();
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index c64173e..920ef4c 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -42,7 +42,7 @@
 #include "llstartup.h"
 #include "message.h"
 #include "llagent.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llviewerstats.h"
 #include "llui.h"
@@ -62,11 +62,11 @@ LLFloaterTOS* LLFloaterTOS::show(ETOSType type, const std::string & message)
        if (type == TOS_TOS)
        {
-                gUICtrlFactory->buildFloater(LLFloaterTOS::sInstance, "floater_tos.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(LLFloaterTOS::sInstance, "floater_tos.xml");
        }
        else
        {
-                gUICtrlFactory->buildFloater(LLFloaterTOS::sInstance, "floater_critical.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(LLFloaterTOS::sInstance, "floater_critical.xml");
        }
        return LLFloaterTOS::sInstance;
@@ -132,7 +132,7 @@ BOOL LLFloaterTOS::postBuild()
        if ( mType != TOS_TOS )
        {
                // this displays the critical message
-                LLTextEditor *Editor = LLUICtrlFactory::getTextEditorByName(this, "tos_text");
+                LLTextEditor *Editor = getChild<LLTextEditor>("tos_text");
                if (Editor)
                {
                        Editor->setHandleEditKeysDirectly( TRUE );
@@ -146,14 +146,14 @@ BOOL LLFloaterTOS::postBuild()
        }
        // disable Agree to TOS radio button until the page has fully loaded
-        LLRadioGroup* tos_agreement = LLUICtrlFactory::getRadioGroupByName(this, "tos_agreement");
+        LLRadioGroup* tos_agreement = getChild<LLRadioGroup>("tos_agreement");
        if ( tos_agreement )
        {
                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");
+        LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
        if ( editor )
        {
                editor->setVisible( FALSE );
@@ -194,7 +194,7 @@ void LLFloaterTOS::setSiteIsAlive( bool alive )
                {
                        // normally this is set when navigation to TOS page navigation completes (so you can't accept before TOS loads)
                        // but if the page is unavailable, we need to do this now
-                        LLRadioGroup* tos_agreement = LLUICtrlFactory::getRadioGroupByName(this, "tos_agreement");
+                        LLRadioGroup* tos_agreement = getChild<LLRadioGroup>("tos_agreement");
                        if ( tos_agreement )
                        {
                                tos_agreement->setEnabled( true );
@@ -286,7 +286,7 @@ void LLFloaterTOS::onNavigateComplete( const EventType& eventIn )
        {
                llinfos << "NAVIGATE COMPLETE" << llendl;
                // enable Agree to TOS radio button now that page has loaded
-                LLRadioGroup* tos_agreement = LLUICtrlFactory::getRadioGroupByName(this, "tos_agreement");
+                LLRadioGroup* tos_agreement = getChild<LLRadioGroup>("tos_agreement");
                if ( tos_agreement )
                {
                        tos_agreement->setEnabled( true );
diff --git a/linden/indra/newview/llfloaterurldisplay.cpp b/linden/indra/newview/llfloaterurldisplay.cpp
index 8d12729..563eaf6 100644
--- a/linden/indra/newview/llfloaterurldisplay.cpp
+++ b/linden/indra/newview/llfloaterurldisplay.cpp
@@ -35,7 +35,7 @@
 #include "llfloaterurldisplay.h"
 #include "llpanelplace.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "v3dmath.h"
@@ -46,7 +46,7 @@
 LLFloaterURLDisplay::LLFloaterURLDisplay(const LLSD& sd)
 {       
        mFactoryMap["place_details_panel"] = LLCallbackMap(LLFloaterURLDisplay::createPlaceDetail, this);
-        gUICtrlFactory->buildFloater(this, "floater_preview_url.xml", &getFactoryMap());
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml", &getFactoryMap());
        this->setVisible(false);
        // If positioned at 0,0 the teleport button is behind the toolbar.
@@ -101,7 +101,7 @@ void* LLFloaterURLDisplay::createPlaceDetail(void* userdata)
 {
        LLFloaterURLDisplay *self = (LLFloaterURLDisplay*)userdata;
        self->mPlacePanel = new LLPanelPlace();
-        gUICtrlFactory->buildPanel(self->mPlacePanel, "panel_place.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(self->mPlacePanel, "panel_place.xml");
        return self->mPlacePanel;
 }
diff --git a/linden/indra/newview/llfloaterurlentry.cpp b/linden/indra/newview/llfloaterurlentry.cpp
index b2cc37f..e9c828b 100644
--- a/linden/indra/newview/llfloaterurlentry.cpp
+++ b/linden/indra/newview/llfloaterurlentry.cpp
@@ -38,7 +38,7 @@
 // project includes
 #include "llcombobox.h"
 #include "llurlhistory.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llwindow.h"
 #include "llviewerwindow.h"
@@ -89,9 +89,9 @@ LLFloaterURLEntry::LLFloaterURLEntry(LLHandle<LLPanel> parent)
        LLFloater(),
        mPanelLandMediaHandle(parent)
 {
-        gUICtrlFactory->buildFloater(this, "floater_url_entry.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_url_entry.xml");
-        mMediaURLEdit = LLUICtrlFactory::getComboBoxByName(this, "media_entry");
+        mMediaURLEdit = getChild<LLComboBox>("media_entry");
        // Cancel button
        childSetAction("cancel_btn", onBtnCancel, this);
diff --git a/linden/indra/newview/llfloatervoicewizard.cpp b/linden/indra/newview/llfloatervoicedevicesettings.cpp
index 94063a0..c7b9562 100644
--- a/linden/indra/newview/llfloatervoicewizard.cpp
+++ b/linden/indra/newview/llfloatervoicedevicesettings.cpp
@@ -1,7 +1,7 @@
 /** 
- * @file llfloatervoicewizard.cpp
+ * @file llfloatervoicedevicesettings.cpp
 * @author Richard Nelson
- * @brief Voice communication set-up wizard
+ * @brief Voice communication set-up 
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
 * 
@@ -32,8 +32,9 @@
 
 #include "llviewerprecompiledheaders.h"
-#include "llfloatervoicewizard.h"
+#include "llfloatervoicedevicesettings.h"
+// Viewer includes
 #include "llagent.h"
 #include "llbutton.h"
 #include "llcombobox.h"
@@ -42,184 +43,14 @@
 #include "llprefsvoice.h"
 #include "llsliderctrl.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
 #include "llvoiceclient.h"
 #include "llimpanel.h"
-LLFloaterVoiceWizard::LLFloaterVoiceWizard(const LLSD& seed) : LLFloater("floater_voice_wizard"), mDevicePanel(NULL)
+// Library includes (after viewer)
-{
+#include "lluictrlfactory.h"
-        mFactoryMap["device_settings"] = LLCallbackMap(createPanelDeviceSettings, this);
-        // do not automatically open singleton floaters (as result of getInstance())
-        BOOL no_open = FALSE;
-        gUICtrlFactory->buildFloater(this, "floater_voice_wizard.xml", &mFactoryMap, no_open);
-        mLogic = new LLPrefsVoiceLogic(this);
-        center();
-}
-LLFloaterVoiceWizard::~LLFloaterVoiceWizard()
-{
-        delete mLogic;
-        mLogic = NULL;
-}
-BOOL LLFloaterVoiceWizard::postBuild()
-{
-        childSetAction("next_btn", onClickNext, this);
-        childSetAction("back_btn", onClickBack, this);
-        childSetAction("ok_btn", onClickOK, this);
-        childSetAction("cancel_btn", onClickCancel, this);
-        childSetCommitCallback("voice_enable", onCommitVoiceEnable, this);
-        return TRUE;
-}
-void LLFloaterVoiceWizard::draw()
-{
-        mLogic->refresh();
-        if (mDevicePanel)
-        {
-                mDevicePanel->refresh();
-        }
-        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(this, "wizard_tabs");
-        if (tabs)
-        {
-                // if on first tab, disable back button, etc
-                if (tabs->getCurrentPanelIndex() == 0)
-                {
-                        if (gSavedSettings.getBOOL("EnableVoiceChat"))
-                        {
-                                childSetEnabled("next_btn", TRUE);
-                                setDefaultBtn(gUICtrlFactory->getButtonByName(this, "next_btn"));
-                        }
-                        else
-                        {
-                                childSetEnabled("next_btn", FALSE);
-                                setDefaultBtn(gUICtrlFactory->getButtonByName(this, "ok_btn"));
-                        }
-                        childSetEnabled("back_btn", FALSE);
-                }
-                else
-                {
-                        // if on any tab but the last, enable the next button
-                        if (tabs->getCurrentPanelIndex() < tabs->getTabCount() - 1)
-                        {
-                                childSetEnabled("next_btn", TRUE);
-                                setDefaultBtn(gUICtrlFactory->getButtonByName(this, "next_btn"));
-                        }
-                        else
-                        {
-                                childSetEnabled("next_btn", FALSE);
-                                setDefaultBtn(gUICtrlFactory->getButtonByName(this, "ok_btn"));
-                        }
-                        childSetEnabled("back_btn", TRUE);
-                }
-        }
-        // because we can simultaneously change voice settings from the preferences UI
-        // we need to stay in sync
-        childSetValue("voice_enable", gSavedSettings.getBOOL("EnableVoiceChat") ? "1" : "0");
-        // show appropriate text on first tab
-        childSetVisible("voice_intro_text3", !gSavedSettings.getBOOL("EnableVoiceChat"));
-        childSetVisible("voice_intro_text4", gSavedSettings.getBOOL("EnableVoiceChat"));
-        LLFloater::draw();
-}
-void LLFloaterVoiceWizard::onOpen()
+LLPanelVoiceDeviceSettings::LLPanelVoiceDeviceSettings()
-{
-        LLFloaterDeviceSettings::hideInstance();
-        if(mDevicePanel)
-        {
-                mDevicePanel->onOpen();
-        }
-        LLFloater::onOpen();
-}
-void LLFloaterVoiceWizard::onClose(bool app_quitting)
-{
-        if(mDevicePanel)
-        {
-                mDevicePanel->onClose(app_quitting);
-        }
-        LLFloater::onClose(app_quitting);
-}
-// static
-void LLFloaterVoiceWizard::onClickNext(void *user_data)
-{
-        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName((LLFloater*)user_data, "wizard_tabs");
-        if (tabs)
-        {
-                tabs->selectNextTab();
-        }
-}
-// static
-void LLFloaterVoiceWizard::onClickBack(void *user_data)
-{
-        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName((LLFloater*)user_data, "wizard_tabs");
-        if (tabs)
-        {
-                tabs->selectPrevTab();
-        }
-}
-// static
-void LLFloaterVoiceWizard::onClickOK(void *user_data)
-{
-        LLFloaterVoiceWizard* self = (LLFloaterVoiceWizard*)user_data;
-        // propagate tuning mic volume to actual mic volume
-        self->mLogic->apply();
-        if (self->mDevicePanel)
-        {
-                self->mDevicePanel->apply();
-        }
-        self->close();
-}
-// static
-void LLFloaterVoiceWizard::onClickCancel(void *user_data)
-{
-        LLFloaterVoiceWizard* self = (LLFloaterVoiceWizard*)user_data;
-        
-        self->mLogic->cancel();
-        if (self->mDevicePanel)
-        {
-                self->mDevicePanel->cancel();
-        }
-        self->close();
-}
-// static
-void LLFloaterVoiceWizard::onCommitVoiceEnable(LLUICtrl* ctrl, void* user_data)
-{
-        gSavedSettings.setBOOL("EnableVoiceChat", ctrl->getValue().asInteger());
-}
-// static
-void* LLFloaterVoiceWizard::createPanelDeviceSettings(void* user_data)
-{
-        LLFloaterVoiceWizard* floaterp = (LLFloaterVoiceWizard*)user_data;
-        floaterp->mDevicePanel = new LLPanelDeviceSettings();
-        return floaterp->mDevicePanel;
-}
-//
-// LLPanelDeviceSettings
-//
-LLPanelDeviceSettings::LLPanelDeviceSettings()
 {
        mCtrlInputDevices = NULL;
        mCtrlOutputDevices = NULL;
@@ -235,18 +66,15 @@ LLPanelDeviceSettings::LLPanelDeviceSettings()
        //gVoiceClient->refreshDeviceLists();
 }
-LLPanelDeviceSettings::~LLPanelDeviceSettings()
+LLPanelVoiceDeviceSettings::~LLPanelVoiceDeviceSettings()
 {
 }
-BOOL LLPanelDeviceSettings::postBuild()
+BOOL LLPanelVoiceDeviceSettings::postBuild()
 {
-        LLSlider* volume_slider = gUICtrlFactory->getSliderBarByName(this, "mic_volume_slider");
+        LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
-        if (volume_slider)
+        // set mic volume tuning slider based on last mic volume setting
-        {
+        volume_slider->setValue(mMicVolume);
-                // set mic volume tuning slider based on last mic volume setting
-                volume_slider->setValue(mMicVolume);
-        }
        childSetCommitCallback("voice_input_device", onCommitInputDevice, this);
        childSetCommitCallback("voice_output_device", onCommitOutputDevice, this);
@@ -254,7 +82,7 @@ BOOL LLPanelDeviceSettings::postBuild()
        return TRUE;
 }
-void LLPanelDeviceSettings::draw()
+void LLPanelVoiceDeviceSettings::draw()
 {
        // let user know that volume indicator is not yet available
        childSetVisible("wait_text", !gVoiceClient->inTuningMode());
@@ -278,7 +106,7 @@ void LLPanelDeviceSettings::draw()
                for(S32 power_bar_idx = 0; power_bar_idx < 5; power_bar_idx++)
                {
                        LLString view_name = llformat("%s%d", "bar", power_bar_idx);
-                        LLView* bar_view = getChildByName(view_name, TRUE);
+                        LLView* bar_view = getChild<LLView>(view_name);
                        if (bar_view)
                        {
                                if (power_bar_idx < discrete_power)
@@ -292,7 +120,7 @@ void LLPanelDeviceSettings::draw()
        }
 }
-void LLPanelDeviceSettings::apply()
+void LLPanelVoiceDeviceSettings::apply()
 {
        std::string s;
        if(mCtrlInputDevices)
@@ -311,7 +139,7 @@ void LLPanelDeviceSettings::apply()
        gSavedSettings.setF32("AudioLevelMic", mMicVolume);
 }
-void LLPanelDeviceSettings::cancel()
+void LLPanelVoiceDeviceSettings::cancel()
 {
        gSavedSettings.setString("VoiceInputAudioDevice", mInputDevice);
        gSavedSettings.setString("VoiceOutputAudioDevice", mOutputDevice);
@@ -323,20 +151,17 @@ void LLPanelDeviceSettings::cancel()
                mCtrlOutputDevices->setSimple(mOutputDevice);
 }
-void LLPanelDeviceSettings::refresh()
+void LLPanelVoiceDeviceSettings::refresh()
 {
        //grab current volume
-        LLSlider* volume_slider = gUICtrlFactory->getSliderBarByName(this, "mic_volume_slider");
+        LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
-        if (volume_slider)
+        // set mic volume tuning slider based on last mic volume setting
-        {
+        mMicVolume = (F32)volume_slider->getValue().asReal();
-                // set mic volume tuning slider based on last mic volume setting
+        gVoiceClient->tuningSetMicVolume(mMicVolume);
-                mMicVolume = (F32)volume_slider->getValue().asReal();
-                gVoiceClient->tuningSetMicVolume(mMicVolume);
-        }
        // Fill in popup menus
-        mCtrlInputDevices = LLUICtrlFactory::getComboBoxByName(this, "voice_input_device");
+        mCtrlInputDevices = getChild<LLComboBox>("voice_input_device");
-        mCtrlOutputDevices = LLUICtrlFactory::getComboBoxByName(this, "voice_output_device");
+        mCtrlOutputDevices = getChild<LLComboBox>("voice_output_device");
        if(!gVoiceClient->deviceSettingsAvailable())
        {
@@ -398,7 +223,7 @@ void LLPanelDeviceSettings::refresh()
        }       
 }
-void LLPanelDeviceSettings::onOpen()
+void LLPanelVoiceDeviceSettings::onOpen()
 {
        mInputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
        mOutputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
@@ -413,40 +238,39 @@ void LLPanelDeviceSettings::onOpen()
        LLVoiceChannel::suspend();
 }
-void LLPanelDeviceSettings::onClose(bool app_quitting)
+void LLPanelVoiceDeviceSettings::onClose(bool app_quitting)
 {
        gVoiceClient->tuningStop();
        LLVoiceChannel::resume();
 }
 // static
-void LLPanelDeviceSettings::onCommitInputDevice(LLUICtrl* ctrl, void* user_data)
+void LLPanelVoiceDeviceSettings::onCommitInputDevice(LLUICtrl* ctrl, void* user_data)
 {
        gSavedSettings.setString("VoiceInputAudioDevice", ctrl->getValue().asString());
 }
 // static
-void LLPanelDeviceSettings::onCommitOutputDevice(LLUICtrl* ctrl, void* user_data)
+void LLPanelVoiceDeviceSettings::onCommitOutputDevice(LLUICtrl* ctrl, void* user_data)
 {
        gSavedSettings.setString("VoiceOutputAudioDevice", ctrl->getValue().asString());
 }
 //
-// LLFloaterDeviceSettings
+// LLFloaterVoiceDeviceSettings
 //
-LLFloaterDeviceSettings::LLFloaterDeviceSettings(const LLSD& seed) : LLFloater("floater_device_settings"), mDevicePanel(NULL)
+LLFloaterVoiceDeviceSettings::LLFloaterVoiceDeviceSettings(const LLSD& seed) : LLFloater("floater_device_settings"), mDevicePanel(NULL)
 {
-        mFactoryMap["device_settings"] = LLCallbackMap(createPanelDeviceSettings, this);
+        mFactoryMap["device_settings"] = LLCallbackMap(createPanelVoiceDeviceSettings, this);
        // do not automatically open singleton floaters (as result of getInstance())
        BOOL no_open = FALSE;
-        gUICtrlFactory->buildFloater(this, "floater_device_settings.xml", &mFactoryMap, no_open);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_device_settings.xml", &mFactoryMap, no_open);
        center();
 }
-void LLFloaterDeviceSettings::onOpen()
+void LLFloaterVoiceDeviceSettings::onOpen()
 {
-        LLFloaterVoiceWizard::hideInstance();
        if(mDevicePanel)
        {
                mDevicePanel->onOpen();
@@ -455,7 +279,7 @@ void LLFloaterDeviceSettings::onOpen()
        LLFloater::onOpen();
 }
-void LLFloaterDeviceSettings::onClose(bool app_quitting)
+void LLFloaterVoiceDeviceSettings::onClose(bool app_quitting)
 {
        if(mDevicePanel)
        {
@@ -465,7 +289,7 @@ void LLFloaterDeviceSettings::onClose(bool app_quitting)
        setVisible(FALSE);
 }
-void LLFloaterDeviceSettings::apply()
+void LLFloaterVoiceDeviceSettings::apply()
 {
        if (mDevicePanel)
        {
@@ -473,7 +297,7 @@ void LLFloaterDeviceSettings::apply()
        }
 }
-void LLFloaterDeviceSettings::cancel()
+void LLFloaterVoiceDeviceSettings::cancel()
 {
        if (mDevicePanel)
        {
@@ -481,7 +305,7 @@ void LLFloaterDeviceSettings::cancel()
        }
 }
-void LLFloaterDeviceSettings::draw()
+void LLFloaterVoiceDeviceSettings::draw()
 {
        if (mDevicePanel)
        {
@@ -491,9 +315,9 @@ void LLFloaterDeviceSettings::draw()
 }
 // static
-void* LLFloaterDeviceSettings::createPanelDeviceSettings(void* user_data)
+void* LLFloaterVoiceDeviceSettings::createPanelVoiceDeviceSettings(void* user_data)
 {
-        LLFloaterDeviceSettings* floaterp = (LLFloaterDeviceSettings*)user_data;
+        LLFloaterVoiceDeviceSettings* floaterp = (LLFloaterVoiceDeviceSettings*)user_data;
-        floaterp->mDevicePanel = new LLPanelDeviceSettings();
+        floaterp->mDevicePanel = new LLPanelVoiceDeviceSettings();
        return floaterp->mDevicePanel;
 }
diff --git a/linden/indra/newview/llfloatervoicewizard.h b/linden/indra/newview/llfloatervoicedevicesettings.h
index a70677d..eba5c3c 100644
--- a/linden/indra/newview/llfloatervoicewizard.h
+++ b/linden/indra/newview/llfloatervoicedevicesettings.h
@@ -1,5 +1,5 @@
 /** 
- * @file llfloatervoicewizard.h
+ * @file llpanelvoicedevicesettings.h
 * @author Richard Nelson
 * @brief Voice communication set-up wizard
 *
@@ -30,44 +30,18 @@
 * $/LicenseInfo$
 */
-#ifndef LL_LLFLOATERVOICEWIZARD_H
+#ifndef LL_LLFLOATERVOICEDEVICESETTINGS_H
-#define LL_LLFLOATERVOICEWIZARD_H
+#define LL_LLFLOATERVOICEDEVICESETTINGS_H
 #include "llfloater.h"
 class LLPrefsVoiceLogic;
-class LLPanelDeviceSettings;
-class LLFloaterVoiceWizard 
+class LLPanelVoiceDeviceSettings : public LLPanel
-        : public LLFloater, public LLFloaterSingleton<LLFloaterVoiceWizard>
 {
 public:
-        LLFloaterVoiceWizard(const LLSD& seed);
+        LLPanelVoiceDeviceSettings();
-        virtual ~LLFloaterVoiceWizard();
+        ~LLPanelVoiceDeviceSettings();
-        /*virtual*/ BOOL postBuild();
-        /*virtual*/ void draw();
-        /*virtual*/ void onOpen();
-        /*virtual*/ void onClose(bool app_quitting);
-protected:
-        static void onClickNext(void *user_data);
-        static void onClickBack(void *user_data);
-        static void onClickOK(void *user_data);
-        static void onClickCancel(void *user_data);
-        static void onCommitVoiceEnable(LLUICtrl* ctrl, void* user_data);
-        static void* createPanelDeviceSettings(void* user_data);
-protected:
-        LLPrefsVoiceLogic* mLogic;
-        LLPanelDeviceSettings* mDevicePanel;
-};
-class LLPanelDeviceSettings : public LLPanel
-{
-public:
-        LLPanelDeviceSettings();
-        ~LLPanelDeviceSettings();
        /*virtual*/ void draw();
        /*virtual*/ BOOL postBuild();
@@ -89,10 +63,10 @@ protected:
        BOOL mDevicesUpdated;
 };
-class LLFloaterDeviceSettings : public LLFloater, public LLFloaterSingleton<LLFloaterDeviceSettings>
+class LLFloaterVoiceDeviceSettings : public LLFloater, public LLFloaterSingleton<LLFloaterVoiceDeviceSettings>
 {
 public:
-        LLFloaterDeviceSettings(const LLSD& seed);
+        LLFloaterVoiceDeviceSettings(const LLSD& seed);
        /*virtual*/ void onOpen();
        /*virtual*/ void onClose(bool app_quitting);
        /*virtual*/ void draw();
@@ -100,9 +74,9 @@ public:
        void cancel();
 protected:
-        static void* createPanelDeviceSettings(void* user_data);
+        static void* createPanelVoiceDeviceSettings(void* user_data);
-        LLPanelDeviceSettings* mDevicePanel;
+        LLPanelVoiceDeviceSettings* mDevicePanel;
 };
-#endif // LL_LLFLOATERVOICEWIZARD_H
+#endif // LL_LLFLOATERVOICEDEVICESETTINGS_H
diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index c842a87..98b449b 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -41,12 +41,13 @@
 #include "llcolorswatch.h"
 #include "llcheckboxctrl.h"
 #include "lltexturectrl.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewercamera.h"
 #include "llcombobox.h"
 #include "lllineeditor.h"
 #include "llfloaterdaycycle.h"
 #include "llboost.h"
+#include "llmultisliderctrl.h"
 #include "v4math.h"
 #include "llviewerdisplay.h"
@@ -66,10 +67,10 @@ std::set<std::string> LLFloaterWater::sDefaultPresets;
 LLFloaterWater::LLFloaterWater() : LLFloater("water floater")
 {
-        gUICtrlFactory->buildFloater(this, "floater_water.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_water.xml");
        
        // add the combo boxes
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(this, "WaterPresetsCombo");
+        LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo");
        if(comboBox != NULL) {
                
@@ -150,7 +151,7 @@ void LLFloaterWater::initCallbacks(void) {
        childSetCommitCallback("WaterBlurMult", onFloatControlMoved, &param_mgr->mBlurMultiplier);
        // Load/save
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(this, "WaterPresetsCombo");
+        LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo");
        //childSetAction("WaterLoadPreset", onLoadPreset, comboBox);
        childSetAction("WaterNewPreset", onNewPreset, comboBox);
@@ -166,7 +167,7 @@ void LLFloaterWater::initCallbacks(void) {
        comboBox->setCommitCallback(onChangePresetName);
        LLTextureCtrl* textCtrl = getChild<LLTextureCtrl>("WaterNormalMap");
-        textCtrl->setDefaultImageAssetID(LLUUID(gViewerArt.getString("water_normal.tga")));
+        textCtrl->setDefaultImageAssetID(DEFAULT_WATER_NORMAL);
        childSetCommitCallback("WaterNormalMap", onNormalMapPicked, NULL);      
 }
@@ -199,8 +200,7 @@ void LLFloaterWater::newPromptCallback(S32 option, const LLString& text, void* u
        }
        if(option == 0) {
-                LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(sWaterMenu, 
+                LLComboBox* comboBox = sWaterMenu->getChild<LLComboBox>( "WaterPresetsCombo");
-                        "WaterPresetsCombo");
                LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
@@ -311,7 +311,7 @@ void LLFloaterWater::show()
        water->syncMenu();
        // comment in if you want the menu to rebuild each time
-        //gUICtrlFactory->buildFloater(water, "floater_water.xml");
+        //LLUICtrlFactory::getInstance()->buildFloater(water, "floater_water.xml");
        //water->initCallbacks();
        water->open();
@@ -604,8 +604,7 @@ void LLFloaterWater::onNewPreset(void* userData)
 void LLFloaterWater::onSavePreset(void* userData)
 {
        // get the name
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(sWaterMenu, 
+        LLComboBox* comboBox = sWaterMenu->getChild<LLComboBox>("WaterPresetsCombo");
-                "WaterPresetsCombo");
        // don't save the empty name
        if(comboBox->getSelectedItemLabel() == "")
@@ -647,8 +646,7 @@ void LLFloaterWater::saveAlertCallback(S32 option, void* userdata)
 void LLFloaterWater::onDeletePreset(void* userData)
 {
-        LLComboBox* combo_box = LLUICtrlFactory::getComboBoxByName(sWaterMenu, 
+        LLComboBox* combo_box = sWaterMenu->getChild<LLComboBox>("WaterPresetsCombo");
-                "WaterPresetsCombo");
        if(combo_box->getSelectedValue().asString() == "")
        {
@@ -665,8 +663,7 @@ void LLFloaterWater::deleteAlertCallback(S32 option, void* userdata)
        // if they choose delete, do it.  Otherwise, don't do anything
        if(option == 0) 
        {
-                LLComboBox* combo_box = LLUICtrlFactory::getComboBoxByName(sWaterMenu, 
+                LLComboBox* combo_box = sWaterMenu->getChild<LLComboBox>("WaterPresetsCombo");
-                        "WaterPresetsCombo");
                LLFloaterDayCycle* day_cycle = NULL;
                LLComboBox* key_combo = NULL;
                LLMultiSliderCtrl* mult_sldr = NULL;
@@ -674,10 +671,8 @@ void LLFloaterWater::deleteAlertCallback(S32 option, void* userdata)
                if(LLFloaterDayCycle::isOpen()) 
                {
                        day_cycle = LLFloaterDayCycle::instance();
-                        key_combo = LLUICtrlFactory::getComboBoxByName(day_cycle, 
+                        key_combo = day_cycle->getChild<LLComboBox>("WaterKeyPresets");
-                                "WaterKeyPresets");
+                        mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WaterDayCycleKeys");
-                        mult_sldr = LLUICtrlFactory::getMultiSliderByName(day_cycle, 
-                                "WaterDayCycleKeys");
                }
                LLString name = combo_box->getSelectedValue().asString();
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 2321f5d..26e2184 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -41,7 +41,7 @@
 #include "llmultisliderctrl.h"
 #include "llspinctrl.h"
 #include "llcheckboxctrl.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewercamera.h"
 #include "llcombobox.h"
 #include "lllineeditor.h"
@@ -68,10 +68,10 @@ static const F32 WL_SUN_AMBIENT_SLIDER_SCALE = 3.0f;
 LLFloaterWindLight::LLFloaterWindLight() : LLFloater("windlight floater")
 {
-        gUICtrlFactory->buildFloater(this, "floater_windlight_options.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_windlight_options.xml");
        
        // add the combo boxes
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(this, "WLPresetsCombo");
+        LLComboBox* comboBox = getChild<LLComboBox>("WLPresetsCombo");
        if(comboBox != NULL) {
                
@@ -214,7 +214,7 @@ void LLFloaterWindLight::initCallbacks(void) {
        // WL Top
        childSetAction("WLDayCycleMenuButton", onOpenDayCycle, NULL);
        // Load/save
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(this, "WLPresetsCombo");
+        LLComboBox* comboBox = getChild<LLComboBox>("WLPresetsCombo");
        //childSetAction("WLLoadPreset", onLoadPreset, comboBox);
        childSetAction("WLNewPreset", onNewPreset, comboBox);
@@ -259,7 +259,7 @@ void LLFloaterWindLight::newPromptCallback(S32 option, const LLString& text, voi
        }
        if(option == 0) {
-                LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(sWindLight, 
+                LLComboBox* comboBox = sWindLight->getChild<LLComboBox>( 
                        "WLPresetsCombo");
                LLFloaterDayCycle* sDayCycle = NULL;
@@ -267,7 +267,7 @@ void LLFloaterWindLight::newPromptCallback(S32 option, const LLString& text, voi
                if(LLFloaterDayCycle::isOpen()) 
                {
                        sDayCycle = LLFloaterDayCycle::instance();
-                        keyCombo = LLUICtrlFactory::getComboBoxByName(sDayCycle, 
+                        keyCombo = sDayCycle->getChild<LLComboBox>( 
                                "WLKeyPresets");
                }
@@ -459,7 +459,7 @@ void LLFloaterWindLight::show()
        windLight->syncMenu();
        // comment in if you want the menu to rebuild each time
-        //gUICtrlFactory->buildFloater(windLight, "floater_windlight_options.xml");
+        //LLUICtrlFactory::getInstance()->buildFloater(windLight, "floater_windlight_options.xml");
        //windLight->initCallbacks();
        windLight->open();
@@ -740,10 +740,8 @@ void LLFloaterWindLight::onSunMoved(LLUICtrl* ctrl, void* userData)
 {
        deactivateAnimator();
-        LLSliderCtrl* sunSldr = LLUICtrlFactory::getSliderByName(sWindLight, 
+        LLSliderCtrl* sunSldr = sWindLight->getChild<LLSliderCtrl>("WLSunAngle");
-                "WLSunAngle");
+        LLSliderCtrl* eastSldr = sWindLight->getChild<LLSliderCtrl>("WLEastAngle");
-        LLSliderCtrl* eastSldr = LLUICtrlFactory::getSliderByName(sWindLight, 
-                "WLEastAngle");
        WLColorControl * colorControl = static_cast<WLColorControl *>(userData);
        
@@ -794,7 +792,7 @@ void LLFloaterWindLight::onNewPreset(void* userData)
 void LLFloaterWindLight::onSavePreset(void* userData)
 {
        // get the name
-        LLComboBox* comboBox = LLUICtrlFactory::getComboBoxByName(sWindLight, 
+        LLComboBox* comboBox = sWindLight->getChild<LLComboBox>( 
                "WLPresetsCombo");
        // don't save the empty name
@@ -835,7 +833,7 @@ void LLFloaterWindLight::saveAlertCallback(S32 option, void* userdata)
 void LLFloaterWindLight::onDeletePreset(void* userData)
 {
-        LLComboBox* combo_box = LLUICtrlFactory::getComboBoxByName(sWindLight, 
+        LLComboBox* combo_box = sWindLight->getChild<LLComboBox>( 
                "WLPresetsCombo");
        if(combo_box->getSelectedValue().asString() == "")
@@ -853,7 +851,7 @@ void LLFloaterWindLight::deleteAlertCallback(S32 option, void* userdata)
        // if they choose delete, do it.  Otherwise, don't do anything
        if(option == 0) 
        {
-                LLComboBox* combo_box = LLUICtrlFactory::getComboBoxByName(sWindLight, 
+                LLComboBox* combo_box = sWindLight->getChild<LLComboBox>( 
                        "WLPresetsCombo");
                LLFloaterDayCycle* day_cycle = NULL;
                LLComboBox* key_combo = NULL;
@@ -862,10 +860,9 @@ void LLFloaterWindLight::deleteAlertCallback(S32 option, void* userdata)
                if(LLFloaterDayCycle::isOpen()) 
                {
                        day_cycle = LLFloaterDayCycle::instance();
-                        key_combo = LLUICtrlFactory::getComboBoxByName(day_cycle, 
+                        key_combo = day_cycle->getChild<LLComboBox>( 
                                "WLKeyPresets");
-                        mult_sldr = LLUICtrlFactory::getMultiSliderByName(day_cycle, 
+                        mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
-                                "WLDayCycleKeys");
                }
                LLString name(combo_box->getSelectedValue().asString());
@@ -956,7 +953,7 @@ void LLFloaterWindLight::onCloudScrollXToggled(LLUICtrl* ctrl, void* userData)
        bool lock = cbCtrl->get();
        LLWLParamManager::instance()->mCurParams.setEnableCloudScrollX(!lock);
-        LLSliderCtrl* sldr = LLUICtrlFactory::getSliderByName(sWindLight, 
+        LLSliderCtrl* sldr = sWindLight->getChild<LLSliderCtrl>( 
                "WLCloudScrollX");
        if(cbCtrl->get()) 
@@ -978,7 +975,7 @@ void LLFloaterWindLight::onCloudScrollYToggled(LLUICtrl* ctrl, void* userData)
        bool lock = cbCtrl->get();
        LLWLParamManager::instance()->mCurParams.setEnableCloudScrollY(!lock);
-        LLSliderCtrl* sldr = LLUICtrlFactory::getSliderByName(sWindLight, 
+        LLSliderCtrl* sldr = sWindLight->getChild<LLSliderCtrl>( 
                "WLCloudScrollY");
        if(cbCtrl->get()) 
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 9ac3133..75fbff2 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -64,7 +64,7 @@
 #include "llviewerstats.h"
 #include "llworldmap.h"
 #include "llworldmapview.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llappviewer.h"
 #include "llmapimagetype.h"
 #include "llweb.h"
@@ -165,7 +165,7 @@ LLFloaterWorldMap::LLFloaterWorldMap()
        LLCallbackMap::map_t factory_map;
        factory_map["objects_mapview"] = LLCallbackMap(createWorldMapView, NULL);
        factory_map["terrain_mapview"] = LLCallbackMap(createWorldMapView, NULL);
-        gUICtrlFactory->buildFloater(this, "floater_world_map.xml", &factory_map);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_world_map.xml", &factory_map);
 }
 // static
@@ -176,29 +176,34 @@ void* LLFloaterWorldMap::createWorldMapView(void* data)
 BOOL LLFloaterWorldMap::postBuild()
 {
-        mTabs = LLUICtrlFactory::getTabContainerByName(this, "maptab");
+        mTabs = getChild<LLTabContainer>("maptab");
        if (!mTabs) return FALSE;
        LLPanel *panel;
-        panel = LLUICtrlFactory::getPanelByName(mTabs, "objects_mapview");
+        panel = mTabs->getChild<LLPanel>("objects_mapview");
        if (panel)
        {
                mTabs->setTabChangeCallback(panel, onCommitBackground);
                mTabs->setTabUserData(panel, this);
        }
-        panel = LLUICtrlFactory::getPanelByName(mTabs, "terrain_mapview");
+        panel = mTabs->getChild<LLPanel>("terrain_mapview");
        if (panel)
        {
                mTabs->setTabChangeCallback(panel, onCommitBackground);
                mTabs->setTabUserData(panel, this);
        }
-        onCommitBackground((void*)this, false);
+        // The following callback syncs the worlmap tabs with the images.
+        // Commented out since it was crashing when LLWorldMap became a singleton.
+        // We should be fine without it but override the onOpen method and put it 
+        // there if it turns out to be needed. -MG
+        //
+        //onCommitBackground((void*)this, false);
        childSetCommitCallback("friend combo", onAvatarComboCommit, this);
-        LLComboBox *avatar_combo = LLUICtrlFactory::getComboBoxByName(this, "friend combo");
+        LLComboBox *avatar_combo = getChild<LLComboBox>("friend combo");
        if (avatar_combo)
        {
                avatar_combo->selectFirstItem();
@@ -210,7 +215,7 @@ BOOL LLFloaterWorldMap::postBuild()
        childSetFocusChangedCallback("location", onLocationFocusChanged, this);
-        LLLineEditor *location_editor = LLUICtrlFactory::getLineEditorByName(this, "location");
+        LLLineEditor *location_editor = getChild<LLLineEditor>("location");
        if (location_editor)
        {
                location_editor->setKeystrokeCallback( onSearchTextEntry );
@@ -224,7 +229,7 @@ BOOL LLFloaterWorldMap::postBuild()
        childSetCommitCallback("landmark combo", onLandmarkComboCommit, this);
-        LLComboBox *landmark_combo = LLUICtrlFactory::getComboBoxByName(this, "landmark combo");
+        LLComboBox *landmark_combo = getChild<LLComboBox>( "landmark combo");
        if (landmark_combo)
        {
                landmark_combo->selectFirstItem();
@@ -294,14 +299,14 @@ void LLFloaterWorldMap::show(void*, BOOL center_on_target)
                map_panel->updateVisibleBlocks();
                // Reload the agent positions when we show the window
-                gWorldMap->eraseItems();
+                LLWorldMap::getInstance()->eraseItems();
                // Reload any maps that may have changed
-                gWorldMap->clearSimFlags();
+                LLWorldMap::getInstance()->clearSimFlags();
                const S32 panel_num = gFloaterWorldMap->mTabs->getCurrentPanelIndex();
                const bool request_from_sim = true;
-                gWorldMap->setCurrentLayer(panel_num, request_from_sim);
+                LLWorldMap::getInstance()->setCurrentLayer(panel_num, request_from_sim);
                // We may already have a bounding box for the regions of the world,
                // so use that to adjust the view.
@@ -335,9 +340,9 @@ void LLFloaterWorldMap::show(void*, BOOL center_on_target)
 // static
 void LLFloaterWorldMap::reloadIcons(void*)
 {
-        gWorldMap->eraseItems();
+        LLWorldMap::getInstance()->eraseItems();
-        gWorldMap->sendMapLayerRequest();
+        LLWorldMap::getInstance()->sendMapLayerRequest();
 }
@@ -376,10 +381,7 @@ void LLFloaterWorldMap::setVisible( BOOL visible )
        if( !visible )
        {
                // While we're not visible, discard the overlay images we're using
-                if (gWorldMap)
+                LLWorldMap::getInstance()->clearImageRefs();
-                {
-                        gWorldMap->clearImageRefs();
-                }
        }
 }
@@ -394,7 +396,7 @@ BOOL LLFloaterWorldMap::handleHover(S32 x, S32 y, MASK mask)
 BOOL LLFloaterWorldMap::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-        if (getVisible() && !isMinimized() && isFrontmost())
+        if (!isMinimized() && isFrontmost())
        {
                F32 slider_value = (F32)childGetValue("zoom slider").asReal();
                slider_value += ((F32)clicks * -0.3333f);
@@ -421,11 +423,6 @@ void LLFloaterWorldMap::reshape( S32 width, S32 height, BOOL called_from_parent
 // virtual
 void LLFloaterWorldMap::draw()
 {
-        if( !getVisible() )
-        {
-                return;
-        }
        // Hide/Show Mature Events controls
        childSetVisible("events_mature_icon", !gAgent.isTeen());
        childSetVisible("events_mature_label", !gAgent.isTeen());
@@ -488,7 +485,7 @@ void LLFloaterWorldMap::draw()
        childSetEnabled("Teleport", (BOOL)tracking_status);
 //      childSetEnabled("Clear", (BOOL)tracking_status);
-        childSetEnabled("Show Destination", (BOOL)tracking_status || gWorldMap->mIsTrackingUnknownLocation);
+        childSetEnabled("Show Destination", (BOOL)tracking_status || LLWorldMap::getInstance()->mIsTrackingUnknownLocation);
        childSetEnabled("copy_slurl", (mSLURL.size() > 0) );
        setMouseOpaque(TRUE);
@@ -569,7 +566,7 @@ void LLFloaterWorldMap::trackLandmark( const LLUUID& landmark_item_id )
        {
                LLUUID asset_id = mLandmarkAssetIDList.get( idx );
                LLString name;
-                LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(this, "landmark combo");
+                LLComboBox* combo = getChild<LLComboBox>( "landmark combo");
                if (combo) name = combo->getSimple();
                mTrackedStatus = LLTracker::TRACKING_LANDMARK;
                LLTracker::trackLandmark(mLandmarkAssetIDList.get( idx ),       // assetID
@@ -609,32 +606,32 @@ void LLFloaterWorldMap::trackGenericItem(const LLItemInfo &item)
 void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
 {
-        LLSimInfo* sim_info = gWorldMap->simInfoFromPosGlobal(pos_global);
+        LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromPosGlobal(pos_global);
        if (!sim_info)
        {
-                gWorldMap->mIsTrackingUnknownLocation = TRUE;
+                LLWorldMap::getInstance()->mIsTrackingUnknownLocation = TRUE;
-                gWorldMap->mInvalidLocation = FALSE;
+                LLWorldMap::getInstance()->mInvalidLocation = FALSE;
-                gWorldMap->mUnknownLocation = pos_global;
+                LLWorldMap::getInstance()->mUnknownLocation = pos_global;
                LLTracker::stopTracking(NULL);
                S32 world_x = S32(pos_global.mdV[0] / 256);
                S32 world_y = S32(pos_global.mdV[1] / 256);
-                gWorldMap->sendMapBlockRequest(world_x, world_y, world_x, world_y, true);
+                LLWorldMap::getInstance()->sendMapBlockRequest(world_x, world_y, world_x, world_y, true);
                setDefaultBtn("");
                return;
        }
        if (sim_info->mAccess == SIM_ACCESS_DOWN)
        {
                // Down sim. Show the blue circle of death!
-                gWorldMap->mIsTrackingUnknownLocation = TRUE;
+                LLWorldMap::getInstance()->mIsTrackingUnknownLocation = TRUE;
-                gWorldMap->mUnknownLocation = pos_global;
+                LLWorldMap::getInstance()->mUnknownLocation = pos_global;
-                gWorldMap->mInvalidLocation = TRUE;
+                LLWorldMap::getInstance()->mInvalidLocation = TRUE;
                LLTracker::stopTracking(NULL);
                setDefaultBtn("");
                return;
        }
        LLString sim_name;
-        gWorldMap->simNameFromPosGlobal( pos_global, sim_name );
+        LLWorldMap::getInstance()->simNameFromPosGlobal( pos_global, sim_name );
        F32 region_x = (F32)fmod( pos_global.mdV[VX], (F64)REGION_WIDTH_METERS );
        F32 region_y = (F32)fmod( pos_global.mdV[VY], (F64)REGION_WIDTH_METERS );
        LLString full_name = llformat("%s (%d, %d, %d)", 
@@ -646,9 +643,9 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
        LLString tooltip("");
        mTrackedStatus = LLTracker::TRACKING_LOCATION;
        LLTracker::trackLocation(pos_global, full_name, tooltip);
-        gWorldMap->mIsTrackingUnknownLocation = FALSE;
+        LLWorldMap::getInstance()->mIsTrackingUnknownLocation = FALSE;
-        gWorldMap->mIsTrackingDoubleClick = FALSE;
+        LLWorldMap::getInstance()->mIsTrackingDoubleClick = FALSE;
-        gWorldMap->mIsTrackingCommit = FALSE;
+        LLWorldMap::getInstance()->mIsTrackingCommit = FALSE;
        setDefaultBtn("Teleport");
 }
@@ -671,7 +668,7 @@ void LLFloaterWorldMap::updateLocation()
                {
                        // Make sure we know where we are before setting the current user position
                        LLString agent_sim_name;
-                        gotSimName = gWorldMap->simNameFromPosGlobal( agentPos, agent_sim_name );
+                        gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal( agentPos, agent_sim_name );
                        if ( gotSimName )
                        {
                                mSetToUserPosition = FALSE;
@@ -698,7 +695,7 @@ void LLFloaterWorldMap::updateLocation()
                return; // invalid location
        }
        LLString sim_name;
-        gotSimName = gWorldMap->simNameFromPosGlobal( pos_global, sim_name );
+        gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal( pos_global, sim_name );
        if ((status != LLTracker::TRACKING_NOTHING) &&
                (status != mTrackedStatus || pos_global != mTrackedLocation || sim_name != mTrackedSimName))
        {
@@ -739,7 +736,7 @@ void LLFloaterWorldMap::updateLocation()
 void LLFloaterWorldMap::trackURL(const LLString& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
 {
-        LLSimInfo* sim_info = gWorldMap->simInfoFromName(region_name);
+        LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name);
        z_coord = llclamp(z_coord, 0, 1000);
        if (sim_info)
        {
@@ -761,9 +758,9 @@ void LLFloaterWorldMap::trackURL(const LLString& region_name, S32 x_coord, S32 y
                // pass sim name to combo box
                gFloaterWorldMap->mCompletingRegionName = region_name;
-                gWorldMap->sendNamedRegionRequest(region_name);
+                LLWorldMap::getInstance()->sendNamedRegionRequest(region_name);
                LLString::toLower(gFloaterWorldMap->mCompletingRegionName);
-                gWorldMap->mIsTrackingCommit = TRUE;
+                LLWorldMap::getInstance()->mIsTrackingCommit = TRUE;
        }
 }
@@ -826,17 +823,15 @@ void LLFloaterWorldMap::friendsChanged()
 void LLFloaterWorldMap::buildAvatarIDList()
 {
        LLCtrlListInterface *list = childGetListInterface("friend combo");
-        if (!list)
+        if (!list) return;
-        {
-                return;
-        }
-        
    // Delete all but the "None" entry
        S32 list_size = list->getItemCount();
-        if (list_size > 1)
+        while (list_size > 1)
        {
-                list->selectItemRange(1, -1);
+                list->selectNthItem(1);
                list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
+                --list_size;
        }
        LLSD default_column;
@@ -848,9 +843,11 @@ void LLFloaterWorldMap::buildAvatarIDList()
        // Get all of the calling cards for avatar that are currently online
        LLCollectMappableBuddies collector;
        LLAvatarTracker::instance().applyFunctor(collector);
-        
+        LLCollectMappableBuddies::buddy_map_t::iterator it;
-        for (LLCollectMappableBuddies::buddy_map_t::iterator it = collector.mMappable.begin();
+        LLCollectMappableBuddies::buddy_map_t::iterator end;
-                 it != collector.mMappable.end(); ++it)
+        it = collector.mMappable.begin();
+        end = collector.mMappable.end();
+        for( ; it != end; ++it)
        {
                list->addSimpleElement((*it).first, ADD_BOTTOM, (*it).second);
        }
@@ -945,7 +942,7 @@ void LLFloaterWorldMap::clearLocationSelection(BOOL clear_ui)
        {
                childSetValue("spin z", 0);
        }
-        gWorldMap->mIsTrackingCommit = FALSE;
+        LLWorldMap::getInstance()->mIsTrackingCommit = FALSE;
        mCompletingRegionName = "";
        mExactMatch = FALSE;
 }
@@ -983,8 +980,8 @@ void LLFloaterWorldMap::clearAvatarSelection(BOOL clear_ui)
 void LLFloaterWorldMap::adjustZoomSliderBounds()
 {
        // World size in regions
-        S32 world_width_regions  = gWorldMap->getWorldWidth() / REGION_WIDTH_UNITS;
+        S32 world_width_regions  = LLWorldMap::getInstance()->getWorldWidth() / REGION_WIDTH_UNITS;
-        S32 world_height_regions = gWorldMap->getWorldHeight() / REGION_WIDTH_UNITS;
+        S32 world_height_regions = LLWorldMap::getInstance()->getWorldHeight() / REGION_WIDTH_UNITS;
        // Pad the world size a little bit, so we have a nice border on
        // the edge
@@ -1186,7 +1183,7 @@ void LLFloaterWorldMap::onAvatarComboCommit( LLUICtrl* ctrl, void* userdata )
        if (new_avatar_id.notNull())
        {
                LLString name;
-                LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(gFloaterWorldMap, "friend combo");
+                LLComboBox* combo = gFloaterWorldMap->getChild<LLComboBox>("friend combo");
                if (combo) name = combo->getSimple();
                self->trackAvatar(new_avatar_id, name);
                onShowTargetBtn(self);
@@ -1243,16 +1240,16 @@ void LLFloaterWorldMap::onLocationCommit( void* userdata )
        LLString::toLower(str);
        gFloaterWorldMap->mCompletingRegionName = str;
-        gWorldMap->mIsTrackingCommit = TRUE;
+        LLWorldMap::getInstance()->mIsTrackingCommit = TRUE;
        self->mExactMatch = FALSE;
        if (str.length() >= 3)
        {
-                gWorldMap->sendNamedRegionRequest(str);
+                LLWorldMap::getInstance()->sendNamedRegionRequest(str);
        }
        else
        {
                str += "#";
-                gWorldMap->sendNamedRegionRequest(str);
+                LLWorldMap::getInstance()->sendNamedRegionRequest(str);
        }
 }
@@ -1263,7 +1260,7 @@ void LLFloaterWorldMap::onClearBtn(void* data)
        LLFloaterWorldMap* self = (LLFloaterWorldMap*)data;
        self->mTrackedStatus = LLTracker::TRACKING_NOTHING;
        LLTracker::stopTracking((void *)(intptr_t)TRUE);
-        gWorldMap->mIsTrackingUnknownLocation = FALSE;
+        LLWorldMap::getInstance()->mIsTrackingUnknownLocation = FALSE;
        self->mSLURL = "";                              // Clear the SLURL since it's invalid
        self->mSetToUserPosition = TRUE;        // Revert back to the current user position
 }
@@ -1337,9 +1334,9 @@ void LLFloaterWorldMap::centerOnTarget(BOOL animate)
                        pos_global = LLTracker::getTrackedPositionGlobal() - gAgent.getCameraPositionGlobal();
                }
        }
-        else if(gWorldMap->mIsTrackingUnknownLocation)
+        else if(LLWorldMap::getInstance()->mIsTrackingUnknownLocation)
        {
-                pos_global = gWorldMap->mUnknownLocation - gAgent.getCameraPositionGlobal();;
+                pos_global = LLWorldMap::getInstance()->mUnknownLocation - gAgent.getCameraPositionGlobal();;
        }
        else
        {
@@ -1532,10 +1529,7 @@ void LLFloaterWorldMap::onCommitBackground(void* userdata, bool from_click)
        // Find my index
        S32 index = self->mTabs->getCurrentPanelIndex();
-        if (gWorldMap)
+        LLWorldMap::getInstance()->setCurrentLayer(index);
-        {
-                gWorldMap->setCurrentLayer(index);
-        }
 }
 void LLFloaterWorldMap::updateSims(bool found_null_sim)
@@ -1545,8 +1539,7 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
                return;
        }
-        LLScrollListCtrl *list = gUICtrlFactory->getScrollListByName(this, "search_results");
+        LLScrollListCtrl *list = getChild<LLScrollListCtrl>("search_results");
-        if (!list) return;
        list->operateOnAll(LLCtrlListInterface::OP_DELETE);
        LLSD selected_value = list->getSelectedValue();
@@ -1556,7 +1549,7 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
        BOOL match_found = FALSE;
        S32 num_results = 0;
        std::map<U64, LLSimInfo*>::const_iterator it;
-        for (it = gWorldMap->mSimInfoMap.begin(); it != gWorldMap->mSimInfoMap.end(); ++it)
+        for (it = LLWorldMap::getInstance()->mSimInfoMap.begin(); it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
        {
                LLSimInfo* info = (*it).second;
                LLString sim_name = info->mName;
@@ -1565,7 +1558,7 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
                if (sim_name_lower.substr(0, name_length) == mCompletingRegionName)
                {
-                        if (gWorldMap->mIsTrackingCommit)
+                        if (LLWorldMap::getInstance()->mIsTrackingCommit)
                        {
                                if (sim_name_lower == mCompletingRegionName)
                                {
@@ -1644,7 +1637,7 @@ void LLFloaterWorldMap::onCommitSearchResult(LLUICtrl*, void* userdata)
        LLString::toLower(sim_name);
        std::map<U64, LLSimInfo*>::const_iterator it;
-        for (it = gWorldMap->mSimInfoMap.begin(); it != gWorldMap->mSimInfoMap.end(); ++it)
+        for (it = LLWorldMap::getInstance()->mSimInfoMap.begin(); it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
        {
                LLSimInfo* info = (*it).second;
                LLString info_sim_name = info->mName;
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 9c59c7b..49ca5e4 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -58,7 +58,7 @@
 #include "llviewerimagelist.h"
 #include "llviewerjointattachment.h"
 #include "llviewermenu.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llvoavatar.h"
 #include "llfloaterproperties.h"
@@ -114,10 +114,11 @@ LLColor4 LLFolderViewItem::sHighlightBgColor;
 LLColor4 LLFolderViewItem::sHighlightFgColor;
 LLColor4 LLFolderViewItem::sFilterBGColor;
 LLColor4 LLFolderViewItem::sFilterTextColor;
-LLColor4 LLFolderViewItem::sLoadingMessageTextColor;
+LLColor4 LLFolderViewItem::sSuffixColor;
+LLColor4 LLFolderViewItem::sSearchStatusColor;
 // Default constructor
-LLFolderViewItem::LLFolderViewItem( const LLString& name, LLViewerImage* icon,
+LLFolderViewItem::LLFolderViewItem( const LLString& name, LLUIImagePtr icon,
                                                                   S32 creation_date,
                                                                   LLFolderView* root,
                                                                        LLFolderViewEventListener* listener ) :
@@ -145,12 +146,12 @@ LLFolderViewItem::LLFolderViewItem( const LLString& name, LLViewerImage* icon,
        setIcon(icon);
        if( !LLFolderViewItem::sFont )
        {
-                LLFolderViewItem::sFont = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
+                LLFolderViewItem::sFont = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
        }
        if (!LLFolderViewItem::sSmallFont)
        {
-                LLFolderViewItem::sSmallFont = gResMgr->getRes( LLFONT_SMALL );
+                LLFolderViewItem::sSmallFont = LLResMgr::getInstance()->getRes( LLFONT_SMALL );
        }
        // HACK: Can't be set above because gSavedSettings might not be constructed.
@@ -159,10 +160,12 @@ LLFolderViewItem::LLFolderViewItem( const LLString& name, LLViewerImage* icon,
        LLFolderViewItem::sHighlightFgColor = gColors.getColor( "MenuItemHighlightFgColor" );
        LLFolderViewItem::sFilterBGColor = gColors.getColor( "FilterBackgroundColor" );
        LLFolderViewItem::sFilterTextColor = gColors.getColor( "FilterTextColor" );
-        LLFolderViewItem::sLoadingMessageTextColor = gColors.getColor( "FolderViewLoadingMessageTextColor" );
+        LLFolderViewItem::sSuffixColor = gColors.getColor( "InventoryItemSuffixColor" );
+        LLFolderViewItem::sSearchStatusColor = gColors.getColor( "InventorySearchStatusColor" );
-        mArrowImage = gImageList.getImage(LLUUID(gViewerArt.getString("folder_arrow.tga")), MIPMAP_FALSE, TRUE); 
-        mBoxImage = gImageList.getImage(LLUUID(gViewerArt.getString("rounded_square.tga")), MIPMAP_FALSE, TRUE);
+        mArrowImage = LLUI::getUIImage("folder_arrow.tga"); 
+        mBoxImage = LLUI::getUIImage("rounded_square.tga");
        refresh();
        setTabStop(FALSE);
@@ -267,13 +270,9 @@ void LLFolderViewItem::setFiltered(BOOL filtered, S32 filter_generation)
        mLastFilterGeneration = filter_generation;
 }
-void LLFolderViewItem::setIcon(LLViewerImage* icon)
+void LLFolderViewItem::setIcon(LLUIImagePtr icon)
 {
        mIcon = icon;
-        if (mIcon)
-        {
-                mIcon->setBoostLevel(LLViewerImage::BOOST_UI);
-        }
 }
 // refresh information from the listener
@@ -369,16 +368,6 @@ void LLFolderViewItem::extendSelectionFromRoot(LLFolderViewItem* selection)
        getRoot()->extendSelection(selection, NULL, selected_items);
 }
-EWidgetType LLFolderViewItem::getWidgetType() const
-{
-        return WIDGET_TYPE_FOLDER_ITEM;
-}
-LLString LLFolderViewItem::getWidgetTag() const
-{
-        return LL_FOLDER_VIEW_ITEM_TAG;
-}
 EInventorySortGroup LLFolderViewItem::getSortGroup() 
 { 
        return SG_ITEM; 
@@ -649,7 +638,7 @@ BOOL LLFolderViewItem::handleMouseDown( S32 x, S32 y, MASK mask )
                S32 screen_x;
                S32 screen_y;
                localPointToScreen(x, y, &screen_x, &screen_y );
-                gToolDragAndDrop->setDragStart( screen_x, screen_y );
+                LLToolDragAndDrop::getInstance()->setDragStart( screen_x, screen_y );
        }
        return TRUE;
 }
@@ -662,7 +651,7 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
                S32 screen_y;
                localPointToScreen(x, y, &screen_x, &screen_y );
                BOOL can_drag = TRUE;
-                if( gToolDragAndDrop->isOverThreshold( screen_x, screen_y ) )
+                if( LLToolDragAndDrop::getInstance()->isOverThreshold( screen_x, screen_y ) )
                {
                        LLFolderView* root = getRoot();
                        
@@ -694,7 +683,7 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
                                        // item.
                                        gViewerWindow->setKeyboardFocus(NULL);
-                                        return gToolDragAndDrop->handleHover( x, y, mask );
+                                        return LLToolDragAndDrop::getInstance()->handleHover( x, y, mask );
                                }
                        }
                }
@@ -813,7 +802,7 @@ void LLFolderViewItem::draw()
                if (mArrowImage)
                {
                        gl_draw_scaled_rotated_image(mIndentation, getRect().getHeight() - ARROW_SIZE - TEXT_PAD,
-                                ARROW_SIZE, ARROW_SIZE, mControlLabelRotation, mArrowImage, sFgColor);
+                                ARROW_SIZE, ARROW_SIZE, mControlLabelRotation, mArrowImage->getImage(), sFgColor);
                }
        }
@@ -905,8 +894,7 @@ void LLFolderViewItem::draw()
        if(mIcon)
        {
-                gl_draw_image(mIndentation + ARROW_SIZE + TEXT_PAD, getRect().getHeight() - mIcon->getHeight(), mIcon);
+                mIcon->draw(mIndentation + ARROW_SIZE + TEXT_PAD, getRect().getHeight() - mIcon->getHeight());
-                mIcon->addTextureStats( (F32)(mIcon->getWidth() * mIcon->getHeight()));
        }
        if (!mLabel.empty())
@@ -934,7 +922,7 @@ void LLFolderViewItem::draw()
                if ( mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime") )
                {
-                        sFont->renderUTF8( "Loading... ", 0, text_left, y, sLoadingMessageTextColor,
+                        sFont->renderUTF8( "Loading... ", 0, text_left, y, sSearchStatusColor,
                                                LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, S32_MAX, S32_MAX, &right_x, FALSE);
                        text_left = right_x;
                }
@@ -944,7 +932,7 @@ void LLFolderViewItem::draw()
                                                        S32_MAX, S32_MAX, &right_x, FALSE );
                if (!mLabelSuffix.empty())
                {
-                        sFont->renderUTF8( mLabelSuffix, 0, right_x, y, LLColor4(0.75f, 0.85f, 0.85f, 1.f),
+                        sFont->renderUTF8( mLabelSuffix, 0, right_x, y, sSuffixColor,
                                                                LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
                                                                S32_MAX, S32_MAX, &right_x, FALSE );
                }
@@ -961,9 +949,8 @@ void LLFolderViewItem::draw()
                                S32 bottom = llfloor(getRect().getHeight() - sFont->getLineHeight() - 3);
                                S32 top = getRect().getHeight();
-                                LLViewerImage::bindTexture(mBoxImage);
+                                LLRect box_rect(left, top, right, bottom);
-                                gGL.color4fv(sFilterBGColor.mV);
+                                mBoxImage->draw(box_rect, sFilterBGColor);
-                                gl_segmented_rect_2d_tex(left, top, right, bottom, mBoxImage->getWidth(), mBoxImage->getHeight(), 16);
                                F32 match_string_left = text_left + sFont->getWidthF32(combined_string, 0, mStringMatchOffset);
                                F32 y = (F32)getRect().getHeight() - sFont->getLineHeight() - (F32)TEXT_PAD;
                                sFont->renderUTF8( combined_string, mStringMatchOffset, match_string_left, y,
@@ -985,7 +972,7 @@ void LLFolderViewItem::draw()
 ///----------------------------------------------------------------------------
 // Default constructor
-LLFolderViewFolder::LLFolderViewFolder( const LLString& name, LLViewerImage* icon,
+LLFolderViewFolder::LLFolderViewFolder( const LLString& name, LLUIImagePtr icon,
                                                                                LLFolderView* root,
                                                                                LLFolderViewEventListener* listener ): 
        LLFolderViewItem( name, icon, 0, root, listener ),      // 0 = no create time
@@ -1019,16 +1006,6 @@ LLFolderViewFolder::~LLFolderViewFolder( void )
        //mFolders.removeAllNodes();
 }
-EWidgetType LLFolderViewFolder::getWidgetType() const
-{
-        return WIDGET_TYPE_FOLDER;
-}
-LLString LLFolderViewFolder::getWidgetTag() const
-{
-        return LL_FOLDER_VIEW_FOLDER_TAG;
-}
 // addToFolder() returns TRUE if it succeeds. FALSE otherwise
 BOOL LLFolderViewFolder::addToFolder(LLFolderViewFolder* folder, LLFolderView* root)
 {
@@ -2098,20 +2075,17 @@ BOOL LLFolderViewFolder::handleDragAndDrop(S32 x, S32 y, MASK mask,
 BOOL LLFolderViewFolder::handleRightMouseDown( S32 x, S32 y, MASK mask )
 {
        BOOL handled = FALSE;
-        if( getVisible() )
+        // fetch contents of this folder, as context menu can depend on contents
+        // still, user would have to open context menu again to see the changes
+        gInventory.fetchDescendentsOf(mListener->getUUID());
+        
+        if( mIsOpen )
        {
-                // fetch contents of this folder, as context menu can depend on contents
+                handled = childrenHandleRightMouseDown( x, y, mask ) != NULL;
-                // still, user would have to open context menu again to see the changes
+        }
-                gInventory.fetchDescendentsOf(mListener->getUUID());
+        if (!handled)
-                
+        {
-                if( mIsOpen )
+                handled = LLFolderViewItem::handleRightMouseDown( x, y, mask );
-                {
-                        handled = childrenHandleRightMouseDown( x, y, mask ) != NULL;
-                }
-                if (!handled)
-                {
-                        handled = LLFolderViewItem::handleRightMouseDown( x, y, mask );
-                }
        }
        return handled;
 }
@@ -2162,16 +2136,12 @@ BOOL LLFolderViewFolder::handleMouseDown( S32 x, S32 y, MASK mask )
 BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
 {
-        if (!getVisible())
+        BOOL handled = FALSE;
-        {
-                return FALSE;
-        }
-        BOOL rv = false;
        if( mIsOpen )
        {
-                rv = childrenHandleDoubleClick( x, y, mask ) != NULL;
+                handled = childrenHandleDoubleClick( x, y, mask ) != NULL;
        }
-        if( !rv )
+        if( !handled )
        {
                if(x < LEFT_INDENTATION + mIndentation && x > mIndentation - LEFT_PAD)
                {
@@ -2184,9 +2154,9 @@ BOOL LLFolderViewFolder::handleDoubleClick( S32 x, S32 y, MASK mask )
                        setSelectionFromRoot(this, FALSE);
                        toggleOpen();
                }
-                return TRUE;
+                handled = TRUE;
        }
-        return rv;
+        return handled;
 }
 void LLFolderViewFolder::draw()
@@ -2529,7 +2499,7 @@ void LLCloseAllFoldersFunctor::doItem(LLFolderViewItem* item)
 ///----------------------------------------------------------------------------
 // Default constructor
-LLFolderView::LLFolderView( const LLString& name, LLViewerImage* root_folder_icon, 
+LLFolderView::LLFolderView( const LLString& name, LLUIImagePtr root_folder_icon, 
                                                   const LLRect& rect, const LLUUID& source_id, LLView *parent_view ) :
 #if LL_WINDOWS
 #pragma warning( push )
@@ -2584,18 +2554,15 @@ LLFolderView::LLFolderView( const LLString& name, LLViewerImage* root_folder_ico
                                                                NULL,
                                                                NULL,
                                                                this,
-                                                                &LLLineEditor::prevalidatePrintableNotPipe,
+                                                                &LLLineEditor::prevalidatePrintableNotPipe);
-                                                                LLViewBorder::BEVEL_NONE,
+        //mRenamer->setWriteableBgColor(LLColor4::white);
-                                                                LLViewBorder::STYLE_LINE,
-                                                                2);
-        mRenamer->setWriteableBgColor(LLColor4::white);
        // Escape is handled by reverting the rename, not commiting it (default behavior)
        mRenamer->setCommitOnFocusLost(TRUE);
        mRenamer->setVisible(FALSE);
        addChild(mRenamer);
        // make the popup menu available
-        LLMenuGL* menu = gUICtrlFactory->buildMenu("menu_inventory.xml", parent_view);
+        LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_inventory.xml", parent_view);
        if (!menu)
        {
                menu = new LLMenuGL("");
@@ -2643,16 +2610,6 @@ LLFolderView::~LLFolderView( void )
        mItemMap.clear();
 }
-EWidgetType LLFolderView::getWidgetType() const
-{
-        return WIDGET_TYPE_FOLDER_VIEW;
-}
-LLString LLFolderView::getWidgetTag() const
-{
-        return LL_FOLDER_VIEW_TAG;
-}
 BOOL LLFolderView::canFocusChildren() const
 {
        return FALSE;
@@ -3156,7 +3113,7 @@ BOOL LLFolderView::startDrag(LLToolDragAndDrop::ESource source)
                        cargo_ids.push_back(id);
                }
-                gToolDragAndDrop->beginMultiDrag(types, cargo_ids, source, mSourceID); 
+                LLToolDragAndDrop::getInstance()->beginMultiDrag(types, cargo_ids, source, mSourceID); 
        }
        return can_drag;
 }
@@ -3187,15 +3144,11 @@ void LLFolderView::draw()
        {
                closeAutoOpenedFolders();
        }
-        if(gViewerWindow->hasKeyboardFocus(this) && !getVisible())
-        {
-                gViewerWindow->setKeyboardFocus( NULL );
-        }
        // while dragging, update selection rendering to reflect single/multi drag status
-        if (gToolDragAndDrop->hasMouseCapture())
+        if (LLToolDragAndDrop::getInstance()->hasMouseCapture())
        {
-                EAcceptance last_accept = gToolDragAndDrop->getLastAccept();
+                EAcceptance last_accept = LLToolDragAndDrop::getInstance()->getLastAccept();
                if (last_accept == ACCEPT_YES_SINGLE || last_accept == ACCEPT_YES_COPY_SINGLE)
                {
                        setShowSingleSelection(TRUE);
@@ -3225,12 +3178,12 @@ void LLFolderView::draw()
                if (gInventory.backgroundFetchActive() || mCompletedFilterGeneration < mFilter.getMinRequiredGeneration())
                {
                        mStatusText = "Searching..."; // *TODO:translate
-                        sFont->renderUTF8(mStatusText, 0, 2, 1, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, S32_MAX, S32_MAX, NULL, FALSE );
+                        sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, S32_MAX, S32_MAX, NULL, FALSE );
                }
                else
                {
                        mStatusText = "No matching items found in inventory."; // *TODO:translate
-                        sFont->renderUTF8(mStatusText, 0, 2, 1, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, S32_MAX, S32_MAX, NULL, FALSE );
+                        sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, S32_MAX, S32_MAX, NULL, FALSE );
                }
        }
@@ -3698,7 +3651,7 @@ void LLFolderView::setFocus(BOOL focus)
        LLFolderViewFolder::setFocus(focus);
 }
-BOOL LLFolderView::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
 {
        BOOL handled = FALSE;
@@ -3716,202 +3669,199 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
                item = *(getChildList()->begin());
        }
-        if( getVisible() && getEnabled() && !called_from_parent )
+        switch( key )
        {
-                switch( key )
+        case KEY_F2:
-                {
+                mSearchString.clear();
-                case KEY_F2:
+                startRenamingSelectedItem();
-                        mSearchString.clear();
+                handled = TRUE;
-                        startRenamingSelectedItem();
+                break;
-                        handled = TRUE;
-                        break;
-                case KEY_RETURN:
-                        if (mask == MASK_NONE)
-                        {
-                                if( mRenameItem && mRenamer->getVisible() )
-                                {
-                                        finishRenamingItem();
-                                        mSearchString.clear();
-                                        handled = TRUE;
-                                }
-                                else
-                                {
-                                        LLFolderView::openSelectedItems();
-                                        handled = TRUE;
-                                }
-                        }
-                        break;
-                case KEY_ESCAPE:
+        case KEY_RETURN:
-                        // mark flag don't commit
+                if (mask == MASK_NONE)
+                {
                        if( mRenameItem && mRenamer->getVisible() )
                        {
-                                revertRenamingItem();
+                                finishRenamingItem();
+                                mSearchString.clear();
                                handled = TRUE;
                        }
                        else
                        {
-                                if( gViewerWindow->childHasKeyboardFocus( this ) )
+                                LLFolderView::openSelectedItems();
-                                {
+                                handled = TRUE;
-                                        gViewerWindow->setKeyboardFocus( NULL );
-                                }
                        }
-                        mSearchString.clear();
+                }
-                        break;
+                break;
-                case KEY_PAGE_UP:
+        case KEY_ESCAPE:
-                        mSearchString.clear();
+                // mark flag don't commit
-                        mScrollContainer->pageUp(30);
+                if( mRenameItem && mRenamer->getVisible() )
+                {
+                        revertRenamingItem();
                        handled = TRUE;
-                        break;
+                }
+                else
+                {
+                        if( gViewerWindow->childHasKeyboardFocus( this ) )
+                        {
+                                gViewerWindow->setKeyboardFocus( NULL );
+                        }
+                }
+                mSearchString.clear();
+                break;
-                case KEY_PAGE_DOWN:
+        case KEY_PAGE_UP:
-                        mSearchString.clear();
+                mSearchString.clear();
-                        mScrollContainer->pageDown(30);
+                mScrollContainer->pageUp(30);
-                        handled = TRUE;
+                handled = TRUE;
-                        break;
+                break;
-                case KEY_HOME:
+        case KEY_PAGE_DOWN:
-                        mSearchString.clear();
+                mSearchString.clear();
-                        mScrollContainer->goToTop();
+                mScrollContainer->pageDown(30);
-                        handled = TRUE;
+                handled = TRUE;
-                        break;
+                break;
-                case KEY_END:
+        case KEY_HOME:
-                        mSearchString.clear();
+                mSearchString.clear();
-                        mScrollContainer->goToBottom();
+                mScrollContainer->goToTop();
-                        break;
+                handled = TRUE;
+                break;
-                case KEY_DOWN:
+        case KEY_END:
-                        if((mSelectedItems.size() > 0) && mScrollContainer)
+                mSearchString.clear();
-                        {
+                mScrollContainer->goToBottom();
-                                LLFolderViewItem* last_selected = getCurSelectedItem();
+                break;
-                                if (!mKeyboardSelection)
+        case KEY_DOWN:
-                                {
+                if((mSelectedItems.size() > 0) && mScrollContainer)
-                                        setSelection(last_selected, FALSE, TRUE);
+                {
-                                        mKeyboardSelection = TRUE;
+                        LLFolderViewItem* last_selected = getCurSelectedItem();
-                                }
-                                LLFolderViewItem* next = NULL;
+                        if (!mKeyboardSelection)
-                                if (mask & MASK_SHIFT)
+                        {
+                                setSelection(last_selected, FALSE, TRUE);
+                                mKeyboardSelection = TRUE;
+                        }
+                        LLFolderViewItem* next = NULL;
+                        if (mask & MASK_SHIFT)
+                        {
+                                // don't shift select down to children of folders (they are implicitly selected through parent)
+                                next = last_selected->getNextOpenNode(FALSE);
+                                if (next)
                                {
-                                        // don't shift select down to children of folders (they are implicitly selected through parent)
+                                        if (next->isSelected())
-                                        next = last_selected->getNextOpenNode(FALSE);
-                                        if (next)
                                        {
-                                                if (next->isSelected())
+                                                // shrink selection
-                                                {
+                                                changeSelectionFromRoot(last_selected, FALSE);
-                                                        // shrink selection
+                                        }
-                                                        changeSelectionFromRoot(last_selected, FALSE);
+                                        else if (last_selected->getParentFolder() == next->getParentFolder())
-                                                }
+                                        {
-                                                else if (last_selected->getParentFolder() == next->getParentFolder())
+                                                // grow selection
-                                                {
+                                                changeSelectionFromRoot(next, TRUE);
-                                                        // grow selection
-                                                        changeSelectionFromRoot(next, TRUE);
-                                                }
                                        }
                                }
-                                else
+                        }
+                        else
+                        {
+                                next = last_selected->getNextOpenNode();
+                                if( next )
                                {
-                                        next = last_selected->getNextOpenNode();
+                                        if (next == last_selected)
-                                        if( next )
                                        {
-                                                if (next == last_selected)
+                                                return FALSE;
-                                                {
-                                                        return FALSE;
-                                                }
-                                                setSelection( next, FALSE, TRUE );
                                        }
+                                        setSelection( next, FALSE, TRUE );
                                }
-                                scrollToShowSelection();
-                                mSearchString.clear();
-                                handled = TRUE;
                        }
-                        break;
+                        scrollToShowSelection();
+                        mSearchString.clear();
+                        handled = TRUE;
+                }
+                break;
-                case KEY_UP:
+        case KEY_UP:
-                        if((mSelectedItems.size() > 0) && mScrollContainer)
+                if((mSelectedItems.size() > 0) && mScrollContainer)
-                        {
+                {
-                                LLFolderViewItem* last_selected = mSelectedItems.back();
+                        LLFolderViewItem* last_selected = mSelectedItems.back();
-                                if (!mKeyboardSelection)
+                        if (!mKeyboardSelection)
-                                {
+                        {
-                                        setSelection(last_selected, FALSE, TRUE);
+                                setSelection(last_selected, FALSE, TRUE);
-                                        mKeyboardSelection = TRUE;
+                                mKeyboardSelection = TRUE;
-                                }
+                        }
-                                LLFolderViewItem* prev = NULL;
+                        LLFolderViewItem* prev = NULL;
-                                if (mask & MASK_SHIFT)
+                        if (mask & MASK_SHIFT)
+                        {
+                                // don't shift select down to children of folders (they are implicitly selected through parent)
+                                prev = last_selected->getPreviousOpenNode(FALSE);
+                                if (prev)
                                {
-                                        // don't shift select down to children of folders (they are implicitly selected through parent)
+                                        if (prev->isSelected())
-                                        prev = last_selected->getPreviousOpenNode(FALSE);
-                                        if (prev)
                                        {
-                                                if (prev->isSelected())
+                                                // shrink selection
-                                                {
+                                                changeSelectionFromRoot(last_selected, FALSE);
-                                                        // shrink selection
+                                        }
-                                                        changeSelectionFromRoot(last_selected, FALSE);
+                                        else if (last_selected->getParentFolder() == prev->getParentFolder())
-                                                }
+                                        {
-                                                else if (last_selected->getParentFolder() == prev->getParentFolder())
+                                                // grow selection
-                                                {
+                                                changeSelectionFromRoot(prev, TRUE);
-                                                        // grow selection
-                                                        changeSelectionFromRoot(prev, TRUE);
-                                                }
                                        }
                                }
-                                else
+                        }
+                        else
+                        {
+                                prev = last_selected->getPreviousOpenNode();
+                                if( prev )
                                {
-                                        prev = last_selected->getPreviousOpenNode();
+                                        if (prev == this)
-                                        if( prev )
                                        {
-                                                if (prev == this)
+                                                return FALSE;
-                                                {
-                                                        return FALSE;
-                                                }
-                                                setSelection( prev, FALSE, TRUE );
                                        }
+                                        setSelection( prev, FALSE, TRUE );
                                }
-                                scrollToShowSelection();
-                                mSearchString.clear();
-                                handled = TRUE;
                        }
-                        break;
+                        scrollToShowSelection();
+                        mSearchString.clear();
+                        handled = TRUE;
+                }
+                break;
+        case KEY_RIGHT:
+                if(mSelectedItems.size())
+                {
+                        LLFolderViewItem* last_selected = getCurSelectedItem();
+                        last_selected->setOpen( TRUE );
+                        mSearchString.clear();
+                        handled = TRUE;
+                }
+                break;
-                case KEY_RIGHT:
+        case KEY_LEFT:
-                        if(mSelectedItems.size())
+                if(mSelectedItems.size())
+                {
+                        LLFolderViewItem* last_selected = getCurSelectedItem();
+                        LLFolderViewItem* parent_folder = last_selected->getParentFolder();
+                        if (!last_selected->isOpen() && parent_folder && parent_folder->getParentFolder())
                        {
-                                LLFolderViewItem* last_selected = getCurSelectedItem();
+                                setSelection(parent_folder, FALSE, TRUE);
-                                last_selected->setOpen( TRUE );
-                                mSearchString.clear();
-                                handled = TRUE;
                        }
-                        break;
+                        else
-                case KEY_LEFT:
-                        if(mSelectedItems.size())
                        {
-                                LLFolderViewItem* last_selected = getCurSelectedItem();
+                                last_selected->setOpen( FALSE );
-                                LLFolderViewItem* parent_folder = last_selected->getParentFolder();
-                                if (!last_selected->isOpen() && parent_folder && parent_folder->getParentFolder())
-                                {
-                                        setSelection(parent_folder, FALSE, TRUE);
-                                }
-                                else
-                                {
-                                        last_selected->setOpen( FALSE );
-                                }
-                                mSearchString.clear();
-                                scrollToShowSelection();
-                                handled = TRUE;
                        }
-                        break;
+                        mSearchString.clear();
+                        scrollToShowSelection();
+                        handled = TRUE;
                }
+                break;
        }
-        if (!handled && gFocusMgr.childHasKeyboardFocus(getRoot()))
+        if (!handled && hasFocus())
        {
                if (key == KEY_BACKSPACE)
                {
@@ -3929,7 +3879,7 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
 }
-BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent)
+BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char)
 {
        if ((uni_char < 0x20) || (uni_char == 0x7F)) // Control character or DEL
        {
@@ -4082,11 +4032,7 @@ BOOL LLFolderView::search(LLFolderViewItem* first_item, const LLString &search_s
 BOOL LLFolderView::handleDoubleClick( S32 x, S32 y, MASK mask )
 {
-        if (!getVisible())
+        // skip LLFolderViewFolder::handleDoubleClick()
-        {
-                return FALSE;
-        }
        return LLView::handleDoubleClick( x, y, mask );
 }
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index 1bd46d7..bbf4b1d 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -81,7 +81,7 @@ public:
        virtual const LLUUID& getUUID() const = 0;
        virtual U32 getCreationDate() const = 0;        // UTC seconds
        virtual PermissionMask getPermissionMask() const = 0;
-        virtual LLViewerImage* getIcon() const = 0;
+        virtual LLUIImagePtr getIcon() const = 0;
        virtual LLFontGL::StyleFlags getLabelStyle() const = 0;
        virtual LLString getLabelSuffix() const = 0;
        virtual void openItem( void ) = 0;
@@ -326,7 +326,8 @@ protected:
        static LLColor4                         sHighlightFgColor;
        static LLColor4                         sFilterBGColor;
        static LLColor4                         sFilterTextColor;
-        static LLColor4                         sLoadingMessageTextColor;
+        static LLColor4                         sSuffixColor;
+        static LLColor4                         sSearchStatusColor;
        LLString                                        mLabel;
        LLString                                        mSearchableLabel;
@@ -340,7 +341,7 @@ protected:
        BOOL                                            mSelectPending;
        LLFontGL::StyleFlags            mLabelStyle;
        LLString                                        mLabelSuffix;
-        LLPointer<LLViewerImage>        mIcon;
+        LLUIImagePtr                            mIcon;
        LLString                                        mStatusText;
        BOOL                                            mHasVisibleChildren;
        S32                                                     mIndentation;
@@ -351,8 +352,8 @@ protected:
        F32                                                     mControlLabelRotation;
        LLFolderView*                           mRoot;
        BOOL                                            mDragAndDropTarget;
-        LLPointer<LLViewerImage>        mArrowImage;
+        LLUIImagePtr                            mArrowImage;
-        LLPointer<LLViewerImage>        mBoxImage;
+        LLUIImagePtr                            mBoxImage;
        BOOL                            mIsLoading;
        LLTimer                         mTimeSinceRequestStart;
        
@@ -382,12 +383,9 @@ public:
        void filterFromRoot( void );
        // creation_date is in UTC seconds
-        LLFolderViewItem( const LLString& name, LLViewerImage* icon, S32 creation_date, LLFolderView* root, LLFolderViewEventListener* listener );
+        LLFolderViewItem( const LLString& name, LLUIImagePtr icon, S32 creation_date, LLFolderView* root, LLFolderViewEventListener* listener );
        virtual ~LLFolderViewItem( void );
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        // addToFolder() returns TRUE if it succeeds. FALSE otherwise
        enum { ARRANGE = TRUE, DO_NOT_ARRANGE = FALSE };
        virtual BOOL addToFolder(LLFolderViewFolder* folder, LLFolderView* root);
@@ -500,7 +498,7 @@ public:
        virtual void    setFiltered(BOOL filtered, S32 filter_generation);
        // change the icon
-        void setIcon(LLViewerImage* icon);
+        void setIcon(LLUIImagePtr icon);
        // refresh information from the object being viewed.
        virtual void refresh();
@@ -572,14 +570,11 @@ public:
                RECURSE_UP_DOWN
        } ERecurseType;
-        LLFolderViewFolder( const LLString& name, LLViewerImage* icon,
+        LLFolderViewFolder( const LLString& name, LLUIImagePtr icon,
                                                LLFolderView* root,
                                                LLFolderViewEventListener* listener );
        virtual ~LLFolderViewFolder( void );
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual BOOL    potentiallyVisible();
        LLFolderViewItem* getNextFromChild( LLFolderViewItem*, BOOL include_children = TRUE );
@@ -729,12 +724,10 @@ public:
        static F32 sAutoOpenTime;
-        LLFolderView( const LLString& name, LLViewerImage* root_folder_icon, const LLRect& rect, 
+        LLFolderView( const LLString& name, LLUIImagePtr root_folder_icon, const LLRect& rect, 
                                        const LLUUID& source_id, LLView *parent_view );
        virtual ~LLFolderView( void );
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual BOOL canFocusChildren() const;
        // FolderViews default to sort by name.  This will change that,
@@ -836,8 +829,8 @@ public:
        // LLView functionality
        ///*virtual*/ BOOL handleKey( KEY key, MASK mask, BOOL called_from_parent );
-        /*virtual*/ BOOL handleKeyHere( KEY key, MASK mask, BOOL called_from_parent );
+        /*virtual*/ BOOL handleKeyHere( KEY key, MASK mask );
-        /*virtual*/ BOOL handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+        /*virtual*/ BOOL handleUnicodeCharHere(llwchar uni_char);
        /*virtual*/ BOOL handleMouseDown( S32 x, S32 y, MASK mask );
        /*virtual*/ BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
        /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
diff --git a/linden/indra/newview/llframestatview.cpp b/linden/indra/newview/llframestatview.cpp
index 33a3265..71d810c 100644
--- a/linden/indra/newview/llframestatview.cpp
+++ b/linden/indra/newview/llframestatview.cpp
@@ -63,16 +63,6 @@ LLFrameStatView::~LLFrameStatView()
        // Children all cleaned up by default view destructor.
 }
-EWidgetType LLFrameStatView::getWidgetType() const
-{
-        return WIDGET_TYPE_FRAME_STAT_VIEW;
-}
-LLString LLFrameStatView::getWidgetTag() const
-{
-        return LL_FRAME_STAT_VIEW_TAG;
-}
 void LLFrameStatView::setup(const LLFrameStats &frame_stats)
 {
        S32 i;
diff --git a/linden/indra/newview/llframestatview.h b/linden/indra/newview/llframestatview.h
index e72cdc4..2528891 100644
--- a/linden/indra/newview/llframestatview.h
+++ b/linden/indra/newview/llframestatview.h
@@ -49,9 +49,6 @@ public:
        LLFrameStatView(const std::string& name, const LLRect& rect);
        virtual ~LLFrameStatView();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        void setup(const LLFrameStats &frame_stats);
        virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index 3be5d4e..27c9836 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -50,6 +50,7 @@
 // newview
 #include "llagent.h"
 #include "llchatbar.h"
+#include "lldelayedgestureerror.h"
 #include "llinventorymodel.h"
 #include "llnotify.h"
 #include "llviewermessage.h"
@@ -1001,25 +1002,16 @@ void LLGestureManager::onLoadComplete(LLVFS *vfs,
        }
        else
        {
-                if( gViewerStats )
+                LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                {
-                        gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                }
-                // Get missing gesture's name. Use UUID if name can't be found.
-                LLStringBase<char>::format_map_t args;
-                LLInventoryItem *item = gInventory.getItem( item_id );
-                args["[NAME]"] = item ? item->getName() : LLString( item_id.asString() );
                if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
                        LL_ERR_FILE_EMPTY == status)
                {
-                        LLNotifyBox::showXml("GestureMissing", args);
+                        LLDelayedGestureError::gestureMissing( item_id );
                }
                else
                {
-                        LLNotifyBox::showXml("UnableToLoadGesture", args);
+                        LLDelayedGestureError::gestureFailedToLoad( item_id );
                }
                llwarns << "Problem loading gesture: " << status << llendl;
diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp
index 8abda4b..41b1c1e 100644
--- a/linden/indra/newview/llgivemoney.cpp
+++ b/linden/indra/newview/llgivemoney.cpp
@@ -47,7 +47,7 @@
 #include "llbutton.h"
 #include "llselectmgr.h"
 #include "lltransactiontypes.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
@@ -94,12 +94,12 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
 {
        if (target_is_object)
        {
-                gUICtrlFactory->buildFloater(this,"floater_pay_object.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this,"floater_pay_object.xml");
-                mObjectSelection = gSelectMgr->getEditSelection();
+                mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
        }
        else 
        {
-                gUICtrlFactory->buildFloater(this,"floater_pay.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this,"floater_pay.xml");
        }
        
@@ -111,7 +111,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
        childSetAction("fastpay 1",&LLFloaterPay::onGive,info);
        childSetVisible("fastpay 1", FALSE);
-        mQuickPayButton[i] = LLUICtrlFactory::getButtonByName(this, "fastpay 1");
+        mQuickPayButton[i] = getChild<LLButton>("fastpay 1");
        mQuickPayInfo[i] = info;
        ++i;
@@ -121,7 +121,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
        childSetAction("fastpay 5",&LLFloaterPay::onGive,info);
        childSetVisible("fastpay 5", FALSE);
-        mQuickPayButton[i] = LLUICtrlFactory::getButtonByName(this, "fastpay 5");
+        mQuickPayButton[i] = getChild<LLButton>("fastpay 5");
        mQuickPayInfo[i] = info;
        ++i;
@@ -131,7 +131,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
        childSetAction("fastpay 10",&LLFloaterPay::onGive,info);
        childSetVisible("fastpay 10", FALSE);
-        mQuickPayButton[i] = LLUICtrlFactory::getButtonByName(this, "fastpay 10");
+        mQuickPayButton[i] = getChild<LLButton>("fastpay 10");
        mQuickPayInfo[i] = info;
        ++i;
@@ -141,7 +141,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
        childSetAction("fastpay 20",&LLFloaterPay::onGive,info);
        childSetVisible("fastpay 20", FALSE);
-        mQuickPayButton[i] = LLUICtrlFactory::getButtonByName(this, "fastpay 20");
+        mQuickPayButton[i] = getChild<LLButton>("fastpay 20");
        mQuickPayInfo[i] = info;
        ++i;
@@ -240,7 +240,7 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
                        if (pay_button > 0)
                        {
                                LLString button_str = "L$";
-                                button_str += gResMgr->getMonetaryString( pay_button );
+                                button_str += LLResMgr::getInstance()->getMonetaryString( pay_button );
                                self->mQuickPayButton[i]->setLabelSelected(button_str);
                                self->mQuickPayButton[i]->setLabelUnselected(button_str);
@@ -261,8 +261,8 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
                // build a string containing the maximum value and calc nerw button width from it.
                LLString balance_str = "L$";
-                balance_str += gResMgr->getMonetaryString( max_pay_amount );
+                balance_str += LLResMgr::getInstance()->getMonetaryString( max_pay_amount );
-                const LLFontGL* font = gResMgr->getRes(LLFONT_SANSSERIF);
+                const LLFontGL* font = LLResMgr::getInstance()->getRes(LLFONT_SANSSERIF);
                S32 new_button_width = font->getWidth( LLString(balance_str));
                new_button_width += ( 12 + 12 );        // padding
@@ -379,7 +379,7 @@ void LLFloaterPay::finishPayUI(const LLUUID& target_id, BOOL is_group)
        childSetFocus("amount", TRUE);
        
-        LLLineEditor* amount = LLUICtrlFactory::getLineEditorByName(this, "amount");
+        LLLineEditor* amount = getChild<LLLineEditor>("amount");
        amount->selectAll();
        mTargetIsGroup = is_group;
 }
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index 31e1935..28b92fd 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -53,7 +53,7 @@
 #include "lltoolmgr.h"
 #include "llselectmgr.h"
 #include "llhudmanager.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llviewerobjectlist.h"
 #include "lltoolselectrect.h"
 #include "llviewerwindow.h"
@@ -86,7 +86,7 @@ BOOL LLAgent::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVecto
        }
        if(!mLookAt || mLookAt->isDead())
        {
-                mLookAt = (LLHUDEffectLookAt *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_LOOKAT);
+                mLookAt = (LLHUDEffectLookAt *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_LOOKAT);
                mLookAt->setSourceObject(mAvatarObject);
        }
@@ -103,7 +103,7 @@ BOOL LLAgent::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVec
        if(!mPointAt || mPointAt->isDead())
        {
-                mPointAt = (LLHUDEffectPointAt *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINTAT);
+                mPointAt = (LLHUDEffectPointAt *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINTAT);
                mPointAt->setSourceObject(mAvatarObject);
        }
@@ -181,8 +181,8 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
        top = llround((F32) top * LLUI::sGLScaleFactor.mV[VY]);
        bottom = llround((F32) bottom * LLUI::sGLScaleFactor.mV[VY]);
-        F32 old_far_plane = gCamera->getFar();
+        F32 old_far_plane = LLViewerCamera::getInstance()->getFar();
-        F32 old_near_plane = gCamera->getNear();
+        F32 old_near_plane = LLViewerCamera::getInstance()->getNear();
        S32 width = right - left + 1;
        S32 height = top - bottom + 1;
@@ -220,17 +220,17 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
        {
                // ...select distance from control
                LLVector3 relative_av_pos = av_pos;
-                relative_av_pos -= gCamera->getOrigin();
+                relative_av_pos -= LLViewerCamera::getInstance()->getOrigin();
-                F32 new_far = relative_av_pos * gCamera->getAtAxis() + gSavedSettings.getF32("MaxSelectDistance");
+                F32 new_far = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() + gSavedSettings.getF32("MaxSelectDistance");
-                F32 new_near = relative_av_pos * gCamera->getAtAxis() - gSavedSettings.getF32("MaxSelectDistance");
+                F32 new_near = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() - gSavedSettings.getF32("MaxSelectDistance");
                new_near = llmax(new_near, 0.1f);
-                gCamera->setFar(new_far);
+                LLViewerCamera::getInstance()->setFar(new_far);
-                gCamera->setNear(new_near);
+                LLViewerCamera::getInstance()->setNear(new_near);
        }
-        gCamera->setPerspective(FOR_SELECTION, 
+        LLViewerCamera::getInstance()->setPerspective(FOR_SELECTION, 
                                                        center_x-width/2, center_y-height/2, width, height, 
                                                        limit_select_distance);
@@ -245,17 +245,17 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
                                {
                                        return true;
                                }
-                                S32 result = gCamera->sphereInFrustum(drawable->getPositionAgent(), drawable->getRadius());
+                                S32 result = LLViewerCamera::getInstance()->sphereInFrustum(drawable->getPositionAgent(), drawable->getRadius());
                                switch (result)
                                {
                                  case 0:
-                                        gSelectMgr->unhighlightObjectOnly(vobjp);
+                                        LLSelectMgr::getInstance()->unhighlightObjectOnly(vobjp);
                                        break;
                                  case 1:
                                        // check vertices
-                                        if (!gCamera->areVertsVisible(vobjp, LLSelectMgr::sRectSelectInclusive))
+                                        if (!LLViewerCamera::getInstance()->areVertsVisible(vobjp, LLSelectMgr::sRectSelectInclusive))
                                        {
-                                                gSelectMgr->unhighlightObjectOnly(vobjp);
+                                                LLSelectMgr::getInstance()->unhighlightObjectOnly(vobjp);
                                        }
                                        break;
                                  default:
@@ -264,15 +264,15 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
                                return true;
                        }
                } func;
-                gSelectMgr->getHighlightedObjects()->applyToObjects(&func);
+                LLSelectMgr::getInstance()->getHighlightedObjects()->applyToObjects(&func);
        }
        if (grow_selection)
        {
                std::vector<LLDrawable*> potentials;
                                
-                for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
+                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
                {
                        LLViewerRegion* region = *iter;
                        for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
@@ -280,7 +280,7 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
                                LLSpatialPartition* part = region->getSpatialPartition(i);
                                if (part)
                                {       
-                                        part->cull(*gCamera, &potentials, TRUE);
+                                        part->cull(*LLViewerCamera::getInstance(), &potentials, TRUE);
                                }
                        }
                }
@@ -304,20 +304,20 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
                                continue;
                        }
-                        S32 result = gCamera->sphereInFrustum(drawable->getPositionAgent(), drawable->getRadius());
+                        S32 result = LLViewerCamera::getInstance()->sphereInFrustum(drawable->getPositionAgent(), drawable->getRadius());
                        if (result)
                        {
                                switch (result)
                                {
                                case 1:
                                        // check vertices
-                                        if (gCamera->areVertsVisible(vobjp, LLSelectMgr::sRectSelectInclusive))
+                                        if (LLViewerCamera::getInstance()->areVertsVisible(vobjp, LLSelectMgr::sRectSelectInclusive))
                                        {
-                                                gSelectMgr->highlightObjectOnly(vobjp);
+                                                LLSelectMgr::getInstance()->highlightObjectOnly(vobjp);
                                        }
                                        break;
                                case 2:
-                                        gSelectMgr->highlightObjectOnly(vobjp);
+                                        LLSelectMgr::getInstance()->highlightObjectOnly(vobjp);
                                        break;
                                default:
                                        break;
@@ -332,8 +332,8 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
        glMatrixMode(GL_MODELVIEW);
        // restore camera
-        gCamera->setFar(old_far_plane);
+        LLViewerCamera::getInstance()->setFar(old_far_plane);
-        gCamera->setNear(old_near_plane);
+        LLViewerCamera::getInstance()->setNear(old_near_plane);
        gViewerWindow->setup3DRender();
 }
@@ -343,10 +343,6 @@ static const F32 COMPASS_RANGE = 0.33f;
 void LLCompass::draw()
 {
-//      S32 left, top, right, bottom;
-        if (!getVisible()) return;
        glMatrixMode(GL_MODELVIEW);
        gGL.pushMatrix();
@@ -413,8 +409,6 @@ void LLCompass::draw()
 void LLHorizontalCompass::draw()
 {
-        if (!getVisible()) return;
        LLGLSUIDefault gls_ui;
        
        S32 width = getRect().getWidth();
@@ -423,7 +417,7 @@ void LLHorizontalCompass::draw()
        if( mTexture )
        {
-                const LLVector3& at_axis = gCamera->getAtAxis();
+                const LLVector3& at_axis = LLViewerCamera::getInstance()->getAtAxis();
                F32 center = atan2( at_axis.mV[VX], at_axis.mV[VY] );
                center += F_PI;
@@ -469,7 +463,7 @@ void LLWind::renderVectors()
        S32 i,j;
        F32 x,y;
-        F32 region_width_meters = gWorldPointer->getRegionWidthInMeters();
+        F32 region_width_meters = LLWorld::getInstance()->getRegionWidthInMeters();
        LLGLSNoTexture gls_no_texture;
        gGL.pushMatrix();
@@ -524,10 +518,10 @@ void LLViewerParcelMgr::renderRect(const LLVector3d &west_south_bottom_global,
        // resolves correctly so we can get a height value.
        const F32 FUDGE = 0.01f;
-        F32 sw_bottom = gWorldp->resolveLandHeightAgent( LLVector3( west, south, 0.f ) );
+        F32 sw_bottom = LLWorld::getInstance()->resolveLandHeightAgent( LLVector3( west, south, 0.f ) );
-        F32 se_bottom = gWorldp->resolveLandHeightAgent( LLVector3( east-FUDGE, south, 0.f ) );
+        F32 se_bottom = LLWorld::getInstance()->resolveLandHeightAgent( LLVector3( east-FUDGE, south, 0.f ) );
-        F32 ne_bottom = gWorldp->resolveLandHeightAgent( LLVector3( east-FUDGE, north-FUDGE, 0.f ) );
+        F32 ne_bottom = LLWorld::getInstance()->resolveLandHeightAgent( LLVector3( east-FUDGE, north-FUDGE, 0.f ) );
-        F32 nw_bottom = gWorldp->resolveLandHeightAgent( LLVector3( west, north-FUDGE, 0.f ) );
+        F32 nw_bottom = LLWorld::getInstance()->resolveLandHeightAgent( LLVector3( west, north-FUDGE, 0.f ) );
        F32 sw_top = sw_bottom + PARCEL_POST_HEIGHT;
        F32 se_top = se_bottom + PARCEL_POST_HEIGHT;
@@ -601,10 +595,10 @@ void LLViewerParcelMgr::renderParcel(LLParcel* parcel )
                // resolves correctly so we can get a height value.
                const F32 FUDGE = 0.01f;
-                F32 sw_bottom = gWorldp->resolveLandHeightAgent( LLVector3( west, south, 0.f ) );
+                F32 sw_bottom = LLWorld::getInstance()->resolveLandHeightAgent( LLVector3( west, south, 0.f ) );
-                F32 se_bottom = gWorldp->resolveLandHeightAgent( LLVector3( east-FUDGE, south, 0.f ) );
+                F32 se_bottom = LLWorld::getInstance()->resolveLandHeightAgent( LLVector3( east-FUDGE, south, 0.f ) );
-                F32 ne_bottom = gWorldp->resolveLandHeightAgent( LLVector3( east-FUDGE, north-FUDGE, 0.f ) );
+                F32 ne_bottom = LLWorld::getInstance()->resolveLandHeightAgent( LLVector3( east-FUDGE, north-FUDGE, 0.f ) );
-                F32 nw_bottom = gWorldp->resolveLandHeightAgent( LLVector3( west, north-FUDGE, 0.f ) );
+                F32 nw_bottom = LLWorld::getInstance()->resolveLandHeightAgent( LLVector3( west, north-FUDGE, 0.f ) );
                // little hack to make nearby lines not Z-fight
                east -= 0.1f;
@@ -856,11 +850,11 @@ void LLViewerParcelMgr::renderCollisionSegments(U8* segments, BOOL use_pass, LLV
        
        if (use_pass && (mCollisionBanned == BA_NOT_ON_LIST))
        {
-                LLViewerImage::bindTexture( getPassImage() );
+                LLViewerImage::bindTexture(mPassImage);
        }
        else
        {
-                LLViewerImage::bindTexture( getBlockedImage() );
+                LLViewerImage::bindTexture(mBlockedImage);
        }
        gGL.begin(GL_QUADS);
@@ -1013,7 +1007,7 @@ void LLViewerObjectList::renderObjectBeacons()
        }
        S32 i;
-        //const LLFontGL *font = gResMgr->getRes(LLFONT_SANSSERIF);
+        //const LLFontGL *font = LLResMgr::getInstance()->getRes(LLFONT_SANSSERIF);
        LLGLSUIDefault gls_ui;
diff --git a/linden/indra/newview/llglslshader.cpp b/linden/indra/newview/llglslshader.cpp
index 2a688e4..f0ad565 100644
--- a/linden/indra/newview/llglslshader.cpp
+++ b/linden/indra/newview/llglslshader.cpp
@@ -114,6 +114,9 @@ LLGLSLShader			gGlowExtractProgram;
 LLGLSLShader                    gPostColorFilterProgram;
 LLGLSLShader                    gPostNightVisionProgram;
+// Deferred rendering shaders
+LLGLSLShader                    gDeferredDiffuseProgram;
 //current avatar shader parameter pointer
 GLint                           gAvatarMatrixParam;
@@ -732,7 +735,7 @@ void LLShaderMgr::setShaders()
        if (gGLManager.mHasFramebufferObject &&
                gSavedSettings.getBOOL("VertexShaderEnable"))
        {
-                LLPipeline::sDynamicReflections = gSavedSettings.getBOOL("RenderDynamicReflections") && gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap");
+                LLPipeline::sDynamicReflections = gSavedSettings.getBOOL("RenderDynamicReflections") && gGLManager.mHasCubeMap && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
                LLPipeline::sWaterReflections = gGLManager.mHasCubeMap;
                LLPipeline::sRenderGlow = gSavedSettings.getBOOL("RenderGlow"); 
        }
@@ -762,7 +765,7 @@ void LLShaderMgr::setShaders()
        }
        sMaxAvatarShaderLevel = 0;
-        if (gFeatureManagerp->isFeatureAvailable("VertexShaderEnable") 
+        if (LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable") 
                && gSavedSettings.getBOOL("VertexShaderEnable"))
        {
                S32 light_class = 2;
@@ -771,7 +774,7 @@ void LLShaderMgr::setShaders()
                S32 effect_class = 2;
                S32 wl_class = 2;
                S32 water_class = 2;
+                S32 deferred_class = 0;
                if (!gSavedSettings.getBOOL("WindLightUseAtmosShaders"))
                {
                        // user has disabled WindLight in their settings, downgrade
@@ -784,7 +787,7 @@ void LLShaderMgr::setShaders()
                        // but class one would
                        // TODO: Make water on class one cards color things
                        // beneath it properly
-                        if(gFeatureManagerp->getGPUClass() < GPU_CLASS_2)
+                        if(LLFeatureManager::getInstance()->getGPUClass() < GPU_CLASS_2)
                        {
                                // use lesser water and other stuff
                                light_class = 2;
@@ -795,6 +798,16 @@ void LLShaderMgr::setShaders()
                        }
                }
+                if (gSavedSettings.getBOOL("RenderDeferred"))
+                {
+                        light_class = 1;
+                        env_class = 0;
+                        obj_class = 0;
+                        water_class = 1;
+                        effect_class = 1;
+                        deferred_class = 1;
+                }
                if(!gSavedSettings.getBOOL("EnableRippleWater"))
                {
                        water_class = 0;
@@ -814,6 +827,7 @@ void LLShaderMgr::setShaders()
                sVertexShaderLevel[SHADER_OBJECT] = obj_class;
                sVertexShaderLevel[SHADER_EFFECT] = effect_class;
                sVertexShaderLevel[SHADER_WINDLIGHT] = wl_class;
+                sVertexShaderLevel[SHADER_DEFERRED] = deferred_class;
                BOOL loaded = loadBasicShaders();
@@ -829,6 +843,7 @@ void LLShaderMgr::setShaders()
                        loadShadersWindLight();
                        loadShadersEffects();
                        loadShadersInterface();
+                        loadShadersDeferred();
                        // Load max avatar shaders to set the max level
                        sVertexShaderLevel[SHADER_AVATAR] = 3;
@@ -939,6 +954,8 @@ void LLShaderMgr::unloadShaders()
        gPostColorFilterProgram.unload();
        gPostNightVisionProgram.unload();
+        gDeferredDiffuseProgram.unload();
        sVertexShaderLevel[SHADER_LIGHTING] = 0;
        sVertexShaderLevel[SHADER_OBJECT] = 0;
        sVertexShaderLevel[SHADER_AVATAR] = 0;
@@ -963,7 +980,7 @@ BOOL LLShaderMgr::loadBasicShaders()
        // class zero we're not going to think about
        // since a class zero card COULD be a ridiculous new card
        // and old cards should have the features masked
-        if(gFeatureManagerp->getGPUClass() == GPU_CLASS_1)
+        if(LLFeatureManager::getInstance()->getGPUClass() == GPU_CLASS_1)
        {
                sum_lights_class = 2;
        }
@@ -1061,10 +1078,7 @@ BOOL LLShaderMgr::loadShadersEnvironment()
                return FALSE;
        }
        
-        if (gWorldPointer)
+        LLWorld::getInstance()->updateWaterObjects();
-        {
-                gWorldPointer->updateWaterObjects();
-        }
        
        return TRUE;
 }
@@ -1147,10 +1161,8 @@ BOOL LLShaderMgr::loadShadersWater()
                return loadShadersWater();
        }
        
-        if (gWorldPointer)
+        LLWorld::getInstance()->updateWaterObjects();
-        {
-                gWorldPointer->updateWaterObjects();
-        }
        return TRUE;
 }
@@ -1244,6 +1256,29 @@ BOOL LLShaderMgr::loadShadersEffects()
 }
+BOOL LLShaderMgr::loadShadersDeferred()
+{
+        if (sVertexShaderLevel[SHADER_DEFERRED] == 0)
+        {
+                gDeferredDiffuseProgram.unload();
+                return FALSE;
+        }
+        BOOL success = TRUE;
+        if (success)
+        {
+                gDeferredDiffuseProgram.mName = "Deffered Diffuse Shader";
+                gDeferredDiffuseProgram.mShaderFiles.clear();
+                gDeferredDiffuseProgram.mShaderFiles.push_back(make_pair("deferred/diffuseV.glsl", GL_VERTEX_SHADER_ARB));
+                gDeferredDiffuseProgram.mShaderFiles.push_back(make_pair("deferred/diffuseF.glsl", GL_FRAGMENT_SHADER_ARB));
+                gDeferredDiffuseProgram.mShaderLevel = sVertexShaderLevel[SHADER_DEFERRED];
+                success = gDeferredDiffuseProgram.createShader(NULL, NULL);
+        }
+        return success;
+}
 BOOL LLShaderMgr::loadShadersObject()
 {
        BOOL success = TRUE;
diff --git a/linden/indra/newview/llglslshader.h b/linden/indra/newview/llglslshader.h
index 41b0c59..f3f83da 100644
--- a/linden/indra/newview/llglslshader.h
+++ b/linden/indra/newview/llglslshader.h
@@ -149,6 +149,7 @@ public:
        static S32 getVertexShaderLevel(S32 type);
        static BOOL loadBasicShaders();
        static BOOL loadShadersEffects();
+        static BOOL loadShadersDeferred();
        static BOOL loadShadersObject();
        static BOOL loadShadersAvatar();
        static BOOL loadShadersEnvironment();
@@ -219,6 +220,7 @@ public:
                SHADER_EFFECT,
                SHADER_WINDLIGHT,
                SHADER_WATER,
+                SHADER_DEFERRED,
                SHADER_COUNT
        };
@@ -406,6 +408,9 @@ extern LLGLSLShader			gWLCloudProgram;
 extern LLGLSLShader                     gPostColorFilterProgram;
 extern LLGLSLShader                     gPostNightVisionProgram;
+// Deferred rendering shaders
+extern LLGLSLShader                     gDeferredDiffuseProgram;
 //current avatar shader parameter pointer
 extern GLint                            gAvatarMatrixParam;
diff --git a/linden/indra/newview/llgroupmgr.cpp b/linden/indra/newview/llgroupmgr.cpp
index af6a6aa..7ea28e0 100644
--- a/linden/indra/newview/llgroupmgr.cpp
+++ b/linden/indra/newview/llgroupmgr.cpp
@@ -53,8 +53,6 @@
 #include "llfloatergroupinfo.h"
 #include "lluictrlfactory.h"
-LLGroupMgr sGroupMgr; // use local instance so that it gets cleaned up on application exit
-LLGroupMgr* gGroupMgr = &sGroupMgr;
 const U32 MAX_CACHED_GROUPS = 10;
@@ -705,7 +703,7 @@ void LLGroupMgrGroupData::sendRoleChanges()
        // If we create a new role, then we need to re-fetch all the role data.
        if (need_role_data)
        {
-                gGroupMgr->sendGroupRoleDataRequest(getID());
+                LLGroupMgr::getInstance()->sendGroupRoleDataRequest(getID());
        }
        // Clean up change lists        
@@ -811,7 +809,7 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
        LLUUID request_id;
        msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_RequestID, request_id);
-        LLGroupMgrGroupData* group_datap = gGroupMgr->createGroupData(group_id);
+        LLGroupMgrGroupData* group_datap = LLGroupMgr::getInstance()->createGroupData(group_id);
        if (group_datap->mMemberRequestID != request_id)
        {
                llwarns << "processGroupMembersReply: Received incorrect (stale?) request id" << llendl;
@@ -867,7 +865,7 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
                //if group members are loaded while titles are missing, load the titles.
                if(group_datap->mTitles.size() < 1)
                {
-                        gGroupMgr->sendGroupTitlesRequest(group_id);
+                        LLGroupMgr::getInstance()->sendGroupTitlesRequest(group_id);
                }
        }
@@ -879,12 +877,12 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
                if (group_datap->mPendingRoleMemberRequest)
                {
                        group_datap->mPendingRoleMemberRequest = FALSE;
-                        gGroupMgr->sendGroupRoleMembersRequest(group_datap->mID);
+                        LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(group_datap->mID);
                }
        }
        group_datap->mChanged = TRUE;
-        gGroupMgr->notifyObservers(GC_MEMBER_DATA);
+        LLGroupMgr::getInstance()->notifyObservers(GC_MEMBER_DATA);
 }
 //static 
@@ -933,7 +931,7 @@ void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
        msg->getBOOL("GroupData", "MaturePublish", mature);
        msg->getUUID(_PREHASH_GroupData, "OwnerRole", owner_role);
-        LLGroupMgrGroupData* group_datap = gGroupMgr->createGroupData(group_id);
+        LLGroupMgrGroupData* group_datap = LLGroupMgr::getInstance()->createGroupData(group_id);
        group_datap->mName = name;
        group_datap->mCharter = charter;
@@ -951,7 +949,7 @@ void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
        group_datap->mGroupPropertiesDataComplete = TRUE;
        group_datap->mChanged = TRUE;
-        gGroupMgr->notifyObservers(GC_PROPERTIES);
+        LLGroupMgr::getInstance()->notifyObservers(GC_PROPERTIES);
 }
 // static
@@ -972,7 +970,7 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
        LLUUID request_id;
        msg->getUUIDFast(_PREHASH_GroupData, _PREHASH_RequestID, request_id);
-        LLGroupMgrGroupData* group_data = gGroupMgr->createGroupData(group_id);
+        LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->createGroupData(group_id);
        if (group_data->mRoleDataRequestID != request_id)
        {
                llwarns << "processGroupRoleDataReply: Received incorrect (stale?) request id" << llendl;
@@ -1013,12 +1011,12 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
                if (group_data->mPendingRoleMemberRequest)
                {
                        group_data->mPendingRoleMemberRequest = FALSE;
-                        gGroupMgr->sendGroupRoleMembersRequest(group_data->mID);
+                        LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(group_data->mID);
                }
        }
        group_data->mChanged = TRUE;
-        gGroupMgr->notifyObservers(GC_ROLE_DATA);
+        LLGroupMgr::getInstance()->notifyObservers(GC_ROLE_DATA);
 }
 // static
@@ -1042,7 +1040,7 @@ void LLGroupMgr::processGroupRoleMembersReply(LLMessageSystem* msg, void** data)
        U32 total_pairs;
        msg->getU32(_PREHASH_AgentData, "TotalPairs", total_pairs);
-        LLGroupMgrGroupData* group_data = gGroupMgr->createGroupData(group_id);
+        LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->createGroupData(group_id);
        if (group_data->mRoleMembersRequestID != request_id)
        {
@@ -1127,7 +1125,7 @@ void LLGroupMgr::processGroupRoleMembersReply(LLMessageSystem* msg, void** data)
        }
        group_data->mChanged = TRUE;
-        gGroupMgr->notifyObservers(GC_ROLE_MEMBER_DATA);
+        LLGroupMgr::getInstance()->notifyObservers(GC_ROLE_MEMBER_DATA);
 }
 // static
@@ -1145,7 +1143,7 @@ void LLGroupMgr::processGroupTitlesReply(LLMessageSystem* msg, void** data)
        LLUUID group_id;
        msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_GroupID, group_id );
-        LLGroupMgrGroupData* group_data = gGroupMgr->createGroupData(group_id);
+        LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->createGroupData(group_id);
        LLUUID request_id;
        msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_RequestID, request_id);
@@ -1177,7 +1175,7 @@ void LLGroupMgr::processGroupTitlesReply(LLMessageSystem* msg, void** data)
        }
        group_data->mChanged = TRUE;
-        gGroupMgr->notifyObservers(GC_TITLES);
+        LLGroupMgr::getInstance()->notifyObservers(GC_TITLES);
 }
 // static
@@ -1210,7 +1208,7 @@ void LLGroupMgr::processJoinGroupReply(LLMessageSystem* msg, void ** data)
                // refresh all group information
                gAgent.sendAgentDataUpdateRequest();
-                gGroupMgr->clearGroupData(group_id);
+                LLGroupMgr::getInstance()->clearGroupData(group_id);
                // refresh the floater for this group, if any.
                LLFloaterGroupInfo::refreshGroup(group_id);
                // refresh the group panel of the search window, if necessary.
@@ -1232,7 +1230,7 @@ void LLGroupMgr::processLeaveGroupReply(LLMessageSystem* msg, void ** data)
                // refresh all group information
                gAgent.sendAgentDataUpdateRequest();
-                gGroupMgr->clearGroupData(group_id);
+                LLGroupMgr::getInstance()->clearGroupData(group_id);
                // close the floater for this group, if any.
                LLFloaterGroupInfo::closeGroup(group_id);
                // refresh the group panel of the search window, if necessary.
@@ -1286,11 +1284,11 @@ LLGroupMgrGroupData* LLGroupMgr::createGroupData(const LLUUID& id)
 {
        LLGroupMgrGroupData* group_datap;
-        group_map_t::iterator existing_group = gGroupMgr->mGroups.find(id);
+        group_map_t::iterator existing_group = LLGroupMgr::getInstance()->mGroups.find(id);
-        if (existing_group == gGroupMgr->mGroups.end())
+        if (existing_group == LLGroupMgr::getInstance()->mGroups.end())
        {
                group_datap = new LLGroupMgrGroupData(id);
-                gGroupMgr->addGroup(group_datap);
+                LLGroupMgr::getInstance()->addGroup(group_datap);
        }
        else
        {
@@ -1647,7 +1645,7 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
        bool start_message = true;
        LLMessageSystem* msg = gMessageSystem;
-        LLGroupMgrGroupData* group_datap = gGroupMgr->getGroupData(group_id);
+        LLGroupMgrGroupData* group_datap = LLGroupMgr::getInstance()->getGroupData(group_id);
        if (!group_datap) return;
        for (std::vector<LLUUID>::iterator it = member_ids.begin();
@@ -1832,7 +1830,7 @@ bool LLGroupMgr::parseRoleActions(const LLString& xml_filename)
                role_action_data->mPowerBit = set_power_mask;
                role_action_set->mActionSetData = role_action_data;
-                gGroupMgr->mRoleActionSets.push_back(role_action_set);
+                LLGroupMgr::getInstance()->mRoleActionSets.push_back(role_action_set);
        }
        return true;
 }
@@ -1840,7 +1838,7 @@ bool LLGroupMgr::parseRoleActions(const LLString& xml_filename)
 // static
 void LLGroupMgr::debugClearAllGroups(void*)
 {
-        gGroupMgr->clearGroups();
+        LLGroupMgr::getInstance()->clearGroups();
        LLGroupMgr::parseRoleActions("role_actions.xml");
 }
diff --git a/linden/indra/newview/llgroupmgr.h b/linden/indra/newview/llgroupmgr.h
index 89be4bf..709bfd8 100644
--- a/linden/indra/newview/llgroupmgr.h
+++ b/linden/indra/newview/llgroupmgr.h
@@ -295,7 +295,7 @@ struct LLRoleActionSet
        std::vector<LLRoleAction*> mActions;
 };
-class LLGroupMgr
+class LLGroupMgr : public LLSingleton<LLGroupMgr>
 {
        LOG_CLASS(LLGroupMgr);
        
@@ -350,19 +350,18 @@ public:
        static void debugClearAllGroups(void*);
        void clearGroups();
        void clearGroupData(const LLUUID& group_id);
-protected:
+private:
        void notifyObservers(LLGroupChange gc);
        void addGroup(LLGroupMgrGroupData* group_datap);
        LLGroupMgrGroupData* createGroupData(const LLUUID &id);
-protected:
        typedef std::multimap<LLUUID,LLGroupMgrObserver*> observer_multimap_t;
        observer_multimap_t mObservers;
        typedef std::map<LLUUID, LLGroupMgrGroupData*> group_map_t;
        group_map_t mGroups;
 };
-extern LLGroupMgr* gGroupMgr;
 #endif
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index cae784b..5b6c3ca 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -159,18 +159,23 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
        S32 y = TOP;
        S32 x = HPAD + HPAD;
+        class NoticeText : public LLTextBox
+        {
+        public:
+                NoticeText(const LLString& name, const LLRect& rect, const LLString& text = LLString::null, const LLFontGL* font = NULL) 
+                        : LLTextBox(name, rect, text, font)
+                {
+                        setHAlign(LLFontGL::RIGHT);
+                        setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
+                        setBorderVisible(FALSE);
+                        setColor( gColors.getColor("GroupNotifyTextColor") );
+                        setBackgroundColor( gColors.getColor("GroupNotifyBoxColor") );
+                }
+        };
        // Title
-        LLTextBox* line;
+        addChild(new NoticeText("title",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),"Group Notice",LLFontGL::sSansSerifHuge));
-        line = new LLTextBox("title",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),"Group Notice",LLFontGL::sSansSerifHuge);
-        line->setHAlign(LLFontGL::RIGHT);
-        line->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
-        line->setBorderVisible(FALSE);
-        line->setColor(LLColor4::white);
-        line->setBackgroundColor( gColors.getColor("GroupNotifyBoxColor") );
-        
-        addChild(line);
        y -= llfloor(1.5f*LINE_HEIGHT);
@@ -179,28 +184,25 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
        std::stringstream from;
        from << "Sent by " << from_name << ", " << group_name;
-        line = new LLTextBox("group",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),from.str().c_str(),LLFontGL::sSansSerif);
+        addChild(new NoticeText("group",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),from.str().c_str(),LLFontGL::sSansSerif));
-        line->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
-        line->setHAlign(LLFontGL::RIGHT);
-        line->setBorderVisible(FALSE);
-        line->setColor(LLColor4::white);
-        line->setBackgroundColor( gColors.getColor("GroupNotifyBoxColor") );
-        addChild(line);
        
        y -= (LINE_HEIGHT + VPAD);
+        x = HPAD + HPAD;
-        LLUUID icon_id(gViewerArt.getString("notify_box_icon.tga"));
        // TODO: change this to be the group icon.
        if (!group_insignia.isNull())
        {
-                icon_id = group_insignia;
+                icon = new LLIconCtrl("icon",
+                                                          LLRect(x, y, x+ICON_WIDTH, y-ICON_WIDTH),
+                                                          group_insignia);
+        }
+        else
+        {
+                icon = new LLIconCtrl("icon",
+                                                          LLRect(x, y, x+ICON_WIDTH, y-ICON_WIDTH),
+                                                          "notify_box_icon.tga");
        }
-        x = HPAD + HPAD;
-        icon = new LLIconCtrl("icon",
-                                                  LLRect(x, y, x+ICON_WIDTH, y-ICON_WIDTH),
-                                                  icon_id);
        icon->setMouseOpaque(FALSE);
        addChild(icon);
@@ -244,14 +246,9 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
        if (mHasInventory)
        {
-                        line = new LLTextBox("subjecttitle",LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),"Attached: ",LLFontGL::sSansSerif);
+                        addChild(new NoticeText("subjecttitle",LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),"Attached: ",LLFontGL::sSansSerif));
-                        line->setBorderVisible(FALSE);
-                        line->setColor(LLColor4::white);
-                        line->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
-                        line->setBackgroundColor( gColors.getColor("GroupNotifyBoxColor") );
-                        addChild(line);
-                        LLViewerImage* item_icon = get_item_icon(mInventoryOffer->mType,
+                        LLUIImagePtr item_icon = get_item_icon(mInventoryOffer->mType,
                                                                                                        LLInventoryType::IT_TEXTURE,
                                                                                                        0, FALSE);
@@ -260,7 +257,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
                        std::stringstream ss;
                        ss << "        " << inventory_name;
-                        line = new LLTextBox("object_name",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),ss.str().c_str(),LLFontGL::sSansSerif);
+                        LLTextBox *line = new LLTextBox("object_name",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),ss.str().c_str(),LLFontGL::sSansSerif);
                        line->setEnabled(FALSE);
                        line->setBorderVisible(TRUE);
                        line->setDisabledColor(LLColor4::blue4);
@@ -271,21 +268,22 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
                        icon = new LLIconCtrl("icon",
                                                                        LLRect(x, y, x+16, y-16),
-                                                                        item_icon->getID());
+                                                                        item_icon->getName());
                        icon->setMouseOpaque(FALSE);
                        addChild(icon);
        }
        LLButton* btn;
        btn = new LLButton("next",
-                                LLRect(getRect().getWidth()-24, BOTTOM_PAD+16, getRect().getWidth()-8, BOTTOM_PAD),
+                                LLRect(getRect().getWidth()-26, BOTTOM_PAD + 20, getRect().getWidth()-2, BOTTOM_PAD),
-                                "notify_next.tga",
+                                "notify_next.png",
-                                "notify_next.tga",
+                                "notify_next.png",
                                "",
                                onClickNext,
                                this,
                                LLFontGL::sSansSerif);
        btn->setToolTip(LLString("Next")); // *TODO: Translate
+        btn->setScaleImage(TRUE);
        addChild(btn);
        mNextBtn = btn;
@@ -357,13 +355,8 @@ LLGroupNotifyBox::~LLGroupNotifyBox()
 // virtual
 BOOL LLGroupNotifyBox::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-        if (getVisible() && getEnabled() && pointInView(x,y))
+        moveToBack();
-        {
+        return TRUE;
-                moveToBack();
-                return TRUE;
-        }
-        return LLPanel::handleRightMouseDown(x, y, mask);
 }
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 316ba0b..6cc3873 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -106,20 +106,10 @@ LLHoverView::~LLHoverView()
 {
 }
-EWidgetType LLHoverView::getWidgetType() const
-{
-        return WIDGET_TYPE_HOVER_VIEW;
-}
-LLString LLHoverView::getWidgetTag() const
-{
-        return LL_HOVER_VIEW_TAG;
-}
 void LLHoverView::updateHover(LLTool* current_tool)
 {
-        BOOL picking_tool = (   current_tool == gToolPie 
+        BOOL picking_tool = (   current_tool == LLToolPie::getInstance() 
-                                                        || current_tool == gToolParcel );
+                                                        || current_tool == LLToolSelectLand::getInstance() );
        mUseHover = !gAgent.cameraMouselook() 
                                && picking_tool 
@@ -127,8 +117,8 @@ void LLHoverView::updateHover(LLTool* current_tool)
        if (mUseHover)
        {
                if ((gViewerWindow->getMouseVelocityStat()->getPrev(0) < 0.01f)
-                        && (gCamera->getAngularVelocityStat()->getPrev(0) < 0.01f)
+                        && (LLViewerCamera::getInstance()->getAngularVelocityStat()->getPrev(0) < 0.01f)
-                        && (gCamera->getVelocityStat()->getPrev(0) < 0.01f))
+                        && (LLViewerCamera::getInstance()->getVelocityStat()->getPrev(0) < 0.01f))
                {
                        if (!mStartHoverPickTimer)
                        {
@@ -164,7 +154,7 @@ void LLHoverView::pickCallback(S32 x, S32 y, MASK mask)
        if (hit_obj)
        {
                gHoverView->setHoverActive(TRUE);
-                gSelectMgr->setHoverObject(hit_obj);
+                LLSelectMgr::getInstance()->setHoverObject(hit_obj);
                gHoverView->mLastHoverObject = hit_obj;
                gHoverView->mHoverOffset = gViewerWindow->lastObjectHitOffset();
        }
@@ -178,7 +168,7 @@ void LLHoverView::pickCallback(S32 x, S32 y, MASK mask)
        {
                gHoverView->setHoverActive(TRUE);
                gHoverView->mHoverLandGlobal = gLastHitPosGlobal;
-                gParcelMgr->requestHoverParcelProperties( gHoverView->mHoverLandGlobal );
+                LLViewerParcelMgr::getInstance()->requestHoverParcelProperties( gHoverView->mHoverLandGlobal );
        }
        else
        {
@@ -200,7 +190,7 @@ void LLHoverView::cancelHover()
        mDoneHoverPick = FALSE;
        mStartHoverPickTimer = FALSE;
-        gSelectMgr->setHoverObject(NULL);
+        LLSelectMgr::getInstance()->setHoverObject(NULL);
        // Can't do this, some code relies on hover object still being
        // set after the hover is cancelled!  Dammit.  JC
        // mLastHoverObject = NULL;
@@ -279,7 +269,7 @@ void LLHoverView::updateText()
                        //
                        BOOL suppressObjectHoverDisplay = !gSavedSettings.getBOOL("ShowAllObjectHoverTip");                     
                        
-                        LLSelectNode *nodep = gSelectMgr->getHoverNode();;
+                        LLSelectNode *nodep = LLSelectMgr::getInstance()->getHoverNode();;
                        if (nodep)
                        {
                                line.clear();
@@ -455,7 +445,7 @@ void LLHoverView::updateText()
                // Didn't hit an object, but since we have a land point we
                // must be hovering over land.
-                LLParcel* hover_parcel = gParcelMgr->getHoverParcel();
+                LLParcel* hover_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel();
                LLUUID owner;
                S32 width = 0;
                S32 height = 0;
@@ -463,8 +453,8 @@ void LLHoverView::updateText()
                if ( hover_parcel )
                {
                        owner = hover_parcel->getOwnerID();
-                        width = S32(gParcelMgr->getHoverParcelWidth());
+                        width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth());
-                        height = S32(gParcelMgr->getHoverParcelHeight());
+                        height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight());
                }
                // Line: "Land"
@@ -602,11 +592,6 @@ void LLHoverView::updateText()
 void LLHoverView::draw()
 {
-        if( !getVisible() )
-        {
-                return;
-        }
        if ( !isHovering() )
        {
                return;
@@ -615,7 +600,10 @@ void LLHoverView::draw()
        // To toggle off hover tips, you have to just suppress the draw.
        // The picking is still needed to do cursor changes over physical
        // and scripted objects.  JC
-        if (!sShowHoverTips) return;
+        if (!sShowHoverTips) 
+        {
+                return;
+        }
        const F32 MAX_HOVER_DISPLAY_SECS = 5.f;
        if (mHoverTimer.getElapsedTimeF32() > MAX_HOVER_DISPLAY_SECS)
@@ -662,10 +650,10 @@ void LLHoverView::draw()
                return;
        }
-        LLViewerImage* box_imagep = gImageList.getImage(LLUUID(gViewerArt.getString("rounded_square.tga")), MIPMAP_FALSE, TRUE);
+        LLUIImagePtr box_imagep = LLUI::getUIImage("rounded_square.tga");
-        LLViewerImage* shadow_imagep = gImageList.getImage(LLUUID(gViewerArt.getString("rounded_square_soft.tga")), MIPMAP_FALSE, TRUE);
+        LLUIImagePtr shadow_imagep = LLUI::getUIImage("rounded_square_soft.tga");
-        const LLFontGL* fontp = gResMgr->getRes(LLFONT_SANSSERIF_SMALL);
+        const LLFontGL* fontp = LLResMgr::getInstance()->getRes(LLFONT_SANSSERIF_SMALL);
        // Render text.
        LLColor4 text_color = gColors.getColor("ToolTipTextColor");
@@ -714,14 +702,10 @@ void LLHoverView::draw()
        shadow_color.mV[VALPHA] = 0.7f * alpha;
        S32 shadow_offset = gSavedSettings.getS32("DropShadowTooltip");
-        gGL.color4fv(shadow_color.mV);
+        shadow_imagep->draw(LLRect(left + shadow_offset, top - shadow_offset, right + shadow_offset, bottom - shadow_offset), shadow_color);
-        LLViewerImage::bindTexture(shadow_imagep);
-        gl_segmented_rect_2d_tex(left + shadow_offset, top - shadow_offset, right + shadow_offset, bottom - shadow_offset, shadow_imagep->getWidth(), shadow_imagep->getHeight(), 16);
        bg_color.mV[VALPHA] = alpha;
-        gGL.color4fv(bg_color.mV);
+        box_imagep->draw(LLRect(left, top, right, bottom), bg_color);
-        LLViewerImage::bindTexture(box_imagep);
-        gl_segmented_rect_2d_tex(left, top, right, bottom, box_imagep->getWidth(), box_imagep->getHeight(), 16);
        S32 cur_offset = top - 4;
        for (text_list_t::iterator iter = mText.begin(); iter != mText.end(); ++iter)
diff --git a/linden/indra/newview/llhoverview.h b/linden/indra/newview/llhoverview.h
index ae74c44..5d76cc7 100644
--- a/linden/indra/newview/llhoverview.h
+++ b/linden/indra/newview/llhoverview.h
@@ -55,9 +55,6 @@ public:
        LLHoverView(const std::string& name, const LLRect& rect);
        ~LLHoverView();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        /*virtual*/ void draw();
        void updateHover(LLTool* current_tool);
@@ -105,7 +102,7 @@ protected:
        // If not null and not dead, we're over an object.
        LLPointer<LLViewerObject>       mLastHoverObject;
-        // If not LLVector3d::zero, we're over land.
+        // If not LLVector3d::ZERO, we're over land.
        LLVector3d                                      mHoverLandGlobal;
        LLVector3d                                      mHoverOffset;
diff --git a/linden/indra/newview/llhudeffect.cpp b/linden/indra/newview/llhudeffect.cpp
index 0a3e6c7..5cc35af 100644
--- a/linden/indra/newview/llhudeffect.cpp
+++ b/linden/indra/newview/llhudeffect.cpp
@@ -36,7 +36,7 @@
 #include "message.h"
 #include "llgl.h"
 #include "llagent.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llimagegl.h"
 #include "llviewerobjectlist.h"
diff --git a/linden/indra/newview/llhudeffectbeam.cpp b/linden/indra/newview/llhudeffectbeam.cpp
index 2ba9ade..d6c38d3 100644
--- a/linden/indra/newview/llhudeffectbeam.cpp
+++ b/linden/indra/newview/llhudeffectbeam.cpp
@@ -43,7 +43,7 @@
 #include "llglheaders.h"
 #include "llhudrender.h"
 #include "llimagegl.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llviewercamera.h"
 #include "llvoavatar.h"
 #include "llviewercontrol.h"
@@ -274,7 +274,7 @@ void LLHUDEffectBeam::render()
        // Init the color of the particles
        LLColor4U coloru = mColor;
-        
        // Draw the particles
        S32 i;
        for (i = 0; i < NUM_POINTS; i++)
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index 4cd69bb..abe2a66 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -40,7 +40,7 @@
 #include "llvoavatar.h"
 #include "lldrawable.h"
 #include "llviewerobjectlist.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llselectmgr.h"
 #include "llglheaders.h"
@@ -400,7 +400,11 @@ BOOL LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec
                return FALSE;
        }
        
-        llassert(target_type < LOOKAT_NUM_TARGETS);
+        if (target_type >= LOOKAT_NUM_TARGETS)
+        {
+                llwarns << "Bad target_type " << (int)target_type << " - ignoring." << llendl;
+                return FALSE;
+        }
        // must be same or higher priority than existing effect
        if ((*mAttentions)[target_type].mPriority < (*mAttentions)[mTargetType].mPriority)
@@ -557,12 +561,13 @@ void LLHUDEffectLookAt::update()
        if (mTargetType != LOOKAT_TARGET_NONE)
        {
-                calcTargetPosition();
+                if (calcTargetPosition())
-                LLMotion* head_motion = ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->findMotion(ANIM_AGENT_HEAD_ROT);
-                if (!head_motion || head_motion->isStopped())
                {
-                        ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->startMotion(ANIM_AGENT_HEAD_ROT);
+                        LLMotion* head_motion = ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->findMotion(ANIM_AGENT_HEAD_ROT);
+                        if (!head_motion || head_motion->isStopped())
+                        {
+                                ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->startMotion(ANIM_AGENT_HEAD_ROT);
+                        }
                }
        }
@@ -579,12 +584,14 @@ void LLHUDEffectLookAt::update()
 * 
 * Has the side-effect of also calling setAnimationData("LookAtPoint") with the new
 * mTargetPos on the source object which is assumed to be an avatar.
+ *
+ * Returns whether we successfully calculated a finite target position.
 */
-void LLHUDEffectLookAt::calcTargetPosition()
+bool LLHUDEffectLookAt::calcTargetPosition()
 {
        if (gNoRender)
        {
-                return;
+                return false;
        }
        LLViewerObject *target_obj = (LLViewerObject *)mTargetObject;
@@ -659,5 +666,11 @@ void LLHUDEffectLookAt::calcTargetPosition()
        }
        mTargetPos -= source_avatar->mHeadp->getWorldPosition();
+        if (!mTargetPos.isFinite())
+                return false;
        source_avatar->setAnimationData("LookAtPoint", (void *)&mTargetPos);
+        return true;
 }
diff --git a/linden/indra/newview/llhudeffectlookat.h b/linden/indra/newview/llhudeffectlookat.h
index cc64c67..918805d 100644
--- a/linden/indra/newview/llhudeffectlookat.h
+++ b/linden/indra/newview/llhudeffectlookat.h
@@ -68,7 +68,7 @@ public:
        ELookAtType getLookAtType() { return mTargetType; }
        const LLVector3& getTargetPos() { return mTargetPos; }
        const LLVector3d& getTargetOffset() { return mTargetOffsetGlobal; }
-        void calcTargetPosition();
+        bool calcTargetPosition();
 protected:
        LLHUDEffectLookAt(const U8 type);
diff --git a/linden/indra/newview/llhudeffectpointat.cpp b/linden/indra/newview/llhudeffectpointat.cpp
index c47705b..97e3bd7 100644
--- a/linden/indra/newview/llhudeffectpointat.cpp
+++ b/linden/indra/newview/llhudeffectpointat.cpp
@@ -232,7 +232,11 @@ BOOL LLHUDEffectPointAt::setPointAt(EPointAtType target_type, LLViewerObject *ob
                return FALSE;
        }
        
-        llassert(target_type < POINTAT_NUM_TARGETS);
+        if (target_type >= POINTAT_NUM_TARGETS)
+        {
+                llwarns << "Bad target_type " << (int)target_type << " - ignoring." << llendl;
+                return FALSE;
+        }
        // must be same or higher priority than existing effect
        if (POINTAT_PRIORITIES[target_type] < POINTAT_PRIORITIES[mTargetType])
@@ -379,17 +383,19 @@ void LLHUDEffectPointAt::update()
                }
                else
                {
-                        calcTargetPosition();
+                        if (calcTargetPosition())
-                
+                        {
-                        ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->startMotion(ANIM_AGENT_EDITING);
+                                ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->startMotion(ANIM_AGENT_EDITING);
+                        }
                }
        }
 }
 //-----------------------------------------------------------------------------
 // calcTargetPosition()
+// returns whether we successfully calculated a finite target position.
 //-----------------------------------------------------------------------------
-void LLHUDEffectPointAt::calcTargetPosition()
+bool LLHUDEffectPointAt::calcTargetPosition()
 {
        LLViewerObject *targetObject = (LLViewerObject *)mTargetObject;
        LLVector3 local_offset;
@@ -435,10 +441,15 @@ void LLHUDEffectPointAt::calcTargetPosition()
        mTargetPos -= mSourceObject->getRenderPosition();
+        if (!mTargetPos.isFinite())
+                return false;
        if (mSourceObject->isAvatar())
        {
                ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->setAnimationData("PointAtPoint", (void *)&mTargetPos);
        }
+        return true;
 }
 const LLVector3d LLHUDEffectPointAt::getPointAtPosGlobal()
diff --git a/linden/indra/newview/llhudeffectpointat.h b/linden/indra/newview/llhudeffectpointat.h
index f9d864e..8df796c 100644
--- a/linden/indra/newview/llhudeffectpointat.h
+++ b/linden/indra/newview/llhudeffectpointat.h
@@ -71,7 +71,7 @@ protected:
        // lookat behavior has either target position or target object with offset
        void setTargetObjectAndOffset(LLViewerObject *objp, LLVector3d offset);
        void setTargetPosGlobal(const LLVector3d &target_pos_global);
-        void calcTargetPosition();
+        bool calcTargetPosition();
        void update();
 public:
        static BOOL sDebugPointAt;
diff --git a/linden/indra/newview/llhudeffecttrail.cpp b/linden/indra/newview/llhudeffecttrail.cpp
index ce5905d..c0ed148 100644
--- a/linden/indra/newview/llhudeffecttrail.cpp
+++ b/linden/indra/newview/llhudeffecttrail.cpp
@@ -196,7 +196,7 @@ void LLHUDEffectSpiral::triggerLocal()
                                psb->setSourceObject(mSourceObject);
                                psb->setTargetObject(mTargetObject);
                                psb->setOwnerUUID(gAgent.getID());
-                                gWorldPointer->mPartSim.addPartSource(psb);
+                                LLViewerPartSim::getInstance()->addPartSource(psb);
                                mPartSourcep = psb;
                        }
                }
@@ -212,7 +212,7 @@ void LLHUDEffectSpiral::triggerLocal()
                                        psb->setColor(color);
                                        psb->mLKGTargetPosGlobal = mPositionGlobal;
                                        psb->setOwnerUUID(gAgent.getID());
-                                        gWorldPointer->mPartSim.addPartSource(psb);
+                                        LLViewerPartSim::getInstance()->addPartSource(psb);
                                        mPartSourcep = psb;
                                }
                        }
@@ -234,7 +234,7 @@ void LLHUDEffectSpiral::triggerLocal()
                                }
                                pss->setColor(color);
                                pss->setOwnerUUID(gAgent.getID());
-                                gWorldPointer->mPartSim.addPartSource(pss);
+                                LLViewerPartSim::getInstance()->addPartSource(pss);
                                mPartSourcep = pss;
                        }
                }
diff --git a/linden/indra/newview/llhudicon.cpp b/linden/indra/newview/llhudicon.cpp
index 393c932..22d157c 100644
--- a/linden/indra/newview/llhudicon.cpp
+++ b/linden/indra/newview/llhudicon.cpp
@@ -102,28 +102,28 @@ void LLHUDIcon::renderIcon(BOOL for_select)
        // put icon above object, and in front
        // RN: don't use drawable radius, it's fricking HUGE
-        LLVector3 icon_relative_pos = (gCamera->getUpAxis() * ~mSourceObject->getRenderRotation());
+        LLVector3 icon_relative_pos = (LLViewerCamera::getInstance()->getUpAxis() * ~mSourceObject->getRenderRotation());
        icon_relative_pos.abs();
        F32 distance_scale = llmin(mSourceObject->getScale().mV[VX] / icon_relative_pos.mV[VX], 
                mSourceObject->getScale().mV[VY] / icon_relative_pos.mV[VY], 
                mSourceObject->getScale().mV[VZ] / icon_relative_pos.mV[VZ]);
        F32 up_distance = 0.5f * distance_scale;
-        LLVector3 icon_position = obj_position + (up_distance * gCamera->getUpAxis()) * 1.2f;
+        LLVector3 icon_position = obj_position + (up_distance * LLViewerCamera::getInstance()->getUpAxis()) * 1.2f;
-        LLVector3 icon_to_cam = gCamera->getOrigin() - icon_position;
+        LLVector3 icon_to_cam = LLViewerCamera::getInstance()->getOrigin() - icon_position;
        icon_to_cam.normVec();
        icon_position += icon_to_cam * mSourceObject->mDrawable->getRadius() * 1.1f;
-        mDistance = dist_vec(icon_position, gCamera->getOrigin());
+        mDistance = dist_vec(icon_position, LLViewerCamera::getInstance()->getOrigin());
        F32 alpha_factor = for_select ? 1.f : clamp_rescale(mDistance, DIST_START_FADE, DIST_END_FADE, 1.f, 0.f);
        LLVector3 x_pixel_vec;
        LLVector3 y_pixel_vec;
        
-        gCamera->getPixelVectors(icon_position, y_pixel_vec, x_pixel_vec);
+        LLViewerCamera::getInstance()->getPixelVectors(icon_position, y_pixel_vec, x_pixel_vec);
        F32 scale_factor = 1.f;
        if (mAnimTimer.getElapsedTimeF32() < ANIM_TIME)
diff --git a/linden/indra/newview/llhudmanager.cpp b/linden/indra/newview/llhudmanager.cpp
index 2c38943..5217893 100644
--- a/linden/indra/newview/llhudmanager.cpp
+++ b/linden/indra/newview/llhudmanager.cpp
@@ -42,8 +42,6 @@
 #include "llviewercontrol.h"
 #include "llviewerobjectlist.h"
-LLHUDManager *gHUDManager = NULL;
 extern BOOL gNoRender;
 // These are loaded from saved settings.
@@ -60,7 +58,6 @@ LLHUDManager::LLHUDManager()
 LLHUDManager::~LLHUDManager()
 {
-        mHUDEffects.reset();
 }
@@ -110,6 +107,12 @@ void LLHUDManager::sendEffects()
        }
 }
+//static
+void LLHUDManager::shutdownClass()
+{
+        getInstance()->mHUDEffects.reset();
+}
 void LLHUDManager::cleanupEffects()
 {
        S32 i = 0;
@@ -155,12 +158,6 @@ void LLHUDManager::processViewerEffect(LLMessageSystem *mesgsys, void **user_dat
                return;
        }
-        if (!gHUDManager)
-        {
-                llwarns << "No gHUDManager!" << llendl;
-                return;
-        }
        LLHUDEffect *effectp = NULL;
        LLUUID effect_id;
        U8 effect_type = 0;
@@ -172,20 +169,20 @@ void LLHUDManager::processViewerEffect(LLMessageSystem *mesgsys, void **user_dat
                effectp = NULL;
                LLHUDEffect::getIDType(mesgsys, k, effect_id, effect_type);
                S32 i;
-                for (i = 0; i < gHUDManager->mHUDEffects.count(); i++)
+                for (i = 0; i < LLHUDManager::getInstance()->mHUDEffects.count(); i++)
                {
-                        LLHUDEffect *cur_effectp = gHUDManager->mHUDEffects[i];
+                        LLHUDEffect *cur_effectp = LLHUDManager::getInstance()->mHUDEffects[i];
                        if (!cur_effectp)
                        {
                                llwarns << "Null effect in effect manager, skipping" << llendl;
-                                gHUDManager->mHUDEffects.remove(i);
+                                LLHUDManager::getInstance()->mHUDEffects.remove(i);
                                i--;
                                continue;
                        }
                        if (cur_effectp->isDead())
                        {
        //                      llwarns << "Dead effect in effect manager, removing" << llendl;
-                                gHUDManager->mHUDEffects.remove(i);
+                                LLHUDManager::getInstance()->mHUDEffects.remove(i);
                                i--;
                                continue;
                        }
@@ -204,7 +201,7 @@ void LLHUDManager::processViewerEffect(LLMessageSystem *mesgsys, void **user_dat
                {
                        if (!effectp)
                        {
-                                effectp = gHUDManager->createViewerEffect(effect_type, FALSE, FALSE);
+                                effectp = LLHUDManager::getInstance()->createViewerEffect(effect_type, FALSE, FALSE);
                        }
                        if (effectp)
diff --git a/linden/indra/newview/llhudmanager.h b/linden/indra/newview/llhudmanager.h
index cf63784..cfe9cad 100644
--- a/linden/indra/newview/llhudmanager.h
+++ b/linden/indra/newview/llhudmanager.h
@@ -44,7 +44,7 @@ class LLHUDAnimalControls;
 // End Ventrella
 class LLMessageSystem;
-class LLHUDManager
+class LLHUDManager : public LLSingleton<LLHUDManager>
 {
 public:
        LLHUDManager();
@@ -56,6 +56,8 @@ public:
        void sendEffects();
        void cleanupEffects();
+        static void shutdownClass();
        static void processViewerEffect(LLMessageSystem *mesgsys, void **user_data);
        static LLColor4 sParentColor;
@@ -65,6 +67,4 @@ protected:
        LLDynamicArrayPtr<LLPointer<LLHUDEffect>                                > mHUDEffects;
 };
-extern LLHUDManager *gHUDManager;
 #endif // LL_LLHUDMANAGER_H
diff --git a/linden/indra/newview/llhudrender.cpp b/linden/indra/newview/llhudrender.cpp
index df1fa46..556b6d6 100644
--- a/linden/indra/newview/llhudrender.cpp
+++ b/linden/indra/newview/llhudrender.cpp
@@ -61,10 +61,10 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
                                        const BOOL orthographic)
 {
        // Do cheap plane culling
-        LLVector3 dir_vec = pos_agent - gCamera->getOrigin();
+        LLVector3 dir_vec = pos_agent - LLViewerCamera::getInstance()->getOrigin();
        dir_vec /= dir_vec.magVec();
-        if (wstr.empty() || (!orthographic && dir_vec * gCamera->getAtAxis() <= 0.f))
+        if (wstr.empty() || (!orthographic && dir_vec * LLViewerCamera::getInstance()->getAtAxis() <= 0.f))
        {
                return;
        }
@@ -78,15 +78,15 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
        }
        else
        {
-                gCamera->getPixelVectors(pos_agent, up_axis, right_axis);
+                LLViewerCamera::getInstance()->getPixelVectors(pos_agent, up_axis, right_axis);
        }
-        LLCoordFrame render_frame = *gCamera;
+        LLCoordFrame render_frame = *LLViewerCamera::getInstance();
        LLQuaternion rot;
        if (!orthographic)
        {
                rot = render_frame.getQuaternion();
-                rot = rot * LLQuaternion(-F_PI_BY_TWO, gCamera->getYAxis());
+                rot = rot * LLQuaternion(-F_PI_BY_TWO, LLViewerCamera::getInstance()->getYAxis());
-                rot = rot * LLQuaternion(F_PI_BY_TWO, gCamera->getXAxis());
+                rot = rot * LLQuaternion(F_PI_BY_TWO, LLViewerCamera::getInstance()->getXAxis());
        }
        else
        {
diff --git a/linden/indra/newview/llhudtext.cpp b/linden/indra/newview/llhudtext.cpp
index 5dc016e..92caf8e 100644
--- a/linden/indra/newview/llhudtext.cpp
+++ b/linden/indra/newview/llhudtext.cpp
@@ -76,6 +76,7 @@ const F32 LOD_2_SCREEN_COVERAGE = 0.40f;
 std::set<LLPointer<LLHUDText> > LLHUDText::sTextObjects;
 std::vector<LLPointer<LLHUDText> > LLHUDText::sVisibleTextObjects;
 std::vector<LLPointer<LLHUDText> > LLHUDText::sVisibleHUDTextObjects;
+BOOL LLHUDText::sDisplayText = TRUE ;
 bool lltextobject_further_away::operator()(const LLPointer<LLHUDText>& lhs, const LLPointer<LLHUDText>& rhs) const
 {
@@ -120,7 +121,7 @@ LLHUDText::~LLHUDText()
 void LLHUDText::render()
 {
-        if (!mOnHUDAttachment)
+        if (!mOnHUDAttachment && sDisplayText)
        {
                LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
                renderText(FALSE);
@@ -174,9 +175,7 @@ void LLHUDText::renderText(BOOL for_select)
        mOffsetY = lltrunc(mHeight * ((mVertAlignment == ALIGN_VERT_CENTER) ? 0.5f : 1.f));
        // *TODO: cache this image
-        LLUUID image_id;
+        LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
-        image_id.set(gViewerArt.getString("rounded_square.tga"));
-        LLViewerImage* imagep = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
        // *TODO: make this a per-text setting
        LLColor4 bg_color = gSavedSettings.getColor4("BackgroundChatColor");
@@ -210,10 +209,10 @@ void LLHUDText::renderText(BOOL for_select)
        }
        else
        {
-                gCamera->getPixelVectors(mPositionAgent, y_pixel_vec, x_pixel_vec);
+                LLViewerCamera::getInstance()->getPixelVectors(mPositionAgent, y_pixel_vec, x_pixel_vec);
        }
-        LLVector2 border_scale_vec((F32)border_width / (F32)imagep->getWidth(), (F32)border_height / (F32)imagep->getHeight());
+        LLVector2 border_scale_vec((F32)border_width / (F32)imagep->getTextureWidth(), (F32)border_height / (F32)imagep->getTextureHeight());
        LLVector3 width_vec = mWidth * x_pixel_vec;
        LLVector3 height_vec = mHeight * y_pixel_vec;
        LLVector3 scaled_border_width = (F32)llfloor(border_scale * (F32)border_width) * x_pixel_vec;
@@ -222,7 +221,7 @@ void LLHUDText::renderText(BOOL for_select)
        mRadius = (width_vec + height_vec).magVec() * 0.5f;
        LLCoordGL screen_pos;
-        gCamera->projectPosAgentToScreen(mPositionAgent, screen_pos, FALSE);
+        LLViewerCamera::getInstance()->projectPosAgentToScreen(mPositionAgent, screen_pos, FALSE);
        LLVector2 screen_offset;
        if (!mUseBubble)
@@ -245,7 +244,7 @@ void LLHUDText::renderText(BOOL for_select)
        //}
        //else
        //{
-        //      render_position = gCamera->roundToPixel(render_position);
+        //      render_position = LLViewerCamera::getInstance()->roundToPixel(render_position);
        //}
        if (mUseBubble)
@@ -271,7 +270,7 @@ void LLHUDText::renderText(BOOL for_select)
                        }
                        else
                        {
-                                LLViewerImage::bindTexture(imagep);
+                                LLViewerImage::bindTexture(imagep->getImage());
                                
                                gGL.color4fv(bg_color.mV);
                                gl_segmented_rect_3d_tex(border_scale_vec, scaled_border_width, scaled_border_height, width_vec, height_vec);
@@ -615,25 +614,25 @@ void LLHUDText::updateVisibility()
        }
        // push text towards camera by radius of object, but not past camera
-        LLVector3 vec_from_camera = mPositionAgent - gCamera->getOrigin();
+        LLVector3 vec_from_camera = mPositionAgent - LLViewerCamera::getInstance()->getOrigin();
        LLVector3 dir_from_camera = vec_from_camera;
        dir_from_camera.normVec();
-        if (dir_from_camera * gCamera->getAtAxis() <= 0.f)
+        if (dir_from_camera * LLViewerCamera::getInstance()->getAtAxis() <= 0.f)
        {
-                mPositionAgent -= projected_vec(vec_from_camera, gCamera->getAtAxis()) * 1.f;
+                mPositionAgent -= projected_vec(vec_from_camera, LLViewerCamera::getInstance()->getAtAxis()) * 1.f;
-                mPositionAgent += gCamera->getAtAxis() * (gCamera->getNear() + 0.1f);
+                mPositionAgent += LLViewerCamera::getInstance()->getAtAxis() * (LLViewerCamera::getInstance()->getNear() + 0.1f);
        }
-        else if (vec_from_camera * gCamera->getAtAxis() <= gCamera->getNear() + 0.1f + mSourceObject->getVObjRadius())
+        else if (vec_from_camera * LLViewerCamera::getInstance()->getAtAxis() <= LLViewerCamera::getInstance()->getNear() + 0.1f + mSourceObject->getVObjRadius())
        {
-                mPositionAgent = gCamera->getOrigin() + vec_from_camera * ((gCamera->getNear() + 0.1f) / (vec_from_camera * gCamera->getAtAxis()));
+                mPositionAgent = LLViewerCamera::getInstance()->getOrigin() + vec_from_camera * ((LLViewerCamera::getInstance()->getNear() + 0.1f) / (vec_from_camera * LLViewerCamera::getInstance()->getAtAxis()));
        }
        else
        {
                mPositionAgent -= dir_from_camera * mSourceObject->getVObjRadius();
        }
-        mLastDistance = (mPositionAgent - gCamera->getOrigin()).magVec();
+        mLastDistance = (mPositionAgent - LLViewerCamera::getInstance()->getOrigin()).magVec();
        if (mLOD >= 3 || !mTextSegments.size() || (mDoFade && (mLastDistance > mFadeDistance + mFadeRange)))
        {
@@ -644,14 +643,14 @@ void LLHUDText::updateVisibility()
        LLVector3 x_pixel_vec;
        LLVector3 y_pixel_vec;
-        gCamera->getPixelVectors(mPositionAgent, y_pixel_vec, x_pixel_vec);
+        LLViewerCamera::getInstance()->getPixelVectors(mPositionAgent, y_pixel_vec, x_pixel_vec);
        LLVector3 render_position = mPositionAgent +                    
                        (x_pixel_vec * mPositionOffset.mV[VX]) +
                        (y_pixel_vec * mPositionOffset.mV[VY]);
        mOffscreen = FALSE;
-        if (!gCamera->sphereInFrustum(render_position, mRadius))
+        if (!LLViewerCamera::getInstance()->sphereInFrustum(render_position, mRadius))
        {
                if (!mVisibleOffScreen)
                {
@@ -674,9 +673,9 @@ LLVector2 LLHUDText::updateScreenPos(LLVector2 &offset)
        LLVector2 screen_pos_vec;
        LLVector3 x_pixel_vec;
        LLVector3 y_pixel_vec;
-        gCamera->getPixelVectors(mPositionAgent, y_pixel_vec, x_pixel_vec);
+        LLViewerCamera::getInstance()->getPixelVectors(mPositionAgent, y_pixel_vec, x_pixel_vec);
        LLVector3 world_pos = mPositionAgent + (offset.mV[VX] * x_pixel_vec) + (offset.mV[VY] * y_pixel_vec);
-        if (!gCamera->projectPosAgentToScreen(world_pos, screen_pos, FALSE) && mVisibleOffScreen)
+        if (!LLViewerCamera::getInstance()->projectPosAgentToScreen(world_pos, screen_pos, FALSE) && mVisibleOffScreen)
        {
                // bubble off-screen, so find a spot for it along screen edge
                LLVector2 window_center(gViewerWindow->getWindowDisplayWidth() * 0.5f, gViewerWindow->getWindowDisplayHeight() * 0.5f);
@@ -684,7 +683,7 @@ LLVector2 LLHUDText::updateScreenPos(LLVector2 &offset)
                                                                        screen_pos.mY - window_center.mV[VY]);
                delta_from_center.normVec();
-                F32 camera_aspect = gCamera->getAspect();
+                F32 camera_aspect = LLViewerCamera::getInstance()->getAspect();
                F32 delta_aspect = llabs(delta_from_center.mV[VX] / delta_from_center.mV[VY]);
                if (camera_aspect / llmax(delta_aspect, 0.001f) > 1.f)
                {
@@ -834,7 +833,7 @@ void LLHUDText::updateAll()
                }
        }
-        LLStat* camera_vel_stat = gCamera->getVelocityStat();
+        LLStat* camera_vel_stat = LLViewerCamera::getInstance()->getVelocityStat();
        F32 camera_vel = camera_vel_stat->getCurrent();
        if (camera_vel > MAX_STABLE_CAMERA_VELOCITY)
        {
diff --git a/linden/indra/newview/llhudtext.h b/linden/indra/newview/llhudtext.h
index 47dc5a7..bd4da88 100644
--- a/linden/indra/newview/llhudtext.h
+++ b/linden/indra/newview/llhudtext.h
@@ -124,6 +124,7 @@ public:
        static void renderAllHUD();
        static void addPickable(std::set<LLViewerObject*> &pick_list);
        static void reshape();
+        static void setDisplayText(BOOL flag) { sDisplayText = flag ; }
 protected:
        LLHUDText(const U8 type);
@@ -170,6 +171,7 @@ private:
        S32                             mLOD;
        BOOL                    mHidden;
+        static BOOL    sDisplayText ;
        static std::set<LLPointer<LLHUDText> > sTextObjects;
        static std::vector<LLPointer<LLHUDText> > sVisibleTextObjects;
        static std::vector<LLPointer<LLHUDText> > sVisibleHUDTextObjects;
diff --git a/linden/indra/newview/llhudview.cpp b/linden/indra/newview/llhudview.cpp
index 7a54623..5867285 100644
--- a/linden/indra/newview/llhudview.cpp
+++ b/linden/indra/newview/llhudview.cpp
@@ -59,16 +59,6 @@ LLHUDView::LLHUDView()
 LLHUDView::~LLHUDView()
 { }
-EWidgetType LLHUDView::getWidgetType() const
-{
-        return WIDGET_TYPE_HUD_VIEW;
-}
-LLString LLHUDView::getWidgetTag() const
-{
-        return LL_HUD_VIEW_TAG;
-}
 // virtual
 void LLHUDView::draw()
 {
diff --git a/linden/indra/newview/llhudview.h b/linden/indra/newview/llhudview.h
index cfe8899..ae32ddd 100644
--- a/linden/indra/newview/llhudview.h
+++ b/linden/indra/newview/llhudview.h
@@ -44,9 +44,6 @@ public:
        LLHUDView();
        virtual ~LLHUDView();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual void draw();
        const LLColor4& colorFromType(S32 type);
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 9e6739f..6f06117 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -62,7 +62,7 @@
 #include "llviewermessage.h"
 #include "llviewerstats.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "lllogchat.h"
 #include "llfloaterhtml.h"
@@ -1154,7 +1154,7 @@ void LLFloaterIMPanel::init(const LLString& session_label)
        mSpeakers = new LLIMSpeakerMgr(mVoiceChannel);
-        gUICtrlFactory->buildFloater(this,
+        LLUICtrlFactory::getInstance()->buildFloater(this,
                                                                xml_filename,
                                                                &getFactoryMap(),
                                                                FALSE);
@@ -1217,12 +1217,12 @@ LLFloaterIMPanel::~LLFloaterIMPanel()
 BOOL LLFloaterIMPanel::postBuild() 
 {
-        requires("chat_editor", WIDGET_TYPE_LINE_EDITOR);
+        requires<LLLineEditor>("chat_editor");
-        requires("im_history", WIDGET_TYPE_TEXT_EDITOR);
+        requires<LLTextEditor>("im_history");
        if (checkRequirements())
        {
-                mInputEditor = LLUICtrlFactory::getLineEditorByName(this, "chat_editor");
+                mInputEditor = getChild<LLLineEditor>("chat_editor");
                mInputEditor->setFocusReceivedCallback( onInputEditorFocusReceived, this );
                mInputEditor->setFocusLostCallback( onInputEditorFocusLost, this );
                mInputEditor->setKeystrokeCallback( onInputEditorKeystroke );
@@ -1240,10 +1240,10 @@ BOOL LLFloaterIMPanel::postBuild()
                childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
                childSetAction("moderator_kick_speaker", onKickSpeaker, this);
-                //LLButton* close_btn = LLUICtrlFactory::getButtonByName(this, "close_btn");
+                //LLButton* close_btn = getChild<LLButton>("close_btn");
                //close_btn->setClickedCallback(&LLFloaterIMPanel::onClickClose, this);
-                mHistoryEditor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "im_history");
+                mHistoryEditor = getChild<LLViewerTextEditor>("im_history");
                mHistoryEditor->setParseHTML(TRUE);
                if ( IM_SESSION_GROUP_START == mDialog )
@@ -1286,16 +1286,16 @@ void LLFloaterIMPanel::onClickMuteVoice(void* user_data)
        LLFloaterIMPanel* floaterp = (LLFloaterIMPanel*)user_data;
        if (floaterp)
        {
-                BOOL is_muted = gMuteListp->isMuted(floaterp->mOtherParticipantUUID, LLMute::flagVoiceChat);
+                BOOL is_muted = LLMuteList::getInstance()->isMuted(floaterp->mOtherParticipantUUID, LLMute::flagVoiceChat);
                LLMute mute(floaterp->mOtherParticipantUUID, floaterp->getTitle(), LLMute::AGENT);
                if (!is_muted)
                {
-                        gMuteListp->add(mute, LLMute::flagVoiceChat);
+                        LLMuteList::getInstance()->add(mute, LLMute::flagVoiceChat);
                }
                else
                {
-                        gMuteListp->remove(mute, LLMute::flagVoiceChat);
+                        LLMuteList::getInstance()->remove(mute, LLMute::flagVoiceChat);
                }
        }
 }
@@ -1384,7 +1384,7 @@ void LLFloaterIMPanel::draw()
                childSetVisible("speaker_volume", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive());
                childSetValue("speaker_volume", gVoiceClient->getUserVolume(mOtherParticipantUUID));
-                childSetValue("mute_btn", gMuteListp->isMuted(mOtherParticipantUUID, LLMute::flagVoiceChat));
+                childSetValue("mute_btn", LLMuteList::getInstance()->isMuted(mOtherParticipantUUID, LLMute::flagVoiceChat));
                childSetVisible("mute_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive());
        }
        LLFloater::draw();
@@ -1540,33 +1540,30 @@ void LLFloaterIMPanel::selectNone()
 }
-BOOL LLFloaterIMPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLFloaterIMPanel::handleKeyHere( KEY key, MASK mask )
 {
        BOOL handled = FALSE;
-        if( getVisible() && getEnabled() && !called_from_parent && gFocusMgr.childHasKeyboardFocus(this))
+        if( KEY_RETURN == key && mask == MASK_NONE)
        {
-                if( KEY_RETURN == key && mask == MASK_NONE)
+                sendMsg();
-                {
+                handled = TRUE;
-                        sendMsg();
-                        handled = TRUE;
-                        // Close talk panels on hitting return
+                // Close talk panels on hitting return
-                        // but not shift-return or control-return
+                // but not shift-return or control-return
-                        if ( !gSavedSettings.getBOOL("PinTalkViewOpen") && !(mask & MASK_CONTROL) && !(mask & MASK_SHIFT) )
+                if ( !gSavedSettings.getBOOL("PinTalkViewOpen") && !(mask & MASK_CONTROL) && !(mask & MASK_SHIFT) )
-                        {
-                                gIMMgr->toggle(NULL);
-                        }
-                }
-                else if ( KEY_ESCAPE == key )
                {
-                        handled = TRUE;
+                        gIMMgr->toggle(NULL);
-                        gFocusMgr.setKeyboardFocus(NULL);
+                }
+        }
+        else if ( KEY_ESCAPE == key )
+        {
+                handled = TRUE;
+                gFocusMgr.setKeyboardFocus(NULL);
-                        // Close talk panel with escape
+                // Close talk panel with escape
-                        if( !gSavedSettings.getBOOL("PinTalkViewOpen") )
+                if( !gSavedSettings.getBOOL("PinTalkViewOpen") )
-                        {
+                {
-                                gIMMgr->toggle(NULL);
+                        gIMMgr->toggle(NULL);
-                        }
                }
        }
@@ -1889,7 +1886,7 @@ void LLFloaterIMPanel::sendMsg()
                                BOOL other_was_typing = mOtherTyping;
-                                addHistoryLine(gAgent.getID(), history_echo);
+                                addHistoryLine(gAgent.getID(), history_echo, gSavedSettings.getColor("IMChatColor"));
                                if (other_was_typing) 
                                {
@@ -1905,7 +1902,7 @@ void LLFloaterIMPanel::sendMsg()
                        mQueuedMsgsForInit.append(utf8_text);
                }
-                gViewerStats->incStat(LLViewerStats::ST_IM_COUNT);
+                LLViewerStats::getInstance()->incStat(LLViewerStats::ST_IM_COUNT);
        }
        mInputEditor->setText(LLString::null);
@@ -2085,12 +2082,31 @@ void LLFloaterIMPanel::removeTypingIndicator(const LLIMInfo* im_info)
 }
 //static
-void LLFloaterIMPanel::chatFromLogFile(LLString line, void* userdata)
+void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, LLString line, void* userdata)
 {
        LLFloaterIMPanel* self = (LLFloaterIMPanel*)userdata;
-        
+        LLUIString message = line;
+        switch (type)
+        {
+        case LLLogChat::LOG_EMPTY:
+                // add warning log enabled message
+                message = LLFloaterChat::getInstance()->getUIString("IM_logging_string");
+                break;
+        case LLLogChat::LOG_END:
+                // add log end message
+                message = LLFloaterChat::getInstance()->getUIString("IM_logging_string");
+                break;
+        case LLLogChat::LOG_LINE:
+                // just add normal lines from file
+                break;
+        default:
+                // nothing
+                break;
+        }
        //self->addHistoryLine(line, LLColor4::grey, FALSE);
-        self->mHistoryEditor->appendColoredText(line, false, true, LLColor4::grey);
+        self->mHistoryEditor->appendColoredText(message, false, true, LLColor4::grey);
 }
 void LLFloaterIMPanel::showSessionStartError(
@@ -2171,3 +2187,4 @@ void LLFloaterIMPanel::onConfirmForceCloseError(S32 option, void* data)
 }
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index a344ba0..16d4042 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -33,6 +33,7 @@
 #define LL_IMPANEL_H
 #include "llfloater.h"
+#include "lllogchat.h"
 #include "lluuid.h"
 #include "lldarray.h"
 #include "llinstantmessage.h"
@@ -216,7 +217,7 @@ public:
        S32 getNumUnreadMessages() { return mNumUnreadMessages; }
-        BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        BOOL handleKeyHere(KEY key, MASK mask);
        BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,
                                                   BOOL drop, EDragAndDropType cargo_type,
                                                   void *cargo_data, EAcceptance *accept,
@@ -256,7 +257,7 @@ public:
        // Handle other participant in the session typing.
        void processIMTyping(const LLIMInfo* im_info, BOOL typing);
-        static void chatFromLogFile(LLString line, void* userdata);
+        static void chatFromLogFile(LLLogChat::ELogLineType type, LLString line, void* userdata);
        //show error statuses to the user
        void showSessionStartError(const std::string& error_string);
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index cad8649..e451388 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -40,7 +40,7 @@
 #include "llhttpclient.h"
 #include "llsdutil.h"
 #include "llstring.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llagent.h"
 #include "llcallingcard.h"
@@ -80,7 +80,7 @@ LLIMMgr* gIMMgr = NULL;
 //
 // Statics
 //
-//*FIXME: make these all either UIStrings or Strings
+// *FIXME: make these all either UIStrings or Strings
 static LLString sOnlyUserMessage;
 static LLUIString sOfflineMessage;
 static LLUIString sInviteMessage;
@@ -152,7 +152,7 @@ LLFloaterIM::LLFloaterIM()
        // the size of the im-sesssion when they were created.  This happens in 
        // LLMultiFloater::resizeToContents() when called through LLMultiFloater::addFloater())
        this->mAutoResize = FALSE;
-        gUICtrlFactory->buildFloater(this, "floater_im.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_im.xml");
 }
 BOOL LLFloaterIM::postBuild()
@@ -374,7 +374,7 @@ LLIMMgr::LLIMMgr() :
        mFriendObserver = new LLIMViewFriendObserver(this);
        LLAvatarTracker::instance().addObserver(mFriendObserver);
-        //*HACK: use floater to initialize string constants from xml file
+        // *HACK: use floater to initialize string constants from xml file
        // then delete it right away
        LLFloaterIM* dummy_floater = new LLFloaterIM();
        delete dummy_floater;
@@ -403,12 +403,12 @@ void LLIMMgr::addMessage(
        const LLVector3& position)
 {
        LLUUID other_participant_id = target_id;
-        bool is_from_system = target_id.isNull();
+        bool is_from_system = target_id.isNull() || !strcmp(from, SYSTEM_FROM);
        // don't process muted IMs
-        if (gMuteListp->isMuted(
+        if (LLMuteList::getInstance()->isMuted(
                        other_participant_id,
-                        LLMute::flagTextChat) && !gMuteListp->isLinden(from))
+                        LLMute::flagTextChat) && !LLMuteList::getInstance()->isLinden(from))
        {
                return;
        }
@@ -490,7 +490,7 @@ void LLIMMgr::addMessage(
        }
        else
        {
-                floater->addHistoryLine(other_participant_id, msg);
+                floater->addHistoryLine(other_participant_id, msg, gSavedSettings.getColor("IMChatColor"));
        }
        LLFloaterChatterBox* chat_floater = LLFloaterChatterBox::getInstance(LLSD());
@@ -695,7 +695,7 @@ void LLIMMgr::inviteToSession(
        const LLString& session_handle)
 {
        //ignore invites from muted residents
-        if (gMuteListp->isMuted(caller_id))
+        if (LLMuteList::getInstance()->isMuted(caller_id))
        {
                return;
        }
@@ -740,7 +740,7 @@ void LLIMMgr::inviteToSession(
        if (channelp && channelp->callStarted())
        {
                // you have already started a call to the other user, so just accept the invite
-                inviteUserResponse(0, invite);
+                inviteUserResponse(0, invite); // inviteUserResponse deletes
                return;
        }
@@ -754,7 +754,7 @@ void LLIMMgr::inviteToSession(
                        if (gSavedSettings.getBOOL("VoiceCallsFriendsOnly"))
                        {
                                // invite not from a friend, so decline
-                                inviteUserResponse(1, invite);
+                                inviteUserResponse(1, invite); // inviteUserResponse deletes
                                return;
                        }
                }
@@ -773,13 +773,17 @@ void LLIMMgr::inviteToSession(
                        args["[GROUP]"] = session_name;
                        LLNotifyBox::showXml(notify_box_type, 
-                                                                 args, 
+                                             args, 
-                                                                 inviteUserResponse, 
+                                             inviteUserResponse, 
-                                                                 (void*)invite);
+                                             (void*)invite); // inviteUserResponse deletes
                }
                mPendingInvitations[session_id.asString()] = LLSD();
        }
+        else
+        {
+                delete invite;
+        }
 }
 //static 
@@ -946,10 +950,10 @@ void LLIMMgr::inviteUserResponse(S32 option, void* user_data)
        case 2: // mute (also implies ignore, so this falls through to the "ignore" case below)
        {
                // mute the sender of this invite
-                if (!gMuteListp->isMuted(invitep->mCallerID))
+                if (!LLMuteList::getInstance()->isMuted(invitep->mCallerID))
                {
                        LLMute mute(invitep->mCallerID, invitep->mCallerName, LLMute::AGENT);
-                        gMuteListp->add(mute);
+                        LLMuteList::getInstance()->add(mute);
                }
        }
        /* FALLTHROUGH */
@@ -1475,12 +1479,12 @@ public:
                                (time_t) message_params["timestamp"].asInteger();
                        BOOL is_busy = gAgent.getBusy();
-                        BOOL is_muted = gMuteListp->isMuted(
+                        BOOL is_muted = LLMuteList::getInstance()->isMuted(
                                from_id,
                                name.c_str(),
                                LLMute::flagTextChat);
-                        BOOL is_linden = gMuteListp->isLinden(
+                        BOOL is_linden = LLMuteList::getInstance()->isLinden(
                                name.c_str());
                        char separator_string[3]=": ";          /* Flawfinder: ignore */
                        int message_offset=0;
@@ -1624,3 +1628,4 @@ LLHTTPRegistration<LLViewerChatterBoxInvitation>
    gHTTPRegistrationMessageChatterBoxInvitation(
                "/message/ChatterBoxInvitation");
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index 27afb17..78b43d5 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -81,7 +81,7 @@
 #include "llviewermessage.h" 
 #include "llviewerregion.h"
 #include "lltabcontainer.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llselectmgr.h"
 const char* NEW_LSL_NAME = "New Script"; // *TODO:Translate? (probably not)
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index be2bb9a..1d5cd88 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -81,7 +81,7 @@
 #include "llviewermessage.h" 
 #include "llviewerregion.h"
 #include "lltabcontainer.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llselectmgr.h"
 #include "llfloateropenobject.h"
@@ -124,11 +124,11 @@ const char* ICON_NAME[ICON_NAME_COUNT] =
        "inv_item_object.tga",
        "inv_item_object_multi.tga",
        "inv_item_notecard.tga",
-        "inv_item_bodypart.tga",
+        "inv_item_skin.tga",
        "inv_item_snapshot.tga",
        "inv_item_shape.tga",
-        "inv_item_bodypart.tga",
+        "inv_item_skin.tga",
        "inv_item_hair.tga",
        "inv_item_eyes.tga",
        "inv_item_shirt.tga",
@@ -388,9 +388,10 @@ void hideContextEntries(LLMenuGL& menu,
                LLString name = (*itor)->getName();
                // descend into split menus:
-                if ((name == "More") && (WIDGET_TYPE_MENU_ITEM_BRANCH == (*itor)->getWidgetType()))
+                LLMenuItemBranchGL* branchp = dynamic_cast<LLMenuItemBranchGL*>(*itor);
+                if ((name == "More") && branchp)
                {
-                        hideContextEntries(*((LLMenuItemBranchGL *)(*itor))->getBranch(), entries_to_show, disabled_entries);
+                        hideContextEntries(*branchp->getBranch(), entries_to_show, disabled_entries);
                }
                
                
@@ -807,10 +808,9 @@ void LLItemBridge::restoreItem()
        }
 }
-LLViewerImage* LLItemBridge::getIcon() const
+LLUIImagePtr LLItemBridge::getIcon() const
 {
-        LLString uuid_string = gViewerArt.getString(ICON_NAME[OBJECT_ICON_NAME]);
+        return LLUI::getUIImage(ICON_NAME[OBJECT_ICON_NAME]);
-        return gImageList.getImage(LLUUID(uuid_string), MIPMAP_FALSE, TRUE);
 }
 PermissionMask LLItemBridge::getPermissionMask() const
@@ -1133,7 +1133,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
        }
        // check to make sure source is agent inventory, and is represented there.
-        LLToolDragAndDrop::ESource source = gToolDragAndDrop->getSource();
+        LLToolDragAndDrop::ESource source = LLToolDragAndDrop::getInstance()->getSource();
        BOOL is_agent_inventory = (model->getCategory(inv_cat->getUUID()) != NULL)
                && (LLToolDragAndDrop::SOURCE_AGENT == source);
@@ -1626,7 +1626,7 @@ void LLFolderBridge::restoreItem()
 }
 // Icons for folders are based on the preferred type
-LLViewerImage* LLFolderBridge::getIcon() const
+LLUIImagePtr LLFolderBridge::getIcon() const
 {
        const char* control = NULL;
        LLAssetType::EType preferred_type = LLAssetType::AT_NONE;
@@ -1687,8 +1687,7 @@ LLViewerImage* LLFolderBridge::getIcon() const
                control = "inv_folder_plain_closed.tga";
                break;
        }
-        LLString uuid_string = gViewerArt.getString(control);
+        return LLUI::getUIImage(control);
-        return gImageList.getImage(LLUUID(uuid_string), MIPMAP_FALSE, TRUE);
 }
 BOOL LLFolderBridge::renameItem(const LLString& new_name)
@@ -2195,7 +2194,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
        LLVOAvatar* avatar = gAgent.getAvatarObject();
        if(!avatar) return FALSE;
-        LLToolDragAndDrop::ESource source = gToolDragAndDrop->getSource();
+        LLToolDragAndDrop::ESource source = LLToolDragAndDrop::getInstance()->getSource();
        BOOL accept = FALSE;
        LLViewerObject* object = NULL;
        if(LLToolDragAndDrop::SOURCE_AGENT == source)
@@ -2318,8 +2317,8 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
                accept = TRUE;
                if(drop)
                {
-                        copy_inventory_from_notecard(gToolDragAndDrop->getObjectID(),
+                        copy_inventory_from_notecard(LLToolDragAndDrop::getInstance()->getObjectID(),
-                                gToolDragAndDrop->getSourceID(), inv_item);
+                                LLToolDragAndDrop::getInstance()->getSourceID(), inv_item);
                }
        }
        else if(LLToolDragAndDrop::SOURCE_LIBRARY == source)
@@ -2351,7 +2350,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 // |        LLScriptBridge (DEPRECTED)               |
 // +=================================================+
-LLViewerImage* LLScriptBridge::getIcon() const
+LLUIImagePtr LLScriptBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_SCRIPT, LLInventoryType::IT_LSL, 0, FALSE);
 }
@@ -2363,7 +2362,7 @@ LLViewerImage* LLScriptBridge::getIcon() const
 LLString LLTextureBridge::sPrefix("Texture: ");
-LLViewerImage* LLTextureBridge::getIcon() const
+LLUIImagePtr LLTextureBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_TEXTURE, mInvType, 0, FALSE);
 }
@@ -2413,7 +2412,7 @@ void LLTextureBridge::openItem()
 LLString LLSoundBridge::sPrefix("Sound: ");
-LLViewerImage* LLSoundBridge::getIcon() const
+LLUIImagePtr LLSoundBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_SOUND, LLInventoryType::IT_SOUND, 0, FALSE);
 }
@@ -2508,7 +2507,7 @@ void LLSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 LLString LLLandmarkBridge::sPrefix("Landmark:  ");
-LLViewerImage* LLLandmarkBridge::getIcon() const
+LLUIImagePtr LLLandmarkBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_LANDMARK, LLInventoryType::IT_LANDMARK, mVisited, FALSE);
 }
@@ -2695,7 +2694,7 @@ void LLCallingCardBridge::performAction(LLFolderView* folder, LLInventoryModel*
        else LLItemBridge::performAction(folder, model, action);
 }
-LLViewerImage* LLCallingCardBridge::getIcon() const
+LLUIImagePtr LLCallingCardBridge::getIcon() const
 {
        BOOL online = FALSE;
        LLViewerInventoryItem* item = getItem();
@@ -2855,7 +2854,7 @@ BOOL LLCallingCardBridge::dragOrDrop(MASK mask, BOOL drop,
 LLString LLNotecardBridge::sPrefix("Note: ");
-LLViewerImage* LLNotecardBridge::getIcon() const
+LLUIImagePtr LLNotecardBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE);
 }
@@ -2923,7 +2922,7 @@ void LLNotecardBridge::openItem()
 LLString LLGestureBridge::sPrefix("Gesture: ");
-LLViewerImage* LLGestureBridge::getIcon() const
+LLUIImagePtr LLGestureBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_GESTURE, LLInventoryType::IT_GESTURE, 0, FALSE);
 }
@@ -3055,7 +3054,7 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 LLString LLAnimationBridge::sPrefix("Animation: ");
-LLViewerImage* LLAnimationBridge::getIcon() const
+LLUIImagePtr LLAnimationBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_ANIMATION, LLInventoryType::IT_ANIMATION, 0, FALSE);
 }
@@ -3173,7 +3172,7 @@ BOOL LLObjectBridge::isItemRemovable()
        return LLInvFVBridge::isItemRemovable();
 }
-LLViewerImage* LLObjectBridge::getIcon() const
+LLUIImagePtr LLObjectBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_OBJECT, mInvType, mAttachPt, mIsMultiObject );
 }
@@ -3223,7 +3222,7 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model
                        gObjectList.findObject(item->getUUID());
                if (found_obj)
                {
-                        gSelectMgr->remove(found_obj);
+                        LLSelectMgr::getInstance()->remove(found_obj);
                }
                else
                {
@@ -3432,10 +3431,10 @@ BOOL LLObjectBridge::renameItem(const LLString& new_name)
                        LLViewerObject* obj = avatar->getWornAttachment( item->getUUID() );
                        if( obj )
                        {
-                                gSelectMgr->deselectAll();
+                                LLSelectMgr::getInstance()->deselectAll();
-                                gSelectMgr->addAsIndividual( obj, SELECT_ALL_TES, FALSE );
+                                LLSelectMgr::getInstance()->addAsIndividual( obj, SELECT_ALL_TES, FALSE );
-                                gSelectMgr->selectionSetObjectName( new_name );
+                                LLSelectMgr::getInstance()->selectionSetObjectName( new_name );
-                                gSelectMgr->deselectAll();
+                                LLSelectMgr::getInstance()->deselectAll();
                        }
                }
        }
@@ -3450,7 +3449,7 @@ BOOL LLObjectBridge::renameItem(const LLString& new_name)
 LLString LLLSLTextBridge::sPrefix("Script: ");
-LLViewerImage* LLLSLTextBridge::getIcon() const
+LLUIImagePtr LLLSLTextBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_SCRIPT, LLInventoryType::IT_LSL, 0, FALSE);
 }
@@ -4176,7 +4175,7 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata)
                                LLViewerObject *found_obj = gObjectList.findObject( obj_item_array.get(i)->getUUID());
                                if (found_obj)
                                {
-                                        gSelectMgr->remove(found_obj);
+                                        LLSelectMgr::getInstance()->remove(found_obj);
                                }
                                else
                                {
@@ -4243,7 +4242,7 @@ LLString LLWearableBridge::getLabelSuffix() const
        }
 }
-LLViewerImage* LLWearableBridge::getIcon() const
+LLUIImagePtr LLWearableBridge::getIcon() const
 {
        return get_item_icon(mAssetType, mInvType, mWearableType, FALSE);
 }
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index cca56c2..80b65b2 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -199,7 +199,7 @@ public:
 protected:
        LLInvFVBridge(LLInventoryPanel* inventory, const LLUUID& uuid) :
-                mInventoryPanel(inventory), mUUID(uuid) {}
+                mInventoryPanel(inventory), mUUID(uuid), mInvType(LLInventoryType::IT_NONE) {}
        LLInventoryObject* getInventoryObject() const;
        BOOL isInTrash() const;
@@ -235,7 +235,7 @@ public:
        virtual void selectItem();
        virtual void restoreItem();
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual const LLString& getDisplayName() const;
        virtual LLString getLabelSuffix() const;
        virtual PermissionMask getPermissionMask() const;
@@ -275,7 +275,7 @@ public:
        virtual void restoreItem();
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual BOOL renameItem(const LLString& new_name);
        virtual BOOL removeItem();
        virtual BOOL isClipboardPasteable() const;
@@ -297,7 +297,7 @@ public:
 protected:
        LLFolderBridge(LLInventoryPanel* inventory, const LLUUID& uuid) :
-                LLInvFVBridge(inventory, uuid) {}
+                LLInvFVBridge(inventory, uuid), mCallingCards(FALSE), mWearables(FALSE) {}
        // menu callbacks
        static void pasteClipboard(void* user_data);
@@ -337,7 +337,7 @@ class LLScriptBridge : public LLItemBridge
 {
        friend class LLInvFVBridge;
 public:
-        LLViewerImage* getIcon() const;
+        LLUIImagePtr getIcon() const;
 protected:
        LLScriptBridge( LLInventoryPanel* inventory, const LLUUID& uuid ) :
@@ -351,7 +351,7 @@ class LLTextureBridge : public LLItemBridge
 public:
        virtual const LLString& getPrefix() { return sPrefix; }
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
 protected:
@@ -367,7 +367,7 @@ class LLSoundBridge : public LLItemBridge
 public:
        virtual const LLString& getPrefix() { return sPrefix; }
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
        virtual void previewItem();
        virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
@@ -387,7 +387,7 @@ public:
        virtual const LLString& getPrefix() { return sPrefix; }
        virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
        virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
 protected:
@@ -427,7 +427,7 @@ public:
        virtual LLString getLabelSuffix() const;
        //virtual const LLString& getDisplayName() const;
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
        virtual void openItem();
        virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
@@ -454,7 +454,7 @@ class LLNotecardBridge : public LLItemBridge
 public:
        virtual const LLString& getPrefix() { return sPrefix; }
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
 protected:
@@ -471,7 +471,7 @@ class LLGestureBridge : public LLItemBridge
 public:
        virtual const LLString& getPrefix() { return sPrefix; }
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        // Only suffix for gesture items, not task items, because only
        // gestures in your inventory can be active.
@@ -501,7 +501,7 @@ public:
        virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
        virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
 protected:
@@ -519,7 +519,7 @@ class LLObjectBridge : public LLItemBridge
 public:
        virtual const LLString& getPrefix() { return sPrefix; }
-        virtual LLViewerImage*  getIcon() const;
+        virtual LLUIImagePtr    getIcon() const;
        virtual void                    performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
        virtual void                    openItem();
        virtual LLFontGL::StyleFlags getLabelStyle() const;
@@ -552,7 +552,7 @@ class LLLSLTextBridge : public LLItemBridge
 public:
        virtual const LLString& getPrefix() { return sPrefix; }
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
 protected:
@@ -568,7 +568,7 @@ class LLWearableBridge : public LLItemBridge
 {
        friend class LLInvFVBridge;
 public:
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void    performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
        virtual void    openItem();
        virtual void    buildContextMenu(LLMenuGL& menu, U32 flags);
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 13a45a8..e76c427 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -930,6 +930,11 @@ void LLInventoryModel::removeObserver(LLInventoryObserver* observer)
        mObservers.erase(observer);
 }
+BOOL LLInventoryModel::containsObserver(LLInventoryObserver* observer)
+{
+        return mObservers.find(observer) != mObservers.end();
+}
 // Call this method when it's time to update everyone on a new state,
 // by default, the inventory model will not update observers
 // automatically.
diff --git a/linden/indra/newview/llinventorymodel.h b/linden/indra/newview/llinventorymodel.h
index 8205bf4..b03be24 100644
--- a/linden/indra/newview/llinventorymodel.h
+++ b/linden/indra/newview/llinventorymodel.h
@@ -243,6 +243,7 @@ public:
        // to remove it.
        void addObserver(LLInventoryObserver* observer);
        void removeObserver(LLInventoryObserver* observer);
+        BOOL containsObserver(LLInventoryObserver* observer);
        //
        // Misc Methods 
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 340608b..5e0456d 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -79,11 +79,13 @@
 #include "llviewermessage.h"
 #include "llviewerregion.h"
 #include "lltabcontainer.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llselectmgr.h"
 #include "llsdserialize.h"
+static LLRegisterWidget<LLInventoryPanel> r("inventory_panel");
 LLDynamicArray<LLInventoryView*> LLInventoryView::sActiveViews;
 //BOOL LLInventoryView::sOpenNextNewItem = FALSE;
@@ -113,18 +115,18 @@ LLInventoryViewFinder::LLInventoryViewFinder(const LLString& name,
        mFilter(inventory_view->mActivePanel->getFilter())
 {
-        gUICtrlFactory->buildFloater(this, "floater_inventory_view_finder.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inventory_view_finder.xml");
        childSetAction("All", selectAllTypes, this);
        childSetAction("None", selectNoTypes, this);
-        mSpinSinceHours = LLUICtrlFactory::getSpinnerByName(this, "spin_hours_ago");
+        mSpinSinceHours = getChild<LLSpinCtrl>("spin_hours_ago");
        childSetCommitCallback("spin_hours_ago", onTimeAgo, this);
-        mSpinSinceDays = LLUICtrlFactory::getSpinnerByName(this, "spin_days_ago");
+        mSpinSinceDays = getChild<LLSpinCtrl>("spin_days_ago");
        childSetCommitCallback("spin_days_ago", onTimeAgo, this);
-//      mCheckSinceLogoff   = LLUICtrlFactory::getSpinnerByName(this, "check_since_logoff");
+//      mCheckSinceLogoff   = getChild<LLSpinCtrl>("check_since_logoff");
        childSetCommitCallback("check_since_logoff", onCheckSinceLogoff, this);
        childSetAction("Close", onCloseBtn, this);
@@ -491,12 +493,12 @@ void LLInventoryView::init(LLInventoryModel* inventory)
        mSavedFolderState = new LLSaveFolderState();
        mSavedFolderState->setApply(FALSE);
-        gUICtrlFactory->buildFloater(this, "floater_inventory.xml", NULL);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inventory.xml", NULL);
-        mFilterTabs = (LLTabContainer*)LLUICtrlFactory::getTabContainerByName(this, "inventory filter tabs");
+        mFilterTabs = (LLTabContainer*)getChild<LLTabContainer>("inventory filter tabs");
        // Set up the default inv. panel/filter settings.
-        mActivePanel = (LLInventoryPanel*)getCtrlByNameAndType("All Items", WIDGET_TYPE_INVENTORY_PANEL);
+        mActivePanel = getChild<LLInventoryPanel>("All Items");
        if (mActivePanel)
        {
                // "All Items" is the previous only view, so it gets the InventorySortOrder
@@ -505,7 +507,7 @@ void LLInventoryView::init(LLInventoryModel* inventory)
                mActivePanel->getRootFolder()->applyFunctorRecursively(*mSavedFolderState);
                mActivePanel->setSelectCallback(onSelectionChange, mActivePanel);
        }
-        LLInventoryPanel* recent_items_panel = (LLInventoryPanel*)getCtrlByNameAndType("Recent Items", WIDGET_TYPE_INVENTORY_PANEL);
+        LLInventoryPanel* recent_items_panel = getChild<LLInventoryPanel>("Recent Items");
        if (recent_items_panel)
        {
                recent_items_panel->setSinceLogoff(TRUE);
@@ -541,7 +543,7 @@ void LLInventoryView::init(LLInventoryModel* inventory)
    }
-        mSearchEditor = (LLSearchEditor*)getCtrlByNameAndType("inventory search editor", WIDGET_TYPE_SEARCH_EDITOR);
+        mSearchEditor = getChild<LLSearchEditor>("inventory search editor");
        if (mSearchEditor)
        {
                mSearchEditor->setSearchCallback(onSearchEdit, this);
@@ -565,7 +567,7 @@ LLInventoryView::~LLInventoryView( void )
 {
        // Save the filters state.
        LLSD filterRoot;
-        LLInventoryPanel* all_items_panel = (LLInventoryPanel*)getCtrlByNameAndType("All Items", WIDGET_TYPE_INVENTORY_PANEL);
+        LLInventoryPanel* all_items_panel = getChild<LLInventoryPanel>("All Items");
        if (all_items_panel)
        {
                LLInventoryFilter* filter = all_items_panel->getFilter();
@@ -574,7 +576,7 @@ LLInventoryView::~LLInventoryView( void )
                filterRoot[filter->getName()] = filterState;
        }
-        LLInventoryPanel* recent_items_panel = (LLInventoryPanel*)getCtrlByNameAndType("Recent Items", WIDGET_TYPE_INVENTORY_PANEL);
+        LLInventoryPanel* recent_items_panel = getChild<LLInventoryPanel>("Recent Items");
        if (recent_items_panel)
        {
                LLInventoryFilter* filter = recent_items_panel->getFilter();
@@ -606,7 +608,7 @@ void LLInventoryView::draw()
                std::ostringstream title;
                title << "Inventory";
                LLString item_count_string;
-                gResMgr->getIntegerString(item_count_string, gInventory.getItemCount());
+                LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount());
                title << " (" << item_count_string << " items)";
                title << mFilterText;
                setTitle(title.str());
@@ -727,15 +729,16 @@ void LLInventoryView::onClose(bool app_quitting)
        }
 }
-BOOL LLInventoryView::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLInventoryView::handleKeyHere(KEY key, MASK mask)
 {
        LLFolderView* root_folder = mActivePanel ? mActivePanel->getRootFolder() : NULL;
        if (root_folder)
        {
                // first check for user accepting current search results
-                if (!called_from_parent
+                if (mSearchEditor 
-                    && mSearchEditor && mSearchEditor->hasFocus()
+                        && mSearchEditor->hasFocus()
-                    && (key == KEY_RETURN || key == KEY_DOWN)
+                    && (key == KEY_RETURN 
+                        || key == KEY_DOWN)
                    && mask == MASK_NONE)
                {
                        // move focus to inventory proper
@@ -750,7 +753,7 @@ BOOL LLInventoryView::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
                }
        }
-        return LLFloater::handleKeyHere(key, mask, called_from_parent);
+        return LLFloater::handleKeyHere(key, mask);
 }
@@ -762,7 +765,7 @@ void LLInventoryView::changed(U32 mask)
        {
                LLLocale locale(LLLocale::USER_LOCALE);
                LLString item_count_string;
-                gResMgr->getIntegerString(item_count_string, gInventory.getItemCount());
+                LLResMgr::getInstance()->getIntegerString(item_count_string, gInventory.getItemCount());
                title << " (Fetched " << item_count_string << " items...)";
        }
        title << mFilterText;
@@ -1076,7 +1079,7 @@ BOOL LLInventoryView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
        return handled;
 }
-LLUUID get_item_icon_uuid(LLAssetType::EType asset_type,
+LLString get_item_icon_name(LLAssetType::EType asset_type,
                                                         LLInventoryType::EType inventory_type,
                                                         U32 attachment_point,
                                                         BOOL item_is_multi )
@@ -1193,19 +1196,17 @@ LLUUID get_item_icon_uuid(LLAssetType::EType asset_type,
        default:
                break;
        }
-        LLString uuid_string = gViewerArt.getString(ICON_NAME[idx]);
+        
-        return LLUUID(uuid_string);
+        return LLString(ICON_NAME[idx]);
 }
-LLViewerImage* get_item_icon(LLAssetType::EType asset_type,
+LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
                                                         LLInventoryType::EType inventory_type,
                                                         U32 attachment_point,
                                                         BOOL item_is_multi)
 {
-        LLUUID icon_uuid = get_item_icon_uuid(asset_type, inventory_type, attachment_point, item_is_multi );
+        const LLString& icon_name = get_item_icon_name(asset_type, inventory_type, attachment_point, item_is_multi );
-        LLViewerImage* imagep = gImageList.getImage(icon_uuid, MIPMAP_FALSE, TRUE);
+        return LLUI::getUIImage(icon_name);
-        imagep->setClamp(TRUE, TRUE);
-        return imagep;
 }
 const LLString LLInventoryPanel::DEFAULT_SORT_ORDER = LLString("InventorySortOrder");
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index c8c3947..a648eb8 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -83,8 +83,6 @@ public:
        BOOL postBuild();
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_INVENTORY_PANEL; }
-        virtual LLString getWidgetTag() const { return LL_INVENTORY_PANEL_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
@@ -226,7 +224,7 @@ public:
        virtual void onClose(bool app_quitting);
        virtual void setVisible(BOOL visible);
        virtual void draw();
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
        BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                EDragAndDropType cargo_type,
@@ -346,12 +344,12 @@ void open_notecard(LLViewerInventoryItem* inv_item, const LLString& title, const
 void open_landmark(LLViewerInventoryItem* inv_item, const LLString& title,                          BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
 void open_texture(const LLUUID& item_id, const LLString& title, BOOL show_keep_discard, const LLUUID& source_id = LLUUID::null, BOOL take_focus = TRUE);
-LLUUID get_item_icon_uuid(LLAssetType::EType asset_type,
+LLString get_item_icon_name(LLAssetType::EType asset_type,
                                                         LLInventoryType::EType inventory_type,
                                                         U32 attachment_point, 
                                                         BOOL item_is_multi );
-LLViewerImage* get_item_icon(LLAssetType::EType asset_type,
+LLUIImagePtr get_item_icon(LLAssetType::EType asset_type,
                                                         LLInventoryType::EType inventory_type,
                                                         U32 attachment_point, 
                                                         BOOL item_is_multi );
diff --git a/linden/indra/newview/lljoystickbutton.cpp b/linden/indra/newview/lljoystickbutton.cpp
index b429ed2..548da07 100644
--- a/linden/indra/newview/lljoystickbutton.cpp
+++ b/linden/indra/newview/lljoystickbutton.cpp
@@ -48,6 +48,10 @@
 #include "llglheaders.h"
+static LLRegisterWidget<LLJoystickAgentSlide> r1("joystick_slide");
+static LLRegisterWidget<LLJoystickAgentTurn> r2("joystick_turn");
 const F32 NUDGE_TIME = 0.25f;           // in seconds
 const F32 ORBIT_NUDGE_RATE = 0.05f; // fraction of normal speed
@@ -603,37 +607,33 @@ void LLJoystickCameraRotate::setToggleState( BOOL left, BOOL top, BOOL right, BO
 void LLJoystickCameraRotate::draw()
 {
-        
+        LLGLSUIDefault gls_ui;
-        if( getVisible() ) 
-        {
-                LLGLSUIDefault gls_ui;
-                getImageUnselected()->draw( 0, 0 );
+        getImageUnselected()->draw( 0, 0 );
-                if( mInTop )
+        if( mInTop )
-                {
+        {
-                        drawRotatedImage( getImageSelected()->getImage(), 0 );
+                drawRotatedImage( getImageSelected()->getImage(), 0 );
-                }
+        }
-                if( mInRight )
+        if( mInRight )
-                {
+        {
-                        drawRotatedImage( getImageSelected()->getImage(), 1 );
+                drawRotatedImage( getImageSelected()->getImage(), 1 );
-                }
+        }
-                if( mInBottom )
+        if( mInBottom )
-                {
+        {
-                        drawRotatedImage( getImageSelected()->getImage(), 2 );
+                drawRotatedImage( getImageSelected()->getImage(), 2 );
-                }
+        }
-                if( mInLeft )
+        if( mInLeft )
-                {
+        {
-                        drawRotatedImage( getImageSelected()->getImage(), 3 );
+                drawRotatedImage( getImageSelected()->getImage(), 3 );
-                }
+        }
-                if (sDebugRects)
+        if (sDebugRects)
-                {
+        {
-                        drawDebugRect();
+                drawDebugRect();
-                }
        }
 }
@@ -722,8 +722,8 @@ LLJoystickCameraZoom::LLJoystickCameraZoom(const LLString& name, LLRect rect, co
        mInTop( FALSE ),
        mInBottom( FALSE )
 {
-        mPlusInImage = gImageList.getImage(LLUI::findAssetUUIDByName(plus_in_img), MIPMAP_FALSE, TRUE);
+        mPlusInImage = LLUIImageList::getInstance()->getUIImage(plus_in_img);
-        mMinusInImage = gImageList.getImage(LLUI::findAssetUUIDByName(minus_in_img), MIPMAP_FALSE, TRUE);
+        mMinusInImage = LLUIImageList::getInstance()->getUIImage(minus_in_img);
 }
@@ -789,26 +789,23 @@ void LLJoystickCameraZoom::setToggleState( BOOL top, BOOL bottom )
 void LLJoystickCameraZoom::draw()
 {
-        if( getVisible() ) 
+        if( mInTop )
        {
-                if( mInTop )
+                mPlusInImage->draw(0,0);
-                {
+        }
-                        gl_draw_image( 0, 0, mPlusInImage );
+        else
-                }
+        if( mInBottom )
-                else
+        {
-                if( mInBottom )
+                mMinusInImage->draw(0,0);
-                {
+        }
-                        gl_draw_image( 0, 0, mMinusInImage );
+        else
-                }
+        {
-                else
+                getImageUnselected()->draw( 0, 0 );
-                {
+        }
-                        getImageUnselected()->draw( 0, 0 );
-                }
-                if (sDebugRects)
+        if (sDebugRects)
-                {
+        {
-                        drawDebugRect();
+                drawDebugRect();
-                }
        }
 }
diff --git a/linden/indra/newview/lljoystickbutton.h b/linden/indra/newview/lljoystickbutton.h
index ed0d1dd..49db055 100644
--- a/linden/indra/newview/lljoystickbutton.h
+++ b/linden/indra/newview/lljoystickbutton.h
@@ -94,9 +94,6 @@ public:
                : LLJoystick(name, rect, default_image, selected_image, initial)
        { }
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_JOYSTICK_TURN; }
-        virtual LLString getWidgetTag() const { return LL_JOYSTICK_TURN; }
        virtual void    onHeldDown();
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
@@ -113,10 +110,6 @@ public:
                : LLJoystick(name, rect, default_image, selected_image, initial)
        { }
        
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_JOYSTICK_SLIDE; }
-        virtual LLString getWidgetTag() const { return LL_JOYSTICK_SLIDE; }
        virtual void    onHeldDown();
        virtual void    onMouseUp();
@@ -183,8 +176,8 @@ protected:
 protected:
        BOOL                    mInTop;
        BOOL                    mInBottom;
-        LLPointer<LLViewerImage>        mPlusInImage;
+        LLUIImagePtr    mPlusInImage;
-        LLPointer<LLViewerImage>        mMinusInImage;
+        LLUIImagePtr    mMinusInImage;
 };
diff --git a/linden/indra/newview/lllandmarklist.cpp b/linden/indra/newview/lllandmarklist.cpp
index 1c0b874..ee5819b 100644
--- a/linden/indra/newview/lllandmarklist.cpp
+++ b/linden/indra/newview/lllandmarklist.cpp
@@ -115,10 +115,7 @@ void LLLandmarkList::processGetAssetReply(
        }
        else
        {
-                if( gViewerStats )
+                LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                {
-                        gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                }
                if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status )
                {
diff --git a/linden/indra/newview/lllcd.cpp b/linden/indra/newview/lllcd.cpp
index f9660b5..6574f6f 100644
--- a/linden/indra/newview/lllcd.cpp
+++ b/linden/indra/newview/lllcd.cpp
@@ -37,7 +37,7 @@
 #include "llstatusbar.h"
 #include "llviewerregion.h"
 #include "llviewerstats.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 #if LL_LCD_COMPILE
@@ -63,7 +63,7 @@ void CreateLCDDebugWindows()
        {
                // load up the text so we are sure it's externalized and localized correctly.
                bogus = new LLPanel();
-                gUICtrlFactory->buildPanel(bogus, "lcd_text.xml");
+                LLUICtrlFactory::getInstance()->buildPanel(bogus, "lcd_text.xml");
                LLLCDPageGroup *pageGroup = NULL;
                pageGroup = new llDefaultPageGroup(gLcdScreen->mLCD, LLLCD::kLCDDefault, gLcdScreen->mSLIcon);
@@ -212,14 +212,11 @@ void LLDebugPageGroup::UpdateDetails()
                ping = llformat("%d", gStatusBar->mRegionDetails.mPing);        
        }
-        if (gViewerStats)
+        packetLoss = llformat("%.1f%%", LLViewerStats::getInstance()->mPacketsLostPercentStat.getCurrent());
-        {
+        simfps = llformat("%d", (int)LLViewerStats::getInstance()->mSimFPS.getCurrent());
-                packetLoss = llformat("%.1f%%", gViewerStats->mPacketsLostPercentStat.getCurrent());
+        fps = llformat("%.1f%", LLViewerStats::getInstance()->mFPSStat.getMeanPerSec());
-                simfps = llformat("%d", (int)gViewerStats->mSimFPS.getCurrent());
+        packetsIn = llformat("%d", (int)LLViewerStats::getInstance()->mSimInPPS.getCurrent());
-                fps = llformat("%.1f%", gViewerStats->mFPSStat.getMeanPerSec());
+        packetsOut = llformat("%d", (int)LLViewerStats::getInstance()->mSimOutPPS.getCurrent());
-                packetsIn = llformat("%d", (int)gViewerStats->mSimInPPS.getCurrent());
-                packetsOut = llformat("%d", (int)gViewerStats->mSimOutPPS.getCurrent());
-        }
        // fps
        mLCD->SetText(mPageArray[0].mDisplayItemArray[0], (LPCTSTR)(utf8str_to_utf16str(fps).c_str()));
diff --git a/linden/indra/newview/lllogchat.cpp b/linden/indra/newview/lllogchat.cpp
index b0f3f42..7be9781 100644
--- a/linden/indra/newview/lllogchat.cpp
+++ b/linden/indra/newview/lllogchat.cpp
@@ -33,7 +33,8 @@
 #include "lllogchat.h"
 #include "llappviewer.h"
-        
+#include "llfloaterchat.h"
 const S32 LOG_RECALL_SIZE = 2048;
 //static
@@ -88,7 +89,7 @@ void LLLogChat::saveHistory(LLString filename, LLString line)
        }
 }
-void LLLogChat::loadHistory(LLString filename , void (*callback)(LLString,void*), void* userdata)
+void LLLogChat::loadHistory(LLString filename , void (*callback)(ELogLineType,LLString,void*), void* userdata)
 {
        if(!filename.size())
        {
@@ -98,6 +99,9 @@ void LLLogChat::loadHistory(LLString filename , void (*callback)(LLString,void*)
        FILE* fptr = LLFile::fopen(makeLogFileName(filename).c_str(), "r");             /*Flawfinder: ignore*/
        if (!fptr)
        {
+                //LLUIString message = LLFloaterChat::getInstance()->getUIString("IM_logging_string");
+                //callback(LOG_EMPTY,"IM_logging_string",userdata);
+                callback(LOG_EMPTY,"",userdata);
                return;                 //No previous conversation with this name.
        }
        else
@@ -124,14 +128,14 @@ void LLLogChat::loadHistory(LLString filename , void (*callback)(LLString,void*)
                        
                        if (!firstline)
                        {
-                                callback(buffer,userdata);
+                                callback(LOG_LINE,buffer,userdata);
                        }
                        else
                        {
                                firstline = FALSE;
                        }
                }
-                callback("-- End of Log ---",userdata);
+                callback(LOG_END,"",userdata);
                
                fclose(fptr);
        }
diff --git a/linden/indra/newview/lllogchat.h b/linden/indra/newview/lllogchat.h
index c2d16dc..8c21ff2 100644
--- a/linden/indra/newview/lllogchat.h
+++ b/linden/indra/newview/lllogchat.h
@@ -36,10 +36,18 @@
 class LLLogChat
 {
 public:
+        // status values for callback function
+        enum ELogLineType {
+                LOG_EMPTY,
+                LOG_LINE,
+                LOG_END
+        };
        static LLString timestamp(bool withdate = false);
        static LLString makeLogFileName(LLString(filename));
        static void saveHistory(LLString filename, LLString line);
-        static void loadHistory(LLString filename, void (*callback)(LLString,void*),void* userdata);
+        static void loadHistory(LLString filename, 
+                                    void (*callback)(ELogLineType,LLString,void*), 
+                                                        void* userdata);
 };
 #endif
diff --git a/linden/indra/newview/llmanip.cpp b/linden/indra/newview/llmanip.cpp
index 9d9103f..8934266 100644
--- a/linden/indra/newview/llmanip.cpp
+++ b/linden/indra/newview/llmanip.cpp
@@ -53,7 +53,7 @@
 #include "llviewerobject.h"
 #include "llviewerwindow.h"
 #include "llvoavatar.h"
-#include "llworld.h"            // for gWorldPointer
+#include "llworld.h"            // for LLWorld::getInstance()
 #include "llresmgr.h"
 #include "pipeline.h"
 #include "llglheaders.h"
@@ -106,14 +106,14 @@ void LLManip::getManipNormal(LLViewerObject* object, EManipPart manip, LLVector3
        LLVector3 grid_scale;
        LLQuaternion grid_rotation;
-        gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+        LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rotation, grid_scale);
        if (manip >= LL_X_ARROW && manip <= LL_Z_ARROW)
        {
                LLVector3 arrow_axis;
                getManipAxis(object, manip, arrow_axis);
-                LLVector3 cross = arrow_axis % gCamera->getAtAxis();
+                LLVector3 cross = arrow_axis % LLViewerCamera::getInstance()->getAtAxis();
                normal = cross % arrow_axis;
                normal.normVec();
        }
@@ -148,7 +148,7 @@ BOOL LLManip::getManipAxis(LLViewerObject* object, EManipPart manip, LLVector3 &
        LLVector3 grid_scale;
        LLQuaternion grid_rotation;
-        gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+        LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rotation, grid_scale);
        if (manip == LL_X_ARROW)
        {
@@ -181,12 +181,12 @@ F32 LLManip::getSubdivisionLevel(const LLVector3 &reference_point, const LLVecto
        }
        else
        {
-                cam_to_reference = reference_point - gCamera->getOrigin();
+                cam_to_reference = reference_point - LLViewerCamera::getInstance()->getOrigin();
        }
        F32 current_range = cam_to_reference.normVec();
        F32 projected_translation_axis_length = (translate_axis % cam_to_reference).magVec();
-        F32 subdivisions = llmax(projected_translation_axis_length * grid_scale / (current_range / gCamera->getPixelMeterRatio() * min_pixel_spacing), 0.f);
+        F32 subdivisions = llmax(projected_translation_axis_length * grid_scale / (current_range / LLViewerCamera::getInstance()->getPixelMeterRatio() * min_pixel_spacing), 0.f);
        subdivisions = llclamp((F32)pow(2.f, llfloor(log(subdivisions) / log(2.f))), 1.f / 32.f, 32.f);
        return subdivisions;
@@ -194,7 +194,7 @@ F32 LLManip::getSubdivisionLevel(const LLVector3 &reference_point, const LLVecto
 void LLManip::handleSelect()
 {
-        mObjectSelection = gSelectMgr->getEditSelection();
+        mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
 }
 void LLManip::handleDeselect()
@@ -255,12 +255,12 @@ BOOL LLManip::getMousePointOnPlaneAgent(LLVector3& point, S32 x, S32 y, LLVector
        return result;
 }
-BOOL LLManip::getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVector3d origin, LLVector3 normal)
+BOOL LLManip::getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVector3d origin, LLVector3 normal) const
 {
        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
        {
                BOOL result = FALSE;
-                F32 mouse_x = ((F32)x / gViewerWindow->getWindowWidth() - 0.5f) * gCamera->getAspect() / gAgent.getAvatarObject()->mHUDCurZoom;
+                F32 mouse_x = ((F32)x / gViewerWindow->getWindowWidth() - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.getAvatarObject()->mHUDCurZoom;
                F32 mouse_y = ((F32)y / gViewerWindow->getWindowHeight() - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
                LLVector3 origin_agent = gAgent.getPosAgentFromGlobal(origin);
@@ -299,7 +299,7 @@ BOOL LLManip::nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, co
        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
        {
-                F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) * gCamera->getAspect() / gAgent.getAvatarObject()->mHUDCurZoom;
+                F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.getAvatarObject()->mHUDCurZoom;
                F32 mouse_y = (((F32)y / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
                a1 = LLVector3(llmin(b1.mV[VX] - 0.1f, b2.mV[VX] - 0.1f, 0.f), -mouse_x, mouse_y);
                a2 = a1 + LLVector3(1.f, 0.f, 0.f);
@@ -342,7 +342,7 @@ BOOL LLManip::nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, co
 LLVector3 LLManip::getSavedPivotPoint() const
 {
-        return gSelectMgr->getSavedBBoxOfSelection().getCenterAgent();
+        return LLSelectMgr::getInstance()->getSavedBBoxOfSelection().getCenterAgent();
 }
 LLVector3 LLManip::getPivotPoint()
@@ -351,7 +351,7 @@ LLVector3 LLManip::getPivotPoint()
        {
                return mObjectSelection->getFirstObject()->getPivotPositionAgent();
        }
-        return gSelectMgr->getBBoxOfSelection().getCenterAgent();
+        return LLSelectMgr::getInstance()->getBBoxOfSelection().getCenterAgent();
 }
@@ -360,7 +360,7 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z)
        LLVector3 grid_origin;
        LLQuaternion grid_rot;
        LLVector3 grid_scale;
-        gSelectMgr->getGrid(grid_origin, grid_rot, grid_scale);
+        LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rot, grid_scale);
        const BOOL children_ok = TRUE;
        LLViewerObject* object = mObjectSelection->getFirstRootObject(children_ok);
@@ -369,7 +369,7 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z)
                return;
        }
-        //LLVector3  center_agent  = gSelectMgr->getBBoxOfSelection().getCenterAgent();
+        //LLVector3  center_agent  = LLSelectMgr::getInstance()->getBBoxOfSelection().getCenterAgent();
        LLVector3  center_agent  = getPivotPoint();
        glPushMatrix();
@@ -381,7 +381,7 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z)
                grid_rot.getAngleAxis(&angle_radians, &x, &y, &z);
                glRotatef(angle_radians * RAD_TO_DEG, x, y, z);
-                F32 region_size = gWorldPointer->getRegionWidthInMeters();
+                F32 region_size = LLWorld::getInstance()->getRegionWidthInMeters();
                const F32 LINE_ALPHA = 0.33f;
@@ -423,29 +423,24 @@ void LLManip::renderXYZ(const LLVector3 &vec)
 {
        const S32 PAD = 10;
        char feedback_string[128];              /*Flawfinder: ignore*/
-        LLVector3 camera_pos = gCamera->getOrigin() + gCamera->getAtAxis();
+        LLVector3 camera_pos = LLViewerCamera::getInstance()->getOrigin() + LLViewerCamera::getInstance()->getAtAxis();
        S32 vertical_offset = gViewerWindow->getWindowHeight() / 2 - VERTICAL_OFFSET;
        S32 window_center_x = gViewerWindow->getWindowWidth() / 2;
        S32 window_center_y = gViewerWindow->getWindowHeight() / 2;
-        LLUUID image_id;
-        image_id.set(gViewerArt.getString("rounded_square.tga"));
-        LLViewerImage* imagep = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
        glPushMatrix();
        {
+                LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
                gViewerWindow->setup2DRender();
                const LLVector2& display_scale = gViewerWindow->getDisplayScale();
                glScalef(display_scale.mV[VX], display_scale.mV[VY], 1.f);
                gGL.color4f(0.f, 0.f, 0.f, 0.7f);
-                gl_draw_scaled_image_with_border(window_center_x - 115, 
+                imagep->draw(
+                        window_center_x - 115, 
                        window_center_y + vertical_offset - PAD, 
-                        16, 
-                        16, 
                        235,
                        PAD * 2 + 10, 
-                        imagep, 
                        LLColor4(0.f, 0.f, 0.f, 0.7f) );
        }
        glPopMatrix();
@@ -457,31 +452,31 @@ void LLManip::renderXYZ(const LLVector3 &vec)
                LLGLDepthTest gls_depth(GL_FALSE);
                // render drop shadowed text
                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);
+                hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -102.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
                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);
+                hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -27.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
                
                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);
+                hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, 48.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
                // render text on top
                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);
+                hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->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);
                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);
+                hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->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);
                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);
+                hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, 48.f, (F32)vertical_offset, LLColor4(0.5f, 0.5f, 1.f, 1.f), FALSE);
        }
 }
 void LLManip::renderTickText(const LLVector3& pos, const char* text, const LLColor4 &color)
 {
-        const LLFontGL* big_fontp = gResMgr->getRes( LLFONT_SANSSERIF );
+        const LLFontGL* big_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
        BOOL hud_selection = mObjectSelection->getSelectType() == SELECT_TYPE_HUD;
        glMatrixMode(GL_MODELVIEW);
@@ -511,8 +506,8 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const char* suffi
 {
        LLLocale locale(LLLocale::USER_LOCALE);
-        const LLFontGL* big_fontp = gResMgr->getRes( LLFONT_SANSSERIF );
+        const LLFontGL* big_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
-        const LLFontGL* small_fontp = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
+        const LLFontGL* small_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
        char val_string[128];           /*Flawfinder: ignore*/
        char fraction_string[128];              /*Flawfinder: ignore*/
@@ -559,7 +554,7 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const char* suffi
        if (fractional_portion != 0)
        {
-                snprintf(fraction_string, sizeof(fraction_string), "%c%02d%s", gResMgr->getDecimalPoint(), fractional_portion, suffix);                 /* Flawfinder: ignore */
+                snprintf(fraction_string, sizeof(fraction_string), "%c%02d%s", LLResMgr::getInstance()->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 ef6630b..34847e7 100644
--- a/linden/indra/newview/llmanip.h
+++ b/linden/indra/newview/llmanip.h
@@ -146,7 +146,7 @@ protected:
        void                            renderTickValue(const LLVector3& pos, F32 value, const char* suffix, const LLColor4 &color);
        void                            renderTickText(const LLVector3& pos, const char* suffix, const LLColor4 &color);
        void                            updateGridSettings();
-        BOOL                            getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVector3d origin, LLVector3 normal);
+        BOOL                            getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVector3d origin, LLVector3 normal) const;
        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 );
        LLColor4                        setupSnapGuideRenderPass(S32 pass);
diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index bd951a6..94bbe7d 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -54,7 +54,6 @@
 #include "llstatusbar.h"
 #include "llui.h"
 #include "llvoavatar.h"
-#include "llviewborder.h"
 #include "llviewercamera.h"
 #include "llviewerobject.h"
 #include "llviewerobject.h"
@@ -109,7 +108,7 @@ LLManipRotate::LLManipRotate( LLToolComposite* composite )
 void LLManipRotate::handleSelect()
 {
        // *FIX: put this in mouseDown?
-        gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+        LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
        gFloaterTools->setStatusText("rotate");
        LLManip::handleSelect();
 }
@@ -225,7 +224,7 @@ void LLManipRotate::render()
                LLVector3 grid_scale;
                LLQuaternion grid_rotation;
-                gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+                LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rotation, grid_scale);
                grid_rotation.getAngleAxis(&angle_radians, &x, &y, &z);
                glRotatef(angle_radians * RAD_TO_DEG, x, y, z);
@@ -386,10 +385,10 @@ BOOL LLManipRotate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
        highlightManipulators(x, y);
        S32 hit_part = mHighlightedPart;
        // we just started a drag, so save initial object positions
-        gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_ROTATE);
+        LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_ROTATE);
        // save selection center
-        mRotationCenter = gAgent.getPosGlobalFromAgent( getPivotPoint() ); //gSelectMgr->getSelectionCenterGlobal();
+        mRotationCenter = gAgent.getPosGlobalFromAgent( getPivotPoint() ); //LLSelectMgr::getInstance()->getSelectionCenterGlobal();
        mManipPart = (EManipPart)hit_part;
        LLVector3 center = gAgent.getPosAgentFromGlobal( mRotationCenter );
@@ -435,7 +434,7 @@ BOOL LLManipRotate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
        // Route future Mouse messages here preemptively.  (Release on mouse up.)
        setMouseCapture( TRUE );
-        gSelectMgr->enableSilhouette(FALSE);
+        LLSelectMgr::getInstance()->enableSilhouette(FALSE);
        return TRUE;
 }
@@ -461,12 +460,12 @@ BOOL LLManipRotate::handleMouseUp(S32 x, S32 y, MASK mask)
                mManipPart = LL_NO_PART;
                // Might have missed last update due to timing.
-                gSelectMgr->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
+                LLSelectMgr::getInstance()->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
-                gSelectMgr->enableSilhouette(TRUE);
+                LLSelectMgr::getInstance()->enableSilhouette(TRUE);
                //gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
-                gSelectMgr->updateSelectionCenter();
+                LLSelectMgr::getInstance()->updateSelectionCenter();
-                gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+                LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
        }
        return LLManip::handleMouseUp(x, y, mask);
@@ -635,7 +634,7 @@ void LLManipRotate::drag( S32 x, S32 y )
                        if (object->isRootEdit() && !object->isAttachment())
                        {
                                LLVector3d new_pos_global = gAgent.getPosGlobalFromAgent(new_position);
-                                new_pos_global = gWorldp->clipToVisibleRegions(selectNode->mSavedPositionGlobal, new_pos_global);
+                                new_pos_global = LLWorld::getInstance()->clipToVisibleRegions(selectNode->mSavedPositionGlobal, new_pos_global);
                                new_position = gAgent.getPosAgentFromGlobal(new_pos_global);
                        }
@@ -704,8 +703,8 @@ void LLManipRotate::drag( S32 x, S32 y )
        }
        // store changes to override updates
-        for (LLObjectSelection::iterator iter = gSelectMgr->getSelection()->begin();
+        for (LLObjectSelection::iterator iter = LLSelectMgr::getInstance()->getSelection()->begin();
-                 iter != gSelectMgr->getSelection()->end(); iter++)
+                 iter != LLSelectMgr::getInstance()->getSelection()->end(); iter++)
        {
                LLSelectNode* selectNode = *iter;
                LLViewerObject*cur = selectNode->getObject();
@@ -716,7 +715,7 @@ void LLManipRotate::drag( S32 x, S32 y )
                }
        }       
-        gSelectMgr->updateSelectionCenter();
+        LLSelectMgr::getInstance()->updateSelectionCenter();
        // RN: just clear focus so camera doesn't follow spurious object updates
        gAgent.clearFocusObject();
@@ -744,7 +743,7 @@ void LLManipRotate::renderSnapGuides()
        LLQuaternion grid_rotation;
        LLVector3 constraint_axis = getConstraintAxis();
-        gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+        LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rotation, grid_scale);
        if (!gSavedSettings.getBOOL("SnapEnabled"))
        {
@@ -771,7 +770,7 @@ void LLManipRotate::renderSnapGuides()
        {
                test_axis = test_axis * ~grid_rotation;
        }
-        else if (gSelectMgr->getGridMode() == GRID_MODE_REF_OBJECT)
+        else if (LLSelectMgr::getInstance()->getGridMode() == GRID_MODE_REF_OBJECT)
        {
                test_axis = test_axis * ~grid_rotation;
                constrain_to_ref_object = TRUE;
@@ -1118,7 +1117,7 @@ BOOL LLManipRotate::updateVisiblity()
        // JC - 03.26.2002
        if (!hasMouseCapture())
        {
-                mRotationCenter = gAgent.getPosGlobalFromAgent( getPivotPoint() );//gSelectMgr->getSelectionCenterGlobal();
+                mRotationCenter = gAgent.getPosGlobalFromAgent( getPivotPoint() );//LLSelectMgr::getInstance()->getSelectionCenterGlobal();
        }
        BOOL visible = FALSE;
@@ -1130,7 +1129,7 @@ BOOL LLManipRotate::updateVisiblity()
                mCenterToCamNorm = mCenterToCam;
                mCenterToCamMag = mCenterToCamNorm.normVec();
-                mRadiusMeters = RADIUS_PIXELS / (F32) gCamera->getViewHeightInPixels();
+                mRadiusMeters = RADIUS_PIXELS / (F32) LLViewerCamera::getInstance()->getViewHeightInPixels();
                mRadiusMeters /= gAgent.getAvatarObject()->mHUDCurZoom;
                mCenterToProfilePlaneMag = mRadiusMeters * mRadiusMeters / mCenterToCamMag;
@@ -1142,13 +1141,13 @@ BOOL LLManipRotate::updateVisiblity()
        }
        else
        {
-                visible = gCamera->projectPosAgentToScreen(center, mCenterScreen );
+                visible = LLViewerCamera::getInstance()->projectPosAgentToScreen(center, mCenterScreen );
                if( visible )
                {
                        mCenterToCam = gAgent.getCameraPositionAgent() - center;
                        mCenterToCamNorm = mCenterToCam;
                        mCenterToCamMag = mCenterToCamNorm.normVec();
-                        LLVector3 cameraAtAxis = gCamera->getAtAxis();
+                        LLVector3 cameraAtAxis = LLViewerCamera::getInstance()->getAtAxis();
                        cameraAtAxis.normVec();
                        F32 z_dist = -1.f * (mCenterToCam * cameraAtAxis);
@@ -1165,8 +1164,8 @@ BOOL LLManipRotate::updateVisiblity()
                        
                        if (mCenterToCamMag > 0.001f)
                        {
-                                F32 fraction_of_fov = RADIUS_PIXELS / (F32) gCamera->getViewHeightInPixels();
+                                F32 fraction_of_fov = RADIUS_PIXELS / (F32) LLViewerCamera::getInstance()->getViewHeightInPixels();
-                                F32 apparent_angle = fraction_of_fov * gCamera->getView();  // radians
+                                F32 apparent_angle = fraction_of_fov * LLViewerCamera::getInstance()->getView();  // radians
                                mRadiusMeters = z_dist * tan(apparent_angle);
                                mCenterToProfilePlaneMag = mRadiusMeters * mRadiusMeters / mCenterToCamMag;
@@ -1274,7 +1273,7 @@ LLVector3 LLManipRotate::getConstraintAxis()
                LLVector3 grid_scale;
                LLQuaternion grid_rotation;
-                gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+                LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rotation, grid_scale);
                LLSelectNode* first_node = mObjectSelection->getFirstMoveableNode(TRUE);
                if (first_node)
@@ -1301,7 +1300,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
        LLVector3 grid_scale;
        LLQuaternion grid_rotation;
-        gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+        LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rotation, grid_scale);
        LLVector3 axis1;
        LLVector3 axis2;
@@ -1311,7 +1310,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
        {
                test_axis = test_axis * ~grid_rotation;
        }
-        else if (gSelectMgr->getGridMode() == GRID_MODE_REF_OBJECT)
+        else if (LLSelectMgr::getInstance()->getGridMode() == GRID_MODE_REF_OBJECT)
        {
                test_axis = test_axis * ~grid_rotation;
        }
@@ -1335,7 +1334,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
        {
                axis1 = axis1 * grid_rotation;
        }
-        else if (gSelectMgr->getGridMode() == GRID_MODE_REF_OBJECT)
+        else if (LLSelectMgr::getInstance()->getGridMode() == GRID_MODE_REF_OBJECT)
        {
                axis1 = axis1 * grid_rotation;
        }
@@ -1651,7 +1650,7 @@ LLVector3 LLManipRotate::intersectRayWithSphere( const LLVector3& ray_pt, const
 //static
 void LLManipRotate::mouseToRay( S32 x, S32 y, LLVector3* ray_pt, LLVector3* ray_dir )
 {
-        if (gSelectMgr->getSelection()->getSelectType() == SELECT_TYPE_HUD)
+        if (LLSelectMgr::getInstance()->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;
@@ -1662,7 +1661,7 @@ void LLManipRotate::mouseToRay( S32 x, S32 y, LLVector3* ray_pt, LLVector3* ray_
        else
        {
                *ray_pt = gAgent.getCameraPositionAgent();
-                gCamera->projectScreenToPosAgent(x, y, ray_dir);
+                LLViewerCamera::getInstance()->projectScreenToPosAgent(x, y, ray_dir);
                *ray_dir -= *ray_pt;
                ray_dir->normVec();
        }
@@ -1672,7 +1671,7 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y )
 {
        mHighlightedPart = LL_NO_PART;
-        //LLBBox bbox = gSelectMgr->getBBoxOfSelection();
+        //LLBBox bbox = LLSelectMgr::getInstance()->getBBoxOfSelection();
        LLViewerObject *first_object = mObjectSelection->getFirstMoveableObject(TRUE);
        
        if (!first_object)
@@ -1691,7 +1690,7 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y )
        LLVector3 grid_scale;
        LLQuaternion grid_rotation;
-        gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+        LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rotation, grid_scale);
        LLVector3 rot_x_axis = LLVector3::x_axis * grid_rotation;
        LLVector3 rot_y_axis = LLVector3::y_axis * grid_rotation;
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index 883c3d7..86bfba9 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -159,9 +159,9 @@ inline void LLManipScale::conditionalHighlight( U32 part, const LLColor4* highli
 void LLManipScale::handleSelect()
 {
-        LLBBox bbox = gSelectMgr->getBBoxOfSelection();
+        LLBBox bbox = LLSelectMgr::getInstance()->getBBoxOfSelection();
        updateSnapGuides(bbox);
-        gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+        LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
        gFloaterTools->setStatusText("scale");
        LLManip::handleSelect();
 }
@@ -226,13 +226,13 @@ void LLManipScale::render()
                const F32 BOX_HANDLE_BASE_SIZE          = 50.0f;   // box size in pixels = BOX_HANDLE_BASE_SIZE * BOX_HANDLE_BASE_FACTOR
                const F32 BOX_HANDLE_BASE_FACTOR        = 0.2f;
                
-                LLVector3 center_agent = gAgent.getPosAgentFromGlobal(gSelectMgr->getSelectionCenterGlobal());
+                LLVector3 center_agent = gAgent.getPosAgentFromGlobal(LLSelectMgr::getInstance()->getSelectionCenterGlobal());
                F32 range;
                F32 range_from_agent;
                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                {
-                        mBoxHandleSize = BOX_HANDLE_BASE_SIZE * BOX_HANDLE_BASE_FACTOR / (F32) gCamera->getViewHeightInPixels();
+                        mBoxHandleSize = BOX_HANDLE_BASE_SIZE * BOX_HANDLE_BASE_FACTOR / (F32) LLViewerCamera::getInstance()->getViewHeightInPixels();
                        mBoxHandleSize /= gAgent.getAvatarObject()->mHUDCurZoom;
                }
                else
@@ -253,8 +253,8 @@ void LLManipScale::render()
                        if (range > 0.001f)
                        {
                                // range != zero
-                                F32 fraction_of_fov = BOX_HANDLE_BASE_SIZE / (F32) gCamera->getViewHeightInPixels();
+                                F32 fraction_of_fov = BOX_HANDLE_BASE_SIZE / (F32) LLViewerCamera::getInstance()->getViewHeightInPixels();
-                                F32 apparent_angle = fraction_of_fov * gCamera->getView();  // radians
+                                F32 apparent_angle = fraction_of_fov * LLViewerCamera::getInstance()->getView();  // radians
                                mBoxHandleSize = range * tan(apparent_angle) * BOX_HANDLE_BASE_FACTOR;
                        }
                        else
@@ -267,7 +267,7 @@ void LLManipScale::render()
                ////////////////////////////////////////////////////////////////////////
                // Draw bounding box
-                LLBBox bbox = gSelectMgr->getBBoxOfSelection();
+                LLBBox bbox = LLSelectMgr::getInstance()->getBBoxOfSelection();
                LLVector3 pos_agent = bbox.getPositionAgent();
                LLQuaternion rot = bbox.getRotation();
@@ -338,10 +338,10 @@ BOOL LLManipScale::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
        highlightManipulators(x, y);
        S32 hit_part = mHighlightedPart;
-        gSelectMgr->enableSilhouette(FALSE);
+        LLSelectMgr::getInstance()->enableSilhouette(FALSE);
        mManipPart = (EManipPart)hit_part;
-        LLBBox bbox = gSelectMgr->getBBoxOfSelection();
+        LLBBox bbox = LLSelectMgr::getInstance()->getBBoxOfSelection();
        LLVector3 box_center_agent = bbox.getCenterAgent();
        LLVector3 box_corner_agent = bbox.localToAgent( unitVectorToLocalBBoxExtent( partToUnitVector( mManipPart ), bbox ) );
        
@@ -354,7 +354,7 @@ BOOL LLManipScale::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
        mDragPointGlobal = mDragStartPointGlobal;
        // we just started a drag, so save initial object positions, orientations, and scales
-        gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_SCALE);
+        LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_SCALE);
        // Route future Mouse messages here preemptively.  (Release on mouse up.)
        setMouseCapture( TRUE );
@@ -384,16 +384,16 @@ BOOL LLManipScale::handleMouseUp(S32 x, S32 y, MASK mask)
                }
                
                //send texture update
-                gSelectMgr->adjustTexturesByScale(TRUE, getStretchTextures());
+                LLSelectMgr::getInstance()->adjustTexturesByScale(TRUE, getStretchTextures());
                
-                gSelectMgr->enableSilhouette(TRUE);
+                LLSelectMgr::getInstance()->enableSilhouette(TRUE);
                mManipPart = LL_NO_PART;
                // Might have missed last update due to UPDATE_DELAY timing
-                gSelectMgr->sendMultipleUpdate( mLastUpdateFlags );
+                LLSelectMgr::getInstance()->sendMultipleUpdate( mLastUpdateFlags );
                
                //gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
-                gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+                LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
        }
        return LLManip::handleMouseUp(x, y, mask);
 }
@@ -422,7 +422,7 @@ BOOL LLManipScale::handleHover(S32 x, S32 y, MASK mask)
        }
        
        // Patch up textures, if possible.
-        gSelectMgr->adjustTexturesByScale(FALSE, getStretchTextures());
+        LLSelectMgr::getInstance()->adjustTexturesByScale(FALSE, getStretchTextures());
        gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLSCALE);
        return TRUE;
@@ -434,7 +434,7 @@ void LLManipScale::highlightManipulators(S32 x, S32 y)
        // If we have something selected, try to hit its manipulator handles.
        // Don't do this with nothing selected, as it kills the framerate.
-        LLBBox bbox = gSelectMgr->getBBoxOfSelection();
+        LLBBox bbox = LLSelectMgr::getInstance()->getBBoxOfSelection();
        if( canAffectSelection() )
        {
@@ -447,15 +447,15 @@ void LLManipScale::highlightManipulators(S32 x, S32 y)
                        transform *= cfr;
                        LLMatrix4 window_scale;
                        F32 zoom_level = 2.f * gAgent.getAvatarObject()->mHUDCurZoom;
-                        window_scale.initAll(LLVector3(zoom_level / gCamera->getAspect(), zoom_level, 0.f),
+                        window_scale.initAll(LLVector3(zoom_level / LLViewerCamera::getInstance()->getAspect(), zoom_level, 0.f),
                                LLQuaternion::DEFAULT,
                                LLVector3::zero);
                        transform *= window_scale;
                }
                else
                {
-                        LLMatrix4 projMatrix = gCamera->getProjection();
+                        LLMatrix4 projMatrix = LLViewerCamera::getInstance()->getProjection();
-                        LLMatrix4 modelView = gCamera->getModelview();
+                        LLMatrix4 modelView = LLViewerCamera::getInstance()->getModelview();
                        transform.initAll(LLVector3(1.f, 1.f, 1.f), bbox.getRotation(), bbox.getPositionAgent());
                        
                        transform *= modelView;
@@ -819,8 +819,8 @@ void LLManipScale::drag( S32 x, S32 y )
        }
        
        // store changes to override updates
-        for (LLObjectSelection::iterator iter = gSelectMgr->getSelection()->begin();
+        for (LLObjectSelection::iterator iter = LLSelectMgr::getInstance()->getSelection()->begin();
-                 iter != gSelectMgr->getSelection()->end(); iter++)
+                 iter != LLSelectMgr::getInstance()->getSelection()->end(); iter++)
        {
                LLSelectNode* selectNode = *iter;
                LLViewerObject*cur = selectNode->getObject();
@@ -831,14 +831,14 @@ void LLManipScale::drag( S32 x, S32 y )
                }
        }       
-        gSelectMgr->updateSelectionCenter();
+        LLSelectMgr::getInstance()->updateSelectionCenter();
    gAgent.clearFocusObject();
 }
 // Scale around the 
 void LLManipScale::dragCorner( S32 x, S32 y )
 {
-        LLBBox bbox     = gSelectMgr->getBBoxOfSelection();
+        LLBBox bbox     = LLSelectMgr::getInstance()->getBBoxOfSelection();
        // Suppress scale if mouse hasn't moved.
        if (x == mLastMouseX && y == mLastMouseY)
@@ -962,8 +962,8 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                mInSnapRegime = FALSE;
        }
-        F32 max_scale_factor = MAX_OBJECT_SCALE / MIN_OBJECT_SCALE;
+        F32 max_scale_factor = DEFAULT_MAX_PRIM_SCALE / MIN_PRIM_SCALE;
-        F32 min_scale_factor = MIN_OBJECT_SCALE / MAX_OBJECT_SCALE;
+        F32 min_scale_factor = MIN_PRIM_SCALE / DEFAULT_MAX_PRIM_SCALE;
        // find max and min scale factors that will make biggest object hit max absolute scale and smallest object hit min absolute scale
        for (LLObjectSelection::iterator iter = mObjectSelection->begin();
@@ -975,10 +975,10 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                {
                        const LLVector3& scale = selectNode->mSavedScale;
-                        F32 cur_max_scale_factor = llmin( MAX_OBJECT_SCALE / scale.mV[VX], MAX_OBJECT_SCALE / scale.mV[VY], MAX_OBJECT_SCALE / scale.mV[VZ] );
+                        F32 cur_max_scale_factor = llmin( DEFAULT_MAX_PRIM_SCALE / scale.mV[VX], DEFAULT_MAX_PRIM_SCALE / scale.mV[VY], DEFAULT_MAX_PRIM_SCALE / scale.mV[VZ] );
                        max_scale_factor = llmin( max_scale_factor, cur_max_scale_factor );
-                        F32 cur_min_scale_factor = llmax( MIN_OBJECT_SCALE / scale.mV[VX], MIN_OBJECT_SCALE / scale.mV[VY], MIN_OBJECT_SCALE / scale.mV[VZ] );
+                        F32 cur_min_scale_factor = llmax( MIN_PRIM_SCALE / scale.mV[VX], MIN_PRIM_SCALE / scale.mV[VY], MIN_PRIM_SCALE / scale.mV[VZ] );
                        min_scale_factor = llmax( min_scale_factor, cur_min_scale_factor );
                }
        }
@@ -1003,7 +1003,7 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                        LLVector3d new_pos_global = drag_global + (selectNode->mSavedPositionGlobal - drag_global) * scale_factor;
                        if (!cur->isAttachment())
                        {
-                                new_pos_global = gWorldp->clipToVisibleRegions(selectNode->mSavedPositionGlobal, new_pos_global);
+                                new_pos_global = LLWorld::getInstance()->clipToVisibleRegions(selectNode->mSavedPositionGlobal, new_pos_global);
                        }
                        cur->setPositionAbsoluteGlobal( new_pos_global );
                        rebuild(cur);
@@ -1081,7 +1081,7 @@ void LLManipScale::dragFace( S32 x, S32 y )
        LLVector3 drag_start_dir_f;
        drag_start_dir_f.setVec(drag_start_dir_d);
-        LLBBox bbox     = gSelectMgr->getBBoxOfSelection();
+        LLBBox bbox     = LLSelectMgr::getInstance()->getBBoxOfSelection();
        F32 s = 0;
        F32 t = 0;
@@ -1224,7 +1224,7 @@ void LLManipScale::sendUpdates( BOOL send_position_update, BOOL send_scale_updat
                // enforce minimum update delay and don't stream updates on sub-object selections
                if( elapsed_time > UPDATE_DELAY && !gSavedSettings.getBOOL("EditLinkedParts") )
                {
-                        gSelectMgr->sendMultipleUpdate( update_flags );
+                        LLSelectMgr::getInstance()->sendMultipleUpdate( update_flags );
                        update_timer.reset();
                        mSendUpdateOnMouseUp = FALSE;
                }
@@ -1270,7 +1270,7 @@ void LLManipScale::stretchFace( const LLVector3& drag_start_agent, const LLVecto
                        F32 denom = axis * dir_local;
                        F32 desired_delta_size  = is_approx_zero(denom) ? 0.f : (delta_local_mag / denom);  // in meters
-                        F32 desired_scale               = llclamp(selectNode->mSavedScale.mV[axis_index] + desired_delta_size, MIN_OBJECT_SCALE, MAX_OBJECT_SCALE);
+                        F32 desired_scale               = llclamp(selectNode->mSavedScale.mV[axis_index] + desired_delta_size, MIN_PRIM_SCALE, DEFAULT_MAX_PRIM_SCALE);
                        // propagate scale constraint back to position offset
                        desired_delta_size              = desired_scale - selectNode->mSavedScale.mV[axis_index]; // propagate constraint back to position
@@ -1288,7 +1288,7 @@ void LLManipScale::stretchFace( const LLVector3& drag_start_agent, const LLVecto
                                if (cur->isRootEdit() && !cur->isAttachment())
                                {
-                                        LLVector3d new_pos_global = gWorldp->clipToVisibleRegions(selectNode->mSavedPositionGlobal, selectNode->mSavedPositionGlobal + delta_pos_global);
+                                        LLVector3d new_pos_global = LLWorld::getInstance()->clipToVisibleRegions(selectNode->mSavedPositionGlobal, selectNode->mSavedPositionGlobal + delta_pos_global);
                                        cur->setPositionGlobal( new_pos_global );
                                }
                                else
@@ -1340,7 +1340,7 @@ void LLManipScale::renderGuidelinesPart( const LLBBox& bbox )
        guideline_end -= guideline_start;
        guideline_end.normVec();
-        guideline_end *= gWorldPointer->getRegionWidthInMeters();
+        guideline_end *= LLWorld::getInstance()->getRegionWidthInMeters();
        guideline_end += guideline_start;
        {
@@ -1358,7 +1358,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
        LLVector3 grid_origin;
        LLVector3 grid_scale;
        LLQuaternion grid_rotation;
-        gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+        LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rotation, grid_scale);
        LLVector3 box_corner_agent = bbox.localToAgent(unitVectorToLocalBBoxExtent( partToUnitVector( mManipPart ), bbox ));
        mScaleCenter = getUniform() ? bbox.getCenterAgent() : bbox.localToAgent(unitVectorToLocalBBoxExtent( -1.f * partToUnitVector( mManipPart ), bbox ));
@@ -1372,8 +1372,8 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
        }
        else
        {
-                F32 object_distance = dist_vec(mScaleCenter, gCamera->getOrigin());
+                F32 object_distance = dist_vec(mScaleCenter, LLViewerCamera::getInstance()->getOrigin());
-                mSnapRegimeOffset = (SNAP_GUIDE_SCREEN_OFFSET * gViewerWindow->getWindowWidth() * object_distance) / gCamera->getPixelMeterRatio();
+                mSnapRegimeOffset = (SNAP_GUIDE_SCREEN_OFFSET * gViewerWindow->getWindowWidth() * object_distance) / LLViewerCamera::getInstance()->getPixelMeterRatio();
        }
        LLVector3 cam_at_axis;
        F32 snap_guide_length;
@@ -1384,9 +1384,9 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
        }
        else
        {
-                cam_at_axis = gCamera->getAtAxis();
+                cam_at_axis = LLViewerCamera::getInstance()->getAtAxis();
-                F32 manipulator_distance = dist_vec(box_corner_agent, gCamera->getOrigin());
+                F32 manipulator_distance = dist_vec(box_corner_agent, LLViewerCamera::getInstance()->getOrigin());
-                snap_guide_length = (SNAP_GUIDE_SCREEN_LENGTH * gViewerWindow->getWindowWidth() * manipulator_distance) / gCamera->getPixelMeterRatio();
+                snap_guide_length = (SNAP_GUIDE_SCREEN_LENGTH * gViewerWindow->getWindowWidth() * manipulator_distance) / LLViewerCamera::getInstance()->getPixelMeterRatio();
        }
        
        mSnapGuideLength = snap_guide_length / llmax(0.1f, (llmin(mSnapGuideDir1 * cam_at_axis, mSnapGuideDir2 * cam_at_axis)));
@@ -1415,7 +1415,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
                LLVector3 scale_snap = grid_scale;
                mScaleSnapUnit1 = scale_snap.scaleVec(partToUnitVector( mManipPart )).magVec();
                mScaleSnapUnit2 = mScaleSnapUnit1;
-                mSnapGuideDir1 *= mSnapGuideDir1 * gCamera->getUpAxis() > 0.f ? 1.f : -1.f;
+                mSnapGuideDir1 *= mSnapGuideDir1 * LLViewerCamera::getInstance()->getUpAxis() > 0.f ? 1.f : -1.f;
                mSnapGuideDir2 = mSnapGuideDir1 * -1.f;
                mSnapDir1 = mScaleDir;
                mSnapDir2 = mScaleDir;
@@ -1430,7 +1430,7 @@ void LLManipScale::updateSnapGuides(const LLBBox& bbox)
                }
                else
                {
-                        local_camera_dir = (gCamera->getOrigin() - bbox.getCenterAgent()) * ~bbox.getRotation();
+                        local_camera_dir = (LLViewerCamera::getInstance()->getOrigin() - bbox.getCenterAgent()) * ~bbox.getRotation();
                        local_camera_dir.normVec();
                }
                local_scale_dir -= projected_vec(local_scale_dir, local_camera_dir);
@@ -1622,7 +1622,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
                        gGL.end();
                }
        
-                LLVector2 screen_translate_axis(llabs(mScaleDir * gCamera->getLeftAxis()), llabs(mScaleDir * gCamera->getUpAxis()));
+                LLVector2 screen_translate_axis(llabs(mScaleDir * LLViewerCamera::getInstance()->getLeftAxis()), llabs(mScaleDir * LLViewerCamera::getInstance()->getUpAxis()));
                screen_translate_axis.normVec();
                S32 tick_label_spacing = llround(screen_translate_axis * sTickLabelSpacing);
@@ -1728,7 +1728,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
                                LLVector3 text_origin = tick_pos + 
                                        (mSnapGuideDir1 * mSnapRegimeOffset * (1.f + tick_scale));
-                                EGridMode grid_mode = gSelectMgr->getGridMode();
+                                EGridMode grid_mode = LLSelectMgr::getInstance()->getGridMode();
                                F32 tick_val;
                                if (grid_mode == GRID_MODE_WORLD)
                                {
@@ -1780,7 +1780,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
                                        LLVector3 text_origin = tick_pos + 
                                                (mSnapGuideDir2 * mSnapRegimeOffset * (1.f + tick_scale));
-                                        EGridMode grid_mode = gSelectMgr->getGridMode();
+                                        EGridMode grid_mode = LLSelectMgr::getInstance()->getGridMode();
                                        F32 tick_val;
                                        if (grid_mode == GRID_MODE_WORLD)
                                        {
@@ -1814,10 +1814,10 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
                {
                        if (mHelpTextTimer.getElapsedTimeF32() < sHelpTextVisibleTime + sHelpTextFadeTime && sNumTimesHelpTextShown < sMaxTimesShowHelpText)
                        {
-                                LLVector3 selection_center_start = gSelectMgr->getSavedBBoxOfSelection().getCenterAgent();
+                                LLVector3 selection_center_start = LLSelectMgr::getInstance()->getSavedBBoxOfSelection().getCenterAgent();
                                LLVector3 offset_dir;
-                                if (mSnapGuideDir1 * gCamera->getAtAxis() > mSnapGuideDir2 * gCamera->getAtAxis())
+                                if (mSnapGuideDir1 * LLViewerCamera::getInstance()->getAtAxis() > mSnapGuideDir2 * LLViewerCamera::getInstance()->getAtAxis())
                                {
                                        offset_dir = mSnapGuideDir2;
                                }
@@ -1834,7 +1834,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
                                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, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
                                help_text = "to snap to grid";
-                                help_text_pos -= gCamera->getUpAxis() * mSnapRegimeOffset * 0.4f;
+                                help_text_pos -= LLViewerCamera::getInstance()->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, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
                        }
                }
@@ -1968,7 +1968,7 @@ F32		LLManipScale::partToMaxScale( S32 part, const LLBBox &bbox ) const
                        max_extent = bbox_extents.mV[i];
                }
        }
-        max_scale_factor = bbox_extents.magVec() * MAX_OBJECT_SCALE / max_extent;
+        max_scale_factor = bbox_extents.magVec() * DEFAULT_MAX_PRIM_SCALE / max_extent;
        if (getUniform())
        {
@@ -1983,7 +1983,7 @@ F32		LLManipScale::partToMinScale( S32 part, const LLBBox &bbox ) const
 {
        LLVector3 bbox_extents = unitVectorToLocalBBoxExtent( partToUnitVector( part ), bbox );
        bbox_extents.abs();
-        F32 min_extent = MAX_OBJECT_SCALE;
+        F32 min_extent = DEFAULT_MAX_PRIM_SCALE;
        for (U32 i = VX; i <= VZ; i++)
        {
                if (bbox_extents.mV[i] > 0.f && bbox_extents.mV[i] < min_extent)
@@ -1991,7 +1991,7 @@ F32		LLManipScale::partToMinScale( S32 part, const LLBBox &bbox ) const
                        min_extent = bbox_extents.mV[i];
                }
        }
-        F32 min_scale_factor = bbox_extents.magVec() * MIN_OBJECT_SCALE / min_extent;
+        F32 min_scale_factor = bbox_extents.magVec() * MIN_PRIM_SCALE / min_extent;
        if (getUniform())
        {
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index c1457b3..7d729a6 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -53,7 +53,7 @@
 #include "llhudrender.h"
 #include "llresmgr.h"
 #include "llselectmgr.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llstatusbar.h"
 #include "lltoolmgr.h"
 #include "llviewercamera.h"
@@ -252,7 +252,7 @@ LLManipTranslate::~LLManipTranslate()
 void LLManipTranslate::handleSelect()
 {
-        gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+        LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
        gFloaterTools->setStatusText("move");
        LLManip::handleSelect();
 }
@@ -309,12 +309,12 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
        mHelpTextTimer.reset();
        sNumTimesHelpTextShown++;
-        gSelectMgr->getGrid(mGridOrigin, mGridRotation, mGridScale);
+        LLSelectMgr::getInstance()->getGrid(mGridOrigin, mGridRotation, mGridScale);
-        gSelectMgr->enableSilhouette(FALSE);
+        LLSelectMgr::getInstance()->enableSilhouette(FALSE);
        // we just started a drag, so save initial object positions
-        gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_MOVE);
+        LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_MOVE);
        mManipPart = (EManipPart)hit_part;
        mMouseDownX = x;
@@ -345,7 +345,7 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
        BOOL axis_exists = getManipAxis(selected_object, mManipPart, axis);
        getManipNormal(selected_object, mManipPart, mManipNormal);
-        //LLVector3 select_center_agent = gAgent.getPosAgentFromGlobal(gSelectMgr->getSelectionCenterGlobal());
+        //LLVector3 select_center_agent = gAgent.getPosAgentFromGlobal(LLSelectMgr::getInstance()->getSelectionCenterGlobal());
        // TomY: The above should (?) be identical to the below
        LLVector3 select_center_agent = getPivotPoint();
        mSubdivisions = llclamp(getSubdivisionLevel(select_center_agent, axis_exists ? axis : LLVector3::z_axis, getMinGridScale()), sGridMinSubdivisionLevel, sGridMaxSubdivisionLevel);
@@ -354,7 +354,7 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
        if (mManipPart >= LL_YZ_PLANE && mManipPart <= LL_XY_PLANE)
        {
                LLCoordGL mouse_pos;
-                if (!gCamera->projectPosAgentToScreen(select_center_agent, mouse_pos))
+                if (!LLViewerCamera::getInstance()->projectPosAgentToScreen(select_center_agent, mouse_pos))
                {
                        // mouse_pos may be nonsense
                        llwarns << "Failed to project object center to screen" << llendl;
@@ -367,7 +367,7 @@ BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
                }
        }
-        gSelectMgr->updateSelectionCenter();
+        LLSelectMgr::getInstance()->updateSelectionCenter();
        LLVector3d object_start_global = gAgent.getPosGlobalFromAgent(getPivotPoint());
        getMousePointOnPlaneGlobal(mDragCursorStartGlobal, x, y, object_start_global, mManipNormal);
        mDragSelectionStartGlobal = object_start_global;
@@ -445,7 +445,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                        if (mask == MASK_COPY)
                        {
                                // ...we're trying to make a copy
-                                gSelectMgr->selectDuplicate(LLVector3::zero, FALSE);
+                                LLSelectMgr::getInstance()->selectDuplicate(LLVector3::zero, FALSE);
                                mCopyMadeThisDrag = TRUE;
                                // When we make the copy, we don't want to do any other processing.
@@ -487,7 +487,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
        axis_d.setVec(axis_f);
-        gSelectMgr->updateSelectionCenter();
+        LLSelectMgr::getInstance()->updateSelectionCenter();
        LLVector3d current_pos_global = gAgent.getPosGlobalFromAgent(getPivotPoint());
        mSubdivisions = llclamp(getSubdivisionLevel(getPivotPoint(), axis_f, getMinGridScale()), sGridMinSubdivisionLevel, sGridMaxSubdivisionLevel);
@@ -558,7 +558,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                        // snap to planar grid
                        LLVector3 cursor_point_agent = gAgent.getPosAgentFromGlobal(cursor_point_global);
-                        LLVector3 camera_plane_projection = gCamera->getAtAxis();
+                        LLVector3 camera_plane_projection = LLViewerCamera::getInstance()->getAtAxis();
                        camera_plane_projection -= projected_vec(camera_plane_projection, mManipNormal);
                        camera_plane_projection.normVec();
                        LLVector3 camera_projected_dir = camera_plane_projection;
@@ -709,7 +709,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                                LLVector3d new_position_global = selectNode->mSavedPositionGlobal + clamped_relative_move;
                                // Don't let object centers go too far underground
-                                F64 min_height = gWorldp->getMinAllowedZ(object);
+                                F64 min_height = LLWorld::getInstance()->getMinAllowedZ(object);
                                if (new_position_global.mdV[VZ] < min_height)
                                {
                                        new_position_global.mdV[VZ] = min_height;
@@ -724,12 +724,12 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                                // Grass is always drawn on the ground, so clamp its position to the ground
                                if (object->getPCode() == LL_PCODE_LEGACY_GRASS)
                                {
-                                        new_position_global.mdV[VZ] = gWorldp->resolveLandHeightGlobal(new_position_global) + 1.f;
+                                        new_position_global.mdV[VZ] = LLWorld::getInstance()->resolveLandHeightGlobal(new_position_global) + 1.f;
                                }
                                
                                if (object->isRootEdit())
                                {
-                                        new_position_global = gWorldp->clipToVisibleRegions(object->getPositionGlobal(), new_position_global);
+                                        new_position_global = LLWorld::getInstance()->clipToVisibleRegions(object->getPositionGlobal(), new_position_global);
                                }
                                // PR: Only update if changed
@@ -776,7 +776,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                }
        }
-        gSelectMgr->updateSelectionCenter();
+        LLSelectMgr::getInstance()->updateSelectionCenter();
        gAgent.clearFocusObject();
        dialog_refresh_all();           // ??? is this necessary?
@@ -794,9 +794,9 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
                return;
        }
        
-        //LLBBox bbox = gSelectMgr->getBBoxOfSelection();
+        //LLBBox bbox = LLSelectMgr::getInstance()->getBBoxOfSelection();
-        LLMatrix4 projMatrix = gCamera->getProjection();
+        LLMatrix4 projMatrix = LLViewerCamera::getInstance()->getProjection();
-        LLMatrix4 modelView = gCamera->getModelview();
+        LLMatrix4 modelView = LLViewerCamera::getInstance()->getModelview();
        LLVector3 object_position = getPivotPoint();
        
@@ -804,7 +804,7 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
        LLVector3 grid_scale;
        LLQuaternion grid_rotation;
-        gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+        LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rotation, grid_scale);
        LLVector3 relative_camera_dir;
@@ -819,14 +819,14 @@ void LLManipTranslate::highlightManipulators(S32 x, S32 y)
                transform *= cfr;
                LLMatrix4 window_scale;
                F32 zoom_level = 2.f * gAgent.getAvatarObject()->mHUDCurZoom;
-                window_scale.initAll(LLVector3(zoom_level / gCamera->getAspect(), zoom_level, 0.f),
+                window_scale.initAll(LLVector3(zoom_level / LLViewerCamera::getInstance()->getAspect(), zoom_level, 0.f),
                        LLQuaternion::DEFAULT,
                        LLVector3::zero);
                transform *= window_scale;
        }
        else
        {
-                relative_camera_dir = (object_position - gCamera->getOrigin()) * ~grid_rotation;
+                relative_camera_dir = (object_position - LLViewerCamera::getInstance()->getOrigin()) * ~grid_rotation;
                relative_camera_dir.normVec();
                transform.initRotTrans(grid_rotation, LLVector4(object_position));
@@ -1036,13 +1036,13 @@ BOOL LLManipTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
        {
                // make sure arrow colors go back to normal
                mManipPart = LL_NO_PART;
-                gSelectMgr->enableSilhouette(TRUE);
+                LLSelectMgr::getInstance()->enableSilhouette(TRUE);
                // Might have missed last update due to UPDATE_DELAY timing.
-                gSelectMgr->sendMultipleUpdate( UPD_POSITION );
+                LLSelectMgr::getInstance()->sendMultipleUpdate( UPD_POSITION );
                
                mInSnapRegime = FALSE;
-                gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+                LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
                //gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
        }
@@ -1105,8 +1105,8 @@ void LLManipTranslate::renderSnapGuides()
        LLVector3 grid_scale;
        LLQuaternion grid_rotation;
-        gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+        LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rotation, grid_scale);
-        LLVector3 saved_selection_center = getSavedPivotPoint(); //gSelectMgr->getSavedBBoxOfSelection().getCenterAgent();
+        LLVector3 saved_selection_center = getSavedPivotPoint(); //LLSelectMgr::getInstance()->getSavedBBoxOfSelection().getCenterAgent();
        LLVector3 selection_center = getPivotPoint();
        LLViewerObject *first_object = first_node->getObject();
@@ -1149,7 +1149,7 @@ void LLManipTranslate::renderSnapGuides()
                }
                else
                {
-                        at_axis_abs = saved_selection_center - gCamera->getOrigin();
+                        at_axis_abs = saved_selection_center - LLViewerCamera::getInstance()->getOrigin();
                        at_axis_abs.normVec();
                        at_axis_abs = at_axis_abs * ~grid_rotation;
@@ -1225,14 +1225,14 @@ void LLManipTranslate::renderSnapGuides()
                }
                else
                {
-                        LLVector3 cam_to_selection = getPivotPoint() - gCamera->getOrigin();
+                        LLVector3 cam_to_selection = getPivotPoint() - LLViewerCamera::getInstance()->getOrigin();
                        F32 current_range = cam_to_selection.normVec();
-                        guide_size_meters = SNAP_GUIDE_SCREEN_SIZE * gViewerWindow->getWindowHeight() * current_range / gCamera->getPixelMeterRatio();
+                        guide_size_meters = SNAP_GUIDE_SCREEN_SIZE * gViewerWindow->getWindowHeight() * current_range / LLViewerCamera::getInstance()->getPixelMeterRatio();
        
-                        F32 fraction_of_fov = mAxisArrowLength / (F32) gCamera->getViewHeightInPixels();
+                        F32 fraction_of_fov = mAxisArrowLength / (F32) LLViewerCamera::getInstance()->getViewHeightInPixels();
-                        F32 apparent_angle = fraction_of_fov * gCamera->getView();  // radians
+                        F32 apparent_angle = fraction_of_fov * LLViewerCamera::getInstance()->getView();  // radians
                        F32 offset_at_camera = tan(apparent_angle) * 1.5f;
-                        F32 range = dist_vec(gAgent.getPosAgentFromGlobal(first_node->mSavedPositionGlobal), gCamera->getOrigin());
+                        F32 range = dist_vec(gAgent.getPosAgentFromGlobal(first_node->mSavedPositionGlobal), LLViewerCamera::getInstance()->getOrigin());
                        mSnapOffsetMeters = range * offset_at_camera;
                }
@@ -1362,7 +1362,7 @@ void LLManipTranslate::renderSnapGuides()
                sub_div_offset = llround(fmod(dist_grid_axis - offset_nearest_grid_unit, getMinGridScale() * 32.f) / smallest_grid_unit_scale);
-                LLVector2 screen_translate_axis(llabs(translate_axis * gCamera->getLeftAxis()), llabs(translate_axis * gCamera->getUpAxis()));
+                LLVector2 screen_translate_axis(llabs(translate_axis * LLViewerCamera::getInstance()->getLeftAxis()), llabs(translate_axis * LLViewerCamera::getInstance()->getUpAxis()));
                screen_translate_axis.normVec();
                S32 tick_label_spacing = llround(screen_translate_axis * sTickLabelSpacing);
@@ -1387,7 +1387,7 @@ void LLManipTranslate::renderSnapGuides()
                        {
                                F32 snap_offset_meters;
-                                if (mSnapOffsetAxis * gCamera->getUpAxis() > 0.f)
+                                if (mSnapOffsetAxis * LLViewerCamera::getInstance()->getUpAxis() > 0.f)
                                {
                                        snap_offset_meters = mSnapOffsetMeters;                 
                                }
@@ -1401,7 +1401,7 @@ void LLManipTranslate::renderSnapGuides()
                                
                                LLVector3 tick_offset = (tick_pos - mGridOrigin) * ~mGridRotation;
                                F32 offset_val = 0.5f * tick_offset.mV[ARROW_TO_AXIS[mManipPart]] / getMinGridScale();
-                                EGridMode grid_mode = gSelectMgr->getGridMode();
+                                EGridMode grid_mode = LLSelectMgr::getInstance()->getGridMode();
                                F32 text_highlight = 0.8f;
                                if(i - llround(offset_nearest_grid_unit / smallest_grid_unit_scale) == 0 && mInSnapRegime)
                                {
@@ -1426,7 +1426,7 @@ void LLManipTranslate::renderSnapGuides()
                        if (mHelpTextTimer.getElapsedTimeF32() < sHelpTextVisibleTime + sHelpTextFadeTime && sNumTimesHelpTextShown < sMaxTimesShowHelpText)
                        {
                                F32 snap_offset_meters_up;
-                                if (mSnapOffsetAxis * gCamera->getUpAxis() > 0.f)
+                                if (mSnapOffsetAxis * LLViewerCamera::getInstance()->getUpAxis() > 0.f)
                                {
                                        snap_offset_meters_up = mSnapOffsetMeters;                      
                                }
@@ -1435,7 +1435,7 @@ void LLManipTranslate::renderSnapGuides()
                                        snap_offset_meters_up = -mSnapOffsetMeters;
                                }
-                                LLVector3 selection_center_start = getSavedPivotPoint();//gSelectMgr->getSavedBBoxOfSelection().getCenterAgent();
+                                LLVector3 selection_center_start = getSavedPivotPoint();//LLSelectMgr::getInstance()->getSavedBBoxOfSelection().getCenterAgent();
                                LLVector3 help_text_pos = selection_center_start + (snap_offset_meters_up * 3.f * mSnapOffsetAxis);
                                const LLFontGL* big_fontp = LLFontGL::sSansSerif;
@@ -1445,7 +1445,7 @@ void LLManipTranslate::renderSnapGuides()
                                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, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
                                help_text = "to snap to grid";
-                                help_text_pos -= gCamera->getUpAxis() * mSnapOffsetMeters * 0.2f;
+                                help_text_pos -= LLViewerCamera::getInstance()->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, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
                        }
                }
@@ -1655,7 +1655,7 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal,
                //setup clip plane
                normal = normal * grid_rotation;
-                if (normal * (gCamera->getOrigin()-selection_center) < 0)
+                if (normal * (LLViewerCamera::getInstance()->getOrigin()-selection_center) < 0)
                {
                        normal = -normal;
                }
@@ -1756,7 +1756,7 @@ void LLManipTranslate::renderTranslationHandles()
        LLQuaternion grid_rotation;
        LLGLDepthTest gls_depth(GL_FALSE);
        
-        gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+        LLSelectMgr::getInstance()->getGrid(grid_origin, grid_rotation, grid_scale);
        LLVector3 at_axis;
        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
        {
@@ -1764,7 +1764,7 @@ void LLManipTranslate::renderTranslationHandles()
        }
        else
        {
-                at_axis = gCamera->getAtAxis() * ~grid_rotation;
+                at_axis = LLViewerCamera::getInstance()->getAtAxis() * ~grid_rotation;
        }
        if (at_axis.mV[VX] > 0.f)
@@ -1823,8 +1823,8 @@ void LLManipTranslate::renderTranslationHandles()
                if (range > 0.001f)
                {
                        // range != zero
-                        F32 fraction_of_fov = mAxisArrowLength / (F32) gCamera->getViewHeightInPixels();
+                        F32 fraction_of_fov = mAxisArrowLength / (F32) LLViewerCamera::getInstance()->getViewHeightInPixels();
-                        F32 apparent_angle = fraction_of_fov * gCamera->getView();  // radians
+                        F32 apparent_angle = fraction_of_fov * LLViewerCamera::getInstance()->getView();  // radians
                        mArrowLengthMeters = range * tan(apparent_angle);
                }
                else
@@ -1859,7 +1859,7 @@ void LLManipTranslate::renderTranslationHandles()
                }
                else
                {
-                        relative_camera_dir = (selection_center - gCamera->getOrigin()) * invRotation;
+                        relative_camera_dir = (selection_center - LLViewerCamera::getInstance()->getOrigin()) * invRotation;
                }
                relative_camera_dir.normVec();
diff --git a/linden/indra/newview/llmapresponders.cpp b/linden/indra/newview/llmapresponders.cpp
index eba890b..d16bc78 100644
--- a/linden/indra/newview/llmapresponders.cpp
+++ b/linden/indra/newview/llmapresponders.cpp
@@ -45,7 +45,7 @@ void LLMapLayerResponder::result(const LLSD& result)
        S32 agent_flags = result["AgentData"]["Flags"];
        
-        if (agent_flags != gWorldMap->mCurrentMap)
+        if (agent_flags != LLWorldMap::getInstance()->mCurrentMap)
        {
                llwarns << "Invalid or out of date map image type returned!" << llendl;
                return;
@@ -54,7 +54,7 @@ void LLMapLayerResponder::result(const LLSD& result)
        LLUUID image_id;
        //U32 left, right, top, bottom;
-        gWorldMap->mMapLayers[agent_flags].clear();
+        LLWorldMap::getInstance()->mMapLayers[agent_flags].clear();
        LLSD::array_const_iterator iter;
        BOOL adjust = FALSE;
@@ -76,14 +76,14 @@ void LLMapLayerResponder::result(const LLSD& result)
                F32 x_meters = F32(new_layer.LayerExtents.mLeft*REGION_WIDTH_UNITS);
                F32 y_meters = F32(new_layer.LayerExtents.mBottom*REGION_WIDTH_UNITS);
-                adjust = gWorldMap->extendAABB(U32(x_meters), U32(y_meters), 
+                adjust = LLWorldMap::getInstance()->extendAABB(U32(x_meters), U32(y_meters), 
                                                           U32(x_meters+REGION_WIDTH_UNITS*new_layer.LayerExtents.getWidth()),
                                                           U32(y_meters+REGION_WIDTH_UNITS*new_layer.LayerExtents.getHeight())) || adjust;
-                gWorldMap->mMapLayers[agent_flags].push_back(new_layer);
+                LLWorldMap::getInstance()->mMapLayers[agent_flags].push_back(new_layer);
        }
-        gWorldMap->mMapLoaded[agent_flags] = TRUE;
+        LLWorldMap::getInstance()->mMapLoaded[agent_flags] = TRUE;
        if(adjust) gFloaterWorldMap->adjustZoomSliderBounds();
        
        /*
@@ -121,21 +121,21 @@ void LLMapLayerResponder::result(const LLSD& result)
                        if (access == 255)
                        {
                                // This region doesn't exist
-                                if (gWorldMap->mIsTrackingUnknownLocation &&
+                                if (LLWorldMap::getInstance()->mIsTrackingUnknownLocation &&
-                                        gWorldMap->mUnknownLocation.mdV[0] >= x_meters &&
+                                        LLWorldMap::getInstance()->mUnknownLocation.mdV[0] >= x_meters &&
-                                        gWorldMap->mUnknownLocation.mdV[0] < x_meters + 256 &&
+                                        LLWorldMap::getInstance()->mUnknownLocation.mdV[0] < x_meters + 256 &&
-                                        gWorldMap->mUnknownLocation.mdV[1] >= y_meters &&
+                                        LLWorldMap::getInstance()->mUnknownLocation.mdV[1] >= y_meters &&
-                                        gWorldMap->mUnknownLocation.mdV[1] < y_meters + 256)
+                                        LLWorldMap::getInstance()->mUnknownLocation.mdV[1] < y_meters + 256)
                                {
                                        // We were tracking this location, but it doesn't exist
-                                        gWorldMap->mInvalidLocation = TRUE;
+                                        LLWorldMap::getInstance()->mInvalidLocation = TRUE;
                                }
                                found_null_sim = true;
                        }
                        else
                        {
-                                adjust = gWorldMap->extendAABB(x_meters, 
+                                adjust = LLWorldMap::getInstance()->extendAABB(x_meters, 
                                                                                           y_meters, 
                                                                                           x_meters+REGION_WIDTH_UNITS,
                                                                                           y_meters+REGION_WIDTH_UNITS) || adjust;
@@ -144,8 +144,8 @@ void LLMapLayerResponder::result(const LLSD& result)
                                //                      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);
+                                LLWorldMap::sim_info_map_t::iterator iter = LLWorldMap::getInstance()->mSimInfoMap.find(handle);
-                                if (iter != gWorldMap->mSimInfoMap.end())
+                                if (iter != LLWorldMap::getInstance()->mSimInfoMap.end())
                                {
                                        LLSimInfo* oldinfo = iter->second;
                                        for (S32 image=0; image<MAP_SIM_IMAGE_TYPES; ++image)
@@ -154,7 +154,7 @@ void LLMapLayerResponder::result(const LLSD& result)
                                        }
                                        delete oldinfo;
                                }
-                                gWorldMap->mSimInfoMap[handle] = siminfo;
+                                LLWorldMap::getInstance()->mSimInfoMap[handle] = siminfo;
                                siminfo->mHandle = handle;
                                siminfo->mName.assign( name );
@@ -162,7 +162,7 @@ void LLMapLayerResponder::result(const LLSD& result)
                                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 = gImageList.getImage(siminfo->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE);
                                siminfo->mCurrentImage->bindTexture(0);
                                siminfo->mCurrentImage->setClamp(TRUE, TRUE);
                        
@@ -175,22 +175,22 @@ void LLMapLayerResponder::result(const LLSD& result)
                                        siminfo->mOverlayImage = NULL;
                                }
-                                if (gWorldMap->mIsTrackingUnknownLocation &&
+                                if (LLWorldMap::getInstance()->mIsTrackingUnknownLocation &&
-                                        gWorldMap->mUnknownLocation.mdV[0] >= x_meters &&
+                                        LLWorldMap::getInstance()->mUnknownLocation.mdV[0] >= x_meters &&
-                                        gWorldMap->mUnknownLocation.mdV[0] < x_meters + 256 &&
+                                        LLWorldMap::getInstance()->mUnknownLocation.mdV[0] < x_meters + 256 &&
-                                        gWorldMap->mUnknownLocation.mdV[1] >= y_meters &&
+                                        LLWorldMap::getInstance()->mUnknownLocation.mdV[1] >= y_meters &&
-                                        gWorldMap->mUnknownLocation.mdV[1] < y_meters + 256)
+                                        LLWorldMap::getInstance()->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;
+                                                LLWorldMap::getInstance()->mInvalidLocation = true;
                                        }
                                        else
                                        {
                                                // We were tracking this location, and it does exist
-                                                bool is_tracking_dbl = gWorldMap->mIsTrackingDoubleClick == TRUE;
+                                                bool is_tracking_dbl = LLWorldMap::getInstance()->mIsTrackingDoubleClick == TRUE;
-                                                gFloaterWorldMap->trackLocation(gWorldMap->mUnknownLocation);
+                                                gFloaterWorldMap->trackLocation(LLWorldMap::getInstance()->mUnknownLocation);
                                                if (is_tracking_dbl)
                                                {
                                                        LLVector3d pos_global = LLTracker::getTrackedPositionGlobal();
diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 61c0042..448bc7f 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -40,7 +40,7 @@
 #include "llviewermedia.h"
 #include "llviewerparcelmedia.h"
 #include "llviewerparcelmgr.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llpanelaudiovolume.h"
 #include "llparcel.h"
 #include "llviewercontrol.h"
@@ -49,6 +49,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
 //
+static LLRegisterWidget<LLMediaRemoteCtrl> r("media_remote");
 LLMediaRemoteCtrl::LLMediaRemoteCtrl()
 {
        setIsChrome(TRUE);
@@ -64,11 +67,11 @@ void LLMediaRemoteCtrl::build()
        deleteAllChildren();
        if (gSavedSettings.getBOOL("ShowVolumeSettingsPopup"))
        {
-                gUICtrlFactory->buildPanel(this, "panel_media_remote_expanded.xml", &getFactoryMap());
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_media_remote_expanded.xml", &getFactoryMap());
        }
        else
        {
-                gUICtrlFactory->buildPanel(this, "panel_media_remote.xml", &getFactoryMap());
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_media_remote.xml", &getFactoryMap());
        }
 }
@@ -92,7 +95,7 @@ void LLMediaRemoteCtrl::draw()
 {
        enableMediaButtons();
        
-        LLButton* expand_button = LLUICtrlFactory::getButtonByName(this, "expand");
+        LLButton* expand_button = getChild<LLButton>("expand");
        if (expand_button)
        {
                if (expand_button->getToggleState())
@@ -155,7 +158,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
        // Put this in xui file
        LLString media_url = mControls->getString("default_tooltip_label");
-        LLParcel* parcel = gParcelMgr->getAgentParcel();
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (gSavedSettings.getBOOL("AudioStreamingVideo"))
        {
@@ -222,14 +225,14 @@ void LLMediaRemoteCtrl::enableMediaButtons()
                        stop_media_enabled = false;
                }
        }
-        const LLUUID media_icon_id = LLUUID(gViewerArt.findString(LLMIMETypes::findIcon(media_type)));
+        const LLString media_icon_name = LLMIMETypes::findIcon(media_type);
-        LLButton* music_play_btn = LLUICtrlFactory::getButtonByName(this, "music_play");
+        LLButton* music_play_btn = getChild<LLButton>("music_play");
-        LLButton* music_stop_btn = LLUICtrlFactory::getButtonByName(this, "music_stop");
+        LLButton* music_stop_btn = getChild<LLButton>("music_stop");
-        LLButton* music_pause_btn = LLUICtrlFactory::getButtonByName(this, "music_pause");
+        LLButton* music_pause_btn = getChild<LLButton>("music_pause");
-        LLButton* media_play_btn = LLUICtrlFactory::getButtonByName(this, "media_play");
+        LLButton* media_play_btn = getChild<LLButton>("media_play");
-        LLButton* media_stop_btn = LLUICtrlFactory::getButtonByName(this, "media_stop");
+        LLButton* media_stop_btn = getChild<LLButton>("media_stop");
-        LLButton* media_pause_btn = LLUICtrlFactory::getButtonByName(this, "media_pause");
+        LLButton* media_pause_btn = getChild<LLButton>("media_pause");
-        LLIconCtrl* media_icon = LLUICtrlFactory::getIconByName(this, "media_icon");
+        LLIconCtrl* media_icon = getChild<LLIconCtrl>("media_icon");
        music_play_btn->setEnabled(play_music_enabled);
        music_stop_btn->setEnabled(stop_music_enabled);
@@ -237,9 +240,9 @@ void LLMediaRemoteCtrl::enableMediaButtons()
        music_pause_btn->setVisible(music_show_pause);
        music_play_btn->setVisible(! music_show_pause);
        childSetColor("music_icon", music_icon_color);
-        if(! media_icon_id.isNull())
+        if(!media_icon_name.empty())
        {
-                media_icon->setImage(media_icon_id);
+                media_icon->setImage(media_icon_name);
        }
        media_play_btn->setEnabled(play_media_enabled);
diff --git a/linden/indra/newview/llmemoryview.cpp b/linden/indra/newview/llmemoryview.cpp
index c6db748..c7a929d 100644
--- a/linden/indra/newview/llmemoryview.cpp
+++ b/linden/indra/newview/llmemoryview.cpp
@@ -67,16 +67,6 @@ LLMemoryView::~LLMemoryView()
 {
 }
-EWidgetType LLMemoryView::getWidgetType() const
-{
-        return WIDGET_TYPE_MEMORY_VIEW;
-}
-LLString LLMemoryView::getWidgetTag() const
-{
-        return LL_MEMORY_VIEW_TAG;
-}
 BOOL LLMemoryView::handleMouseDown(S32 x, S32 y, MASK mask)
 {
        if (mask & MASK_SHIFT)
diff --git a/linden/indra/newview/llmemoryview.h b/linden/indra/newview/llmemoryview.h
index 64652ef..3fd61a1 100644
--- a/linden/indra/newview/llmemoryview.h
+++ b/linden/indra/newview/llmemoryview.h
@@ -40,9 +40,6 @@ public:
        LLMemoryView(const std::string& name, const LLRect& rect);
        virtual ~LLMemoryView();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        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);
diff --git a/linden/indra/newview/llmenucommands.cpp b/linden/indra/newview/llmenucommands.cpp
index 0db42e2..14db323 100644
--- a/linden/indra/newview/llmenucommands.cpp
+++ b/linden/indra/newview/llmenucommands.cpp
@@ -62,7 +62,7 @@
 #include "llviewerparceloverlay.h"
 #include "llviewerregion.h"
 #include "llviewerstats.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llworld.h"
 #include "llworldmap.h"
diff --git a/linden/indra/newview/llmimetypes.cpp b/linden/indra/newview/llmimetypes.cpp
index db00079..d5a1ffe 100644
--- a/linden/indra/newview/llmimetypes.cpp
+++ b/linden/indra/newview/llmimetypes.cpp
@@ -34,7 +34,7 @@
 #include "llmimetypes.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 LLMIMETypes::mime_info_map_t LLMIMETypes::sMap;
 LLMIMETypes::mime_widget_set_map_t LLMIMETypes::sWidgetMap;
@@ -52,7 +52,7 @@ LLString sDefaultImpl;
 bool LLMIMETypes::parseMIMETypes(const LLString& xml_filename)
 {
        LLXMLNodePtr root;
-        bool success = LLViewerUICtrlFactory::getLayeredXMLNode(xml_filename, root);
+        bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);
        if ( ! success || root.isNull() || ! root->hasName( "mimetypes" ) )
        {
                llwarns << "Unable to read MIME type file: "
diff --git a/linden/indra/newview/llmorphview.cpp b/linden/indra/newview/llmorphview.cpp
index 404534b..6a592e6 100644
--- a/linden/indra/newview/llmorphview.cpp
+++ b/linden/indra/newview/llmorphview.cpp
@@ -80,16 +80,6 @@ LLMorphView::LLMorphView(const std::string& name, const LLRect& rect)
 {
 }
-EWidgetType LLMorphView::getWidgetType() const
-{
-        return WIDGET_TYPE_MORPH_VIEW;
-}
-LLString LLMorphView::getWidgetTag() const
-{
-        return LL_MORPH_VIEW_TAG;
-}
 //-----------------------------------------------------------------------------
 // initialize()
 //-----------------------------------------------------------------------------
@@ -110,8 +100,8 @@ void	LLMorphView::initialize()
        avatarp->mSpecialRenderMode = 3;
        
        // set up camera for close look at avatar
-        mOldCameraNearClip = gCamera->getNear();
+        mOldCameraNearClip = LLViewerCamera::getInstance()->getNear();
-        gCamera->setNear(MORPH_NEAR_CLIP);      
+        LLViewerCamera::getInstance()->setNear(MORPH_NEAR_CLIP);        
 }
 //-----------------------------------------------------------------------------
@@ -127,7 +117,7 @@ void	LLMorphView::shutdown()
                avatarp->startMotion( ANIM_AGENT_BODY_NOISE );
                avatarp->mSpecialRenderMode = 0;
                // reset camera
-                gCamera->setNear(mOldCameraNearClip);
+                LLViewerCamera::getInstance()->setNear(mOldCameraNearClip);
        }
 }
diff --git a/linden/indra/newview/llmorphview.h b/linden/indra/newview/llmorphview.h
index 14645f4..1ea09ac 100644
--- a/linden/indra/newview/llmorphview.h
+++ b/linden/indra/newview/llmorphview.h
@@ -44,9 +44,6 @@ class LLMorphView : public LLView
 public:
        LLMorphView(const std::string& name, const LLRect& rect);
        
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        void            initialize();
        void            shutdown();
diff --git a/linden/indra/newview/llmoveview.cpp b/linden/indra/newview/llmoveview.cpp
index 5444a6e..0bb0a5e 100644
--- a/linden/indra/newview/llmoveview.cpp
+++ b/linden/indra/newview/llmoveview.cpp
@@ -39,12 +39,10 @@
 // Viewer includes
 #include "llagent.h"
 #include "llviewercontrol.h"
-#include "llfontgl.h"
 #include "llbutton.h"
 #include "llviewerwindow.h"
 #include "lljoystickbutton.h"
-#include "llresmgr.h"
+#include "lluictrlfactory.h"
-#include "llvieweruictrlfactory.h"
 //
 // Constants
@@ -54,68 +52,48 @@ const F32 MOVE_BUTTON_DELAY = 0.0f;
 const F32 YAW_NUDGE_RATE = 0.05f;       // fraction of normal speed
 const F32 NUDGE_TIME = 0.25f;           // in seconds
-const char *MOVE_TITLE = "";
-//
-// Global statics
-//
-LLFloaterMove* LLFloaterMove::sInstance = NULL;
 //
 // Member functions
 //
 // protected
-LLFloaterMove::LLFloaterMove()
+LLFloaterMove::LLFloaterMove(const LLSD& key)
-:       LLFloater("move floater", "FloaterMoveRect", MOVE_TITLE, FALSE, 100, 100, DRAG_ON_TOP,
+:       LLFloater("move floater")
-                          MINIMIZE_NO)
 {
        setIsChrome(TRUE);
-        gUICtrlFactory->buildFloater(this,"floater_moveview.xml"); 
-        mForwardButton = LLViewerUICtrlFactory::getJoystickAgentTurnByName(this, "forward btn"); 
+        const BOOL DONT_OPEN = FALSE;
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_moveview.xml", NULL, DONT_OPEN); 
+        mForwardButton = getChild<LLJoystickAgentTurn>("forward btn"); 
        mForwardButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
-        mBackwardButton = LLViewerUICtrlFactory::getJoystickAgentTurnByName(this, "backward btn"); 
+        mBackwardButton = getChild<LLJoystickAgentTurn>("backward btn"); 
        mBackwardButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
-        mSlideLeftButton = LLViewerUICtrlFactory::getJoystickAgentSlideByName(this, "slide left btn"); 
+        mSlideLeftButton = getChild<LLJoystickAgentSlide>("slide left btn"); 
        mSlideLeftButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
-        mSlideRightButton = LLViewerUICtrlFactory::getJoystickAgentSlideByName(this, "slide right btn"); 
+        mSlideRightButton = getChild<LLJoystickAgentSlide>("slide right btn"); 
        mSlideRightButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
-        mTurnLeftButton = LLUICtrlFactory::getButtonByName(this, "turn left btn"); 
+        mTurnLeftButton = getChild<LLButton>("turn left btn"); 
        mTurnLeftButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
        mTurnLeftButton->setHeldDownCallback( turnLeft );
-        mTurnRightButton = LLUICtrlFactory::getButtonByName(this, "turn right btn"); 
+        mTurnRightButton = getChild<LLButton>("turn right btn"); 
        mTurnRightButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
        mTurnRightButton->setHeldDownCallback( turnRight );
-        mMoveUpButton = LLUICtrlFactory::getButtonByName(this, "move up btn"); 
+        mMoveUpButton = getChild<LLButton>("move up btn"); 
        childSetAction("move up btn",moveUp,NULL);
        mMoveUpButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
        mMoveUpButton->setHeldDownCallback( moveUp );
-        mMoveDownButton = LLUICtrlFactory::getButtonByName(this, "move down btn"); 
+        mMoveDownButton = getChild<LLButton>("move down btn"); 
        childSetAction("move down btn",moveDown,NULL);  
        mMoveDownButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
        mMoveDownButton->setHeldDownCallback( moveDown );
-        mFlyButton = LLUICtrlFactory::getButtonByName(this, "fly btn"); 
-        childSetAction("fly btn",onFlyButtonClicked,NULL);
-        sInstance = this;
-}
-// protected
-LLFloaterMove::~LLFloaterMove()
-{
-        // children all deleted by LLView destructor
-        sInstance = NULL;
 }
 // virtual
@@ -133,48 +111,12 @@ void LLFloaterMove::onClose(bool app_quitting)
 // Static member functions
 //
-// static
+void LLFloaterMove::onOpen()
-void LLFloaterMove::show(void*)
 {
-        if (sInstance)
+        LLFloater::onOpen();
-        {
-                sInstance->open();      /*Flawfinder: ignore*/
-        }
-        else
-        {
-                LLFloaterMove* f = new LLFloaterMove();
-                f->open();      /*Flawfinder: ignore*/
-        }
-        
        gSavedSettings.setBOOL("ShowMovementControls", TRUE);
 }
-// static
-void LLFloaterMove::toggle(void*)
-{
-        if (sInstance)
-        {
-                sInstance->close();
-        }
-        else
-        {
-                show(NULL);
-        }
-}
-// static
-BOOL LLFloaterMove::visible(void*)
-{
-        return (sInstance != NULL);
-}
-// protected static 
-void LLFloaterMove::onFlyButtonClicked(void *)
-{
-        gAgent.toggleFlying();
-}
 // protected static 
 F32 LLFloaterMove::getYawRate( F32 time )
 {
@@ -192,14 +134,14 @@ F32 LLFloaterMove::getYawRate( F32 time )
 // protected static 
 void LLFloaterMove::turnLeft(void *)
 {
-        F32 time = sInstance->mTurnLeftButton->getHeldDownTime();
+        F32 time = getInstance()->mTurnLeftButton->getHeldDownTime();
        gAgent.moveYaw( getYawRate( time ) );
 }
 // protected static 
 void LLFloaterMove::turnRight(void *)
 {
-        F32 time = sInstance->mTurnRightButton->getHeldDownTime();
+        F32 time = getInstance()->mTurnRightButton->getHeldDownTime();
        gAgent.moveYaw( -getYawRate( time ) );
 }
diff --git a/linden/indra/newview/llmoveview.h b/linden/indra/newview/llmoveview.h
index 2683e62..a3a4ad1 100644
--- a/linden/indra/newview/llmoveview.h
+++ b/linden/indra/newview/llmoveview.h
@@ -43,23 +43,20 @@ class LLJoystickAgentSlide;
 // Classes
 //
 class LLFloaterMove
-:       public LLFloater
+:       public LLFloater, 
+        public LLFloaterSingleton<LLFloaterMove>
 {
+        friend class LLUISingleton<LLFloaterMove, VisibilityPolicy<LLFloater> >;
+        
 protected:
-        LLFloaterMove();
+        LLFloaterMove(const LLSD& key);
-        ~LLFloaterMove();
+        ~LLFloaterMove() {}
 public:
+        /*virtual*/ void onOpen();
        /*virtual*/ void onClose(bool app_quitting);
-        static void onFlyButtonClicked(void* userdata);
-        static F32      getYawRate(F32 time);
-        static void show(void*);
+        static F32      getYawRate(F32 time);
-        static void toggle(void*);
-        static BOOL visible(void*);
-        
-        // This function is used for agent-driven button highlighting
-        static LLFloaterMove* getInstance()                             { return sInstance; }
 protected:
        static void turnLeftNudge(void* userdata);
@@ -72,8 +69,6 @@ protected:
        static void moveDown(void* userdata);
 public:
-        LLButton*                               mFlyButton;
        LLJoystickAgentTurn*    mForwardButton;
        LLJoystickAgentTurn*    mBackwardButton;
        LLJoystickAgentSlide*   mSlideLeftButton;
@@ -82,9 +77,6 @@ public:
        LLButton*                               mTurnRightButton;
        LLButton*                               mMoveUpButton;
        LLButton*                               mMoveDownButton;
-protected:
-        static LLFloaterMove*   sInstance;
 };
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index 9b645a6..c411ffe 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -59,14 +59,12 @@
 #include "message.h"
 #include "llagent.h"
-#include "llfloatermute.h"
 #include "llviewergenericmessage.h"     // for gGenericDispatcher
 #include "llviewerwindow.h"
 #include "llworld.h" //for particle system banning
 #include "llviewerobject.h" 
 #include "llviewerobjectlist.h"
-LLMuteList* gMuteListp = NULL;
 std::map<LLUUID, F32> LLMuteList::sUserVolumeSettings;
@@ -81,7 +79,7 @@ public:
                const LLUUID& invoice,
                const sparam_t& strings)
        {
-                gMuteListp->setLoaded();
+                LLMuteList::getInstance()->setLoaded();
                return true;
        }
 };
@@ -159,18 +157,27 @@ void LLMute::setFromDisplayName(const LLString& display_name)
        return;
 }
+/* static */
+LLMuteList* LLMuteList::getInstance()
+{
+        // Register callbacks at the first time that we find that the message system has been created.
+        static BOOL registered = FALSE;
+        if( !registered && gMessageSystem != NULL)
+        {
+                registered = TRUE;
+                // Register our various callbacks
+                gMessageSystem->setHandlerFuncFast(_PREHASH_MuteListUpdate, processMuteListUpdate);
+                gMessageSystem->setHandlerFuncFast(_PREHASH_UseCachedMuteList, processUseCachedMuteList);
+        }
+        return LLSingleton<LLMuteList>::getInstance(); // Call the "base" implementation.
+}
 //-----------------------------------------------------------------------------
 // LLMuteList()
 //-----------------------------------------------------------------------------
 LLMuteList::LLMuteList() :
        mIsLoaded(FALSE)
 {
-        LLMessageSystem* msg = gMessageSystem;
-        // Register our various callbacks
-        msg->setHandlerFuncFast(_PREHASH_MuteListUpdate, processMuteListUpdate);
-        msg->setHandlerFuncFast(_PREHASH_UseCachedMuteList, processUseCachedMuteList);
        gGenericDispatcher.addHandler("emptymutelist", &sDispatchEmptyMuteList);
        // load per-resident voice volume information
@@ -318,7 +325,7 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags)
                                        //Kill all particle systems owned by muted task
                                        if(localmute.mType == LLMute::AGENT || localmute.mType == LLMute::OBJECT)
                                        {
-                                                gWorldPointer->mPartSim.clearParticlesByOwnerID(localmute.mID);
+                                                LLViewerPartSim::getInstance()->clearParticlesByOwnerID(localmute.mID);
                                        }
                                }
                                return TRUE;
@@ -345,7 +352,7 @@ void LLMuteList::updateAdd(const LLMute& mute)
        msg->addU32("MuteFlags", mute.mFlags);
        gAgent.sendReliableMessage();
-        mIsLoaded = TRUE;
+        mIsLoaded = TRUE; // why is this here? -MG
 }
@@ -398,8 +405,7 @@ BOOL LLMuteList::remove(const LLMute& mute, U32 flags)
                }
                
                // Must be after erase.
-                notifyObservers();
+                setLoaded();  // why is this here? -MG
-                found = TRUE;
        }
        // Clean up any legacy mutes
@@ -411,8 +417,7 @@ BOOL LLMuteList::remove(const LLMute& mute, U32 flags)
                updateRemove(mute);
                mLegacyMutes.erase(legacy_it);
                // Must be after erase.
-                notifyObservers();
+                setLoaded(); // why is this here? -MG
-                found = TRUE;
        }
        
        return found;
@@ -502,8 +507,7 @@ BOOL LLMuteList::loadFromFile(const LLString& filename)
                }
        }
        fclose(fp);
-        mIsLoaded = TRUE;
+        setLoaded();
-        notifyObservers();      
        return TRUE;
 }
@@ -673,24 +677,22 @@ void LLMuteList::processMuteListUpdate(LLMessageSystem* msg, void**)
 void LLMuteList::processUseCachedMuteList(LLMessageSystem* msg, void**)
 {
        llinfos << "LLMuteList::processUseCachedMuteList()" << llendl;
-        if (!gMuteListp) return;
        char agent_id_string[UUID_STR_LENGTH];          /*Flawfinder: ignore*/
        gAgent.getID().toString(agent_id_string);
        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);
+        LLMuteList::getInstance()->loadFromFile(filename);
 }
 void LLMuteList::onFileMuteList(void** user_data, S32 error_code, LLExtStat ext_status)
 {
        llinfos << "LLMuteList::processMuteListFile()" << llendl;
-        if (!gMuteListp) return;
        std::string *local_filename_and_path = (std::string*)user_data;
        if(local_filename_and_path && !local_filename_and_path->empty() && (error_code == 0))
        {
-                gMuteListp->loadFromFile(local_filename_and_path->c_str());
+                LLMuteList::getInstance()->loadFromFile(local_filename_and_path->c_str());
                LLFile::remove(local_filename_and_path->c_str());
        }
        delete local_filename_and_path;
@@ -714,14 +716,6 @@ void LLMuteList::setLoaded()
 void LLMuteList::notifyObservers()
 {
-        // HACK: LLFloaterMute is constructed before LLMuteList,
-        // so it can't easily observe it.  Changing this requires
-        // much reshuffling of the startup process. JC
-        if (gFloaterMute)
-        {
-                gFloaterMute->refreshMuteList();
-        }
        for (observer_set_t::iterator it = mObservers.begin();
                it != mObservers.end();
                )
diff --git a/linden/indra/newview/llmutelist.h b/linden/indra/newview/llmutelist.h
index fa85924..e1a87c8 100644
--- a/linden/indra/newview/llmutelist.h
+++ b/linden/indra/newview/llmutelist.h
@@ -79,12 +79,17 @@ public:
        U32                     mFlags; // flags pertaining to this mute entry
 };
-class LLMuteList
+class LLMuteList : public LLSingleton<LLMuteList>
 {
 public:
        LLMuteList();
        ~LLMuteList();
+        // Implemented locally so that we can perform some delayed initialization. 
+        // Callers should be careful to call this one and not LLSingleton<LLMuteList>::getInstance()
+        // which would circumvent that mechanism. -MG
+        static LLMuteList* getInstance();
        void addObserver(LLMuteListObserver* observer);
        void removeObserver(LLMuteListObserver* observer);
@@ -170,6 +175,5 @@ public:
        virtual void onChange() = 0;
 };
-extern LLMuteList *gMuteListp;
 #endif //LL_MUTELIST_H
diff --git a/linden/indra/newview/llnameeditor.cpp b/linden/indra/newview/llnameeditor.cpp
index dcb8911..99f9ee7 100644
--- a/linden/indra/newview/llnameeditor.cpp
+++ b/linden/indra/newview/llnameeditor.cpp
@@ -42,6 +42,7 @@
 #include "llstring.h"
 #include "llui.h"
+static LLRegisterWidget<LLNameEditor> r("name_editor");
 // statics
 std::set<LLNameEditor*> LLNameEditor::sInstances;
@@ -55,10 +56,7 @@ LLNameEditor::LLNameEditor(const std::string& name, const LLRect& rect,
                void (*keystroke_callback)(LLLineEditor* caller, void* user_data),
                void (*focus_lost_callback)(LLFocusableElement* caller, void* user_data),
                void* userdata,
-                LLLinePrevalidateFunc prevalidate_func,
+                LLLinePrevalidateFunc prevalidate_func)
-                LLViewBorder::EBevel border_bevel,
-                LLViewBorder::EStyle border_style,
-                S32 border_thickness)
 :       LLLineEditor(name, rect, 
                                 "(retrieving)", 
                                 glfont, 
@@ -67,10 +65,7 @@ LLNameEditor::LLNameEditor(const std::string& name, const LLRect& rect,
                                 keystroke_callback,
                                 focus_lost_callback,
                                 userdata,
-                                 prevalidate_func,
+                                 prevalidate_func),
-                                 border_bevel,
-                                 border_style,
-                                 border_thickness),
        mNameID(name_id)
 {
        LLNameEditor::sInstances.insert(this);
@@ -157,19 +152,6 @@ LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
        node->getAttributeS32("max_length", max_text_length);
        LLFontGL* font = LLView::selectFont(node);
-        
-        LLViewBorder::EStyle border_style = LLViewBorder::STYLE_LINE;
-        LLString border_string;
-        node->getAttributeString("border_style", border_string);
-        LLString::toLower(border_string);
-        if (border_string == "texture")
-        {
-                border_style = LLViewBorder::STYLE_TEXTURE;
-        }
-        S32 border_thickness = 1;
-        node->getAttributeS32("border_thickness", border_thickness);
        LLUICtrlCallback commit_callback = NULL;
@@ -178,14 +160,7 @@ LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
                                                                LLUUID::null, FALSE,
                                                                font,
                                                                max_text_length,
-                                                                commit_callback,
+                                                                commit_callback);
-                                                                NULL,
-                                                                NULL,
-                                                                NULL,
-                                                                NULL,
-                                                                LLViewBorder::BEVEL_IN,
-                                                                border_style,
-                                                                border_thickness);
        LLString label;
        if(node->getAttributeString("label", label))
diff --git a/linden/indra/newview/llnameeditor.h b/linden/indra/newview/llnameeditor.h
index 1f31f64..3d9a9cc 100644
--- a/linden/indra/newview/llnameeditor.h
+++ b/linden/indra/newview/llnameeditor.h
@@ -54,10 +54,7 @@ public:
                void (*keystroke_callback)(LLLineEditor* caller, void* user_data) = NULL,
                void (*focus_lost_callback)(LLFocusableElement* caller, void* user_data) = NULL,
                void* userdata = NULL,
-                LLLinePrevalidateFunc prevalidate_func = NULL,
+                LLLinePrevalidateFunc prevalidate_func = NULL);
-                LLViewBorder::EBevel border_bevel = LLViewBorder::BEVEL_IN,
-                LLViewBorder::EStyle border_style = LLViewBorder::STYLE_LINE,
-                S32 border_thickness = 1);
                // By default, follows top and left and is mouse-opaque.
                // If no text, text = name.
                // If no font, uses default system font.
@@ -74,8 +71,6 @@ public:
        static void refreshAll(const LLUUID& id, const char* firstname,
                                                   const char* lastname, BOOL is_group);
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_NAME_EDITOR; }
-        virtual LLString getWidgetTag() const { return LL_NAME_EDITOR_TAG; }
        // Take/return agent UUIDs
        virtual void    setValue( const LLSD& value );
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp
index bdfdf06..564677a 100644
--- a/linden/indra/newview/llnamelistctrl.cpp
+++ b/linden/indra/newview/llnamelistctrl.cpp
@@ -39,6 +39,8 @@
 #include "llagent.h"
 #include "llinventory.h"
+static LLRegisterWidget<LLNameListCtrl> r("name_list");
 // statics
 std::set<LLNameListCtrl*> LLNameListCtrl::sInstances;
diff --git a/linden/indra/newview/llnamelistctrl.h b/linden/indra/newview/llnamelistctrl.h
index 71e336d..3aa4dfc 100644
--- a/linden/indra/newview/llnamelistctrl.h
+++ b/linden/indra/newview/llnamelistctrl.h
@@ -50,8 +50,7 @@ public:
                                   S32 name_column_index = 0,
                                   const LLString& tooltip = LLString::null);
        virtual ~LLNameListCtrl();
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_NAME_LIST; }
-        virtual LLString getWidgetTag() const { return LL_NAME_LIST_CTRL_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 01400b1..9226fac 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -103,15 +103,20 @@ LLNetMap::LLNetMap(
        mObjectImageCenterGlobal = gAgent.getCameraPositionGlobal();
        
+        // TODO: exteralize hardcoded constants.
        const S32 DIR_WIDTH = 10;
        const S32 DIR_HEIGHT = 10;
        LLRect major_dir_rect(  0, DIR_HEIGHT, DIR_WIDTH, 0 );
+        const LLColor4 minor_color( 1.f, 1.f, 1.f, .7f );
-        mTextBoxNorth = new LLTextBox( "N", major_dir_rect );
+        const LLRect minor_dir_rect(  0, DIR_HEIGHT, DIR_WIDTH * 2, 0 );
-        mTextBoxNorth->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
+        // Note: removing special treatment for north compass point (DEV-10559). -MG
+        //mTextBoxNorth = new LLTextBox( "N", major_dir_rect );
+        //mTextBoxNorth->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
+        //addChild( mTextBoxNorth );
+        mTextBoxNorth = new LLTextBox( "N", major_dir_rect );
+        mTextBoxNorth->setColor( minor_color );
        addChild( mTextBoxNorth );
-        LLColor4 minor_color( 1.f, 1.f, 1.f, .7f );
        
        mTextBoxEast =  new LLTextBox( "E", major_dir_rect );
        mTextBoxEast->setColor( minor_color );
@@ -127,8 +132,6 @@ LLNetMap::LLNetMap(
        mTextBoxSouth->setColor( minor_color );
        addChild( mTextBoxSouth );
-        LLRect minor_dir_rect(  0, DIR_HEIGHT, DIR_WIDTH * 2, 0 );
        mTextBoxSouthEast =     new LLTextBox( "SE", minor_dir_rect );
        mTextBoxSouthEast->setColor( minor_color );
        addChild( mTextBoxSouthEast );
@@ -163,8 +166,6 @@ LLNetMap::LLNetMap(
        mPopupMenuHandle = menu->getHandle();
        sInstance = this;
-        gSavedSettings.getControl("MiniMapRotate")->addListener(&mNetMapListener);
 }
 LLNetMap::~LLNetMap()
@@ -172,17 +173,6 @@ LLNetMap::~LLNetMap()
        sInstance = NULL;
 }
-EWidgetType LLNetMap::getWidgetType() const
-{
-        return WIDGET_TYPE_NET_MAP;
-}
-LLString LLNetMap::getWidgetTag() const
-{
-        return LL_NET_MAP_TAG;
-}
 void LLNetMap::setScale( F32 scale )
 {
        gMiniMapScale = scale;
@@ -196,20 +186,8 @@ void LLNetMap::setScale( F32 scale )
                F32 half_width = (F32)(getRect().getWidth() / 2);
                F32 half_height = (F32)(getRect().getHeight() / 2);
                F32 radius = sqrt( half_width * half_width + half_height * half_height );
                F32 region_widths = (2.f*radius)/gMiniMapScale;
+                F32 meters = region_widths * LLWorld::getInstance()->getRegionWidthInMeters();
-                F32 meters;
-                if (!gWorldPointer)
-                {
-                        // Hack!  Sometimes world hasn't been initialized at this point.
-                        meters = 256.f*region_widths;
-                }
-                else
-                {
-                        meters = region_widths * gWorldPointer->getRegionWidthInMeters();
-                }
                F32 num_pixels = (F32)mObjectImagep->getWidth();
                mObjectMapTPM = num_pixels/meters;
                mObjectMapPixels = 2.f*radius;
@@ -233,10 +211,6 @@ void LLNetMap::draw()
 {
        static LLFrameTimer map_timer;
-        if (!getVisible() || !gWorldPointer)
-        {
-                return;
-        }
        if (mObjectImagep.isNull())
        {
                createObjectImage();
@@ -273,15 +247,15 @@ void LLNetMap::draw()
                if( LLNetMap::sRotateMap )
                {
                        // rotate subsequent draws to agent rotation
-                        rotation = atan2( gCamera->getAtAxis().mV[VX], gCamera->getAtAxis().mV[VY] );
+                        rotation = atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] );
                        glRotatef( rotation * RAD_TO_DEG, 0.f, 0.f, 1.f);
                }
                // figure out where agent is
-                S32 region_width = llround(gWorldPointer->getRegionWidthInMeters());
+                S32 region_width = llround(LLWorld::getInstance()->getRegionWidthInMeters());
-                for (LLWorld::region_list_t::iterator iter = gWorldp->mActiveRegionList.begin();
+                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                         iter != gWorldp->mActiveRegionList.end(); ++iter)
+                         iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
                {
                        LLViewerRegion* regionp = *iter;
                        // Find x and y position relative to camera's center.
@@ -397,8 +371,8 @@ void LLNetMap::draw()
                LLVector3 pos_map;
                // Draw avatars
-                for (LLWorld::region_list_t::iterator iter = gWorldp->mActiveRegionList.begin();
+                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                         iter != gWorldp->mActiveRegionList.end(); ++iter)
+                         iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
                {
                        LLViewerRegion* regionp = *iter;
                        const LLVector3d& origin_global = regionp->getOriginGlobal();
@@ -462,19 +436,18 @@ void LLNetMap::draw()
                }
                // Draw dot for self avatar position
-                //drawTracking( gAgent.getPosGlobalFromAgent(gAgent.getFrameAgent().getCenter()), gSelfMapColor );
                pos_global = gAgent.getPositionGlobal();
                pos_map = globalPosToView(pos_global);
-                gl_draw_image(llround(pos_map.mV[VX]) - 4,
+                LLUIImagePtr you = LLWorldMapView::sAvatarYouSmallImage;
-                                        llround(pos_map.mV[VY]) - 4,
+                you->draw(
-                                        LLWorldMapView::sAvatarYouSmallImage,
+                        llround(pos_map.mV[VX]) - you->getWidth()/2, 
-                                        LLColor4::white);
+                        llround(pos_map.mV[VY]) - you->getHeight()/2);
                // Draw frustum
-                F32 meters_to_pixels = gMiniMapScale/ gWorldPointer->getRegionWidthInMeters();
+                F32 meters_to_pixels = gMiniMapScale/ LLWorld::getInstance()->getRegionWidthInMeters();
-                F32 horiz_fov = gCamera->getView() * gCamera->getAspect();
+                F32 horiz_fov = LLViewerCamera::getInstance()->getView() * LLViewerCamera::getInstance()->getAspect();
-                F32 far_clip_meters = gCamera->getFar();
+                F32 far_clip_meters = LLViewerCamera::getInstance()->getFar();
                F32 far_clip_pixels = far_clip_meters * meters_to_pixels;
                F32 half_width_meters = far_clip_meters * tan( horiz_fov / 2 );
@@ -503,7 +476,7 @@ void LLNetMap::draw()
                        // If we don't rotate the map, we have to rotate the frustum.
                        gGL.pushMatrix();
                                gGL.translatef( ctr_x, ctr_y, 0 );
-                                glRotatef( atan2( gCamera->getAtAxis().mV[VX], gCamera->getAtAxis().mV[VY] ) * RAD_TO_DEG, 0.f, 0.f, -1.f);
+                                glRotatef( atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] ) * RAD_TO_DEG, 0.f, 0.f, -1.f);
                                gGL.begin( GL_TRIANGLES  );
                                        gGL.vertex2f( 0, 0 );
                                        gGL.vertex2f( -half_width_pixels, far_clip_pixels );
@@ -539,7 +512,7 @@ LLVector3 LLNetMap::globalPosToView( const LLVector3d& global_pos )
        if( LLNetMap::sRotateMap )
        {
-                F32 radians = atan2( gCamera->getAtAxis().mV[VX], gCamera->getAtAxis().mV[VY] );
+                F32 radians = atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] );
                LLQuaternion rot(radians, LLVector3(0.f, 0.f, 1.f));
                pos_local.rotVec( rot );
        }
@@ -583,7 +556,7 @@ LLVector3d LLNetMap::viewPosToGlobal( S32 x, S32 y )
        LLVector3 pos_local( (F32)x, (F32)y, 0 );
-        F32 radians = - atan2( gCamera->getAtAxis().mV[VX], gCamera->getAtAxis().mV[VY] );
+        F32 radians = - atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] );
        if( LLNetMap::sRotateMap )
        {
@@ -591,7 +564,7 @@ LLVector3d LLNetMap::viewPosToGlobal( S32 x, S32 y )
                pos_local.rotVec( rot );
        }
-        pos_local *= ( gWorldPointer->getRegionWidthInMeters() / gMiniMapScale );
+        pos_local *= ( LLWorld::getInstance()->getRegionWidthInMeters() / gMiniMapScale );
        
        LLVector3d pos_global;
        pos_global.setVec( pos_local );
@@ -614,7 +587,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect_s
        {
                return FALSE;
        }
-        LLViewerRegion* region = gWorldPointer->getRegionFromPosGlobal( viewPosToGlobal( x, y ) );
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( viewPosToGlobal( x, y ) );
        if( region )
        {
                msg.assign( region->getName() );
@@ -828,9 +801,3 @@ void LLNetMap::handleZoomLevel(void* which)
                break;
        }
 }
-bool LLRotateNetMapListener::handleEvent(LLPointer<LLEvent> event, const LLSD& user_data)
-{
-        LLNetMap::setRotateMap(event->getValue().asBoolean());
-        return true;
-}
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 88ec051..7a3654c 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -45,21 +45,12 @@ class LLCoordGL;
 class LLTextBox;
 class LLMenuGL;
-class LLRotateNetMapListener : public LLSimpleListener
-{
-public:
-        bool handleEvent(LLPointer<LLEvent>, const LLSD& user_data);
-};
 class LLNetMap : public LLUICtrl
 {
 public:
        LLNetMap(const std::string& name, const LLRect& rect, const LLColor4& bg_color );
        virtual ~LLNetMap();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual void    draw();
        virtual BOOL    handleDoubleClick( S32 x, S32 y, MASK mask );
        virtual BOOL    handleRightMouseDown( S32 x, S32 y, MASK mask );
@@ -117,8 +108,6 @@ public:
        LLTextBox*              mTextBoxNorthWest;
        LLTextBox*              mTextBoxSouthWest;
-        LLRotateNetMapListener mNetMapListener;
        static BOOL             sRotateMap;
        static LLNetMap*        sInstance;
 };
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index 0bd039a..19695e8 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -334,13 +334,14 @@ LLNotifyBox::LLNotifyBox(LLPointer<LLNotifyBoxTemplate> xml_template, const LLSt
        {
                LLButton* btn;
                btn = new LLButton("next",
-                                                   LLRect(getRect().getWidth()-18, BOTTOM_PAD+16, getRect().getWidth()-2, BOTTOM_PAD+2),
+                                                   LLRect(getRect().getWidth()-26, BOTTOM_PAD + 20, getRect().getWidth()-2, BOTTOM_PAD),
-                                                   "notify_next.tga",
+                                                   "notify_next.png",
-                                                   "notify_next.tga",
+                                                   "notify_next.png",
                                                   "",
                                                   onClickNext,
                                                   this,
                                                   sFont);
+                btn->setScaleImage(TRUE);
                btn->setToolTip(LLString("Next")); // *TODO: Translate
                addChild(btn);
                mNextBtn = btn;
@@ -445,7 +446,7 @@ BOOL LLNotifyBox::handleMouseUp(S32 x, S32 y, MASK mask)
 // virtual
 BOOL LLNotifyBox::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-        if (!mIsTip && getVisible() && getEnabled() && pointInView(x,y))
+        if (!mIsTip)
        {
                moveToBack(true);
                return TRUE;
@@ -505,12 +506,10 @@ void LLNotifyBox::draw()
 void LLNotifyBox::drawBackground() const
 {
-        LLUUID image_id;
+        LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
-        image_id.set(gViewerArt.getString("rounded_square.tga"));
-        LLViewerImage* imagep = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
        if (imagep)
        {
-                LLViewerImage::bindTexture(imagep);
+                LLViewerImage::bindTexture(imagep->getImage());
                // set proper background color depending on whether notify box is a caution or not
                LLColor4 color = mIsCaution? gColors.getColor("NotifyCautionBoxColor") : gColors.getColor("NotifyBoxColor");
                if(gFocusMgr.childHasKeyboardFocus( this ))
@@ -520,11 +519,11 @@ void LLNotifyBox::drawBackground() const
                        gGL.color4fv(color.mV);
                        gl_segmented_rect_2d_tex(-focus_width, getRect().getHeight() + focus_width, 
                                                                        getRect().getWidth() + focus_width, -focus_width,
-                                                                        imagep->getWidth(), imagep->getHeight(),
+                                                                        imagep->getTextureWidth(), imagep->getTextureHeight(),
                                                                        16, mIsTip ? ROUNDED_RECT_TOP : ROUNDED_RECT_BOTTOM);
                        color = gColors.getColor("ColorDropShadow");
                        gGL.color4fv(color.mV);
-                        gl_segmented_rect_2d_tex(0, getRect().getHeight(), getRect().getWidth(), 0, imagep->getWidth(), imagep->getHeight(), 16, mIsTip ? ROUNDED_RECT_TOP : ROUNDED_RECT_BOTTOM);
+                        gl_segmented_rect_2d_tex(0, getRect().getHeight(), getRect().getWidth(), 0, imagep->getTextureWidth(), imagep->getTextureHeight(), 16, mIsTip ? ROUNDED_RECT_TOP : ROUNDED_RECT_BOTTOM);
                        if( mIsCaution )
                                color = gColors.getColor("NotifyCautionBoxColor");
@@ -532,12 +531,12 @@ void LLNotifyBox::drawBackground() const
                                color = gColors.getColor("NotifyBoxColor");
                        gGL.color4fv(color.mV);
-                        gl_segmented_rect_2d_tex(1, getRect().getHeight()-1, getRect().getWidth()-1, 1, imagep->getWidth(), imagep->getHeight(), 16, mIsTip ? ROUNDED_RECT_TOP : ROUNDED_RECT_BOTTOM);
+                        gl_segmented_rect_2d_tex(1, getRect().getHeight()-1, getRect().getWidth()-1, 1, imagep->getTextureWidth(), imagep->getTextureHeight(), 16, mIsTip ? ROUNDED_RECT_TOP : ROUNDED_RECT_BOTTOM);
                }
                else
                {
                        gGL.color4fv(color.mV);
-                        gl_segmented_rect_2d_tex(0, getRect().getHeight(), getRect().getWidth(), 0, imagep->getWidth(), imagep->getHeight(), 16, mIsTip ? ROUNDED_RECT_TOP : ROUNDED_RECT_BOTTOM);
+                        gl_segmented_rect_2d_tex(0, getRect().getHeight(), getRect().getWidth(), 0, imagep->getTextureWidth(), imagep->getTextureHeight(), 16, mIsTip ? ROUNDED_RECT_TOP : ROUNDED_RECT_BOTTOM);
                }
        }
 }
diff --git a/linden/indra/newview/llnotify.h b/linden/indra/newview/llnotify.h
index 9421a5b..f2d37c1 100644
--- a/linden/indra/newview/llnotify.h
+++ b/linden/indra/newview/llnotify.h
@@ -168,8 +168,6 @@ public:
        void showOnly(LLView * ctrl);
        LLNotifyBox * getFirstNontipBox() const;
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_VIEW; };
-        virtual LLString getWidgetTag() const { return LLString(); }
        class Matcher
        {
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 0366e75..e5c1113 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -55,12 +55,13 @@
 #include "llviewermedia.h"
 #include "llviewerparcelmedia.h"
 #include "llviewerparcelmgr.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llvoiceclient.h"
 #include "llvoavatar.h"
 #include "llvoiceremotectrl.h"
 #include "llwebbrowserctrl.h"
+#include "llselectmgr.h"
 //
 // Globals
@@ -112,7 +113,7 @@ LLOverlayBar::LLOverlayBar()
        factory_map["voice_remote"] = LLCallbackMap(LLOverlayBar::createVoiceRemote, this);
        factory_map["chat_bar"] = LLCallbackMap(LLOverlayBar::createChatBar, this);
        
-        gUICtrlFactory->buildPanel(this, "panel_overlaybar.xml", &factory_map);
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_overlaybar.xml", &factory_map);
 }
 BOOL LLOverlayBar::postBuild()
@@ -136,16 +137,6 @@ LLOverlayBar::~LLOverlayBar()
        // LLView destructor cleans up children
 }
-EWidgetType LLOverlayBar::getWidgetType() const
-{
-        return WIDGET_TYPE_OVERLAY_BAR;
-}
-LLString LLOverlayBar::getWidgetTag() const
-{
-        return LL_OVERLAY_BAR_TAG;
-}
 // virtual
 void LLOverlayBar::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
@@ -159,12 +150,12 @@ void LLOverlayBar::reshape(S32 width, S32 height, BOOL called_from_parent)
 void LLOverlayBar::layoutButtons()
 {
-        LLView* state_buttons_panel = getChildByName("state_buttons", TRUE);
+        LLView* state_buttons_panel = getChildView("state_buttons");
-        if (state_buttons_panel && state_buttons_panel->getVisible())
+        if (state_buttons_panel->getVisible())
        {
                LLViewQuery query;
-                LLWidgetTypeFilter widget_filter(WIDGET_TYPE_BUTTON);
+                LLWidgetTypeFilter<LLButton> widget_filter;
                query.addPreFilter(LLEnabledFilter::getInstance());
                query.addPreFilter(&widget_filter);
@@ -200,7 +191,7 @@ void LLOverlayBar::refresh()
        BOOL buttons_changed = FALSE;
        BOOL im_received = gIMMgr->getIMReceived();
-        LLButton* button = LLUICtrlFactory::getButtonByName(this, "IM Received");
+        LLButton* button = getChild<LLButton>("IM Received");
        if (button && button->getVisible() != im_received)
        {
                button->setVisible(im_received);
@@ -210,7 +201,7 @@ void LLOverlayBar::refresh()
        }
        BOOL busy = gAgent.getBusy();
-        button = LLUICtrlFactory::getButtonByName(this, "Set Not Busy");
+        button = getChild<LLButton>("Set Not Busy");
        if (button && button->getVisible() != busy)
        {
                button->setVisible(busy);
@@ -220,7 +211,7 @@ void LLOverlayBar::refresh()
        }
        BOOL controls_grabbed = gAgent.anyControlGrabbed();
-        button = LLUICtrlFactory::getButtonByName(this, "Release Keys");
+        button = getChild<LLButton>("Release Keys");
        if (button && button->getVisible() != controls_grabbed)
        {
@@ -233,7 +224,7 @@ void LLOverlayBar::refresh()
        BOOL mouselook_grabbed;
        mouselook_grabbed = gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_DOWN_INDEX)
                || gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX);
-        button = LLUICtrlFactory::getButtonByName(this, "Mouselook");
+        button = getChild<LLButton>("Mouselook");
        if (button && button->getVisible() != mouselook_grabbed)
        {
@@ -248,7 +239,7 @@ void LLOverlayBar::refresh()
        {
                sitting = gAgent.getAvatarObject()->mIsSitting;
        }
-        button = LLUICtrlFactory::getButtonByName(this, "Stand Up");
+        button = getChild<LLButton>("Stand Up");
        if (button && button->getVisible() != sitting)
        {
@@ -325,6 +316,7 @@ void LLOverlayBar::onClickMouselook(void*)
 //static
 void LLOverlayBar::onClickStandUp(void*)
 {
+        LLSelectMgr::getInstance()->deselectAllForStandingUp();
        gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
 }
@@ -359,7 +351,7 @@ void LLOverlayBar::toggleMediaPlay(void*)
        }
        else
        {
-                LLParcel* parcel = gParcelMgr->getAgentParcel();
+                LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                if (parcel)
                {
                        LLViewerParcelMedia::play(parcel);
@@ -380,7 +372,7 @@ void LLOverlayBar::toggleMusicPlay(void*)
                gOverlayBar->mMusicState = PLAYING; // desired state
                if (gAudiop)
                {
-                        LLParcel* parcel = gParcelMgr->getAgentParcel();
+                        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                        if ( parcel )
                        {
                                // this doesn't work properly when crossing parcel boundaries - even when the 
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index abbc33f..51a6e50 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -57,9 +57,6 @@ public:
        LLOverlayBar();
        ~LLOverlayBar();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        /*virtual*/ void refresh();
        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
        /*virtual*/ BOOL postBuild();
diff --git a/linden/indra/newview/llpanelLCD.cpp b/linden/indra/newview/llpanelLCD.cpp
index b58b21c..cd6626c 100644
--- a/linden/indra/newview/llpanelLCD.cpp
+++ b/linden/indra/newview/llpanelLCD.cpp
@@ -38,7 +38,7 @@
 #include "llrect.h"
 #include "llfontgl.h"
 #include "message.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 // project includes
 #include "llviewerwindow.h"
@@ -70,18 +70,18 @@
 LLPanelLCD::LLPanelLCD() 
 {
-        gUICtrlFactory->buildPanel(this, "panel_preferences_lcd.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_lcd.xml");
 }
 BOOL LLPanelLCD::postBuild()
 {
-        requires("LCDDestination", WIDGET_TYPE_RADIO_GROUP);
+        requires<LLRadioGroup>("LCDDestination");
-        requires("DisplayLinden", WIDGET_TYPE_CHECKBOX);
+        requires<LLCheckBoxCtrl>("DisplayLinden");
-        requires("DisplayDebug", WIDGET_TYPE_CHECKBOX);
+        requires<LLCheckBoxCtrl>("DisplayDebug");
-        requires("DisplayDebugConsole", WIDGET_TYPE_CHECKBOX);
+        requires<LLCheckBoxCtrl>("DisplayDebugConsole");
-        requires("DisplayRegion", WIDGET_TYPE_CHECKBOX);
+        requires<LLCheckBoxCtrl>("DisplayRegion");
-        requires("DisplayChat", WIDGET_TYPE_CHECKBOX);
+        requires<LLCheckBoxCtrl>("DisplayChat");
-        requires("DisplayIM", WIDGET_TYPE_CHECKBOX);
+        requires<LLCheckBoxCtrl>("DisplayIM");
        if (!checkRequirements())
        {
diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp
index 606eeb9..6dc1e73 100644
--- a/linden/indra/newview/llpanelaudioprefs.cpp
+++ b/linden/indra/newview/llpanelaudioprefs.cpp
@@ -57,7 +57,7 @@
 #include "lltextbox.h"
 #include "llui.h"
 #include "llviewerparcelmgr.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
@@ -76,7 +76,7 @@ LLPanelAudioPrefs::LLPanelAudioPrefs()
 {
        mFactoryMap["Volume Panel"]     = LLCallbackMap(createVolumePanel, NULL);
        
-        gUICtrlFactory->buildPanel(this, "panel_preferences_audio.xml", &getFactoryMap());
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_audio.xml", &getFactoryMap());
 }
 LLPanelAudioPrefs::~LLPanelAudioPrefs()
diff --git a/linden/indra/newview/llpanelaudiovolume.cpp b/linden/indra/newview/llpanelaudiovolume.cpp
index 0464814..e5bc9c5 100644
--- a/linden/indra/newview/llpanelaudiovolume.cpp
+++ b/linden/indra/newview/llpanelaudiovolume.cpp
@@ -35,7 +35,7 @@
 #include "lloverlaybar.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 ////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 5d32f4b..3314ec1 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -74,14 +74,13 @@
 #include "llviewergenericmessage.h"     // send_generic_message
 #include "llviewerobjectlist.h"
 #include "llviewerregion.h"
-#include "llviewborder.h"
 #include "llweb.h"
 #include "llinventorymodel.h"
 #include "roles_constants.h"
 #define kArraySize( _kArray ) ( sizeof( (_kArray) ) / sizeof( _kArray[0] ) )
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 // Statics
 std::list<LLPanelAvatar*> LLPanelAvatar::sAllPanels;
@@ -104,9 +103,6 @@ public:
        LLDropTarget(const std::string& name, const LLRect& rect, const LLUUID& agent_id);
        ~LLDropTarget();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        void doDrop(EDragAndDropType cargo_type, void* cargo_data);
        //
@@ -133,16 +129,6 @@ LLDropTarget::~LLDropTarget()
 {
 }
-EWidgetType LLDropTarget::getWidgetType() const
-{
-        return WIDGET_TYPE_DROP_TARGET;
-}
-LLString LLDropTarget::getWidgetTag() const
-{
-        return LL_DROP_TARGET_TAG;
-}
 void LLDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
 {
        llinfos << "LLDropTarget::doDrop()" << llendl;
@@ -243,12 +229,9 @@ LLPanelAvatarTab::LLPanelAvatarTab(const std::string& name, const LLRect &rect,
 // virtual
 void LLPanelAvatarTab::draw()
 {
-        if (getVisible())
+        refresh();
-        {
-                refresh();
-                LLPanel::draw();
+        LLPanel::draw();
-        }
 }
 void LLPanelAvatarTab::sendAvatarProfileRequestIfNeeded(const char* method)
@@ -314,12 +297,12 @@ void LLPanelAvatarSecondLife::clearControls()
        mPartnerID = LLUUID::null;
        
-        LLScrollListCtrl*       group_list = LLUICtrlFactory::getScrollListByName(this,"groups"); 
+        LLScrollListCtrl*       group_list = getChild<LLScrollListCtrl>("groups"); 
        if(group_list)
        {
                group_list->deleteAllItems();
        }
-        LLScrollListCtrl*       ratings_list = LLUICtrlFactory::getScrollListByName(this,"ratings"); 
+        LLScrollListCtrl*       ratings_list = getChild<LLScrollListCtrl>("ratings"); 
        if(ratings_list)
        {
                ratings_list->deleteAllItems();
@@ -339,15 +322,6 @@ void LLPanelAvatarSecondLife::enableControls(BOOL self)
        childSetEnabled("allow_publish", self);
        childSetVisible("?", self);
        childSetEnabled("?", self);
-        if (!self)
-        {
-                // This is because the LLTextEditor
-                // appears to reset the read only background color when
-                // setEnable is called, for some reason
-                LLTextEditor* about = LLUICtrlFactory::getTextEditorByName(this,"about");
-                if (about) about->setReadOnlyBgColor(LLColor4::transparent);
-        }
 }
@@ -361,7 +335,7 @@ void LLPanelAvatarSecondLife::onDoubleClickGroup(void* data)
        LLPanelAvatarSecondLife* self = (LLPanelAvatarSecondLife*)data;
        
-        LLScrollListCtrl*       group_list =  LLUICtrlFactory::getScrollListByName(self,"groups"); 
+        LLScrollListCtrl*       group_list =  self->getChild<LLScrollListCtrl>("groups"); 
        if(group_list)
        {
                LLScrollListItem* item = group_list->getFirstSelected();
@@ -478,7 +452,7 @@ BOOL LLPanelAvatarNotes::postBuild(void)
 {
        childSetCommitCallback("notes edit",onCommitNotes,this);
        
-        LLTextEditor*   te = LLUICtrlFactory::getTextEditorByName(this,"notes edit");
+        LLTextEditor*   te = getChild<LLTextEditor>("notes edit");
        if(te) te->setCommitOnFocusLost(TRUE);
        return TRUE;
 }
@@ -529,7 +503,7 @@ BOOL LLPanelAvatarAdvanced::postBuild()
        for(S32 tt=0; tt < mWantToCount; ++tt)
        {       
                LLString ctlname = llformat("chk%d", tt);
-                mWantToCheck[tt] = LLUICtrlFactory::getCheckBoxByName(this,ctlname);
+                mWantToCheck[tt] = getChild<LLCheckBoxCtrl>(ctlname);
        }       
        mSkillsCount = (6>kArraySize(mSkillsCheck))?kArraySize(mSkillsCheck):6;
@@ -537,11 +511,11 @@ BOOL LLPanelAvatarAdvanced::postBuild()
        {
                //Find the Skills checkboxes and save off thier controls
                LLString ctlname = llformat("schk%d",tt);
-                mSkillsCheck[tt] = LLUICtrlFactory::getCheckBoxByName(this,ctlname);
+                mSkillsCheck[tt] = getChild<LLCheckBoxCtrl>(ctlname);
        }
-        mWantToEdit = LLUICtrlFactory::getLineEditorByName(this,"want_to_edit");
+        mWantToEdit = getChild<LLLineEditor>("want_to_edit");
-        mSkillsEdit = LLUICtrlFactory::getLineEditorByName(this,"skills_edit");
+        mSkillsEdit = getChild<LLLineEditor>("skills_edit");
        childSetVisible("skills_edit",LLPanelAvatar::sAllowFirstLife);
        childSetVisible("want_to_edit",LLPanelAvatar::sAllowFirstLife);
@@ -717,17 +691,6 @@ void LLPanelAvatarAdvanced::enableControls(BOOL self)
        if (mWantToEdit) mWantToEdit->setEnabled(self);
        if (mSkillsEdit) mSkillsEdit->setEnabled(self);
        childSetEnabled("languages_edit",self);
-        if (!self)
-        {
-                // This is because the LLTextEditor
-                // appears to reset the read only background color when
-                // setEnable is called, for some reason
-                if (mWantToEdit) mWantToEdit->setReadOnlyBgColor(LLColor4::transparent);
-                if (mSkillsEdit) mSkillsEdit->setReadOnlyBgColor(LLColor4::transparent);
-                LLLineEditor* languages_edit = getChild<LLLineEditor>("languages_edit");
-                languages_edit->setReadOnlyBgColor(LLColor4::transparent);
-        }
 }
 void LLPanelAvatarAdvanced::setWantSkills(U32 want_to_mask, const std::string& want_to_text,
@@ -828,7 +791,7 @@ void LLPanelAvatarClassified::refresh()
 {
        BOOL self = (gAgent.getID() == getPanelAvatar()->getAvatarID());
        
-        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(this,"classified tab");
+        LLTabContainer* tabs = getChild<LLTabContainer>("classified tab");
        
        S32 tab_count = tabs ? tabs->getTabCount() : 0;
@@ -862,7 +825,7 @@ void LLPanelAvatarClassified::refresh()
 BOOL LLPanelAvatarClassified::canClose()
 {
-        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
+        LLTabContainer* tabs = getChild<LLTabContainer>("classified tab");
        for (S32 i = 0; i < tabs->getTabCount(); i++)
        {
                LLPanelClassified* panel = (LLPanelClassified*)tabs->getPanelByIndex(i);
@@ -876,7 +839,7 @@ BOOL LLPanelAvatarClassified::canClose()
 BOOL LLPanelAvatarClassified::titleIsValid()
 {
-        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
+        LLTabContainer* tabs = getChild<LLTabContainer>("classified tab");
        if ( tabs )
        {
                LLPanelClassified* panel = (LLPanelClassified*)tabs->getCurrentPanel();
@@ -894,7 +857,7 @@ BOOL LLPanelAvatarClassified::titleIsValid()
 void LLPanelAvatarClassified::apply()
 {
-        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this, "classified tab");
+        LLTabContainer* tabs = getChild<LLTabContainer>("classified tab");
        for (S32 i = 0; i < tabs->getTabCount(); i++)
        {
                LLPanelClassified* panel = (LLPanelClassified*)tabs->getPanelByIndex(i);
@@ -905,7 +868,7 @@ void LLPanelAvatarClassified::apply()
 void LLPanelAvatarClassified::deleteClassifiedPanels()
 {
-        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this,"classified tab");
+        LLTabContainer* tabs = getChild<LLTabContainer>("classified tab");
        if (tabs)
        {
                tabs->deleteAllTabs();
@@ -925,7 +888,7 @@ void LLPanelAvatarClassified::processAvatarClassifiedReply(LLMessageSystem* msg,
        char classified_name[DB_PICK_NAME_SIZE];                /*Flawfinder: ignore*/
        LLPanelClassified* panel_classified = NULL;
-        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this,"classified tab");
+        LLTabContainer* tabs = getChild<LLTabContainer>("classified tab");
        // Don't remove old panels.  We need to be able to process multiple
        // packets for people who have lots of classifieds. JC
@@ -983,7 +946,7 @@ void LLPanelAvatarClassified::callbackNew(S32 option, void* data)
        {
                LLPanelClassified* panel_classified = new LLPanelClassified(false, false);
                panel_classified->initNewClassified();
-                LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(self,"classified tab");
+                LLTabContainer* tabs = self->getChild<LLTabContainer>("classified tab");
                if(tabs)
                {
                        tabs->addTabPanel(panel_classified, panel_classified->getClassifiedName());
@@ -998,7 +961,7 @@ void LLPanelAvatarClassified::onClickDelete(void* data)
 {
        LLPanelAvatarClassified* self = (LLPanelAvatarClassified*)data;
-        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(self,"classified tab");
+        LLTabContainer* tabs = self->getChild<LLTabContainer>("classified tab");
        LLPanelClassified* panel_classified = NULL;
        if(tabs)
        {
@@ -1017,7 +980,7 @@ void LLPanelAvatarClassified::onClickDelete(void* data)
 void LLPanelAvatarClassified::callbackDelete(S32 option, void* data)
 {
        LLPanelAvatarClassified* self = (LLPanelAvatarClassified*)data;
-        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(self,"classified tab");
+        LLTabContainer* tabs = self->getChild<LLTabContainer>("classified tab");
        LLPanelClassified* panel_classified=NULL;
        if(tabs)
        {
@@ -1062,7 +1025,7 @@ LLPanelAvatarPicks::LLPanelAvatarPicks(const std::string& name,
 void LLPanelAvatarPicks::refresh()
 {
        BOOL self = (gAgent.getID() == getPanelAvatar()->getAvatarID());
-        LLTabContainer* tabs = LLViewerUICtrlFactory::getTabContainerByName(this,"picks tab");
+        LLTabContainer* tabs = getChild<LLTabContainer>("picks tab");
        S32 tab_count = tabs ? tabs->getTabCount() : 0;
        childSetEnabled("New...",    self && tab_count < MAX_AVATAR_PICKS);
        childSetEnabled("Delete...", self && tab_count > 0);
@@ -1075,7 +1038,7 @@ void LLPanelAvatarPicks::refresh()
 void LLPanelAvatarPicks::deletePickPanels()
 {
-        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(this,"picks tab");
+        LLTabContainer* tabs = getChild<LLTabContainer>("picks tab");
        if(tabs)
        {
                tabs->deleteAllTabs();
@@ -1094,7 +1057,7 @@ void LLPanelAvatarPicks::processAvatarPicksReply(LLMessageSystem* msg, void**)
        char pick_name[DB_PICK_NAME_SIZE];              /*Flawfinder: ignore*/
        LLPanelPick* panel_pick = NULL;
-        LLTabContainer* tabs =  LLUICtrlFactory::getTabContainerByName(this,"picks tab");
+        LLTabContainer* tabs =  getChild<LLTabContainer>("picks tab");
        // Clear out all the old panels.  We'll replace them with the correct
        // number of new panels.
@@ -1144,7 +1107,7 @@ void LLPanelAvatarPicks::onClickNew(void* data)
 {
        LLPanelAvatarPicks* self = (LLPanelAvatarPicks*)data;
        LLPanelPick* panel_pick = new LLPanelPick(FALSE);
-        LLTabContainer* tabs =  LLUICtrlFactory::getTabContainerByName(self,"picks tab");
+        LLTabContainer* tabs =  self->getChild<LLTabContainer>("picks tab");
        panel_pick->initNewPick();
        if(tabs)
@@ -1159,7 +1122,7 @@ void LLPanelAvatarPicks::onClickNew(void* data)
 void LLPanelAvatarPicks::onClickDelete(void* data)
 {
        LLPanelAvatarPicks* self = (LLPanelAvatarPicks*)data;
-        LLTabContainer* tabs =  LLUICtrlFactory::getTabContainerByName(self,"picks tab");
+        LLTabContainer* tabs =  self->getChild<LLTabContainer>("picks tab");
        LLPanelPick* panel_pick = tabs?(LLPanelPick*)tabs->getCurrentPanel():NULL;
        if (!panel_pick) return;
@@ -1177,7 +1140,7 @@ void LLPanelAvatarPicks::onClickDelete(void* data)
 void LLPanelAvatarPicks::callbackDelete(S32 option, void* data)
 {
        LLPanelAvatarPicks* self = (LLPanelAvatarPicks*)data;
-        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(self,"picks tab");
+        LLTabContainer* tabs = self->getChild<LLTabContainer>("picks tab");
        LLPanelPick* panel_pick = tabs?(LLPanelPick*)tabs->getCurrentPanel():NULL;
        LLMessageSystem* msg = gMessageSystem;
@@ -1257,7 +1220,7 @@ LLPanelAvatar::LLPanelAvatar(
        factory_map["1st Life"] = LLCallbackMap(createPanelAvatarFirstLife, this);
        factory_map["My Notes"] = LLCallbackMap(createPanelAvatarNotes, this);
        
-        gUICtrlFactory->buildPanel(this, "panel_avatar.xml", &factory_map);
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_avatar.xml", &factory_map);
        selectTab(0);
        
@@ -1266,7 +1229,7 @@ LLPanelAvatar::LLPanelAvatar(
 BOOL LLPanelAvatar::postBuild(void)
 {
-        mTab = LLUICtrlFactory::getTabContainerByName(this,"tab");
+        mTab = getChild<LLTabContainer>("tab");
        childSetAction("Kick",onClickKick,this);
        childSetAction("Freeze",onClickFreeze, this);
        childSetAction("Unfreeze", onClickUnfreeze, this);
@@ -1406,7 +1369,7 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const LLString &name,
                mDropTarget->setAgentID(mAvatarID);
        }
-        LLNameEditor* name_edit = LLViewerUICtrlFactory::getNameEditorByName(this, "name");
+        LLNameEditor* name_edit = getChild<LLNameEditor>("name");
        if(name_edit)
        {
                if (name.empty())
@@ -1535,7 +1498,7 @@ void LLPanelAvatar::resetGroupList()
                
        if (mPanelSecondLife)
        {
-                LLScrollListCtrl* group_list = LLUICtrlFactory::getScrollListByName(mPanelSecondLife,"groups");
+                LLScrollListCtrl* group_list = mPanelSecondLife->getChild<LLScrollListCtrl>("groups");
                if (group_list)
                {
                        group_list->deleteAllItems();
@@ -1584,7 +1547,7 @@ void LLPanelAvatar::onClickIM(void* userdata)
        gIMMgr->setFloaterOpen(TRUE);
        std::string name;
-        LLNameEditor* nameedit = LLViewerUICtrlFactory::getNameEditorByName(self->mPanelSecondLife, "name");
+        LLNameEditor* nameedit = self->mPanelSecondLife->getChild<LLNameEditor>("name");
        if (nameedit) name = nameedit->getText();
        gIMMgr->addSession(name, IM_NOTHING_SPECIAL, self->mAvatarID);
 }
@@ -1601,7 +1564,7 @@ void LLPanelAvatar::onClickTrack(void* userdata)
        if( gFloaterWorldMap )
        {
                std::string name;
-                LLNameEditor* nameedit = LLViewerUICtrlFactory::getNameEditorByName(self->mPanelSecondLife, "name");
+                LLNameEditor* nameedit = self->mPanelSecondLife->getChild<LLNameEditor>("name");
                if (nameedit) name = nameedit->getText();
                gFloaterWorldMap->trackAvatar(self->mAvatarID, name);
                LLFloaterWorldMap::show(NULL, TRUE);
@@ -1613,7 +1576,7 @@ void LLPanelAvatar::onClickTrack(void* userdata)
 void LLPanelAvatar::onClickAddFriend(void* userdata)
 {
        LLPanelAvatar* self = (LLPanelAvatar*) userdata;
-        LLNameEditor* name_edit = LLViewerUICtrlFactory::getNameEditorByName(self->mPanelSecondLife, "name");   
+        LLNameEditor* name_edit = self->mPanelSecondLife->getChild<LLNameEditor>("name");       
        if (name_edit)
        {
                LLPanelFriends::requestFriendshipDialog(self->getAvatarID(),
@@ -1629,21 +1592,21 @@ void LLPanelAvatar::onClickMute(void *userdata)
        LLPanelAvatar* self = (LLPanelAvatar*) userdata;
        
        LLUUID agent_id = self->getAvatarID();
-        LLNameEditor* name_edit = LLViewerUICtrlFactory::getNameEditorByName(self->mPanelSecondLife, "name");
+        LLNameEditor* name_edit = self->mPanelSecondLife->getChild<LLNameEditor>("name");
        
        if (name_edit)
        {
                std::string agent_name = name_edit->getText();
                LLFloaterMute::showInstance();
                
-                if (gMuteListp->isMuted(agent_id))
+                if (LLMuteList::getInstance()->isMuted(agent_id))
                {
-                        gFloaterMute->selectMute(agent_id);
+                        LLFloaterMute::getInstance()->selectMute(agent_id);
                }
                else
                {
                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
-                        gMuteListp->add(mute);
+                        LLMuteList::getInstance()->add(mute);
                }
        }
 }
@@ -1679,7 +1642,7 @@ void LLPanelAvatar::onClickOK(void *userdata)
        {
                self->sendAvatarPropertiesUpdate();
-                LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(self,"tab");
+                LLTabContainer* tabs = self->getChild<LLTabContainer>("tab");
                if ( tabs->getCurrentPanel() != self->mPanelClassified )
                {
                        self->mPanelClassified->apply();
@@ -1984,7 +1947,7 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**)
                        continue;
                }
                
-                LLScrollListCtrl*       group_list = LLUICtrlFactory::getScrollListByName(self->mPanelSecondLife,"groups"); 
+                LLScrollListCtrl*       group_list = self->mPanelSecondLife->getChild<LLScrollListCtrl>("groups"); 
 //              if(group_list)
 //              {
 //                      group_list->deleteAllItems();
@@ -2316,7 +2279,7 @@ void LLPanelAvatar::onClickCSR(void* userdata)
        LLPanelAvatar* self = (LLPanelAvatar*)userdata;
        if (!self) return;
        
-        LLNameEditor* name_edit = LLViewerUICtrlFactory::getNameEditorByName(self, "name");
+        LLNameEditor* name_edit = self->getChild<LLNameEditor>("name");
        if (!name_edit) return;
        LLString name = name_edit->getText();
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index 45c4e38..7908ccc 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -60,7 +60,7 @@
 #include "lltexturectrl.h"
 #include "lluiconstants.h"
 #include "llurldispatcher.h"    // for classified HTML detail click teleports
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerwindow.h"
 #include "llworldmap.h"
@@ -184,11 +184,11 @@ LLPanelClassified::LLPanelClassified(bool in_finder, bool from_search)
        std::string classified_def_file;
        if (mInFinder)
        {
-                gUICtrlFactory->buildPanel(this, "panel_classified.xml");
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_classified.xml");
        }
        else
        {
-                gUICtrlFactory->buildPanel(this, "panel_avatar_classified.xml");
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_avatar_classified.xml");
        }
        // Register dispatcher
@@ -223,12 +223,12 @@ void LLPanelClassified::reset()
 BOOL LLPanelClassified::postBuild()
 {
-    mSnapshotCtrl = LLViewerUICtrlFactory::getTexturePickerByName(this, "snapshot_ctrl");
+    mSnapshotCtrl = getChild<LLTextureCtrl>("snapshot_ctrl");
        mSnapshotCtrl->setCommitCallback(onCommitAny);
        mSnapshotCtrl->setCallbackUserData(this);
        mSnapshotSize = mSnapshotCtrl->getRect();
-    mNameEditor = LLViewerUICtrlFactory::getLineEditorByName(this, "given_name_editor");
+    mNameEditor = getChild<LLLineEditor>("given_name_editor");
        mNameEditor->setMaxTextLength(DB_PARCEL_NAME_LEN);
        mNameEditor->setCommitOnFocusLost(TRUE);
        mNameEditor->setFocusReceivedCallback(focusReceived, this);
@@ -236,35 +236,35 @@ BOOL LLPanelClassified::postBuild()
        mNameEditor->setCallbackUserData(this);
        mNameEditor->setPrevalidate( LLLineEditor::prevalidateASCII );
-    mDescEditor = LLUICtrlFactory::getTextEditorByName(this, "desc_editor");
+    mDescEditor = getChild<LLTextEditor>("desc_editor");
        mDescEditor->setCommitOnFocusLost(TRUE);
        mDescEditor->setFocusReceivedCallback(focusReceived, this);
        mDescEditor->setCommitCallback(onCommitAny);
        mDescEditor->setCallbackUserData(this);
        mDescEditor->setTabsToNextField(TRUE);
-    mLocationEditor = LLViewerUICtrlFactory::getLineEditorByName(this, "location_editor");
+    mLocationEditor = getChild<LLLineEditor>("location_editor");
-    mSetBtn = LLViewerUICtrlFactory::getButtonByName(this, "set_location_btn");
+    mSetBtn = getChild<LLButton>( "set_location_btn");
    mSetBtn->setClickedCallback(onClickSet);
    mSetBtn->setCallbackUserData(this);
-    mTeleportBtn = LLViewerUICtrlFactory::getButtonByName(this, "classified_teleport_btn");
+    mTeleportBtn = getChild<LLButton>( "classified_teleport_btn");
    mTeleportBtn->setClickedCallback(onClickTeleport);
    mTeleportBtn->setCallbackUserData(this);
-    mMapBtn = LLViewerUICtrlFactory::getButtonByName(this, "classified_map_btn");
+    mMapBtn = getChild<LLButton>( "classified_map_btn");
    mMapBtn->setClickedCallback(onClickMap);
    mMapBtn->setCallbackUserData(this);
        if(mInFinder)
        {
-                mProfileBtn  = LLViewerUICtrlFactory::getButtonByName(this, "classified_profile_btn");
+                mProfileBtn  = getChild<LLButton>( "classified_profile_btn");
                mProfileBtn->setClickedCallback(onClickProfile);
                mProfileBtn->setCallbackUserData(this);
        }
-        mCategoryCombo = LLViewerUICtrlFactory::getComboBoxByName(this, "classified_category_combo");
+        mCategoryCombo = getChild<LLComboBox>( "classified_category_combo");
        LLClassifiedInfo::cat_map::iterator iter;
        for (iter = LLClassifiedInfo::sCategories.begin();
                iter != LLClassifiedInfo::sCategories.end();
@@ -276,7 +276,7 @@ BOOL LLPanelClassified::postBuild()
        mCategoryCombo->setCommitCallback(onCommitAny);
        mCategoryCombo->setCallbackUserData(this);
-        mMatureCheck = LLViewerUICtrlFactory::getCheckBoxByName(this, "classified_mature_check");
+        mMatureCheck = getChild<LLCheckBoxCtrl>( "classified_mature_check");
        mMatureCheck->setCommitCallback(onCommitAny);
        mMatureCheck->setCallbackUserData(this);
        if (gAgent.isTeen())
@@ -287,18 +287,18 @@ BOOL LLPanelClassified::postBuild()
        if (!mInFinder)
        {
-                mAutoRenewCheck = LLUICtrlFactory::getCheckBoxByName(this, "auto_renew_check");
+                mAutoRenewCheck = getChild<LLCheckBoxCtrl>( "auto_renew_check");
                mAutoRenewCheck->setCommitCallback(onCommitAny);
                mAutoRenewCheck->setCallbackUserData(this);
        }
-        mUpdateBtn = LLUICtrlFactory::getButtonByName(this, "classified_update_btn");
+        mUpdateBtn = getChild<LLButton>("classified_update_btn");
    mUpdateBtn->setClickedCallback(onClickUpdate);
    mUpdateBtn->setCallbackUserData(this);
        if (!mInFinder)
        {
-                mClickThroughText = LLUICtrlFactory::getTextBoxByName(this, "click_through_text");
+                mClickThroughText = getChild<LLTextBox>("click_through_text");
        }
        
    return TRUE;
@@ -351,10 +351,10 @@ void LLPanelClassified::saveCallback(S32 option, void* data)
                                LLView* view = self;
                                while (view)
                                {
-                                        if (view->getWidgetType() == WIDGET_TYPE_FLOATER)
+                                        LLFloater* floaterp = dynamic_cast<LLFloater*>(view);
+                                        if (floaterp)
                                        {
-                                                LLFloater* f = (LLFloater*)view;
+                                                floaterp->close();
-                                                f->close();
                                                break;
                                        }
                                        view = view->getParent();
@@ -393,7 +393,7 @@ void LLPanelClassified::initNewClassified()
        mPaidFor = FALSE;
        // Try to fill in the current parcel
-        LLParcel* parcel = gParcelMgr->getAgentParcel();
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (parcel)
        {
                mNameEditor->setText(parcel->getName());
@@ -674,17 +674,16 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
                self->mUpdateBtn->setLabel(self->getString("update_txt"));
                self->resetDirty();
+                self->resetDirty();
    }
 }
 void LLPanelClassified::draw()
 {
-        if (getVisible())
+        refresh();
-        {
-                refresh();
-                LLPanel::draw();
+        LLPanel::draw();
-        }
 }
@@ -709,12 +708,13 @@ void LLPanelClassified::refresh()
                if(godlike)
                {
                        //make it smaller, so text is more legible
-                        mSnapshotCtrl->setRect(LLRect(20, 375, 320, 175));
+                        mSnapshotCtrl->setOrigin(20, 175);
-                        
+                        mSnapshotCtrl->reshape(300, 200);
                }
                else
                {
-                        mSnapshotCtrl->setRect(mSnapshotSize);
+                        mSnapshotCtrl->setOrigin(mSnapshotSize.mLeft, mSnapshotSize.mBottom);
+                        mSnapshotCtrl->reshape(mSnapshotSize.getWidth(), mSnapshotSize.getHeight());
                        //normal
                }
                mNameEditor->setEnabled(godlike);
@@ -1004,7 +1004,7 @@ LLFloaterPriceForListing::~LLFloaterPriceForListing()
 //virtual
 BOOL LLFloaterPriceForListing::postBuild()
 {
-        LLLineEditor* edit = LLUICtrlFactory::getLineEditorByName(this, "price_edit");
+        LLLineEditor* edit = getChild<LLLineEditor>("price_edit");
        if (edit)
        {
                edit->setPrevalidate(LLLineEditor::prevalidateNonNegativeS32);
@@ -1028,7 +1028,7 @@ void LLFloaterPriceForListing::show( void (*callback)(S32, LLString, void*), voi
        LLFloaterPriceForListing *self = new LLFloaterPriceForListing();
        // Builds and adds to gFloaterView
-        gUICtrlFactory->buildFloater(self, "floater_price_for_listing.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(self, "floater_price_for_listing.xml");
        self->center();
        self->mCallback = callback;
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index 631f1a7..be4d9db 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -109,20 +109,20 @@ void LLPanelContents::getState(LLViewerObject *objectp )
        }
        LLUUID group_id;                        // used for SL-23488
-        gSelectMgr->selectGetGroup(group_id);  // sets group_id as a side effect SL-23488
+        LLSelectMgr::getInstance()->selectGetGroup(group_id);  // sets group_id as a side effect SL-23488
        // BUG? Check for all objects being editable?
        BOOL editable = gAgent.isGodlike()
                                        || (objectp->permModify()
                                               && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) )));  // solves SL-23488
-        BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
+        BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME );
        // Edit script button - ok if object is editable and there's an
        // unambiguous destination for the object.
        if(     editable &&
                all_volume &&
-                ((gSelectMgr->getSelection()->getRootObjectCount() == 1)
+                ((LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1)
-                                        || (gSelectMgr->getSelection()->getObjectCount() == 1)))
+                                        || (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1)))
        {
                //mBtnNewScript->setEnabled(TRUE);
                childSetEnabled("button new script",TRUE);
@@ -138,7 +138,7 @@ void LLPanelContents::getState(LLViewerObject *objectp )
 void LLPanelContents::refresh()
 {
        const BOOL children_ok = TRUE;
-        LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject(children_ok);
+        LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
        getState(object);
        if (mPanelInventory)
@@ -157,7 +157,7 @@ void LLPanelContents::refresh()
 void LLPanelContents::onClickNewScript(void *userdata)
 {
        const BOOL children_ok = TRUE;
-        LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject(children_ok);
+        LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
        if(object)
        {
                LLPermissions perm;
diff --git a/linden/indra/newview/llpaneldebug.cpp b/linden/indra/newview/llpaneldebug.cpp
index 288302b..dce0235 100644
--- a/linden/indra/newview/llpaneldebug.cpp
+++ b/linden/indra/newview/llpaneldebug.cpp
@@ -77,7 +77,7 @@ LLPanelDebug::LLPanelDebug(const std::string& name, const LLRect& rect)
        LLCheckboxCtrl* check = NULL;
        LLSliderCtrl *sliderctrl = NULL;
-        const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
        const S32 HPAD = 10;
        const S32 VPAD = 4;
diff --git a/linden/indra/newview/llpaneldirbrowser.cpp b/linden/indra/newview/llpaneldirbrowser.cpp
index 3ce533c..0d359d7 100644
--- a/linden/indra/newview/llpaneldirbrowser.cpp
+++ b/linden/indra/newview/llpaneldirbrowser.cpp
@@ -67,7 +67,7 @@
 #include "llviewercontrol.h"
 #include "llviewerimagelist.h"
 #include "llviewermessage.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include <string>
 #include <sstream>
@@ -128,7 +128,7 @@ void LLPanelDirBrowser::draw()
        // item.  Unfortunately, we don't know when the find is actually done,
        // so only do this if it's been some time since the last packet of
        // results was received.
-        if (getVisible() && mLastResultTimer.getElapsedTimeF32() > 0.5)
+        if (mLastResultTimer.getElapsedTimeF32() > 0.5)
        {
                if (!mDidAutoSelect &&
                        !childHasFocus("results"))
@@ -182,8 +182,7 @@ void LLPanelDirBrowser::resetSearchStart()
 // protected
 void LLPanelDirBrowser::updateResultCount()
 {
-        LLScrollListCtrl* list = gUICtrlFactory->getScrollListByName(this, "results");
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("results");
-        if (!list) return;
        S32 result_count = list->getItemCount();
        LLString result_text;
@@ -496,13 +495,11 @@ void LLPanelDirBrowser::processDirPeopleReply(LLMessageSystem *msg, void**)
                LLSD row;
                row["id"] = agent_id;
-                LLUUID image_id;
                // We don't show online status in the finder anymore,
                // so just use the 'offline' icon as the generic 'person' icon
-                image_id.set( gViewerArt.getString("icon_avatar_offline.tga") );
                row["columns"][0]["column"] = "icon";
                row["columns"][0]["type"] = "icon";
-                row["columns"][0]["value"] = image_id;
+                row["columns"][0]["value"] = "icon_avatar_offline.tga";
                content["type"] = AVATAR_CODE;
@@ -655,11 +652,9 @@ void LLPanelDirBrowser::processDirPopularReply(LLMessageSystem *msg, void**)
                LLSD row;
                row["id"] = parcel_id;
-                LLUUID image_id;
-                image_id.set( gViewerArt.getString("icon_popular.tga") );
                row["columns"][0]["column"] = "icon";
                row["columns"][0]["type"] = "icon";
-                row["columns"][0]["value"] = image_id;
+                row["columns"][0]["value"] = "icon_popular.tga";
                row["columns"][1]["column"] = "name";
                row["columns"][1]["value"] = name;
@@ -759,17 +754,15 @@ void LLPanelDirBrowser::processDirEventsReply(LLMessageSystem* msg, void**)
                LLUUID image_id;
                if (event_flags & EVENT_FLAG_MATURE)
                {
-                        image_id.set( gViewerArt.getString("icon_event_mature.tga") );
                        row["columns"][0]["column"] = "icon";
                        row["columns"][0]["type"] = "icon";
-                        row["columns"][0]["value"] = image_id;
+                        row["columns"][0]["value"] = "icon_event_mature.tga";
                }
                else
                {
-                        image_id.set( gViewerArt.getString("icon_event.tga") );
                        row["columns"][0]["column"] = "icon";
                        row["columns"][0]["type"] = "icon";
-                        row["columns"][0]["value"] = image_id;
+                        row["columns"][0]["value"] = "icon_event.tga";
                }
                row["columns"][1]["column"] = "name";
@@ -855,10 +848,9 @@ void LLPanelDirBrowser::processDirGroupsReply(LLMessageSystem* msg, void**)
                row["id"] = group_id;
                LLUUID image_id;
-                image_id.set( gViewerArt.getString("icon_group.tga") );
                row["columns"][0]["column"] = "icon";
                row["columns"][0]["type"] = "icon";
-                row["columns"][0]["value"] = image_id;
+                row["columns"][0]["value"] = "icon_group.tga";
                row["columns"][1]["column"] = "name";
                row["columns"][1]["value"] = group_name;
@@ -1088,11 +1080,9 @@ void LLPanelDirBrowser::addClassified(LLCtrlListInterface *list, const LLUUID& p
        LLSD row;
        row["id"] = pick_id;
-        LLUUID image_id;
-        image_id.set( gViewerArt.getString("icon_top_pick.tga") );
        row["columns"][0]["column"] = "icon";
        row["columns"][0]["type"] = "icon";
-        row["columns"][0]["value"] = image_id;
+        row["columns"][0]["value"] = "icon_top_pick.tga";
        row["columns"][1]["column"] = "name";
        row["columns"][1]["value"] = name;
@@ -1114,28 +1104,25 @@ LLSD LLPanelDirBrowser::createLandSale(const LLUUID& parcel_id, BOOL is_auction,
        // Icon and type
        if(is_auction)
        {
-                image_id.set( gViewerArt.getString("icon_auction.tga") );
                row["columns"][0]["column"] = "icon";
                row["columns"][0]["type"] = "icon";
-                row["columns"][0]["value"] = image_id;
+                row["columns"][0]["value"] = "icon_auction.tga";
                *type = AUCTION_CODE;
        }
        else if (is_for_sale)
        {
-                image_id.set( gViewerArt.getString("icon_for_sale.tga") );
                row["columns"][0]["column"] = "icon";
                row["columns"][0]["type"] = "icon";
-                row["columns"][0]["value"] = image_id;
+                row["columns"][0]["value"] = "icon_for_sale.tga";
                *type = FOR_SALE_CODE;
        }
        else
        {
-                image_id.set( gViewerArt.getString("icon_place.tga") );
                row["columns"][0]["column"] = "icon";
                row["columns"][0]["type"] = "icon";
-                row["columns"][0]["value"] = image_id;
+                row["columns"][0]["value"] = "icon_place.tga";
                *type = PLACE_CODE;
        }
@@ -1175,35 +1162,9 @@ void LLPanelDirBrowser::newClassified()
        }
 }
-void LLPanelDirBrowser::renameClassified(const LLUUID& classified_id, const char* name)
-{
-        // TomY What, really?
-        /*LLScrollListItem* row;
-        for (row = mResultsList->getFirstData(); row; row = mResultsList->getNextData())
-        {
-                if (row->getUUID() == classified_id)
-                {
-                        const LLScrollListCell* column;
-                        LLScrollListText* text;
-                        // icon
-                        // type
-                        column = row->getColumn(2);     // name (visible)
-                        text = (LLScrollListText*)column;
-                        text->setText(name);
-                        column = row->getColumn(3);     // name (invisible)
-                        text = (LLScrollListText*)column;
-                        text->setText(name);
-                }
-        }*/
-}
 void LLPanelDirBrowser::setupNewSearch()
 {
-        LLScrollListCtrl* list = gUICtrlFactory->getScrollListByName(this, "results");
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("results");
-        if (!list) return;
        gDirBrowserInstances.removeData(mSearchID);
        // Make a new query ID
@@ -1263,8 +1224,7 @@ void LLPanelDirBrowser::sendDirFindQuery(
 void LLPanelDirBrowser::addHelpText(const char* text)
 {
-        LLScrollListCtrl* list = gUICtrlFactory->getScrollListByName(this, "results");
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("results");
-        if (!list) return;
        list->addCommentText(text);
        childDisable("results");
diff --git a/linden/indra/newview/llpaneldirbrowser.h b/linden/indra/newview/llpaneldirbrowser.h
index fd32e5a..1f0e879 100644
--- a/linden/indra/newview/llpaneldirbrowser.h
+++ b/linden/indra/newview/llpaneldirbrowser.h
@@ -105,8 +105,6 @@ public:
        void showEvent(const U32 event_id);
-        void renameClassified(const LLUUID& classified_id, const char* name);
        // Prev/Next page buttons
        static void onClickNext(void* data);
        static void onClickPrev(void* data);
diff --git a/linden/indra/newview/llpaneldirclassified.cpp b/linden/indra/newview/llpaneldirclassified.cpp
index 52b10b2..7edf78d 100644
--- a/linden/indra/newview/llpaneldirclassified.cpp
+++ b/linden/indra/newview/llpaneldirclassified.cpp
@@ -58,7 +58,7 @@
 #include "llpaneldirbrowser.h"
 #include "lltextbox.h"
 #include "llviewermessage.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llworldmap.h"
 //
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 294c535..dcda770 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -57,7 +57,7 @@
 #include "lldir.h"
 #include "llviewercontrol.h"
 #include "llviewerregion.h"             // for region name for search urls
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llfloaterdirectory.h"
 #include "llpaneldirbrowser.h"
@@ -125,7 +125,7 @@ BOOL LLPanelDirFindAll::postBuild()
                childSetValue("mature_check", false);
        }
-        mWebBrowser = LLViewerUICtrlFactory::getWebBrowserByName(this, "find_browser");
+        mWebBrowser = getChild<LLWebBrowserCtrl>("find_browser");
        if (mWebBrowser)
        {
                // new pages appear in same window as the results page now
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index 5bc1f7e..e5072c5 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -53,6 +53,7 @@
 #include "llspinctrl.h"
 #include "llstartup.h"
 #include "lltextbox.h"
+#include "lltexteditor.h"
 #include "llui.h"
 #include "llviewercamera.h"
 #include "llviewerimage.h"
@@ -67,7 +68,7 @@
 #include "llwindow.h"
 #include "llworld.h"
 #include "pipeline.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llfeaturemanager.h"
 #include "llglslshader.h"
 #include "llfloaterhardwaresettings.h"
@@ -88,63 +89,11 @@ const S32 ASPECT_RATIO_STR_LEN = 100;
 LLPanelDisplay::LLPanelDisplay()
 {
-        gUICtrlFactory->buildPanel(this, "panel_preferences_graphics1.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_graphics1.xml");
 }
 BOOL LLPanelDisplay::postBuild()
 {
-        requires("windowed mode", WIDGET_TYPE_CHECKBOX);
-        requires("fullscreen combo", WIDGET_TYPE_COMBO_BOX);
-        requires("aspect_ratio", WIDGET_TYPE_COMBO_BOX);
-        requires("aspect_auto_detect", WIDGET_TYPE_CHECKBOX);
-        requires("AspectRatioLabel1", WIDGET_TYPE_TEXT_BOX);    
-        requires("DisplayResLabel", WIDGET_TYPE_TEXT_BOX);
-        requires("FullScreenInfo", WIDGET_TYPE_TEXT_EDITOR);
-        requires("QualityPerformanceSelection", WIDGET_TYPE_SLIDER);
-        requires("CustomSettings", WIDGET_TYPE_CHECKBOX);
-        requires("GraphicsHardwareButton", WIDGET_TYPE_BUTTON);
-        requires("Defaults", WIDGET_TYPE_BUTTON);
-        
-        requires("BumpShiny", WIDGET_TYPE_CHECKBOX);
-        requires("BasicShaders", WIDGET_TYPE_CHECKBOX);
-        requires("AvatarVertexProgram", WIDGET_TYPE_CHECKBOX);
-        requires("WindLightUseAtmosShaders", WIDGET_TYPE_CHECKBOX);
-        requires("Reflections", WIDGET_TYPE_CHECKBOX);
-        
-        requires("AvatarImpostors", WIDGET_TYPE_CHECKBOX);
-        requires("AvatarCloth", WIDGET_TYPE_CHECKBOX);
-        
-        requires("DrawDistance", WIDGET_TYPE_SLIDER);
-        requires("DrawDistanceMeterText1", WIDGET_TYPE_TEXT_BOX);
-        requires("DrawDistanceMeterText2", WIDGET_TYPE_TEXT_BOX);
-        requires("ObjectMeshDetail", WIDGET_TYPE_SLIDER);
-        requires("FlexibleMeshDetail", WIDGET_TYPE_SLIDER);
-        requires("TreeMeshDetail", WIDGET_TYPE_SLIDER);
-        requires("AvatarMeshDetail", WIDGET_TYPE_SLIDER);
-        requires("TerrainMeshDetail", WIDGET_TYPE_SLIDER);
-        requires("SkyMeshDetail", WIDGET_TYPE_SLIDER);
-        requires("MaxParticleCount", WIDGET_TYPE_SLIDER);
-        requires("RenderPostProcess", WIDGET_TYPE_SLIDER);
-        requires("ObjectMeshDetailText", WIDGET_TYPE_TEXT_BOX);
-        requires("FlexibleMeshDetailText", WIDGET_TYPE_TEXT_BOX);
-        requires("TreeMeshDetailText", WIDGET_TYPE_TEXT_BOX);
-        requires("AvatarMeshDetailText", WIDGET_TYPE_TEXT_BOX);
-        requires("TerrainMeshDetailText", WIDGET_TYPE_TEXT_BOX);
-        requires("SkyMeshDetailText", WIDGET_TYPE_TEXT_BOX);
-        requires("PostProcessText", WIDGET_TYPE_TEXT_BOX);
-        requires("LightingDetailRadio", WIDGET_TYPE_RADIO_GROUP);
-        requires("TerrainDetailRadio", WIDGET_TYPE_RADIO_GROUP);
-        if (!checkRequirements())
-        {
-                return FALSE;
-        }
        // return to default values
        childSetAction("Defaults", setHardwareDefaults, NULL);
        
@@ -159,20 +108,20 @@ BOOL LLPanelDisplay::postBuild()
        
        // radio set for fullscreen size
        
-        mCtrlWindowed = LLUICtrlFactory::getCheckBoxByName(this, "windowed mode");
+        mCtrlWindowed = getChild<LLCheckBoxCtrl>( "windowed mode");
        mCtrlWindowed->setCommitCallback(onCommitWindowedMode);
        mCtrlWindowed->setCallbackUserData(this);
-        mAspectRatioLabel1 = LLUICtrlFactory::getTextBoxByName(this, "AspectRatioLabel1");
+        mAspectRatioLabel1 = getChild<LLTextBox>("AspectRatioLabel1");
-        mFullScreenInfo = LLUICtrlFactory::getTextEditorByName(this, "FullScreenInfo");
+        mFullScreenInfo = getChild<LLTextEditor>("FullScreenInfo");
-        mDisplayResLabel = LLUICtrlFactory::getTextBoxByName(this, "DisplayResLabel");
+        mDisplayResLabel = getChild<LLTextBox>("DisplayResLabel");
        S32 num_resolutions = 0;
        LLWindow::LLWindowResolution* supported_resolutions = gViewerWindow->getWindow()->getSupportedResolutions(num_resolutions);
        S32 fullscreen_mode = num_resolutions - 1;
-        mCtrlFullScreen = LLUICtrlFactory::getComboBoxByName(this, "fullscreen combo");
+        mCtrlFullScreen = getChild<LLComboBox>( "fullscreen combo");
        
        LLUIString resolution_label = getUIString("resolution_format");
@@ -239,7 +188,7 @@ BOOL LLPanelDisplay::postBuild()
                aspect_ratio_text = llformat("%.3f", mAspectRatio);
        }
-        mCtrlAspectRatio = LLUICtrlFactory::getComboBoxByName(this, "aspect_ratio");
+        mCtrlAspectRatio = getChild<LLComboBox>( "aspect_ratio");
        mCtrlAspectRatio->setTextEntryCallback(onKeystrokeAspectRatio);
        mCtrlAspectRatio->setCommitCallback(onSelectAspectRatio);
        mCtrlAspectRatio->setCallbackUserData(this);
@@ -247,125 +196,123 @@ BOOL LLPanelDisplay::postBuild()
        mCtrlAspectRatio->add(aspect_ratio_text, &mAspectRatio, ADD_TOP);
        mCtrlAspectRatio->setCurrentByIndex(0);
-        mCtrlAutoDetectAspect = LLUICtrlFactory::getCheckBoxByName(this, "aspect_auto_detect");
+        mCtrlAutoDetectAspect = getChild<LLCheckBoxCtrl>( "aspect_auto_detect");
        mCtrlAutoDetectAspect->setCommitCallback(onCommitAutoDetectAspect);
        mCtrlAutoDetectAspect->setCallbackUserData(this);
        // radio performance box
-        mCtrlSliderQuality = LLUICtrlFactory::getSliderByName(this, 
+        mCtrlSliderQuality = getChild<LLSliderCtrl>("QualityPerformanceSelection");
-                "QualityPerformanceSelection");
        mCtrlSliderQuality->setSliderMouseUpCallback(onChangeQuality);
        mCtrlSliderQuality->setCallbackUserData(this);
-        mCtrlCustomSettings = LLUICtrlFactory::getCheckBoxByName(this, "CustomSettings");
+        mCtrlCustomSettings = getChild<LLCheckBoxCtrl>("CustomSettings");
        mCtrlCustomSettings->setCommitCallback(onChangeCustom);
        mCtrlCustomSettings->setCallbackUserData(this);
-        mGraphicsBorder = static_cast<LLViewBorder*>(getChildByName("GraphicsBorder"));
+        mGraphicsBorder = getChild<LLViewBorder>("GraphicsBorder");
-        llassert(mGraphicsBorder != NULL);
        //----------------------------------------------------------------------------
        // Enable Bump/Shiny
-        mCtrlBumpShiny = LLUICtrlFactory::getCheckBoxByName(this, "BumpShiny");
+        mCtrlBumpShiny = getChild<LLCheckBoxCtrl>("BumpShiny");
        
        //----------------------------------------------------------------------------
        // Enable Reflections
-        mCtrlReflections = LLUICtrlFactory::getCheckBoxByName(this, "Reflections");
+        mCtrlReflections = getChild<LLCheckBoxCtrl>("Reflections");
        mCtrlReflections->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
        mCtrlReflections->setCallbackUserData(this);
-        mRadioReflectionDetail = LLUICtrlFactory::getRadioGroupByName(this, "ReflectionDetailRadio");
+        mRadioReflectionDetail = getChild<LLRadioGroup>("ReflectionDetailRadio");
        
        // WindLight
-        mCtrlWindLight = LLUICtrlFactory::getCheckBoxByName(this, "WindLightUseAtmosShaders");
+        mCtrlWindLight = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
        mCtrlWindLight->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
        mCtrlWindLight->setCallbackUserData(this);
        //----------------------------------------------------------------------------
        // Enable Avatar Shaders
-        mCtrlAvatarVP = LLUICtrlFactory::getCheckBoxByName(this, "AvatarVertexProgram");
+        mCtrlAvatarVP = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
        mCtrlAvatarVP->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
        mCtrlAvatarVP->setCallbackUserData(this);
        //----------------------------------------------------------------------------
        // Avatar Render Mode
-        mCtrlAvatarCloth = LLUICtrlFactory::getCheckBoxByName(this, "AvatarCloth");
+        mCtrlAvatarCloth = getChild<LLCheckBoxCtrl>("AvatarCloth");
-        mCtrlAvatarImpostors = LLUICtrlFactory::getCheckBoxByName(this, "AvatarImpostors");
+        mCtrlAvatarImpostors = getChild<LLCheckBoxCtrl>("AvatarImpostors");
        //----------------------------------------------------------------------------
        // radio set for lighting detail
-        mRadioLightingDetail2 = LLUICtrlFactory::getRadioGroupByName(this, "LightingDetailRadio");
+        mRadioLightingDetail2 = getChild<LLRadioGroup>("LightingDetailRadio");
        //----------------------------------------------------------------------------
        // radio set for terrain detail mode
-        mRadioTerrainDetail = LLUICtrlFactory::getRadioGroupByName(this, "TerrainDetailRadio");
+        mRadioTerrainDetail = getChild<LLRadioGroup>("TerrainDetailRadio");
        //----------------------------------------------------------------------------
        // Global Shader Enable
-        mCtrlShaderEnable = LLUICtrlFactory::getCheckBoxByName(this, "BasicShaders");
+        mCtrlShaderEnable = getChild<LLCheckBoxCtrl>("BasicShaders");
        mCtrlShaderEnable->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
        mCtrlShaderEnable->setCallbackUserData(this);
        
        //============================================================================
        // Object detail slider
-        mCtrlDrawDistance = LLUICtrlFactory::getSliderByName(this, "DrawDistance");
+        mCtrlDrawDistance = getChild<LLSliderCtrl>("DrawDistance");
-        mDrawDistanceMeterText1 = LLUICtrlFactory::getTextBoxByName(this, "DrawDistanceMeterText1");
+        mDrawDistanceMeterText1 = getChild<LLTextBox>("DrawDistanceMeterText1");
-        mDrawDistanceMeterText2 = LLUICtrlFactory::getTextBoxByName(this, "DrawDistanceMeterText2");
+        mDrawDistanceMeterText2 = getChild<LLTextBox>("DrawDistanceMeterText2");
        mCtrlDrawDistance->setCommitCallback(&LLPanelDisplay::updateMeterText);
        mCtrlDrawDistance->setCallbackUserData(this);
        // Object detail slider
-        mCtrlLODFactor = LLUICtrlFactory::getSliderByName(this, "ObjectMeshDetail");
+        mCtrlLODFactor = getChild<LLSliderCtrl>("ObjectMeshDetail");
-        mLODFactorText = LLUICtrlFactory::getTextBoxByName(this, "ObjectMeshDetailText");
+        mLODFactorText = getChild<LLTextBox>("ObjectMeshDetailText");
        mCtrlLODFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
        mCtrlLODFactor->setCallbackUserData(mLODFactorText);
        // Flex object detail slider
-        mCtrlFlexFactor = LLUICtrlFactory::getSliderByName(this, "FlexibleMeshDetail");
+        mCtrlFlexFactor = getChild<LLSliderCtrl>("FlexibleMeshDetail");
-        mFlexFactorText = LLUICtrlFactory::getTextBoxByName(this, "FlexibleMeshDetailText");
+        mFlexFactorText = getChild<LLTextBox>("FlexibleMeshDetailText");
        mCtrlFlexFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
        mCtrlFlexFactor->setCallbackUserData(mFlexFactorText);
        // Tree detail slider
-        mCtrlTreeFactor = LLUICtrlFactory::getSliderByName(this, "TreeMeshDetail");
+        mCtrlTreeFactor = getChild<LLSliderCtrl>("TreeMeshDetail");
-        mTreeFactorText = LLUICtrlFactory::getTextBoxByName(this, "TreeMeshDetailText");
+        mTreeFactorText = getChild<LLTextBox>("TreeMeshDetailText");
        mCtrlTreeFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
        mCtrlTreeFactor->setCallbackUserData(mTreeFactorText);
        // Avatar detail slider
-        mCtrlAvatarFactor = LLUICtrlFactory::getSliderByName(this, "AvatarMeshDetail");
+        mCtrlAvatarFactor = getChild<LLSliderCtrl>("AvatarMeshDetail");
-        mAvatarFactorText = LLUICtrlFactory::getTextBoxByName(this, "AvatarMeshDetailText");
+        mAvatarFactorText = getChild<LLTextBox>("AvatarMeshDetailText");
        mCtrlAvatarFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
        mCtrlAvatarFactor->setCallbackUserData(mAvatarFactorText);
        // Terrain detail slider
-        mCtrlTerrainFactor = LLUICtrlFactory::getSliderByName(this, "TerrainMeshDetail");
+        mCtrlTerrainFactor = getChild<LLSliderCtrl>("TerrainMeshDetail");
-        mTerrainFactorText = LLUICtrlFactory::getTextBoxByName(this, "TerrainMeshDetailText");
+        mTerrainFactorText = getChild<LLTextBox>("TerrainMeshDetailText");
        mCtrlTerrainFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
        mCtrlTerrainFactor->setCallbackUserData(mTerrainFactorText);
        // Terrain detail slider
-        mCtrlSkyFactor = LLUICtrlFactory::getSliderByName(this, "SkyMeshDetail");
+        mCtrlSkyFactor = getChild<LLSliderCtrl>("SkyMeshDetail");
-        mSkyFactorText = LLUICtrlFactory::getTextBoxByName(this, "SkyMeshDetailText");
+        mSkyFactorText = getChild<LLTextBox>("SkyMeshDetailText");
        mCtrlSkyFactor->setCommitCallback(&LLPanelDisplay::updateSliderText);
        mCtrlSkyFactor->setCallbackUserData(mSkyFactorText);
        // Particle detail slider
-        mCtrlMaxParticle = LLUICtrlFactory::getSliderByName(this, "MaxParticleCount");
+        mCtrlMaxParticle = getChild<LLSliderCtrl>("MaxParticleCount");
        // Glow detail slider
-        mCtrlPostProcess = LLUICtrlFactory::getSliderByName(this, "RenderPostProcess");
+        mCtrlPostProcess = getChild<LLSliderCtrl>("RenderPostProcess");
-        mPostProcessText = LLUICtrlFactory::getTextBoxByName(this, "PostProcessText");
+        mPostProcessText = getChild<LLTextBox>("PostProcessText");
        mCtrlPostProcess->setCommitCallback(&LLPanelDisplay::updateSliderText);
        mCtrlPostProcess->setCallbackUserData(mPostProcessText);
        // Text boxes (for enabling/disabling)
-        mShaderText = LLUICtrlFactory::getTextBoxByName(this, "ShadersText");
+        mShaderText = getChild<LLTextBox>("ShadersText");
-        mReflectionText = LLUICtrlFactory::getTextBoxByName(this, "ReflectionDetailText");
+        mReflectionText = getChild<LLTextBox>("ReflectionDetailText");
-        mAvatarText = LLUICtrlFactory::getTextBoxByName(this, "AvatarRenderingText");
+        mAvatarText = getChild<LLTextBox>("AvatarRenderingText");
-        mTerrainText = LLUICtrlFactory::getTextBoxByName(this, "TerrainDetailText");
+        mTerrainText = getChild<LLTextBox>("TerrainDetailText");
-        mLightingText = LLUICtrlFactory::getTextBoxByName(this, "LightingDetailText");
+        mLightingText = getChild<LLTextBox>("LightingDetailText");
-        mMeshDetailText = LLUICtrlFactory::getTextBoxByName(this, "MeshDetailText");
+        mMeshDetailText = getChild<LLTextBox>("MeshDetailText");
        refresh();
@@ -462,11 +409,11 @@ void LLPanelDisplay::refreshEnabledState()
        // Reflections
        BOOL reflections = gSavedSettings.getBOOL("VertexShaderEnable") 
                && gGLManager.mHasCubeMap 
-                && gFeatureManagerp->isFeatureAvailable("RenderCubeMap");
+                && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
        mCtrlReflections->setEnabled(reflections);
        
        // Bump & Shiny
-        bool bumpshiny = gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap") && gFeatureManagerp->isFeatureAvailable("RenderObjectBump");
+        bool bumpshiny = gGLManager.mHasCubeMap && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap") && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump");
        mCtrlBumpShiny->setEnabled(bumpshiny ? TRUE : FALSE);
        
        for (S32 i = 0; i < mRadioReflectionDetail->getItemCount(); ++i)
@@ -489,7 +436,7 @@ void LLPanelDisplay::refreshEnabledState()
        }
        // Vertex Shaders
-        mCtrlShaderEnable->setEnabled(gFeatureManagerp->isFeatureAvailable("VertexShaderEnable"));
+        mCtrlShaderEnable->setEnabled(LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"));
        BOOL shaders = mCtrlShaderEnable->get();
        if (shaders)
@@ -517,7 +464,7 @@ void LLPanelDisplay::refreshEnabledState()
 void LLPanelDisplay::disableUnavailableSettings()
 {       
        // if vertex shaders off, disable all shader related products
-        if(!gFeatureManagerp->isFeatureAvailable("VertexShaderEnable"))
+        if(!LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"))
        {
                mCtrlShaderEnable->setEnabled(FALSE);
                mCtrlShaderEnable->setValue(FALSE);
@@ -536,21 +483,21 @@ void LLPanelDisplay::disableUnavailableSettings()
        }
        // disabled windlight
-        if(!gFeatureManagerp->isFeatureAvailable("WindLightUseAtmosShaders"))
+        if(!LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders"))
        {
                mCtrlWindLight->setEnabled(FALSE);
                mCtrlWindLight->setValue(FALSE);
        }
        // disabled reflections
-        if(!gFeatureManagerp->isFeatureAvailable("RenderWaterReflections"))
+        if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderWaterReflections"))
        {
                mCtrlReflections->setEnabled(FALSE);
                mCtrlReflections->setValue(FALSE);
        }
        // disabled av
-        if(!gFeatureManagerp->isFeatureAvailable("RenderAvatarVP"))
+        if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderAvatarVP"))
        {
                mCtrlAvatarVP->setEnabled(FALSE);
                mCtrlAvatarVP->setValue(FALSE);
@@ -559,13 +506,13 @@ void LLPanelDisplay::disableUnavailableSettings()
                mCtrlAvatarCloth->setValue(FALSE);
        }
        // disabled cloth
-        if(!gFeatureManagerp->isFeatureAvailable("RenderAvatarCloth"))
+        if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderAvatarCloth"))
        {
                mCtrlAvatarCloth->setEnabled(FALSE);
                mCtrlAvatarCloth->setValue(FALSE);
        }
        // disabled impostors
-        if(!gFeatureManagerp->isFeatureAvailable("RenderUseImpostors"))
+        if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderUseImpostors"))
        {
                mCtrlAvatarImpostors->setEnabled(FALSE);
                mCtrlAvatarImpostors->setValue(FALSE);
@@ -722,7 +669,7 @@ void LLPanelDisplay::onChangeQuality(LLUICtrl *ctrl, void *data)
        }
        U32 set = (U32)sldr->getValueF32();
-        gFeatureManagerp->setGraphicsLevel(set, true);
+        LLFeatureManager::getInstance()->setGraphicsLevel(set, true);
        
        LLFloaterPreference::refreshEnabledGraphics();
        cur_panel->refresh();
@@ -859,15 +806,12 @@ void LLPanelDisplay::applyResolution()
        }
        // force aspect ratio
-        if (fullscreen && gCamera)
+        if (fullscreen)
        {
-                gCamera->setAspect( gViewerWindow->getDisplayAspectRatio() );
+                LLViewerCamera::getInstance()->setAspect( gViewerWindow->getDisplayAspectRatio() );
        }
-        if (gWorldPointer)
+        send_agent_update(TRUE);
-        {
-                send_agent_update(TRUE);
-        }
        // Update enable/disable
        refresh();
@@ -955,11 +899,8 @@ void LLPanelDisplay::onVertexShaderEnable(LLUICtrl* self, void* data)
 void LLPanelDisplay::setHardwareDefaults(void* user_data)
 {
-        if (gFeatureManagerp)
+        LLFeatureManager::getInstance()->applyRecommendedSettings();
-        {
+        LLFloaterPreference::refreshEnabledGraphics();
-                gFeatureManagerp->applyRecommendedSettings();
-                LLFloaterPreference::refreshEnabledGraphics();
-        }
 }
 void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, void* user_data)
@@ -999,12 +940,8 @@ void LLPanelDisplay::updateMeterText(LLUICtrl* ctrl, void* user_data)
        LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
        LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
-        LLTextBox* m1 = LLUICtrlFactory::getTextBoxByName(panel, "DrawDistanceMeterText1");
+        LLTextBox* m1 = panel->getChild<LLTextBox>("DrawDistanceMeterText1");
-        LLTextBox* m2 = LLUICtrlFactory::getTextBoxByName(panel, "DrawDistanceMeterText2");
+        LLTextBox* m2 = panel->getChild<LLTextBox>("DrawDistanceMeterText2");
-        if(m1 == NULL || m2 == NULL || slider == NULL)
-        {
-                return;
-        }
        // toggle the two text boxes based on whether we have 1 or two digits
        F32 val = slider->getValueF32();
diff --git a/linden/indra/newview/llpanelevent.cpp b/linden/indra/newview/llpanelevent.cpp
index 2bf61b3..abfbe79 100644
--- a/linden/indra/newview/llpanelevent.cpp
+++ b/linden/indra/newview/llpanelevent.cpp
@@ -51,7 +51,7 @@
 #include "llviewercontrol.h"
 #include "llweb.h"
 #include "llworldmap.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 //static
 std::list<LLPanelEvent*> LLPanelEvent::sAllPanels;
@@ -70,51 +70,35 @@ LLPanelEvent::~LLPanelEvent()
 BOOL LLPanelEvent::postBuild()
 {
-        mTBName = LLViewerUICtrlFactory::getTextBoxByName(this, "event_name");
+        mTBName = getChild<LLTextBox>("event_name");
-        mTBName->setColor(gColors.getColor( "LabelSelectedColor" ));
-        mTBCategory = LLViewerUICtrlFactory::getTextBoxByName(this, "event_category");
+        mTBCategory = getChild<LLTextBox>("event_category");
-        mTBCategory->setColor(gColors.getColor( "LabelSelectedColor" ));
-        childSetColor("event_mature_yes", gColors.getColor( "LabelSelectedColor" ));
-        childSetColor("event_mature_no", gColors.getColor( "LabelSelectedColor" ));
        
-        mTBDate = LLViewerUICtrlFactory::getTextBoxByName(this, "event_date");
+        mTBDate = getChild<LLTextBox>("event_date");
-        mTBDate->setColor(gColors.getColor( "LabelSelectedColor" ));
-        mTBDuration = LLViewerUICtrlFactory::getTextBoxByName(this, "event_duration");
+        mTBDuration = getChild<LLTextBox>("event_duration");
-        mTBDuration->setColor(gColors.getColor( "LabelSelectedColor" ));
-        mTBDesc = LLUICtrlFactory::getTextEditorByName(this, "event_desc");
+        mTBDesc = getChild<LLTextEditor>("event_desc");
        mTBDesc->setWordWrap(TRUE);
        mTBDesc->setEnabled(FALSE);
-        mTBDesc->setFgColor(gColors.getColor( "LabelSelectedColor" ));
-        mTBDesc->setReadOnlyFgColor(LLColor4(1.f, 1.f, 1.f, 1.f));
-        mTBRunBy = LLViewerUICtrlFactory::getTextBoxByName(this, "event_runby");
+        mTBRunBy = getChild<LLTextBox>("event_runby");
-        mTBRunBy->setColor(gColors.getColor( "LabelSelectedColor" ));
+        mTBLocation = getChild<LLTextBox>("event_location");
-        mTBLocation = LLViewerUICtrlFactory::getTextBoxByName(this, "event_location");
+        mTBCover = getChild<LLTextBox>("event_cover");
-        mTBLocation->setColor(gColors.getColor( "LabelSelectedColor" ));
-        mTBCover = LLViewerUICtrlFactory::getTextBoxByName(this, "event_cover");
-        mTBCover->setColor(gColors.getColor( "LabelSelectedColor" ));
-        mTeleportBtn = LLViewerUICtrlFactory::getButtonByName(this, "teleport_btn");
+        mTeleportBtn = getChild<LLButton>( "teleport_btn");
        mTeleportBtn->setClickedCallback(onClickTeleport);
        mTeleportBtn->setCallbackUserData(this);
-        mMapBtn = LLViewerUICtrlFactory::getButtonByName(this, "map_btn");
+        mMapBtn = getChild<LLButton>( "map_btn");
        mMapBtn->setClickedCallback(onClickMap);
        mMapBtn->setCallbackUserData(this);
-        //mLandmarkBtn = LLViewerUICtrlFactory::getButtonByName(this, "landmark_btn");
+        mNotifyBtn = getChild<LLButton>( "notify_btn");
-        //mLandmarkBtn->setClickedCallback(onClickLandmark);
-        //mLandmarkBtn->setCallbackUserData(this);
-        mNotifyBtn = LLViewerUICtrlFactory::getButtonByName(this, "notify_btn");
        mNotifyBtn->setClickedCallback(onClickNotify);
        mNotifyBtn->setCallbackUserData(this);
-        mCreateEventBtn = LLViewerUICtrlFactory::getButtonByName(this, "create_event_btn");
+        mCreateEventBtn = getChild<LLButton>( "create_event_btn");
        mCreateEventBtn->setClickedCallback(onClickCreateEvent);
        mCreateEventBtn->setCallbackUserData(this);
diff --git a/linden/indra/newview/llpanelevent.h b/linden/indra/newview/llpanelevent.h
index a3d474f..a75ee28 100644
--- a/linden/indra/newview/llpanelevent.h
+++ b/linden/indra/newview/llpanelevent.h
@@ -86,7 +86,6 @@ protected:
        LLButton*               mTeleportBtn;
        LLButton*               mMapBtn;
-        //LLButton*             mLandmarkBtn;
        LLButton*               mCreateEventBtn;
        LLButton*               mNotifyBtn;
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index a52c57f..4742627 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -60,7 +60,7 @@
 #include "llviewermedia.h"
 #include "llviewerobject.h"
 #include "llviewerstats.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 //
 // Methods
@@ -100,7 +100,7 @@ BOOL	LLPanelFace::postBuild()
                // Allow any texture to be used during non-immediate mode.
                mTextureCtrl->setNonImmediateFilterPermMask(PERM_NONE);
                LLAggregatePermissions texture_perms;
-                if (gSelectMgr->selectGetAggregateTexturePermissions(texture_perms))
+                if (LLSelectMgr::getInstance()->selectGetAggregateTexturePermissions(texture_perms))
                {
                        BOOL can_copy = 
                                texture_perms.getValue(PERM_COPY) == LLAggregatePermissions::AP_EMPTY || 
@@ -128,14 +128,14 @@ BOOL	LLPanelFace::postBuild()
                mColorSwatch->setCanApplyImmediately(TRUE);
        }
-        mLabelColorTransp = LLUICtrlFactory::getTextBoxByName(this,"color trans");
+        mLabelColorTransp = getChild<LLTextBox>("color trans");
        if(mLabelColorTransp)
        {
                mLabelColorTransp->setFollowsTop();
                mLabelColorTransp->setFollowsLeft();
        }
-        mCtrlColorTransp = LLUICtrlFactory::getSpinnerByName(this,"ColorTrans");
+        mCtrlColorTransp = getChild<LLSpinCtrl>("ColorTrans");
        if(mCtrlColorTransp)
        {
                mCtrlColorTransp->setCommitCallback(LLPanelFace::onCommitAlpha);
@@ -145,14 +145,14 @@ BOOL	LLPanelFace::postBuild()
                mCtrlColorTransp->setFollowsLeft();
        }
-        mCheckFullbright = LLUICtrlFactory::getCheckBoxByName(this,"checkbox fullbright");
+        mCheckFullbright = getChild<LLCheckBoxCtrl>("checkbox fullbright");
        if (mCheckFullbright)
        {
                mCheckFullbright->setCommitCallback(LLPanelFace::onCommitFullbright);
                mCheckFullbright->setCallbackUserData( this );
        }
-        mLabelTexGen = LLUICtrlFactory::getTextBoxByName(this,"tex gen");
+        mLabelTexGen = getChild<LLTextBox>("tex gen");
-        mComboTexGen = LLUICtrlFactory::getComboBoxByName(this,"combobox texgen");
+        mComboTexGen = getChild<LLComboBox>("combobox texgen");
        if(mComboTexGen)
        {
                mComboTexGen->setCommitCallback(LLPanelFace::onCommitTexGen);
@@ -160,8 +160,8 @@ BOOL	LLPanelFace::postBuild()
                mComboTexGen->setCallbackUserData( this );
        }
-        mLabelGlow = LLUICtrlFactory::getTextBoxByName(this,"glow label");
+        mLabelGlow = getChild<LLTextBox>("glow label");
-        mCtrlGlow = LLUICtrlFactory::getSpinnerByName(this,"glow");
+        mCtrlGlow = getChild<LLSpinCtrl>("glow");
        if(mCtrlGlow)
        {
                mCtrlGlow->setCommitCallback(LLPanelFace::onCommitGlow);
@@ -210,69 +210,68 @@ void LLPanelFace::sendTexture()
                {
                        id = mTextureCtrl->getImageAssetID();
                }
-                gSelectMgr->selectionSetImage(id);
+                LLSelectMgr::getInstance()->selectionSetImage(id);
        }
 }
 void LLPanelFace::sendBump()
 {       
-        LLComboBox*     mComboBumpiness = gUICtrlFactory->getComboBoxByName(this,"combobox bumpiness");
+        LLComboBox*     mComboBumpiness = getChild<LLComboBox>("combobox bumpiness");
        if(!mComboBumpiness)return;
        U8 bump = (U8) mComboBumpiness->getCurrentIndex() & TEM_BUMP_MASK;
-        gSelectMgr->selectionSetBumpmap( bump );
+        LLSelectMgr::getInstance()->selectionSetBumpmap( bump );
 }
 void LLPanelFace::sendTexGen()
 {
-        LLComboBox*     mComboTexGen = gUICtrlFactory->getComboBoxByName(this,"combobox texgen");
+        LLComboBox*     mComboTexGen = getChild<LLComboBox>("combobox texgen");
        if(!mComboTexGen)return;
        U8 tex_gen = (U8) mComboTexGen->getCurrentIndex() << TEM_TEX_GEN_SHIFT;
-        gSelectMgr->selectionSetTexGen( tex_gen );
+        LLSelectMgr::getInstance()->selectionSetTexGen( tex_gen );
 }
 void LLPanelFace::sendShiny()
 {
-        LLComboBox*     mComboShininess = gUICtrlFactory->getComboBoxByName(this,"combobox shininess");
+        LLComboBox*     mComboShininess = getChild<LLComboBox>("combobox shininess");
        if(!mComboShininess)return;
        U8 shiny = (U8) mComboShininess->getCurrentIndex() & TEM_SHINY_MASK;
-        gSelectMgr->selectionSetShiny( shiny );
+        LLSelectMgr::getInstance()->selectionSetShiny( shiny );
 }
 void LLPanelFace::sendFullbright()
 {
-        LLCheckBoxCtrl* mCheckFullbright = gUICtrlFactory->getCheckBoxByName(this,"checkbox fullbright");
+        LLCheckBoxCtrl* mCheckFullbright = getChild<LLCheckBoxCtrl>("checkbox fullbright");
        if(!mCheckFullbright)return;
        U8 fullbright = mCheckFullbright->get() ? TEM_FULLBRIGHT_MASK : 0;
-        gSelectMgr->selectionSetFullbright( fullbright );
+        LLSelectMgr::getInstance()->selectionSetFullbright( fullbright );
 }
 void LLPanelFace::sendColor()
 {
        
-        LLColorSwatchCtrl*      mColorSwatch = LLViewerUICtrlFactory::getColorSwatchByName(this,"colorswatch");
+        LLColorSwatchCtrl*      mColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
        if(!mColorSwatch)return;
        LLColor4 color = mColorSwatch->get();
-        gSelectMgr->selectionSetColorOnly( color );
+        LLSelectMgr::getInstance()->selectionSetColorOnly( color );
 }
 void LLPanelFace::sendAlpha()
 {       
-        LLSpinCtrl*     mCtrlColorTransp = LLViewerUICtrlFactory::getSpinnerByName(this,"ColorTrans");
+        LLSpinCtrl*     mCtrlColorTransp = getChild<LLSpinCtrl>("ColorTrans");
        if(!mCtrlColorTransp)return;
        F32 alpha = (100.f - mCtrlColorTransp->get()) / 100.f;
-        gSelectMgr->selectionSetAlphaOnly( alpha );
+        LLSelectMgr::getInstance()->selectionSetAlphaOnly( alpha );
 }
 void LLPanelFace::sendGlow()
 {
-        LLSpinCtrl*     mCtrlGlow = LLViewerUICtrlFactory::getSpinnerByName(this,"glow");
+        LLSpinCtrl*     mCtrlGlow = getChild<LLSpinCtrl>("glow");
-        if(!mCtrlGlow)return;
        F32 glow = mCtrlGlow->get();
-        gSelectMgr->selectionSetGlow( glow );
+        LLSelectMgr::getInstance()->selectionSetGlow( glow );
 }
 struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor
@@ -282,14 +281,14 @@ struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor
        {
                BOOL valid;
                F32 value;
-                LLSpinCtrl*     ctrlTexScaleS = LLViewerUICtrlFactory::getSpinnerByName(mPanel,"TexScaleU");
+                LLSpinCtrl*     ctrlTexScaleS = mPanel->getChild<LLSpinCtrl>("TexScaleU");
-                LLSpinCtrl*     ctrlTexScaleT = LLViewerUICtrlFactory::getSpinnerByName(mPanel,"TexScaleV");
+                LLSpinCtrl*     ctrlTexScaleT = mPanel->getChild<LLSpinCtrl>("TexScaleV");
-                LLSpinCtrl*     ctrlTexOffsetS = LLViewerUICtrlFactory::getSpinnerByName(mPanel,"TexOffsetU");
+                LLSpinCtrl*     ctrlTexOffsetS = mPanel->getChild<LLSpinCtrl>("TexOffsetU");
-                LLSpinCtrl*     ctrlTexOffsetT = LLViewerUICtrlFactory::getSpinnerByName(mPanel,"TexOffsetV");
+                LLSpinCtrl*     ctrlTexOffsetT = mPanel->getChild<LLSpinCtrl>("TexOffsetV");
-                LLSpinCtrl*     ctrlTexRotation = LLViewerUICtrlFactory::getSpinnerByName(mPanel,"TexRot");
+                LLSpinCtrl*     ctrlTexRotation = mPanel->getChild<LLSpinCtrl>("TexRot");
-                LLCheckBoxCtrl* checkFlipScaleS = LLViewerUICtrlFactory::getCheckBoxByName(mPanel,"checkbox flip s");
+                LLCheckBoxCtrl* checkFlipScaleS = mPanel->getChild<LLCheckBoxCtrl>("checkbox flip s");
-                LLCheckBoxCtrl* checkFlipScaleT = LLViewerUICtrlFactory::getCheckBoxByName(mPanel,"checkbox flip t");
+                LLCheckBoxCtrl* checkFlipScaleT = mPanel->getChild<LLCheckBoxCtrl>("checkbox flip t");
-                LLComboBox*             comboTexGen = LLViewerUICtrlFactory::getComboBoxByName(mPanel,"combobox texgen");
+                LLComboBox*             comboTexGen = mPanel->getChild<LLComboBox>("combobox texgen");
                if (ctrlTexScaleS)
                {
                        valid = !ctrlTexScaleS->getTentative() || !checkFlipScaleS->getTentative();
@@ -373,15 +372,15 @@ struct LLPanelFaceSendFunctor : public LLSelectedObjectFunctor
 void LLPanelFace::sendTextureInfo()
 {
        LLPanelFaceSetTEFunctor setfunc(this);
-        gSelectMgr->getSelection()->applyToTEs(&setfunc);
+        LLSelectMgr::getInstance()->getSelection()->applyToTEs(&setfunc);
        LLPanelFaceSendFunctor sendfunc;
-        gSelectMgr->getSelection()->applyToObjects(&sendfunc);
+        LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc);
 }
 void LLPanelFace::getState()
 {
-        LLViewerObject* objectp = gSelectMgr->getSelection()->getFirstObject();
+        LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
        if( objectp
                && objectp->getPCode() == LL_PCODE_VOLUME
@@ -411,7 +410,7 @@ void LLPanelFace::getState()
                childSetEnabled("button apply",editable);
                bool identical;
-                LLTextureCtrl*  texture_ctrl = LLViewerUICtrlFactory::getTexturePickerByName(this,"texture control");
+                LLTextureCtrl*  texture_ctrl = getChild<LLTextureCtrl>("texture control");
                
                // Texture
                {
@@ -424,7 +423,7 @@ void LLPanelFace::getState()
                                        return image ? image->getID() : LLUUID::null;
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, id );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, id );
                        
                        if (identical)
                        {
@@ -463,7 +462,7 @@ void LLPanelFace::getState()
                {
 //                      texture_ctrl->setValid( editable );
                
-                        if (gSelectMgr->selectGetAggregateTexturePermissions(texture_perms))
+                        if (LLSelectMgr::getInstance()->selectGetAggregateTexturePermissions(texture_perms))
                        {
                                BOOL can_copy = 
                                        texture_perms.getValue(PERM_COPY) == LLAggregatePermissions::AP_EMPTY || 
@@ -491,7 +490,7 @@ void LLPanelFace::getState()
                                        return object->getTE(face)->mScaleS;
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, scale_s );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, scale_s );
                        childSetValue("TexScaleU",editable ? llabs(scale_s) : 0);
                        childSetTentative("TexScaleU",LLSD((BOOL)(!identical)));
                        childSetEnabled("TexScaleU",editable);
@@ -509,7 +508,7 @@ void LLPanelFace::getState()
                                        return object->getTE(face)->mScaleT;
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, scale_t );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, scale_t );
                        childSetValue("TexScaleV",llabs(editable ? llabs(scale_t) : 0));
                        childSetTentative("TexScaleV",LLSD((BOOL)(!identical)));
@@ -530,7 +529,7 @@ void LLPanelFace::getState()
                                        return object->getTE(face)->mOffsetS;
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, offset_s );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, offset_s );
                        childSetValue("TexOffsetU", editable ? offset_s : 0);
                        childSetTentative("TexOffsetU",!identical);
                        childSetEnabled("TexOffsetU",editable);
@@ -545,7 +544,7 @@ void LLPanelFace::getState()
                                        return object->getTE(face)->mOffsetT;
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, offset_t );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, offset_t );
                        childSetValue("TexOffsetV", editable ? offset_t : 0);
                        childSetTentative("TexOffsetV",!identical);
                        childSetEnabled("TexOffsetV",editable);
@@ -562,14 +561,14 @@ void LLPanelFace::getState()
                                        return object->getTE(face)->mRotation;
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, rotation );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, rotation );
                        childSetValue("TexRot", editable ? rotation * RAD_TO_DEG : 0);
                        childSetTentative("TexRot",!identical);
                        childSetEnabled("TexRot",editable);
                }
                // Color swatch
-                LLColorSwatchCtrl*      mColorSwatch = LLViewerUICtrlFactory::getColorSwatchByName(this,"colorswatch");
+                LLColorSwatchCtrl*      mColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
                LLColor4 color = LLColor4::white;
                if(mColorSwatch)
                {
@@ -580,7 +579,7 @@ void LLPanelFace::getState()
                                        return object->getTE(face)->getColor();
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, color );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, color );
                        
                        mColorSwatch->setOriginal(color);
                        mColorSwatch->set(color, TRUE);
@@ -609,7 +608,7 @@ void LLPanelFace::getState()
                                        return object->getTE(face)->getGlow();
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, glow );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, glow );
                        childSetValue("glow",glow);
                        childSetEnabled("glow",editable);
@@ -628,7 +627,7 @@ void LLPanelFace::getState()
                                        return (F32)(object->getTE(face)->getShiny());
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, shinyf );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, shinyf );
                        LLCtrlSelectionInterface* combobox_shininess =
                              childGetSelectionInterface("combobox shininess");
                        if (combobox_shininess)
@@ -653,7 +652,7 @@ void LLPanelFace::getState()
                                        return (F32)(object->getTE(face)->getBumpmap());
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, bumpf );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, bumpf );
                        LLCtrlSelectionInterface* combobox_bumpiness =
                              childGetSelectionInterface("combobox bumpiness");
                        if (combobox_bumpiness)
@@ -678,7 +677,7 @@ void LLPanelFace::getState()
                                        return (F32)(object->getTE(face)->getTexGen());
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, genf );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, genf );
                        S32 selected_texgen = ((S32) genf) >> TEM_TEX_GEN_SHIFT;
                        LLCtrlSelectionInterface* combobox_texgen =
                              childGetSelectionInterface("combobox texgen");
@@ -716,7 +715,7 @@ void LLPanelFace::getState()
                                        return (F32)(object->getTE(face)->getFullbright());
                                }
                        } func;
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, fullbrightf );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, fullbrightf );
                        childSetValue("checkbox fullbright",(S32)fullbrightf);
                        childSetEnabled("checkbox fullbright",editable);
@@ -743,11 +742,11 @@ void LLPanelFace::getState()
                                        return object->getTE(face)->mScaleS / object->getScale().mV[s_axis];
                                }
                        } func;                 
-                        identical = gSelectMgr->getSelection()->getSelectedTEValue( &func, repeats );
+                        identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, repeats );
                        
                        childSetValue("rptctrl", editable ? repeats : 0);
                        childSetTentative("rptctrl",!identical);
-                        LLComboBox*     mComboTexGen = LLViewerUICtrlFactory::getComboBoxByName(this,"combobox texgen");
+                        LLComboBox*     mComboTexGen = getChild<LLComboBox>("combobox texgen");
                        if (mComboTexGen)
                        {
                                BOOL enabled = editable && (!mComboTexGen || mComboTexGen->getCurrentIndex() != 1);
@@ -825,14 +824,14 @@ void LLPanelFace::onCommitAlpha(LLUICtrl* ctrl, void* userdata)
 // static
 void LLPanelFace::onCancelColor(LLUICtrl* ctrl, void* userdata)
 {
-        gSelectMgr->selectionRevertColors();
+        LLSelectMgr::getInstance()->selectionRevertColors();
 }
 // static
 void LLPanelFace::onSelectColor(LLUICtrl* ctrl, void* userdata)
 {
        LLPanelFace* self = (LLPanelFace*) userdata;
-        gSelectMgr->saveSelectedObjectColors();
+        LLSelectMgr::getInstance()->saveSelectedObjectColors();
        self->sendColor();
 }
@@ -875,8 +874,8 @@ void LLPanelFace::onCommitGlow(LLUICtrl* ctrl, void* userdata)
 BOOL LLPanelFace::onDragTexture(LLUICtrl*, LLInventoryItem* item, void*)
 {
        BOOL accept = TRUE;
-        for (LLObjectSelection::root_iterator iter = gSelectMgr->getSelection()->root_begin();
+        for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
-                 iter != gSelectMgr->getSelection()->root_end(); iter++)
+                 iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
        {
                LLSelectNode* node = *iter;
                LLViewerObject* obj = node->getObject();
@@ -894,7 +893,7 @@ void LLPanelFace::onCommitTexture( LLUICtrl* ctrl, void* userdata )
 {
        LLPanelFace* self = (LLPanelFace*) userdata;
-        gViewerStats->incStat(LLViewerStats::ST_EDIT_TEXTURE_COUNT );
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_EDIT_TEXTURE_COUNT );
        
        self->sendTexture();
 }
@@ -902,14 +901,14 @@ void LLPanelFace::onCommitTexture( LLUICtrl* ctrl, void* userdata )
 // static
 void LLPanelFace::onCancelTexture(LLUICtrl* ctrl, void* userdata)
 {
-        gSelectMgr->selectionRevertTextures();
+        LLSelectMgr::getInstance()->selectionRevertTextures();
 }
 // static
 void LLPanelFace::onSelectTexture(LLUICtrl* ctrl, void* userdata)
 {
        LLPanelFace* self = (LLPanelFace*) userdata;
-        gSelectMgr->saveSelectedObjectTextures();
+        LLSelectMgr::getInstance()->saveSelectedObjectTextures();
        self->sendTexture();
 }
@@ -931,7 +930,7 @@ void LLPanelFace::onClickApply(void* userdata)
        //F32 repeats_per_meter = self->mCtrlRepeatsPerMeter->get();
        F32 repeats_per_meter = (F32)self->childGetValue( "rptctrl" ).asReal();//self->mCtrlRepeatsPerMeter->get();
-        gSelectMgr->selectionTexScaleAutofit( repeats_per_meter );
+        LLSelectMgr::getInstance()->selectionTexScaleAutofit( repeats_per_meter );
 }
 // commit the fit media texture to prim button
@@ -965,8 +964,8 @@ struct LLPanelFaceSetMediaFunctor : public LLSelectedTEFunctor
 void LLPanelFace::onClickAutoFix(void* userdata)
 {
        LLPanelFaceSetMediaFunctor setfunc;
-        gSelectMgr->getSelection()->applyToTEs(&setfunc);
+        LLSelectMgr::getInstance()->getSelection()->applyToTEs(&setfunc);
        LLPanelFaceSendFunctor sendfunc;
-        gSelectMgr->getSelection()->applyToObjects(&sendfunc);
+        LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc);
 }
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 2c68e9a..17fca4e 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -38,7 +38,7 @@
 #include "llrect.h"
 #include "llfontgl.h"
 #include "message.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 // project includes
 #include "llagent.h"
@@ -58,6 +58,9 @@
 #include "llappviewer.h"
 #include "llurlsimstring.h"
 #include "llappviewer.h"
+#include "llcheckboxctrl.h"
+#include "llradiogroup.h"
 //
 // Imported globals
 //
@@ -73,6 +76,13 @@ void set_start_location(LLUICtrl* ctrl, void* data);
 //
 // Static functions
 //
+static void set_render_name_fade_out(LLUICtrl* ctrl, void* data)
+{
+        LLComboBox* combo = (LLComboBox*)ctrl;
+        if (!combo) return;
+        gSavedSettings.setS32("RenderName", combo->getCurrentIndex() );
+}
 void set_crash_behavior(LLUICtrl* ctrl, void* data)
 {
        LLAppViewer::instance()->setCrashBehavior(((LLComboBox*) ctrl)->getCurrentIndex());
@@ -95,37 +105,18 @@ void LLPanelGeneral::set_specific_start_location(LLLineEditor* line_editor, void
 LLPanelGeneral::LLPanelGeneral()
 {
-        gUICtrlFactory->buildPanel(this, "panel_preferences_general.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_general.xml");
 }
 BOOL LLPanelGeneral::postBuild()
 {
-        requires("location_combobox", WIDGET_TYPE_COMBO_BOX);
+        childSetCommitCallback("fade_out_combobox", set_render_name_fade_out);
-        requires("show_location_checkbox", WIDGET_TYPE_CHECKBOX);
-        requires("fade_out_radio", WIDGET_TYPE_RADIO_GROUP);
-        requires("show_my_name_checkbox", WIDGET_TYPE_CHECKBOX);
-        requires("show_my_title_checkbox", WIDGET_TYPE_CHECKBOX);
-        requires("small_avatar_names_checkbox", WIDGET_TYPE_CHECKBOX);
-        requires("effect_color_swatch", WIDGET_TYPE_COLOR_SWATCH);
-        requires("UI Scale", WIDGET_TYPE_SLIDER);
-        requires("ui_auto_scale", WIDGET_TYPE_CHECKBOX);
-        requires("afk_timeout_spinner", WIDGET_TYPE_SPINNER);
-        requires("rotate_mini_map_checkbox", WIDGET_TYPE_CHECKBOX);
-        requires("friends_online_notify_checkbox", WIDGET_TYPE_CHECKBOX);
-        requires("notify_money_change_checkbox", WIDGET_TYPE_CHECKBOX);
-        requires("use_system_color_picker_checkbox", WIDGET_TYPE_CHECKBOX);
-        requires("crash_behavior_combobox", WIDGET_TYPE_COMBO_BOX);
-        if (!checkRequirements())
-        {
-                return FALSE;
-        }
        LLString region_name_prompt = getString("region_name_prompt");
        // location combobox
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(this, "location_combobox");
+        LLComboBox* combo = getChild<LLComboBox>( "location_combobox");
        if (combo)
        {
                if (!LLURLSimString::sInstance.mSimString.empty())
@@ -151,7 +142,7 @@ BOOL LLPanelGeneral::postBuild()
        // Show location on login screen
        childSetCommitCallback("show_location_checkbox", &LLPanelGeneral::clickShowStartLocation);
-        combo = LLUICtrlFactory::getComboBoxByName(this, "crash_behavior_combobox");
+        combo = getChild<LLComboBox>( "crash_behavior_combobox");
        if (combo)
        {
                combo->setCurrentByIndex( LLAppViewer::instance()->getCrashBehavior() );
@@ -175,7 +166,7 @@ void LLPanelGeneral::refresh()
 {
        LLPanel::refresh();
        BOOL login_last = gSavedSettings.getBOOL("LoginLastLocation");
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(this, "location_combobox");
+        LLComboBox* combo = getChild<LLComboBox>( "location_combobox");
        if (combo)
        {
                if (!LLURLSimString::sInstance.mSimString.empty())
@@ -191,13 +182,19 @@ void LLPanelGeneral::refresh()
        }
        
        mCrashBehavior = LLAppViewer::instance()->getCrashBehavior();
-        combo = LLUICtrlFactory::getComboBoxByName(this, "crash_behavior_combobox");
+        combo = getChild<LLComboBox>( "crash_behavior_combobox");
        if (combo)
        {
                combo->setCurrentByIndex( LLAppViewer::instance()->getCrashBehavior() );
        }
        
        mRenderName = gSavedSettings.getS32("RenderName");
+        combo = getChild<LLComboBox>("fade_out_combobox");
+        if (combo)
+        {
+                combo->setCurrentByIndex( mRenderName );
+        }
        mRenderNameHideSelf = gSavedSettings.getBOOL("RenderNameHideSelf");
        mSmallAvatarNames = gSavedSettings.getBOOL("SmallAvatarNames");
        mRenderHideGroupTitle = gSavedSettings.getBOOL("RenderHideGroupTitle");
@@ -239,9 +236,6 @@ void LLPanelGeneral::cancel()
        LLURLSimString::setString(mLoginLocation);
        LLAppViewer::instance()->setCrashBehavior(mCrashBehavior);
-        // make listener
-        //gAFKTimeout = away_timeout;
 }
 void LLPanelGeneral::clickShowStartLocation(LLUICtrl*, void* user_data)
diff --git a/linden/indra/newview/llpanelgroup.cpp b/linden/indra/newview/llpanelgroup.cpp
index b6f4681..84f6594 100644
--- a/linden/indra/newview/llpanelgroup.cpp
+++ b/linden/indra/newview/llpanelgroup.cpp
@@ -42,7 +42,7 @@
 #include "lltabcontainer.h"
 #include "lltextbox.h"
 #include "llviewermessage.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llappviewer.h"
@@ -160,16 +160,16 @@ LLPanelGroup::LLPanelGroup(const std::string& filename,
        mFactoryMap["roles_sub_tab"] = LLCallbackMap(LLPanelGroupRolesSubTab::createTab, &mID);
        mFactoryMap["actions_sub_tab"] = LLCallbackMap(LLPanelGroupActionsSubTab::createTab, &mID);
-        gGroupMgr->addObserver(this);
+        LLGroupMgr::getInstance()->addObserver(this);
        // Pass on construction of this panel to the control factory.
-        gUICtrlFactory->buildPanel(this, filename, &getFactoryMap());
+        LLUICtrlFactory::getInstance()->buildPanel(this, filename, &getFactoryMap());
        mFilename = filename;
 }
 LLPanelGroup::~LLPanelGroup()
 {
-        gGroupMgr->removeObserver(this);
+        LLGroupMgr::getInstance()->removeObserver(this);
        int i;
        int tab_count = mTabContainer->getTabCount();
@@ -360,9 +360,9 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
 {
        LLRect rect(getRect());
-        gGroupMgr->removeObserver(this);
+        LLGroupMgr::getInstance()->removeObserver(this);
        mID = group_id;
-        gGroupMgr->addObserver(this);
+        LLGroupMgr::getInstance()->addObserver(this);
        //TODO:  this is really bad, we should add a method
        // where the panels can just update themselves
        // on a group id change.  Similar to update() but with a group
@@ -371,7 +371,7 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
        // For now, rebuild panel
        //delete children and rebuild panel
        deleteAllChildren();
-        gUICtrlFactory->buildPanel(this, mFilename, &getFactoryMap());
+        LLUICtrlFactory::getInstance()->buildPanel(this, mFilename, &getFactoryMap());
 }
 void LLPanelGroup::selectTab(std::string tab_name)
@@ -603,7 +603,7 @@ void LLPanelGroup::draw()
 void LLPanelGroup::refreshData()
 {
-        gGroupMgr->clearGroupData(getID());
+        LLGroupMgr::getInstance()->clearGroupData(getID());
        mCurrentTab->activate();
        // 5 second timeout
@@ -616,14 +616,13 @@ void LLPanelGroup::close()
 {
        // Pass this to the parent, if it is a floater.
        LLView* viewp = getParent();
-        if (viewp
+        LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
-                && WIDGET_TYPE_FLOATER == viewp->getWidgetType())
+        if (floaterp)
        {
                // First, set the force close flag, since the floater
                // will be asking us whether it can close.
                mForceClose = TRUE;
                // Tell the parent floater to close.
-                LLFloater* floaterp = (LLFloater*) viewp;
                floaterp->close();
        }
 }
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index e2572f1..1709ad2 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -33,7 +33,7 @@
 #include "llpanelgroupgeneral.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llagent.h"
 #include "roles_constants.h"
 #include "llfloateravatarinfo.h"
@@ -304,7 +304,7 @@ void LLPanelGroupGeneral::onCommitTitle(LLUICtrl* ctrl, void* data)
 {
        LLPanelGroupGeneral* self = (LLPanelGroupGeneral*)data;
        if (self->mGroupID.isNull() || !self->mAllowEdit) return;
-        gGroupMgr->sendGroupTitleUpdate(self->mGroupID,self->mComboActiveTitle->getCurrentID());
+        LLGroupMgr::getInstance()->sendGroupTitleUpdate(self->mGroupID,self->mComboActiveTitle->getCurrentID());
        self->update(GC_TITLES);
 }
@@ -329,7 +329,7 @@ void LLPanelGroupGeneral::onClickJoin(void *userdata)
        lldebugs << "joining group: " << self->mGroupID << llendl;
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(self->mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(self->mGroupID);
        if (gdatap)
        {
@@ -350,7 +350,7 @@ void LLPanelGroupGeneral::onClickJoin(void *userdata)
        }
        else
        {
-                llwarns << "gGroupMgr->getGroupData(" << self->mGroupID
+                llwarns << "LLGroupMgr::getInstance()->getGroupData(" << self->mGroupID
                        << ") was NULL" << llendl;
        }
 }
@@ -366,7 +366,7 @@ void LLPanelGroupGeneral::joinDlgCB(S32 which, void *userdata)
                return;
        }
-        gGroupMgr->sendGroupMemberJoin(self->mGroupID);
+        LLGroupMgr::getInstance()->sendGroupMemberJoin(self->mGroupID);
 }
 // static
@@ -392,17 +392,17 @@ bool LLPanelGroupGeneral::needsApply(LLString& mesg)
 void LLPanelGroupGeneral::activate()
 {
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (mGroupID.notNull()
                && (!gdatap || mFirstUse))
        {
-                gGroupMgr->sendGroupTitlesRequest(mGroupID);
+                LLGroupMgr::getInstance()->sendGroupTitlesRequest(mGroupID);
-                gGroupMgr->sendGroupPropertiesRequest(mGroupID);
+                LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mGroupID);
                
                if (!gdatap || !gdatap->isMemberDataComplete() )
                {
-                        gGroupMgr->sendGroupMembersRequest(mGroupID);
+                        LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
                }
                mFirstUse = FALSE;
@@ -446,12 +446,12 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
                        LLString::format_map_t args;
                        args["[MESSAGE]"] = mConfirmGroupCreateStr;
                        gViewerWindow->alertXml("GenericAlertYesCancel", args,
-                                createGroupCallback,this);
+                                createGroupCallback,new LLHandle<LLPanel>(getHandle()));
                        return false;
                }
-                LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+                LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
                if (!gdatap)
                {
@@ -496,7 +496,7 @@ bool LLPanelGroupGeneral::apply(LLString& mesg)
                if (can_change_ident || can_change_member_opts)
                {
-                        gGroupMgr->sendUpdateGroupInfo(mGroupID);
+                        LLGroupMgr::getInstance()->sendUpdateGroupInfo(mGroupID);
                }
        }
@@ -526,7 +526,10 @@ void LLPanelGroupGeneral::cancel()
 // static
 void LLPanelGroupGeneral::createGroupCallback(S32 option, void* userdata)
 {
-        LLPanelGroupGeneral* self = (LLPanelGroupGeneral*)userdata;
+        LLHandle<LLPanel> panel_handle = *(LLHandle<LLPanel>*)userdata;
+        delete (LLHandle<LLPanel>*)userdata;
+        LLPanelGroupGeneral* self = dynamic_cast<LLPanelGroupGeneral*>(panel_handle.get());
        if (!self) return;
        switch(option)
@@ -537,7 +540,7 @@ void LLPanelGroupGeneral::createGroupCallback(S32 option, void* userdata)
                        U32 enrollment_fee = (self->mCtrlEnrollmentFee->get() ? 
                                                                        (U32) self->mSpinEnrollmentFee->get() : 0);
                
-                        gGroupMgr->sendCreateGroupRequest(self->mGroupNameEditor->getText(),
+                        LLGroupMgr::getInstance()->sendCreateGroupRequest(self->mGroupNameEditor->getText(),
                                                                                                self->mEditCharter->getText(),
                                                                                                self->mCtrlShowInGroupList->get(),
                                                                                                self->mInsignia->getImageAssetID(),
@@ -563,7 +566,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 {
        if (mGroupID.isNull()) return;
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) return;
@@ -734,7 +737,7 @@ void LLPanelGroupGeneral::updateMembers()
 {
        mPendingMemberUpdate = FALSE;
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!mListVisibleMembers || !gdatap 
                || !gdatap->isMemberDataComplete())
diff --git a/linden/indra/newview/llpanelgroupinvite.cpp b/linden/indra/newview/llpanelgroupinvite.cpp
index c393854..e051bb6 100644
--- a/linden/indra/newview/llpanelgroupinvite.cpp
+++ b/linden/indra/newview/llpanelgroupinvite.cpp
@@ -42,7 +42,8 @@
 #include "lltextbox.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
+#include "llviewerwindow.h"
 class LLPanelGroupInvite::impl
 {
@@ -65,6 +66,7 @@ public:
        static void callbackAddUsers(const std::vector<std::string>& names,
                                                                 const std::vector<LLUUID>& agent_ids,
                                                                 void* user_data);
+        static void inviteOwnerCallback(S32 option, void* userdata);
 public:
        LLUUID mGroupID;
@@ -75,6 +77,8 @@ public:
        LLButton                *mOKButton;
        LLButton                *mRemoveButton;
        LLTextBox               *mGroupName;
+        LLString                mOwnerWarning;
+        bool            mConfirmedOwnerInvite;
        void (*mCloseCallback)(void* data);
@@ -82,16 +86,18 @@ public:
 };
-LLPanelGroupInvite::impl::impl(const LLUUID& group_id)
+LLPanelGroupInvite::impl::impl(const LLUUID& group_id):
+        mGroupID( group_id ),
+        mLoadingText (),
+        mInvitees ( NULL ),
+        mRoleNames( NULL ),
+        mOKButton ( NULL ),
+        mRemoveButton( NULL ),
+        mGroupName( NULL ),
+        mConfirmedOwnerInvite( false ),
+        mCloseCallback( NULL ),
+        mCloseCallbackUserData( NULL )
 {
-        mGroupID = group_id;
-        mInvitees  = NULL;
-        mRoleNames = NULL;
-        mRemoveButton = NULL;
-        mCloseCallback = NULL;
-        mCloseCallbackUserData = NULL;
 }
 LLPanelGroupInvite::impl::~impl()
@@ -140,12 +146,23 @@ void LLPanelGroupInvite::impl::submitInvitations()
 {
        std::map<LLUUID, LLUUID> role_member_pairs;
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        // Default to everyone role.
        LLUUID role_id = LLUUID::null;
        if (mRoleNames)
        {
                role_id = mRoleNames->getCurrentID();
+                
+                // owner role: display confirmation and wait for callback
+                if ((role_id == gdatap->mOwnerRole) && (!mConfirmedOwnerInvite))
+                {
+                        LLString::format_map_t args;
+                        args["[MESSAGE]"] = mOwnerWarning;
+                        gViewerWindow->alertXml("GenericAlertYesCancel", args, inviteOwnerCallback, this);
+                        return; // we'll be called again if user confirms
+                }
        }
        //loop over the users
@@ -157,12 +174,34 @@ void LLPanelGroupInvite::impl::submitInvitations()
                role_member_pairs[item->getUUID()] = role_id;
        }
-        gGroupMgr->sendGroupMemberInvites(mGroupID, role_member_pairs);
+        LLGroupMgr::getInstance()->sendGroupMemberInvites(mGroupID, role_member_pairs);
        //then close
        (*mCloseCallback)(mCloseCallbackUserData);
 }
+//static
+void LLPanelGroupInvite::impl::inviteOwnerCallback(S32 option, void* userdata)
+{
+        LLPanelGroupInvite::impl* self = (LLPanelGroupInvite::impl*)userdata;
+        if (!self) return;
+        switch(option)
+        {
+        case 0:
+                // user confirmed that they really want a new group owner
+                self->mConfirmedOwnerInvite = true;
+                self->submitInvitations();
+                break;
+        case 1:
+                // fall through
+        default:
+                break;
+        }
+}
 void LLPanelGroupInvite::impl::addRoleNames(LLGroupMgrGroupData* gdatap)
 {
        LLGroupMgrGroupData::member_list_t::iterator agent_iter =
@@ -323,7 +362,7 @@ LLPanelGroupInvite::LLPanelGroupInvite(const std::string& name,
        std::string panel_def_file;
        // Pass on construction of this panel to the control factory.
-        gUICtrlFactory->buildPanel(this, "panel_group_invite.xml", &getFactoryMap());
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_group_invite.xml", &getFactoryMap());
 }
 LLPanelGroupInvite::~LLPanelGroupInvite()
@@ -412,8 +451,8 @@ void LLPanelGroupInvite::update()
 void LLPanelGroupInvite::updateLists()
 {
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mImplementation->mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mImplementation->mGroupID);
-        BOOL waiting = FALSE;
+        bool waiting = false;
        if (gdatap) 
        {
@@ -426,7 +465,7 @@ void LLPanelGroupInvite::updateLists()
                } 
                else 
                {
-                        waiting = TRUE;
+                        waiting = true;
                }
                if (gdatap->isRoleDataComplete() && gdatap->isMemberDataComplete()) 
                {
@@ -442,21 +481,21 @@ void LLPanelGroupInvite::updateLists()
                } 
                else 
                {
-                        waiting = TRUE;
+                        waiting = true;
                }
        } 
        else 
        {
-                waiting = TRUE;
+                waiting = true;
        }
        if (waiting) 
        {
                if (!mPendingUpdate) 
                {
-                        gGroupMgr->sendGroupPropertiesRequest(mImplementation->mGroupID);
+                        LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mImplementation->mGroupID);
-                        gGroupMgr->sendGroupMembersRequest(mImplementation->mGroupID);
+                        LLGroupMgr::getInstance()->sendGroupMembersRequest(mImplementation->mGroupID);
-                        gGroupMgr->sendGroupRoleDataRequest(mImplementation->mGroupID);
+                        LLGroupMgr::getInstance()->sendGroupRoleDataRequest(mImplementation->mGroupID);
                }
                mPendingUpdate = TRUE;
        } 
@@ -523,6 +562,8 @@ BOOL LLPanelGroupInvite::postBuild()
                button->setCallbackUserData(mImplementation);
        }
+        mImplementation->mOwnerWarning = getString("confirm_invite_owner_str");
        update();
        
        return (mImplementation->mRoleNames &&
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp
index 7cfe460..419d6d2 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.cpp
+++ b/linden/indra/newview/llpanelgrouplandmoney.cpp
@@ -46,7 +46,7 @@
 #include "lltextbox.h"
 #include "lltabcontainer.h"
 #include "lltransactiontypes.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llstatusbar.h"
 #include "llfloaterworldmap.h"
diff --git a/linden/indra/newview/llpanelgroupnotices.cpp b/linden/indra/newview/llpanelgroupnotices.cpp
index 30709af..846a4c1 100644
--- a/linden/indra/newview/llpanelgroupnotices.cpp
+++ b/linden/indra/newview/llpanelgroupnotices.cpp
@@ -76,8 +76,6 @@ public:
        //
        // LLView functionality
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                                                                   EDragAndDropType cargo_type,
                                                                   void* cargo_data,
@@ -96,16 +94,6 @@ LLGroupDropTarget::LLGroupDropTarget(const std::string& name, const LLRect& rect
 {
 }
-EWidgetType LLGroupDropTarget::getWidgetType() const
-{
-        return WIDGET_TYPE_DONTCARE;
-}
-LLString LLGroupDropTarget::getWidgetTag() const
-{
-        return LL_GROUP_DROP_TARGET_TAG;
-}
 void LLGroupDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
 {
        llinfos << "LLGroupDropTarget::doDrop()" << llendl;
@@ -328,12 +316,12 @@ void LLPanelGroupNotices::setItem(LLPointer<LLInventoryItem> inv_item)
                item_is_multi = TRUE;
        };
-        LLViewerImage* item_icon = get_item_icon(inv_item->getType(),
+        LLString icon_name = get_item_icon_name(inv_item->getType(),
                                                                                inv_item->getInventoryType(),
                                                                                inv_item->getFlags(),
                                                                                item_is_multi );
-        mCreateInventoryIcon->setImage(item_icon->getID());
+        mCreateInventoryIcon->setImage(icon_name);
        mCreateInventoryIcon->setVisible(TRUE);
        std::stringstream ss;
@@ -486,11 +474,11 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
                row["columns"][0]["column"] = "icon";
                if (has_attachment)
                {
-                        LLUUID icon_id = get_item_icon_uuid(
+                        LLString icon_name = get_item_icon_name(
-                                                (LLAssetType::EType)asset_type,
+                                                                        (LLAssetType::EType)asset_type,
-                                                LLInventoryType::IT_NONE,FALSE, FALSE);
+                                                                        LLInventoryType::IT_NONE,FALSE, FALSE);
                        row["columns"][0]["type"] = "icon";
-                        row["columns"][0]["value"] = icon_id;
+                        row["columns"][0]["value"] = icon_name;
                }
                row["columns"][1]["column"] = "subject";
@@ -556,11 +544,11 @@ void LLPanelGroupNotices::showNotice(const char* subject,
        {
                mInventoryOffer = inventory_offer;
-                LLViewerImage* item_icon = get_item_icon(mInventoryOffer->mType,
+                LLString icon_name = get_item_icon_name(mInventoryOffer->mType,
                                                                                                LLInventoryType::IT_TEXTURE,
                                                                                                0, FALSE);
-                mViewInventoryIcon->setImage(item_icon->getID());
+                mViewInventoryIcon->setImage(icon_name);
                mViewInventoryIcon->setVisible(TRUE);
                std::stringstream ss;
diff --git a/linden/indra/newview/llpanelgrouproles.cpp b/linden/indra/newview/llpanelgrouproles.cpp
index 194f880..ccf776f 100644
--- a/linden/indra/newview/llpanelgrouproles.cpp
+++ b/linden/indra/newview/llpanelgrouproles.cpp
@@ -61,7 +61,7 @@ bool agentCanRemoveFromRole(const LLUUID& group_id,
 bool agentCanAddToRole(const LLUUID& group_id,
                                           const LLUUID& role_id)
 {
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(group_id);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(group_id);
        if (!gdatap) 
        {
                llwarns << "agentCanAddToRole "
@@ -414,14 +414,14 @@ void LLPanelGroupRoles::update(LLGroupChange gc)
 void LLPanelGroupRoles::activate()
 {
        // Start requesting member and role data if needed.
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        //if (!gdatap || mFirstUse)
        {
                // Check member data.
                
                if (!gdatap || !gdatap->isMemberDataComplete() )
                {
-                        gGroupMgr->sendGroupMembersRequest(mGroupID);
+                        LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
                }
                // Check role data.
@@ -430,19 +430,19 @@ void LLPanelGroupRoles::activate()
                        // Mildly hackish - clear all pending changes
                        cancel();
-                        gGroupMgr->sendGroupRoleDataRequest(mGroupID);
+                        LLGroupMgr::getInstance()->sendGroupRoleDataRequest(mGroupID);
                }
                // Check role-member mapping data.
                if (!gdatap || !gdatap->isRoleMemberDataComplete() )
                {
-                        gGroupMgr->sendGroupRoleMembersRequest(mGroupID);
+                        LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(mGroupID);
                }
                // Need this to get base group member powers
                if (!gdatap || !gdatap->isGroupPropertiesDataComplete() )
                {
-                        gGroupMgr->sendGroupPropertiesRequest(mGroupID);
+                        LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mGroupID);
                }
                mFirstUse = FALSE;
@@ -529,23 +529,23 @@ BOOL LLPanelGroupSubTab::postBuild()
        bool no_recurse = false;
        LLIconCtrl* icon = getChild<LLIconCtrl>("power_folder_icon",no_recurse);
-        if (icon && icon->getImage().notNull())
+        if (icon && !icon->getImageName().empty())
        {
-                mActionIcons["folder"] = icon->getImage();
+                mActionIcons["folder"] = icon->getImageName();
                removeChild(icon, TRUE);
        }
        icon = getChild<LLIconCtrl>("power_all_have_icon",no_recurse);
-        if (icon && icon->getImage().notNull())
+        if (icon && !icon->getImageName().empty())
        {
-                mActionIcons["full"] = icon->getImage();
+                mActionIcons["full"] = icon->getImageName();
                removeChild(icon, TRUE);
        }
        icon = getChild<LLIconCtrl>("power_partial_icon",no_recurse);
-        if (icon && icon->getImage().notNull())
+        if (icon && !icon->getImageName().empty())
        {
-                mActionIcons["partial"] = icon->getImage();
+                mActionIcons["partial"] = icon->getImageName();
                removeChild(icon, TRUE);
        }
@@ -679,14 +679,14 @@ void LLPanelGroupSubTab::buildActionsList(LLScrollListCtrl* ctrl,
                                                                                  BOOL filter,
                                                                                  BOOL is_owner_role)
 {
-        if (gGroupMgr->mRoleActionSets.empty())
+        if (LLGroupMgr::getInstance()->mRoleActionSets.empty())
        {
                llwarns << "Can't build action list - no actions found." << llendl;
                return;
        }
-        std::vector<LLRoleActionSet*>::iterator ras_it = gGroupMgr->mRoleActionSets.begin();
+        std::vector<LLRoleActionSet*>::iterator ras_it = LLGroupMgr::getInstance()->mRoleActionSets.begin();
-        std::vector<LLRoleActionSet*>::iterator ras_end = gGroupMgr->mRoleActionSets.end();
+        std::vector<LLRoleActionSet*>::iterator ras_end = LLGroupMgr::getInstance()->mRoleActionSets.end();
        for ( ; ras_it != ras_end; ++ras_it)
        {
@@ -951,7 +951,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
        mAssignedRolesList->deleteAllItems();
        mAllowedActionsList->deleteAllItems();
        
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) 
        {
                llwarns << "LLPanelGroupMembersSubTab::handleMemberSelect() "
@@ -1199,14 +1199,14 @@ void LLPanelGroupMembersSubTab::handleEjectMembers()
        mMembersList->deleteSelectedItems();
-        gGroupMgr->sendGroupMemberEjects(mGroupID,
+        LLGroupMgr::getInstance()->sendGroupMemberEjects(mGroupID,
                                                                         selected_members);
 }
 void LLPanelGroupMembersSubTab::handleRoleCheck(const LLUUID& role_id,
                                                                                                LLRoleMemberChangeType type)
 {
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) return;
        //add that the user is requesting to change the roles for selected
@@ -1356,7 +1356,7 @@ void LLPanelGroupMembersSubTab::cancel()
 bool LLPanelGroupMembersSubTab::apply(LLString& mesg)
 {
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap)
        {
                llwarns << "Unable to get group data for group " << mGroupID << llendl;
@@ -1421,7 +1421,7 @@ void LLPanelGroupMembersSubTab::applyMemberChanges()
 {
        //sucks to do a find again here, but it is in constant time, so, could
        //be worse
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap)
        {
                llwarns << "Unable to get group data for group " << mGroupID << llendl;
@@ -1446,7 +1446,7 @@ void LLPanelGroupMembersSubTab::applyMemberChanges()
        }
        mMemberRoleChangeData.clear();
-        gGroupMgr->sendGroupRoleMemberChanges(mGroupID);        
+        LLGroupMgr::getInstance()->sendGroupRoleMemberChanges(mGroupID);        
        //force a UI update
        handleMemberSelect();
@@ -1485,7 +1485,7 @@ U64 LLPanelGroupMembersSubTab::getAgentPowersBasedOnRoleChanges(const LLUUID& ag
        //and then we have to build the powers up bases on the roles the agent
        //is in
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) 
        {
                llwarns << "LLPanelGroupMembersSubTab::getAgentPowersBasedOnRoleChanges() -- No group data!" << llendl;
@@ -1598,7 +1598,7 @@ void LLPanelGroupMembersSubTab::update(LLGroupChange gc)
                return;
        }
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) 
        {
                llwarns << "LLPanelGroupMembersSubTab::update() -- No group data!" << llendl;
@@ -1649,7 +1649,7 @@ void LLPanelGroupMembersSubTab::updateMembers()
        lldebugs << "LLPanelGroupMembersSubTab::updateMembers()" << llendl;
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) 
        {
                llwarns << "LLPanelGroupMembersSubTab::updateMembers() -- No group data!" << llendl;
@@ -1856,7 +1856,7 @@ bool LLPanelGroupRolesSubTab::needsApply(LLString& mesg)
 {
        lldebugs << "LLPanelGroupRolesSubTab::needsApply()" << llendl;
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        return (mHasRoleChange                                                          // Text changed in current role
                        || (gdatap && gdatap->pendingRoleChanges()));   // Pending role changes in the group
@@ -1867,7 +1867,7 @@ bool LLPanelGroupRolesSubTab::apply(LLString& mesg)
        lldebugs << "LLPanelGroupRolesSubTab::apply()" << llendl;
        saveRoleChanges();
-        gGroupMgr->sendGroupRoleChanges(mGroupID);
+        LLGroupMgr::getInstance()->sendGroupRoleChanges(mGroupID);
        notifyObservers();
@@ -1877,7 +1877,7 @@ bool LLPanelGroupRolesSubTab::apply(LLString& mesg)
 void LLPanelGroupRolesSubTab::cancel()
 {
        mHasRoleChange = FALSE;
-        gGroupMgr->cancelGroupRoleChanges(mGroupID);
+        LLGroupMgr::getInstance()->cancelGroupRoleChanges(mGroupID);
        notifyObservers();
 }
@@ -1930,11 +1930,11 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
        if (mGroupID.isNull()) return;
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap || !gdatap->isRoleDataComplete())
        {
-                gGroupMgr->sendGroupRoleDataRequest(mGroupID);
+                LLGroupMgr::getInstance()->sendGroupRoleDataRequest(mGroupID);
        }
        else
        {
@@ -2005,12 +2005,12 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
        if (!gdatap || !gdatap->isMemberDataComplete())
        {
-                gGroupMgr->sendGroupMembersRequest(mGroupID);
+                LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
        }
        
        if (!gdatap || !gdatap->isRoleMemberDataComplete())
        {
-                gGroupMgr->sendGroupRoleMembersRequest(mGroupID);
+                LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(mGroupID);
        }
        if ((GC_ROLE_MEMBER_DATA == gc || GC_MEMBER_DATA == gc)
@@ -2037,7 +2037,7 @@ void LLPanelGroupRolesSubTab::handleRoleSelect()
        mAssignedMembersList->deleteAllItems();
        mAllowedActionsList->deleteAllItems();
        
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) 
        {
                llwarns << "LLPanelGroupRolesSubTab::handleRoleSelect() "
@@ -2118,7 +2118,7 @@ void LLPanelGroupRolesSubTab::buildMembersList()
 {
        mAssignedMembersList->deleteAllItems();
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) 
        {
                llwarns << "LLPanelGroupRolesSubTab::handleRoleSelect() "
@@ -2179,7 +2179,7 @@ void LLPanelGroupRolesSubTab::handleActionCheck(LLCheckBoxCtrl* check, bool forc
 {
        lldebugs << "LLPanelGroupRolesSubTab::handleActionSelect()" << llendl;
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) 
        {
                llwarns << "LLPanelGroupRolesSubTab::handleRoleSelect() "
@@ -2313,7 +2313,7 @@ void LLPanelGroupRolesSubTab::handleMemberVisibilityChange(bool value)
 {
        lldebugs << "LLPanelGroupRolesSubTab::handleMemberVisibilityChange()" << llendl;
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) 
        {
                llwarns << "LLPanelGroupRolesSubTab::handleRoleSelect() "
@@ -2348,7 +2348,7 @@ void LLPanelGroupRolesSubTab::onCreateRole(void* user_data)
 void LLPanelGroupRolesSubTab::handleCreateRole()
 {
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) return;
@@ -2389,7 +2389,7 @@ void LLPanelGroupRolesSubTab::onDeleteRole(void* user_data)
 void LLPanelGroupRolesSubTab::handleDeleteRole()
 {
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) return;
@@ -2416,7 +2416,7 @@ void LLPanelGroupRolesSubTab::handleDeleteRole()
 void LLPanelGroupRolesSubTab::saveRoleChanges()
 {
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) return;
@@ -2589,7 +2589,7 @@ void LLPanelGroupActionsSubTab::handleActionSelect()
                mActionDescription->clear();
        }
-        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(mGroupID);
+        LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if (!gdatap) return;
@@ -2611,7 +2611,7 @@ void LLPanelGroupActionsSubTab::handleActionSelect()
        }
        else
        {
-                gGroupMgr->sendGroupMembersRequest(mGroupID);
+                LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
        }
        if (gdatap->isRoleDataComplete())
@@ -2632,6 +2632,6 @@ void LLPanelGroupActionsSubTab::handleActionSelect()
        }
        else
        {
-                gGroupMgr->sendGroupRoleDataRequest(mGroupID);
+                LLGroupMgr::getInstance()->sendGroupRoleDataRequest(mGroupID);
        }
 }
diff --git a/linden/indra/newview/llpanelgrouproles.h b/linden/indra/newview/llpanelgrouproles.h
index 5a0ea31..83052c0 100644
--- a/linden/indra/newview/llpanelgrouproles.h
+++ b/linden/indra/newview/llpanelgrouproles.h
@@ -45,7 +45,7 @@ class LLScrollListItem;
 // Forward declare for friend usage.
 //virtual BOOL LLPanelGroupSubTab::postBuildSubTab(LLView*);
-typedef std::map<std::string,LLUUID> icon_map_t;
+typedef std::map<std::string,std::string> icon_map_t;
 class LLPanelGroupRoles : public LLPanelGroupTab,
                                                  public LLPanelGroupTabObserver
diff --git a/linden/indra/newview/llpanelgroupvoting.cpp b/linden/indra/newview/llpanelgroupvoting.cpp
index dae1eda..d58af78 100644
--- a/linden/indra/newview/llpanelgroupvoting.cpp
+++ b/linden/indra/newview/llpanelgroupvoting.cpp
@@ -1589,7 +1589,7 @@ BOOL LLPanelGroupVoting::postBuild()
 void LLPanelGroupVoting::activate()
 {
-        gGroupMgr->sendGroupPropertiesRequest(mGroupID);
+        LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mGroupID);
        update(GC_ALL);
        mImpl->setEnableListProposals();
@@ -1609,7 +1609,7 @@ bool LLPanelGroupVoting::apply(LLString& mesg)
 void LLPanelGroupVoting::update(LLGroupChange gc)
 {
        LLGroupMgrGroupData* group_datap = NULL;
-        group_datap = gGroupMgr->getGroupData(mGroupID);
+        group_datap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
        if ( group_datap )
        {
diff --git a/linden/indra/newview/llpanelinput.cpp b/linden/indra/newview/llpanelinput.cpp
index 7fac7f8..7034b1c 100644
--- a/linden/indra/newview/llpanelinput.cpp
+++ b/linden/indra/newview/llpanelinput.cpp
@@ -38,11 +38,12 @@
 #include "llrect.h"
 #include "llfontgl.h"
 #include "message.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 // project includes
 #include "llviewerwindow.h"
 #include "llcheckboxctrl.h"
+#include "llfloaterjoystick.h"
 #include "llradiogroup.h"
 #include "llresmgr.h"
 #include "llspinctrl.h"
@@ -73,24 +74,13 @@
 LLPanelInput::LLPanelInput() 
 {
-        gUICtrlFactory->buildPanel(this, "panel_preferences_input.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_input.xml");
 }
 BOOL LLPanelInput::postBuild()
 {
-        requires("Mouse Sensitivity", WIDGET_TYPE_SLIDER_BAR);
+        childSetAction("joystic_setup_button", onClickJoystickSetup, (void*)this);
-        requires("invert mouse", WIDGET_TYPE_CHECKBOX);
-        requires("automatic fly", WIDGET_TYPE_CHECKBOX);
-        requires("dynamic camera", WIDGET_TYPE_SLIDER);
-        requires("edit camera movement", WIDGET_TYPE_CHECKBOX);
-        requires("appearance camera movement", WIDGET_TYPE_CHECKBOX);
-        requires("avfp", WIDGET_TYPE_CHECKBOX);
        
-        if (!checkRequirements())
-        {
-                return FALSE;
-        }       
        refresh();
        return TRUE;
@@ -135,3 +125,15 @@ void LLPanelInput::cancel()
        gSavedSettings.setBOOL("FirstPersonAvatarVisible", mFirstPersonAvatarVisible);
 }
+//static
+void LLPanelInput::onClickJoystickSetup(void* user_data)
+{
+        LLPanelInput* prefs = (LLPanelInput*)user_data;
+        LLFloaterJoystick* floaterp = LLFloaterJoystick::showInstance();
+        LLFloater* parent_floater = gFloaterView->getParentFloater(prefs);
+        if (parent_floater)
+        {
+                parent_floater->addDependentFloater(floaterp, FALSE);
+        }
+}
diff --git a/linden/indra/newview/llpanelinput.h b/linden/indra/newview/llpanelinput.h
index c90c03c..e73e0ed 100644
--- a/linden/indra/newview/llpanelinput.h
+++ b/linden/indra/newview/llpanelinput.h
@@ -50,6 +50,9 @@ public:
        void apply();
        void cancel();
+private:
+        static void onClickJoystickSetup(void* user_data);
 protected:
        F32 mMouseSensitivityVal;
        BOOL mAutomaticFly;
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 3e92760..466e2b3 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -125,7 +125,7 @@ public:
        virtual PermissionMask getPermissionMask() const { return PERM_NONE; }
        virtual const LLUUID& getUUID() const { return mUUID; }
        virtual U32 getCreationDate() const;
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
        virtual void previewItem();
        virtual void selectItem() {}
@@ -339,7 +339,7 @@ U32 LLTaskInvFVBridge::getCreationDate() const
        return 0;
 }
-LLViewerImage* LLTaskInvFVBridge::getIcon() const
+LLUIImagePtr LLTaskInvFVBridge::getIcon() const
 {
        BOOL item_is_multi = FALSE;
        if ( mFlags & LLInventoryItem::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS )
@@ -700,7 +700,7 @@ public:
                const LLUUID& uuid,
                const LLString& name);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual const LLString& getDisplayName() const { return getName(); }
        virtual BOOL isItemRenameable() const;
        virtual BOOL renameItem(const LLString& new_name);
@@ -721,10 +721,9 @@ LLTaskCategoryBridge::LLTaskCategoryBridge(
 {
 }
-LLViewerImage* LLTaskCategoryBridge::getIcon() const
+LLUIImagePtr LLTaskCategoryBridge::getIcon() const
 {
-        LLString uuid_string = gViewerArt.getString("inv_folder_plain_closed.tga");
+        return LLUI::getUIImage("inv_folder_plain_closed.tga");
-        return gImageList.getImage(LLUUID(uuid_string), MIPMAP_FALSE, TRUE);
 }
 BOOL LLTaskCategoryBridge::isItemRenameable() const
@@ -799,7 +798,7 @@ BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop,
                switch(cargo_type)
                {
                case DAD_CATEGORY:
-                        accept = gToolDragAndDrop->dadUpdateInventoryCategory(object,drop);
+                        accept = LLToolDragAndDrop::getInstance()->dadUpdateInventoryCategory(object,drop);
                        break;
                case DAD_TEXTURE:
                case DAD_SOUND:
@@ -817,8 +816,8 @@ BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop,
                        //accept = LLToolDragAndDrop::isInventoryDropAcceptable(object, (LLViewerInventoryItem*)cargo_data);
                        if(LLToolDragAndDrop::isInventoryDropAcceptable(
                                   object, (LLViewerInventoryItem*)cargo_data)
-                           && (LLToolDragAndDrop::SOURCE_WORLD != gToolDragAndDrop->getSource())
+                           && (LLToolDragAndDrop::SOURCE_WORLD != LLToolDragAndDrop::getInstance()->getSource())
-                           && (LLToolDragAndDrop::SOURCE_NOTECARD != gToolDragAndDrop->getSource()))
+                           && (LLToolDragAndDrop::SOURCE_NOTECARD != LLToolDragAndDrop::getInstance()->getSource()))
                        {
                                accept = TRUE;
                        }
@@ -826,8 +825,8 @@ BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop,
                        {
                                LLToolDragAndDrop::dropInventory(object,
                                                                                                 (LLViewerInventoryItem*)cargo_data,
-                                                                                                 gToolDragAndDrop->getSource(),
+                                                                                                 LLToolDragAndDrop::getInstance()->getSource(),
-                                                                                                 gToolDragAndDrop->getSourceID());
+                                                                                                 LLToolDragAndDrop::getInstance()->getSourceID());
                        }
                        break;
                case DAD_SCRIPT:
@@ -838,8 +837,8 @@ BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop,
                        //accept = LLToolDragAndDrop::isInventoryDropAcceptable(object, (LLViewerInventoryItem*)cargo_data);
                        if(LLToolDragAndDrop::isInventoryDropAcceptable(
                                   object, (LLViewerInventoryItem*)cargo_data)
-                           && (LLToolDragAndDrop::SOURCE_WORLD != gToolDragAndDrop->getSource())
+                           && (LLToolDragAndDrop::SOURCE_WORLD != LLToolDragAndDrop::getInstance()->getSource())
-                           && (LLToolDragAndDrop::SOURCE_NOTECARD != gToolDragAndDrop->getSource()))
+                           && (LLToolDragAndDrop::SOURCE_NOTECARD != LLToolDragAndDrop::getInstance()->getSource()))
                        {
                                accept = TRUE;
                        }
@@ -850,8 +849,8 @@ BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop,
                                // inactive if the control key is being held down.
                                BOOL active = ((mask & MASK_CONTROL) == 0);
                                LLToolDragAndDrop::dropScript(object, item, active,
-                                                                                          gToolDragAndDrop->getSource(),
+                                                                                          LLToolDragAndDrop::getInstance()->getSource(),
-                                                                                          gToolDragAndDrop->getSourceID());
+                                                                                          LLToolDragAndDrop::getInstance()->getSourceID());
                        }
                        break;
                case DAD_CALLINGCARD:
@@ -875,7 +874,7 @@ public:
                const LLString& name,
                LLInventoryType::EType it);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
 protected:
        LLInventoryType::EType mInventoryType;
@@ -891,7 +890,7 @@ LLTaskTextureBridge::LLTaskTextureBridge(
 {
 }
-LLViewerImage* LLTaskTextureBridge::getIcon() const
+LLUIImagePtr LLTaskTextureBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_TEXTURE, mInventoryType, 0, FALSE);
 }
@@ -928,7 +927,7 @@ public:
                const LLUUID& uuid,
                const LLString& name);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
        virtual void performAction(LLFolderView* folder, LLInventoryModel* model, LLString action);
        virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
@@ -943,7 +942,7 @@ LLTaskSoundBridge::LLTaskSoundBridge(
 {
 }
-LLViewerImage* LLTaskSoundBridge::getIcon() const
+LLUIImagePtr LLTaskSoundBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_SOUND, LLInventoryType::IT_SOUND, 0, FALSE);
 }
@@ -1065,7 +1064,7 @@ public:
                const LLUUID& uuid,
                const LLString& name);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
 };
 LLTaskLandmarkBridge::LLTaskLandmarkBridge(
@@ -1076,7 +1075,7 @@ LLTaskLandmarkBridge::LLTaskLandmarkBridge(
 {
 }
-LLViewerImage* LLTaskLandmarkBridge::getIcon() const
+LLUIImagePtr LLTaskLandmarkBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_LANDMARK, LLInventoryType::IT_LANDMARK, 0, FALSE);
 }
@@ -1094,7 +1093,7 @@ public:
                const LLUUID& uuid,
                const LLString& name);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual BOOL isItemRenameable() const;
        virtual BOOL renameItem(const LLString& new_name);
 };
@@ -1107,7 +1106,7 @@ LLTaskCallingCardBridge::LLTaskCallingCardBridge(
 {
 }
-LLViewerImage* LLTaskCallingCardBridge::getIcon() const
+LLUIImagePtr LLTaskCallingCardBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_CALLINGCARD, LLInventoryType::IT_CALLINGCARD, 0, FALSE);
 }
@@ -1135,7 +1134,7 @@ public:
                const LLUUID& uuid,
                const LLString& name);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        //static BOOL enableIfCopyable( void* userdata );
 };
@@ -1147,7 +1146,7 @@ LLTaskScriptBridge::LLTaskScriptBridge(
 {
 }
-LLViewerImage* LLTaskScriptBridge::getIcon() const
+LLUIImagePtr LLTaskScriptBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_SCRIPT, LLInventoryType::IT_LSL, 0, FALSE);
 }
@@ -1235,7 +1234,7 @@ public:
                const LLUUID& uuid,
                const LLString& name);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
 };
 LLTaskObjectBridge::LLTaskObjectBridge(
@@ -1246,7 +1245,7 @@ LLTaskObjectBridge::LLTaskObjectBridge(
 {
 }
-LLViewerImage* LLTaskObjectBridge::getIcon() const
+LLUIImagePtr LLTaskObjectBridge::getIcon() const
 {
        BOOL item_is_multi = FALSE;
        if ( mFlags & LLInventoryItem::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS )
@@ -1269,7 +1268,7 @@ public:
                const LLUUID& uuid,
                const LLString& name);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
        virtual BOOL removeItem();
 };
@@ -1282,7 +1281,7 @@ LLTaskNotecardBridge::LLTaskNotecardBridge(
 {
 }
-LLViewerImage* LLTaskNotecardBridge::getIcon() const
+LLUIImagePtr LLTaskNotecardBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE);
 }
@@ -1335,7 +1334,7 @@ public:
                const LLUUID& uuid,
                const LLString& name);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
        virtual BOOL removeItem();
 };
@@ -1348,7 +1347,7 @@ LLTaskGestureBridge::LLTaskGestureBridge(
 {
 }
-LLViewerImage* LLTaskGestureBridge::getIcon() const
+LLUIImagePtr LLTaskGestureBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_GESTURE, LLInventoryType::IT_GESTURE, 0, FALSE);
 }
@@ -1395,7 +1394,7 @@ public:
                const LLUUID& uuid,
                const LLString& name);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
        virtual BOOL removeItem();
 };
@@ -1408,7 +1407,7 @@ LLTaskAnimationBridge::LLTaskAnimationBridge(
 {
 }
-LLViewerImage* LLTaskAnimationBridge::getIcon() const
+LLUIImagePtr LLTaskAnimationBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_ANIMATION, LLInventoryType::IT_ANIMATION, 0, FALSE);
 }
@@ -1475,7 +1474,7 @@ public:
                LLAssetType::EType asset_type,
                U32 flags);
-        virtual LLViewerImage* getIcon() const;
+        virtual LLUIImagePtr getIcon() const;
 protected:
        LLAssetType::EType              mAssetType;
@@ -1492,7 +1491,7 @@ LLTaskWearableBridge::LLTaskWearableBridge(
 {
 }
-LLViewerImage* LLTaskWearableBridge::getIcon() const
+LLUIImagePtr LLTaskWearableBridge::getIcon() const
 {
        return get_item_icon(mAssetType, LLInventoryType::IT_WEARABLE, mFlags, FALSE );
 }
@@ -1620,9 +1619,9 @@ void LLPanelInventory::clearContents()
 {
        mHaveInventory = FALSE;
        mIsInventoryEmpty = TRUE;
-        if (gToolDragAndDrop && gToolDragAndDrop->getSource() == LLToolDragAndDrop::SOURCE_WORLD)
+        if (LLToolDragAndDrop::getInstance() && LLToolDragAndDrop::getInstance()->getSource() == LLToolDragAndDrop::SOURCE_WORLD)
        {
-                gToolDragAndDrop->endDrag();
+                LLToolDragAndDrop::getInstance()->endDrag();
        }
        if( mScroller )
@@ -1854,12 +1853,12 @@ void LLPanelInventory::refresh()
        //llinfos << "LLPanelInventory::refresh()" << llendl;
        BOOL has_inventory = FALSE;
        const BOOL non_root_ok = TRUE;
-        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode(NULL, non_root_ok);
+        LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(NULL, non_root_ok);
        if(node)
        {
                LLViewerObject* object = node->getObject();
-                if(object && ((gSelectMgr->getSelection()->getRootObjectCount() == 1)
+                if(object && ((LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1)
-                                          || (gSelectMgr->getSelection()->getObjectCount() == 1)))
+                                          || (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1)))
                {
                        // determine if we need to make a request. Start with a
                        // default based on if we have inventory at all.
@@ -1925,30 +1924,27 @@ void LLPanelInventory::startRenamingSelectedItem()
 void LLPanelInventory::draw()
 {
-        if( getVisible() )
+        LLPanel::draw();
-        {
-                LLPanel::draw();
-                if(mIsInventoryEmpty)
+        if(mIsInventoryEmpty)
+        {
+                if((LLUUID::null != mTaskUUID) && (!mHaveInventory))
                {
-                        if((LLUUID::null != mTaskUUID) && (!mHaveInventory))
+                        LLFontGL::sSansSerif->renderUTF8("Loading contents...", 0,
-                        {
+                                                                                 (S32)(getRect().getWidth() * 0.5f),
-                                LLFontGL::sSansSerif->renderUTF8("Loading contents...", 0,
+                                                                                 10,
-                                                                                         (S32)(getRect().getWidth() * 0.5f),
+                                                                                 LLColor4( 1, 1, 1, 1 ),
-                                                                                         10,
+                                                                                 LLFontGL::HCENTER,
-                                                                                         LLColor4( 1, 1, 1, 1 ),
+                                                                                 LLFontGL::BOTTOM);
-                                                                                         LLFontGL::HCENTER,
+                }
-                                                                                         LLFontGL::BOTTOM);
+                else if(mHaveInventory)
-                        }
+                {
-                        else if(mHaveInventory)
+                        LLFontGL::sSansSerif->renderUTF8("No contents", 0,
-                        {
+                                                                                 (S32)(getRect().getWidth() * 0.5f),
-                                LLFontGL::sSansSerif->renderUTF8("No contents", 0,
+                                                                                 10,
-                                                                                         (S32)(getRect().getWidth() * 0.5f),
+                                                                                 LLColor4( 1, 1, 1, 1 ),
-                                                                                         10,
+                                                                                 LLFontGL::HCENTER,
-                                                                                         LLColor4( 1, 1, 1, 1 ),
+                                                                                 LLFontGL::BOTTOM);
-                                                                                         LLFontGL::HCENTER,
-                                                                                         LLFontGL::BOTTOM);
-                        }
                }
        }
 }
diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp
index 5edd304..be05703 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -43,7 +43,7 @@
 #include "llviewerregion.h"
 #include "roles_constants.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 LLPanelLandSelectObserver* LLPanelLandInfo::sObserver = NULL;
 LLPanelLandInfo* LLPanelLandInfo::sInstance = NULL;
@@ -81,7 +81,7 @@ LLPanelLandInfo::LLPanelLandInfo(const std::string& name)
        if (!sObserver)
        {
                sObserver = new LLPanelLandSelectObserver();
-                gParcelMgr->addObserver( sObserver );
+                LLViewerParcelMgr::getInstance()->addObserver( sObserver );
        }
 }
@@ -90,7 +90,7 @@ LLPanelLandInfo::LLPanelLandInfo(const std::string& name)
 // virtual
 LLPanelLandInfo::~LLPanelLandInfo()
 {
-        gParcelMgr->removeObserver( sObserver );
+        LLViewerParcelMgr::getInstance()->removeObserver( sObserver );
        delete sObserver;
        sObserver = NULL;
@@ -111,8 +111,8 @@ void LLPanelLandInfo::refreshAll()
 // public
 void LLPanelLandInfo::refresh()
 {
-        LLParcel *parcel = gParcelMgr->getParcelSelection()->getParcel();
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel();
-        LLViewerRegion *regionp = gParcelMgr->getSelectionRegion();
+        LLViewerRegion *regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion();
        if (!parcel || !regionp)
        {
@@ -177,9 +177,9 @@ void LLPanelLandInfo::refresh()
                // not just a single unit of land,
                // you must own part of it,
                // and it must not be a whole parcel.
-                if (gParcelMgr->getSelectedArea() > PARCEL_UNIT_AREA
+                if (LLViewerParcelMgr::getInstance()->getSelectedArea() > PARCEL_UNIT_AREA
-                        //&& gParcelMgr->getSelfCount() > 1
+                        //&& LLViewerParcelMgr::getInstance()->getSelfCount() > 1
-                        && !gParcelMgr->getParcelSelection()->getWholeParcelSelected())
+                        && !LLViewerParcelMgr::getInstance()->getParcelSelection()->getWholeParcelSelected())
                {
                        childSetEnabled("button join land",TRUE);
                }
@@ -197,12 +197,12 @@ void LLPanelLandInfo::refresh()
                S32 rent_price;
                BOOL for_sale;
                F32 dwell;
-                gParcelMgr->getDisplayInfo(&area,
+                LLViewerParcelMgr::getInstance()->getDisplayInfo(&area,
                                                                   &claim_price,
                                                                   &rent_price,
                                                                   &for_sale,
                                                                   &dwell);
-                if(is_public || (is_for_sale && gParcelMgr->getParcelSelection()->getWholeParcelSelected()))
+                if(is_public || (is_for_sale && LLViewerParcelMgr::getInstance()->getParcelSelection()->getWholeParcelSelected()))
                {
                        childSetTextArg("label_area_price","[PRICE]", llformat("%d",claim_price));
                        childSetTextArg("label_area_price","[AREA]", llformat("%d",area));
@@ -222,35 +222,35 @@ void LLPanelLandInfo::refresh()
 //static
 void LLPanelLandInfo::onClickClaim(void*)
 {
-        gParcelMgr->startBuyLand();
+        LLViewerParcelMgr::getInstance()->startBuyLand();
 }
 //static
 void LLPanelLandInfo::onClickRelease(void*)
 {
-        gParcelMgr->startReleaseLand();
+        LLViewerParcelMgr::getInstance()->startReleaseLand();
 }
 // static
 void LLPanelLandInfo::onClickDivide(void*)
 {
-        gParcelMgr->startDivideLand();
+        LLViewerParcelMgr::getInstance()->startDivideLand();
 }
 // static
 void LLPanelLandInfo::onClickJoin(void*)
 {
-        gParcelMgr->startJoinLand();
+        LLViewerParcelMgr::getInstance()->startJoinLand();
 }
 //static
 void LLPanelLandInfo::onClickAbout(void*)
 {
        // Promote the rectangle selection to a parcel selection
-        if (!gParcelMgr->getParcelSelection()->getWholeParcelSelected())
+        if (!LLViewerParcelMgr::getInstance()->getParcelSelection()->getWholeParcelSelected())
        {
-                gParcelMgr->selectParcelInRectangle();
+                LLViewerParcelMgr::getInstance()->selectParcelInRectangle();
        }
        LLFloaterLand::showInstance();
diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index cb8e8c5..6810c0a 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -37,7 +37,7 @@
 // viewer includes
 #include "llmimetypes.h"
 #include "llviewerparcelmgr.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 // library includes
 #include "llcheckboxctrl.h"
@@ -80,58 +80,51 @@ LLPanelLandMedia::~LLPanelLandMedia()
 BOOL LLPanelLandMedia::postBuild()
 {
-        mCheckSoundLocal = LLUICtrlFactory::getCheckBoxByName(this, "check sound local");
+        mCheckSoundLocal = getChild<LLCheckBoxCtrl>("check sound local");
        childSetCommitCallback("check sound local", onCommitAny, this);
-        mRadioVoiceChat = LLUICtrlFactory::getRadioGroupByName(this, "parcel_voice_channel");
+        mRadioVoiceChat = getChild<LLRadioGroup>("parcel_voice_channel");
        childSetCommitCallback("parcel_voice_channel", onCommitAny, this);
-        mMusicURLEdit = LLUICtrlFactory::getLineEditorByName(this, "music_url");
+        mMusicURLEdit = getChild<LLLineEditor>("music_url");
        childSetCommitCallback("music_url", onCommitAny, this);
-        mMediaTextureCtrl = LLViewerUICtrlFactory::getTexturePickerByName(this, "media texture");
+        mMediaTextureCtrl = getChild<LLTextureCtrl>("media texture");
-        if (mMediaTextureCtrl)
+        mMediaTextureCtrl->setCommitCallback( onCommitAny );
-        {
+        mMediaTextureCtrl->setCallbackUserData( this );
-                mMediaTextureCtrl->setCommitCallback( onCommitAny );
+        mMediaTextureCtrl->setAllowNoTexture ( TRUE );
-                mMediaTextureCtrl->setCallbackUserData( this );
+        mMediaTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
-                mMediaTextureCtrl->setAllowNoTexture ( TRUE );
+        mMediaTextureCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
-                mMediaTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
-                mMediaTextureCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
-        }
-        else
-        {
-                llwarns << "LLViewerUICtrlFactory::getTexturePickerByName() returned NULL for 'media texure'" << llendl;
-        }
-        mMediaAutoScaleCheck = LLUICtrlFactory::getCheckBoxByName(this, "media_auto_scale");
+        mMediaAutoScaleCheck = getChild<LLCheckBoxCtrl>("media_auto_scale");
        childSetCommitCallback("media_auto_scale", onCommitAny, this);
-        mMediaLoopCheck = LLUICtrlFactory::getCheckBoxByName(this, "media_loop");
+        mMediaLoopCheck = getChild<LLCheckBoxCtrl>("media_loop");
        childSetCommitCallback("media_loop", onCommitAny, this);
-        mMediaUrlCheck = LLUICtrlFactory::getCheckBoxByName(this, "hide_media_url");
+        mMediaUrlCheck = getChild<LLCheckBoxCtrl>("hide_media_url");
        childSetCommitCallback("hide_media_url", onCommitAny, this);
-        mMusicUrlCheck = LLUICtrlFactory::getCheckBoxByName(this, "hide_music_url");
+        mMusicUrlCheck = getChild<LLCheckBoxCtrl>("hide_music_url");
        childSetCommitCallback("hide_music_url", onCommitAny, this);
-        mMediaURLEdit = LLUICtrlFactory::getLineEditorByName(this, "media_url");
+        mMediaURLEdit = getChild<LLLineEditor>("media_url");
        childSetCommitCallback("media_url", onCommitAny, this);
-        mMediaDescEdit = LLUICtrlFactory::getLineEditorByName(this, "url_description");
+        mMediaDescEdit = getChild<LLLineEditor>("url_description");
        childSetCommitCallback("url_description", onCommitAny, this);
-        mMediaTypeCombo = LLUICtrlFactory::getComboBoxByName(this, "media type");
+        mMediaTypeCombo = getChild<LLComboBox>("media type");
        childSetCommitCallback("media type", onCommitType, this);
        populateMIMECombo();
-        mMediaWidthCtrl = LLUICtrlFactory::getSpinnerByName(this, "media_size_width");
+        mMediaWidthCtrl = getChild<LLSpinCtrl>("media_size_width");
        childSetCommitCallback("media_size_width", onCommitAny, this);
-        mMediaHeightCtrl = LLUICtrlFactory::getSpinnerByName(this, "media_size_height");
+        mMediaHeightCtrl = getChild<LLSpinCtrl>("media_size_height");
        childSetCommitCallback("media_size_height", onCommitAny, this);
-        mMediaSizeCtrlLabel = LLUICtrlFactory::getTextBoxByName(this, "media_size");
+        mMediaSizeCtrlLabel = getChild<LLTextBox>("media_size");
-        mSetURLButton = LLUICtrlFactory::getButtonByName(this, "set_media_url");
+        mSetURLButton = getChild<LLButton>("set_media_url");
        childSetAction("set_media_url", onSetBtn, this);
        return TRUE;
@@ -401,7 +394,7 @@ void LLPanelLandMedia::onCommitAny(LLUICtrl*, void *userdata)
        parcel->setObscureMusic( obscure_music );
        // Send current parcel data upstream to server
-        gParcelMgr->sendParcelPropertiesUpdate( parcel );
+        LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
        // Might have changed properties, so let's redraw!
        self->refresh();
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 26075a1..f403271 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -65,7 +65,7 @@
 #include "llnotify.h"
 #include "llappviewer.h"                                        // for gHideLinks
 #include "llurlsimstring.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llhttpclient.h"
 #include "llweb.h"
 #include "llwebbrowserctrl.h"
@@ -206,7 +206,7 @@ void LLLoginHandler::parse(const LLSD& queryMap)
        
        if (LLAppViewer::instance()->getLoginURIs().size() == 0)
        {
-            snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);                /* Flawfinder: ignore */
+                gGridName = gGridInfo[gGridChoice].mName;               /* Flawfinder: ignore */
            LLAppViewer::instance()->resetURIs();
        }           
        
@@ -349,9 +349,9 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
        gViewerWindow->getRootView()->addChildAtEnd(this);
        // Logo
-        mLogoImage = gImageList.getImage("startup_logo.tga", LLUUID::null, MIPMAP_FALSE, TRUE);
+        mLogoImage = LLUI::getUIImage("startup_logo.j2c");
-        gUICtrlFactory->buildPanel(this, "panel_login.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_login.xml");
        
 #if USE_VIEWER_AUTH
        //leave room for the login menu bar
@@ -368,44 +368,43 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
        childSetUserData("password_edit", this);
        // change z sort of clickable text to be behind buttons
-        sendChildToBack(getChildByName("channel_text"));
+        sendChildToBack(getChildView("channel_text"));
-        sendChildToBack(getChildByName("version_text"));
+        sendChildToBack(getChildView("version_text"));
-        sendChildToBack(getChildByName("forgot_password_text"));
+        sendChildToBack(getChildView("forgot_password_text"));
-        LLLineEditor* edit = LLUICtrlFactory::getLineEditorByName(this, "password_edit");
+        LLLineEditor* edit = getChild<LLLineEditor>("password_edit");
        if (edit) edit->setDrawAsterixes(TRUE);
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(this, "start_location_combo");
+        LLComboBox* combo = getChild<LLComboBox>("start_location_combo");
-        if (combo)
+        combo->setAllowTextEntry(TRUE, 128, FALSE);
-        {
-                combo->setAllowTextEntry(TRUE, 128, FALSE);
-                // The XML file loads the combo with the following labels:
+        // The XML file loads the combo with the following labels:
-                // 0 - "My Home"
+        // 0 - "My Home"
-                // 1 - "My Last Location"
+        // 1 - "My Last Location"
-                // 2 - "<Type region name>"
+        // 2 - "<Type region name>"
-                BOOL login_last = gSavedSettings.getBOOL("LoginLastLocation");
+        BOOL login_last = gSavedSettings.getBOOL("LoginLastLocation");
-                LLString sim_string = LLURLSimString::sInstance.mSimString;
+        LLString sim_string = LLURLSimString::sInstance.mSimString;
-                if (!sim_string.empty())
+        if (!sim_string.empty())
-                {
+        {
-                        // Replace "<Type region name>" with this region name
+                // Replace "<Type region name>" with this region name
-                        combo->remove(2);
+                combo->remove(2);
-                        combo->add( sim_string );
+                combo->add( sim_string );
-                        combo->setTextEntry(sim_string);
+                combo->setTextEntry(sim_string);
-                        combo->setCurrentByIndex( 2 );
+                combo->setCurrentByIndex( 2 );
-                }
+        }
-                else if (login_last)
+        else if (login_last)
-                {
+        {
-                        combo->setCurrentByIndex( 1 );
+                combo->setCurrentByIndex( 1 );
-                }
-                else
-                {
-                        combo->setCurrentByIndex( 0 );
-                }
-                combo->setCommitCallback( &LLPanelGeneral::set_start_location );
        }
+        else
+        {
+                combo->setCurrentByIndex( 0 );
+        }
+        combo->setCommitCallback( &LLPanelGeneral::set_start_location );
+        childSetCommitCallback("server_combo", onSelectServer, this);
        childSetAction("connect_btn", onClickConnect, this);
@@ -413,71 +412,59 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
        childSetAction("quit_btn", onClickQuit, this);
-        LLTextBox* version_text = LLUICtrlFactory::getTextBoxByName(this, "version_text");
+        LLTextBox* version_text = getChild<LLTextBox>("version_text");
-        if (version_text)
+        LLString version = llformat("%d.%d.%d (%d)",
-        {
+                LL_VERSION_MAJOR,
-                LLString version = llformat("%d.%d.%d (%d)",
+                LL_VERSION_MINOR,
-                        LL_VERSION_MAJOR,
+                LL_VERSION_PATCH,
-                        LL_VERSION_MINOR,
+                LL_VIEWER_BUILD );
-                        LL_VERSION_PATCH,
+        version_text->setText(version);
-                        LL_VIEWER_BUILD );
+        version_text->setClickedCallback(onClickVersion);
-                version_text->setText(version);
+        version_text->setCallbackUserData(this);
-                version_text->setClickedCallback(onClickVersion);
-                version_text->setCallbackUserData(this);
+        LLTextBox* channel_text = getChild<LLTextBox>("channel_text");
-        }
+        channel_text->setText(gSavedSettings.getString("VersionChannelName"));
+        channel_text->setClickedCallback(onClickVersion);
-        LLTextBox* channel_text = LLUICtrlFactory::getTextBoxByName(this, "channel_text");
+        channel_text->setCallbackUserData(this);
-        if (channel_text)
-        {
-                channel_text->setText(gChannelName);
-                channel_text->setClickedCallback(onClickVersion);
-                channel_text->setCallbackUserData(this);
-        }
        
-        LLTextBox* forgot_password_text = LLUICtrlFactory::getTextBoxByName(this, "forgot_password_text");
+        LLTextBox* forgot_password_text = getChild<LLTextBox>("forgot_password_text");
-        if (forgot_password_text)
+        forgot_password_text->setClickedCallback(onClickForgotPassword);
-        {
-                forgot_password_text->setClickedCallback(onClickForgotPassword);
-        }
 #endif    
        
        // get the web browser control
        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("login_html");
-        if ( web_browser )
+        // Need to handle login secondlife:///app/ URLs
-        {
+        web_browser->setOpenAppSLURLs( true );
-                // Need to handle login secondlife:///app/ URLs
-                web_browser->setOpenAppSLURLs( true );
-                // observe browser events
+        // observe browser events
-                web_browser->addObserver( this );
+        web_browser->addObserver( this );
-                // don't make it a tab stop until SL-27594 is fixed
+        // don't make it a tab stop until SL-27594 is fixed
-                web_browser->setTabStop(FALSE);
+        web_browser->setTabStop(FALSE);
-                web_browser->navigateToLocalPage( "loading", "loading.html" );
+        web_browser->navigateToLocalPage( "loading", "loading.html" );
-                // make links open in external browser
+        // make links open in external browser
-                web_browser->setOpenInExternalBrowser( true );
+        web_browser->setOpenInExternalBrowser( true );
-                // force the size to be correct (XML doesn't seem to be sufficient to do this) (with some padding so the other login screen doesn't show through)
+        // force the size to be correct (XML doesn't seem to be sufficient to do this) (with some padding so the other login screen doesn't show through)
-                LLRect htmlRect = getRect();
+        LLRect htmlRect = getRect();
 #if USE_VIEWER_AUTH
-                htmlRect.setCenterAndSize( getRect().getCenterX() - 2, getRect().getCenterY(), getRect().getWidth() + 6, getRect().getHeight());
+        htmlRect.setCenterAndSize( getRect().getCenterX() - 2, getRect().getCenterY(), getRect().getWidth() + 6, getRect().getHeight());
 #else
-                htmlRect.setCenterAndSize( getRect().getCenterX() - 2, getRect().getCenterY() + 40, getRect().getWidth() + 6, getRect().getHeight() - 78 );
+        htmlRect.setCenterAndSize( getRect().getCenterX() - 2, getRect().getCenterY() + 40, getRect().getWidth() + 6, getRect().getHeight() - 78 );
 #endif
-                web_browser->setRect( htmlRect );
+        web_browser->setRect( htmlRect );
-                web_browser->reshape( htmlRect.getWidth(), htmlRect.getHeight(), TRUE );
+        web_browser->reshape( htmlRect.getWidth(), htmlRect.getHeight(), TRUE );
-                reshape( getRect().getWidth(), getRect().getHeight(), 1 );
+        reshape( getRect().getWidth(), getRect().getHeight(), 1 );
-                // kick off a request to grab the url manually
+        // kick off a request to grab the url manually
-                gResponsePtr = LLIamHereLogin::build( this );
+        gResponsePtr = LLIamHereLogin::build( this );
-                std::string login_page = LLAppViewer::instance()->getLoginPage();
+        std::string login_page = gSavedSettings.getString("LoginPage");
-                if (login_page.empty())
+        if (login_page.empty())
-                {
+        {
-                        login_page = getString( "real_url" );
+                login_page = getString( "real_url" );
-                }
+        }
-                LLHTTPClient::head( login_page, gResponsePtr );
+        LLHTTPClient::head( login_page, gResponsePtr );
-        };
 #if !USE_VIEWER_AUTH
        // Initialize visibility (and don't force visibility - use prefs)
@@ -549,15 +536,13 @@ LLPanelLogin::~LLPanelLogin()
        if ( gResponsePtr )
                gResponsePtr->setParent( 0 );
-        // We know we're done with the image, so be rid of it.
+        //// We know we're done with the image, so be rid of it.
-        gImageList.deleteImage( mLogoImage );
+        //gImageList.deleteImage( mLogoImage );
 }
 // virtual
 void LLPanelLogin::draw()
 {
-        if (!getVisible()) return;
        glPushMatrix();
        {
                F32 image_aspect = 1.333333f;
@@ -578,14 +563,14 @@ void LLPanelLogin::draw()
                        // draw a background box in black
                        gl_rect_2d( 0, height - 264, width, 264, LLColor4( 0.0f, 0.0f, 0.0f, 1.f ) );
                        // draw the bottom part of the background image - just the blue background to the native client UI
-                        gl_draw_scaled_image(0, -264, width + 8, mLogoImage->getHeight(), mLogoImage);
+                        mLogoImage->draw(0, -264, width + 8, mLogoImage->getHeight());
 #endif
                }
                else
                {
                        // the HTML login page is not available so default to the original screen
                        S32 offscreen_part = height / 3;
-                        gl_draw_scaled_image(0, -offscreen_part, width, height+offscreen_part, mLogoImage);
+                        mLogoImage->draw(0, -offscreen_part, width, height+offscreen_part);
                };
        }
        glPopMatrix();
@@ -594,56 +579,50 @@ void LLPanelLogin::draw()
 }
 // virtual
-BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask)
 {
-        if (getVisible() && getEnabled())
+        if (( KEY_RETURN == key ) && (MASK_ALT == mask))
        {
-                if (( KEY_RETURN == key ) && (MASK_ALT == mask))
+                gViewerWindow->toggleFullscreen(FALSE);
-                {
+                return TRUE;
-                        gViewerWindow->toggleFullscreen(FALSE);
+        }
-                        return TRUE;
-                }
-                if (('P' == key) && (MASK_CONTROL == mask))
+        if (('P' == key) && (MASK_CONTROL == mask))
-                {
+        {
-                        LLFloaterPreference::show(NULL);
+                LLFloaterPreference::show(NULL);
-                        return TRUE;
+                return TRUE;
-                }
+        }
-                if (('T' == key) && (MASK_CONTROL == mask))
+        if (('T' == key) && (MASK_CONTROL == mask))
-                {
+        {
-                        new LLFloaterSimple("floater_test.xml");
+                new LLFloaterSimple("floater_test.xml");
-                        return TRUE;
+                return TRUE;
-                }
+        }
-                
+        
-                if ( KEY_F1 == key )
+        if ( KEY_F1 == key )
-                {
+        {
-                        llinfos << "Spawning HTML help window" << llendl;
+                llinfos << "Spawning HTML help window" << llendl;
-                        gViewerHtmlHelp.show();
+                gViewerHtmlHelp.show();
-                        return TRUE;
+                return TRUE;
-                }
+        }
 # if !LL_RELEASE_FOR_DOWNLOAD
-                if ( KEY_F2 == key )
+        if ( KEY_F2 == key )
-                {
+        {
-                        llinfos << "Spawning floater TOS window" << llendl;
+                llinfos << "Spawning floater TOS window" << llendl;
-                        LLFloaterTOS* tos_dialog = LLFloaterTOS::show(LLFloaterTOS::TOS_TOS,"");
+                LLFloaterTOS* tos_dialog = LLFloaterTOS::show(LLFloaterTOS::TOS_TOS,"");
-                        tos_dialog->startModal();
+                tos_dialog->startModal();
-                        return TRUE;
+                return TRUE;
-                }
+        }
 #endif
-                if (!called_from_parent)
+        if (KEY_RETURN == key && MASK_NONE == mask)
-                {
+        {
-                        if (KEY_RETURN == key && MASK_NONE == mask)
+                // let the panel handle UICtrl processing: calls onClickConnect()
-                        {
+                return LLPanel::handleKeyHere(key, mask);
-                                // let the panel handle UICtrl processing: calls onClickConnect()
-                                return LLPanel::handleKeyHere(key, mask, called_from_parent);
-                        }
-                }
        }
-        return LLPanel::handleKeyHere(key, mask, called_from_parent);
+        return LLPanel::handleKeyHere(key, mask);
 }
 // virtual 
@@ -685,12 +664,12 @@ void LLPanelLogin::giveFocus()
                {
                        // User saved his name but not his password.  Move
                        // focus to password field.
-                        edit = LLUICtrlFactory::getLineEditorByName(sInstance, "password_edit");
+                        edit = sInstance->getChild<LLLineEditor>("password_edit");
                }
                else
                {
                        // User doesn't have a name, so start there.
-                        edit = LLUICtrlFactory::getLineEditorByName(sInstance, "first_name_edit");
+                        edit = sInstance->getChild<LLLineEditor>("first_name_edit");
                }
                if (edit)
@@ -771,12 +750,9 @@ void LLPanelLogin::addServer(const char *server, S32 domain_name)
                return;
        }
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(sInstance, "server_combo");
+        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
-        if (combo)
+        combo->add(server, LLSD(domain_name) );
-        {
+        combo->setCurrentByIndex(0);
-                combo->add(server, LLSD(domain_name) );
-                combo->setCurrentByIndex(0);
-        }
 }
 // static
@@ -810,27 +786,24 @@ BOOL LLPanelLogin::getServer(LLString &server, S32 &domain_name)
        }
        else
        {
-                LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(sInstance, "server_combo");
+                LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
-                if (combo)
+                LLSD combo_val = combo->getValue();
+                if (LLSD::TypeInteger == combo_val.type())
                {
-                        LLSD combo_val = combo->getValue();
+                        domain_name = combo->getValue().asInteger();
-                        if (LLSD::TypeInteger == combo_val.type())
-                        {
-                                domain_name = combo->getValue().asInteger();
-                                if ((S32)GRID_INFO_OTHER == domain_name)
+                        if ((S32)GRID_INFO_OTHER == domain_name)
-                                {
-                                        server = gGridName;
-                                }
-                        }
-                        else
                        {
-                                // no valid selection, return other
+                                server = gGridName;
-                                domain_name = (S32)GRID_INFO_OTHER;
-                                server = combo_val.asString();
                        }
-                        user_picked = combo->isDirty();
                }
+                else
+                {
+                        // no valid selection, return other
+                        domain_name = (S32)GRID_INFO_OTHER;
+                        server = combo_val.asString();
+                }
+                user_picked = combo->isDirty();
        }
        return user_picked;
@@ -845,11 +818,8 @@ void LLPanelLogin::getLocation(LLString &location)
                return;
        }
        
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(sInstance, "start_location_combo");
+        LLComboBox* combo = sInstance->getChild<LLComboBox>("start_location_combo");
-        if (combo)
+        location = combo->getValue().asString();
-        {
-                location = combo->getValue().asString();
-        }
 }
 // static
@@ -860,8 +830,7 @@ void LLPanelLogin::refreshLocation( bool force_visible )
 #if USE_VIEWER_AUTH
        loadLoginPage();
 #else
-        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(sInstance, "start_location_combo");
+        LLComboBox* combo = sInstance->getChild<LLComboBox>("start_location_combo");
-        if (!combo) return;
        if (LLURLSimString::parse())
        {
@@ -927,13 +896,70 @@ void LLPanelLogin::loadLoginPage()
        
        std::ostringstream oStr;
-        std::string login_page = LLAppViewer::instance()->getLoginPage();
+        std::string login_page = gSavedSettings.getString("LoginPage");
        if (login_page.empty())
        {
                login_page = sInstance->getString( "real_url" );
        }
        oStr << login_page;
        
+        // Use the right delimeter depending on how LLURI parses the URL
+        LLURI login_page_uri = LLURI(login_page);
+        std::string first_query_delimiter = "&";
+        if (login_page_uri.queryMap().size() == 0)
+        {
+                first_query_delimiter = "?";
+        }
+        // Language
+        LLString language(gSavedSettings.getString("Language"));
+        if(language == "default")
+        {
+                language = gSavedSettings.getString("SystemLanguage");
+        }
+        oStr << first_query_delimiter<<"lang=" << language;
+        
+        // First Login?
+        if (gSavedSettings.getBOOL("FirstLoginThisInstall"))
+        {
+                oStr << "&firstlogin=TRUE";
+        }
+        // Channel and Version
+        LLString version = llformat("%d.%d.%d (%d)",
+                                                LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD);
+        char* curl_channel = curl_escape(gSavedSettings.getString("VersionChannelName").c_str(), 0);
+        char* curl_version = curl_escape(version.c_str(), 0);
+        oStr << "&channel=" << curl_channel;
+        oStr << "&version=" << curl_version;
+        curl_free(curl_channel);
+        curl_free(curl_version);
+        // Grid
+        LLString grid;
+        S32 grid_index;
+        getServer( grid, grid_index );
+        if( grid_index != (S32)GRID_INFO_OTHER )
+        {
+                grid = gGridInfo[grid_index].mLabel;
+        }
+        if(gGridChoice != (EGridInfo)grid_index)
+        {
+                LLAppViewer::instance()->resetURIs();
+                gGridChoice = (EGridInfo)grid_index;
+                gViewerWindow->setMenuBackgroundColor(false, 
+                        !LLAppViewer::instance()->isInProductionGrid());
+                gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor());
+        }
+    
+        char* curl_grid = curl_escape(grid.c_str(), 0);
+        oStr << "&grid=" << curl_grid;
+        curl_free(curl_grid);
 #if USE_VIEWER_AUTH
        LLURLSimString::sInstance.parse();
@@ -963,60 +989,35 @@ void LLPanelLogin::loadLoginPage()
        }
        
        LLString firstname, lastname;
-        
-        if (gCmdLineFirstName.empty())
+    if(gSavedSettings.getLLSD("UserLoginInfo").size() == 3)
+    {
+        LLSD cmd_line_login = gSavedSettings.getLLSD("UserLoginInfo");
+                firstname = cmd_line_login[0].asString();
+                lastname = cmd_line_login[1].asString();
+        password = cmd_line_login[2].asString();
+    }
+        
+        if (firstname.empty())
        {
                firstname = gSavedSettings.getString("FirstName");
        }
-        else
-        {
-                firstname = gCmdLineFirstName;
-        }
        
-        if (gCmdLineLastName.empty())
+        if (lastname.empty())
        {
                lastname = gSavedSettings.getString("LastName");
        }
-        else
-        {
-                lastname = gCmdLineLastName;
-        }
        
-        LLString version = llformat("%d.%d.%d (%d)",
-                                                LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD);
        char* curl_region = curl_escape(region.c_str(), 0);
-        char* curl_channel = curl_escape(gChannelName.c_str(), 0);
-        char* curl_version = curl_escape(version.c_str(), 0);
-        
+        oStr <<"firstname=" << firstname <<
-        // Use the right delimeter depending on how LLURI parses the URL
+                "&lastname=" << lastname << "&location=" << location << "&region=" << curl_region;
-        LLURI login_page_uri = LLURI(login_page);
-        std::string first_query_delimiter = "&";
-        if (login_page_uri.queryMap().size() == 0)
-        {
-                first_query_delimiter = "?";
-        }
-        oStr << first_query_delimiter << "firstname=" << firstname <<
-                "&lastname=" << lastname << "&location=" << location << "&region=" << curl_region <<
-                "&grid=" << gGridInfo[gGridChoice].mLabel << "&channel=" << curl_channel <<
-                "&version=" << curl_version;
        
        curl_free(curl_region);
-        curl_free(curl_channel);
-        curl_free(curl_version);
-        LLString language(gSavedSettings.getString("Language"));
-        if(language == "default")
-        {
-                language = gSavedSettings.getString("SystemLanguage");
-        }
-        oStr << "&lang=" << language;
-        if (!gCmdLinePassword.empty())
+        if (!password.empty())
        {
-                oStr << "&password=" << gCmdLinePassword;
+                oStr << "&password=" << password;
        }
        else if (!(password = load_password_from_disk()).empty())
        {
@@ -1087,15 +1088,12 @@ void LLPanelLogin::onClickConnect(void *)
                        // has both first and last name typed
                        // store off custom server entry, if currently selected
-                        LLComboBox* combo = LLUICtrlFactory::getComboBoxByName(sInstance, "server_combo");
+                        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
-                        if (combo)
+                        S32 selected_server = combo->getValue();
+                        if (selected_server == GRID_INFO_NONE)
                        {
-                                S32 selected_server = combo->getValue();
+                                LLString custom_server = combo->getValue().asString();
-                                if (selected_server == GRID_INFO_NONE)
+                                gSavedSettings.setString("CustomServer", custom_server);
-                                {
-                                        LLString custom_server = combo->getValue().asString();
-                                        gSavedSettings.setString("CustomServer", custom_server);
-                                }
                        }
                        sInstance->mCallback(0, sInstance->mCallbackData);
                }
@@ -1177,3 +1175,10 @@ void LLPanelLogin::onPassKey(LLLineEditor* caller, void* user_data)
                sCapslockDidNotification = TRUE;
        }
 }
+// static
+void LLPanelLogin::onSelectServer(LLUICtrl*, void*)
+{
+        // grid changed so show new splash screen (possibly)
+        loadLoginPage();
+}
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index a754224..1100cd6 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -74,7 +74,7 @@ public:
                                void *callback_data);
        ~LLPanelLogin();
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
        virtual void draw();
        virtual void setFocus( BOOL b );
@@ -112,9 +112,10 @@ private:
        virtual void onNavigateComplete( const EventType& eventIn );
        static void onClickForgotPassword(void*);
        static void onPassKey(LLLineEditor* caller, void* user_data);
+        static void onSelectServer(LLUICtrl*, void*);
        
 private:
-        LLPointer<LLViewerImage> mLogoImage;
+        LLPointer<LLUIImage> mLogoImage;
        void                    (*mCallback)(S32 option, void *userdata);
        void*                   mCallbackData;
diff --git a/linden/indra/newview/llpanelmorph.cpp b/linden/indra/newview/llpanelmorph.cpp
index 817b214..a8da26d 100644
--- a/linden/indra/newview/llpanelmorph.cpp
+++ b/linden/indra/newview/llpanelmorph.cpp
@@ -217,7 +217,7 @@ void LLPanelMorph::updateSpinners(LLPolyMesh *mesh)
 //-----------------------------------------------------------------------------
 void LLPanelMorph::createSpinners(LLPolyMesh *mesh)
 {
-        const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
        S32 cur_y;
        S32 new_height;
        S32 control_focus = -1;
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index fc21ecb..fb33edf 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -36,7 +36,7 @@
 #include "llscrolllistctrl.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llfirstuse.h"
 class LLPopupData
@@ -56,7 +56,7 @@ LLPanelMsgs::LLPanelMsgs() :
        mDisabledPopups( NULL ),
        mEnabledPopups( NULL )
 {
-        gUICtrlFactory->buildPanel(this, "panel_preferences_popups.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_popups.xml");
 }
@@ -68,8 +68,8 @@ LLPanelMsgs::~LLPanelMsgs()
 //-----------------------------------------------------------------------------
 BOOL LLPanelMsgs::postBuild()
 {
-        mDisabledPopups = LLViewerUICtrlFactory::getScrollListByName(this, "disabled_popups");
+        mDisabledPopups = getChild<LLScrollListCtrl>("disabled_popups");
-        mEnabledPopups = LLViewerUICtrlFactory::getScrollListByName(this, "enabled_popups");
+        mEnabledPopups = getChild<LLScrollListCtrl>("enabled_popups");
        childSetAction("enable_popup", onClickEnablePopup, this);
        childSetAction("reset_dialogs_btn", onClickResetDialogs, this);
        childSetAction("skip_dialogs_btn", onClickSkipDialogs, this);
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index be797cc..a900d0e 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -53,12 +53,12 @@
 #include "llviewerthrottle.h"
 #include "llworld.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 LLPanelNetwork::LLPanelNetwork()
 {
-        gUICtrlFactory->buildPanel(this, "panel_preferences_network.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_network.xml");
 }
 BOOL LLPanelNetwork::postBuild()
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index a395d09..7024691 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -69,7 +69,7 @@
 #include "llworld.h"
 #include "pipeline.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llfirstuse.h"
 #include "lldrawpool.h"
@@ -110,57 +110,57 @@ BOOL	LLPanelObject::postBuild()
        //--------------------------------------------------------
        
        // Lock checkbox
-        mCheckLock = gUICtrlFactory->getCheckBoxByName(this,"checkbox locked");
+        mCheckLock = getChild<LLCheckBoxCtrl>("checkbox locked");
        childSetCommitCallback("checkbox locked",onCommitLock,this);
        // Physical checkbox
-        mCheckPhysics = gUICtrlFactory->getCheckBoxByName(this,"Physical Checkbox Ctrl");
+        mCheckPhysics = getChild<LLCheckBoxCtrl>("Physical Checkbox Ctrl");
        childSetCommitCallback("Physical Checkbox Ctrl",onCommitPhysics,this);
        // Temporary checkbox
-        mCheckTemporary = gUICtrlFactory->getCheckBoxByName(this,"Temporary Checkbox Ctrl");
+        mCheckTemporary = getChild<LLCheckBoxCtrl>("Temporary Checkbox Ctrl");
        childSetCommitCallback("Temporary Checkbox Ctrl",onCommitTemporary,this);
        // Phantom checkbox
-        mCheckPhantom = gUICtrlFactory->getCheckBoxByName(this,"Phantom Checkbox Ctrl");
+        mCheckPhantom = getChild<LLCheckBoxCtrl>("Phantom Checkbox Ctrl");
        childSetCommitCallback("Phantom Checkbox Ctrl",onCommitPhantom,this);
        
        // Position
-        mLabelPosition = gUICtrlFactory->getTextBoxByName(this,"label position");
+        mLabelPosition = getChild<LLTextBox>("label position");
-        mCtrlPosX = gUICtrlFactory->getSpinnerByName(this,"Pos X");
+        mCtrlPosX = getChild<LLSpinCtrl>("Pos X");
        childSetCommitCallback("Pos X",onCommitPosition,this);
-        mCtrlPosY = gUICtrlFactory->getSpinnerByName(this,"Pos Y");
+        mCtrlPosY = getChild<LLSpinCtrl>("Pos Y");
        childSetCommitCallback("Pos Y",onCommitPosition,this);
-        mCtrlPosZ = gUICtrlFactory->getSpinnerByName(this,"Pos Z");
+        mCtrlPosZ = getChild<LLSpinCtrl>("Pos Z");
        childSetCommitCallback("Pos Z",onCommitPosition,this);
        // Scale
-        mLabelSize = gUICtrlFactory->getTextBoxByName(this,"label size");
+        mLabelSize = getChild<LLTextBox>("label size");
-        mCtrlScaleX = gUICtrlFactory->getSpinnerByName(this,"Scale X");
+        mCtrlScaleX = getChild<LLSpinCtrl>("Scale X");
        childSetCommitCallback("Scale X",onCommitScale,this);
        // Scale Y
-        mCtrlScaleY = gUICtrlFactory->getSpinnerByName(this,"Scale Y");
+        mCtrlScaleY = getChild<LLSpinCtrl>("Scale Y");
        childSetCommitCallback("Scale Y",onCommitScale,this);
        // Scale Z
-        mCtrlScaleZ = gUICtrlFactory->getSpinnerByName(this,"Scale Z");
+        mCtrlScaleZ = getChild<LLSpinCtrl>("Scale Z");
        childSetCommitCallback("Scale Z",onCommitScale,this);
        // Rotation
-        mLabelRotation = gUICtrlFactory->getTextBoxByName(this,"label rotation");
+        mLabelRotation = getChild<LLTextBox>("label rotation");
-        mCtrlRotX = gUICtrlFactory->getSpinnerByName(this,"Rot X");
+        mCtrlRotX = getChild<LLSpinCtrl>("Rot X");
        childSetCommitCallback("Rot X",onCommitRotation,this);
-        mCtrlRotY = gUICtrlFactory->getSpinnerByName(this,"Rot Y");
+        mCtrlRotY = getChild<LLSpinCtrl>("Rot Y");
        childSetCommitCallback("Rot Y",onCommitRotation,this);
-        mCtrlRotZ = gUICtrlFactory->getSpinnerByName(this,"Rot Z");
+        mCtrlRotZ = getChild<LLSpinCtrl>("Rot Z");
        childSetCommitCallback("Rot Z",onCommitRotation,this);
        //--------------------------------------------------------
                
        // material type popup
-        mLabelMaterial = gUICtrlFactory->getTextBoxByName(this,"label material");
+        mLabelMaterial = getChild<LLTextBox>("label material");
-        mComboMaterial = gUICtrlFactory->getComboBoxByName(this,"material");
+        mComboMaterial = getChild<LLComboBox>("material");
        childSetCommitCallback("material",onCommitMaterial,this);
        mComboMaterial->removeall();
        // *TODO:translate
@@ -176,84 +176,84 @@ BOOL	LLPanelObject::postBuild()
        mComboMaterialItemCount = mComboMaterial->getItemCount();
        // Base Type
-        mLabelBaseType = gUICtrlFactory->getTextBoxByName(this,"label basetype");
+        mLabelBaseType = getChild<LLTextBox>("label basetype");
-        mComboBaseType = gUICtrlFactory->getComboBoxByName(this,"comboBaseType");
+        mComboBaseType = getChild<LLComboBox>("comboBaseType");
        childSetCommitCallback("comboBaseType",onCommitParametric,this);
        // Cut
-        mLabelCut = gUICtrlFactory->getTextBoxByName(this,"text cut");
+        mLabelCut = getChild<LLTextBox>("text cut");
-        mSpinCutBegin = gUICtrlFactory->getSpinnerByName(this,"cut begin");
+        mSpinCutBegin = getChild<LLSpinCtrl>("cut begin");
        childSetCommitCallback("cut begin",onCommitParametric,this);
        mSpinCutBegin->setValidateBeforeCommit( precommitValidate );
-        mSpinCutEnd = gUICtrlFactory->getSpinnerByName(this,"cut end");
+        mSpinCutEnd = getChild<LLSpinCtrl>("cut end");
        childSetCommitCallback("cut end",onCommitParametric,this);
        mSpinCutEnd->setValidateBeforeCommit( &precommitValidate );
        // Hollow / Skew
-        mLabelHollow = gUICtrlFactory->getTextBoxByName(this,"text hollow");
+        mLabelHollow = getChild<LLTextBox>("text hollow");
-        mLabelSkew = gUICtrlFactory->getTextBoxByName(this,"text skew");
+        mLabelSkew = getChild<LLTextBox>("text skew");
-        mSpinHollow = gUICtrlFactory->getSpinnerByName(this,"Scale 1");
+        mSpinHollow = getChild<LLSpinCtrl>("Scale 1");
        childSetCommitCallback("Scale 1",onCommitParametric,this);
        mSpinHollow->setValidateBeforeCommit( &precommitValidate );
-        mSpinSkew = gUICtrlFactory->getSpinnerByName(this,"Skew");
+        mSpinSkew = getChild<LLSpinCtrl>("Skew");
        childSetCommitCallback("Skew",onCommitParametric,this);
        mSpinSkew->setValidateBeforeCommit( &precommitValidate );
-        mLabelHoleType = gUICtrlFactory->getTextBoxByName(this,"Hollow Shape");
+        mLabelHoleType = getChild<LLTextBox>("Hollow Shape");
        // Hole Type
-        mComboHoleType = gUICtrlFactory->getComboBoxByName(this,"hole");
+        mComboHoleType = getChild<LLComboBox>("hole");
        childSetCommitCallback("hole",onCommitParametric,this);
        // Twist
-        mLabelTwist = gUICtrlFactory->getTextBoxByName(this,"text twist");
+        mLabelTwist = getChild<LLTextBox>("text twist");
-        mSpinTwistBegin = gUICtrlFactory->getSpinnerByName(this,"Twist Begin");
+        mSpinTwistBegin = getChild<LLSpinCtrl>("Twist Begin");
        childSetCommitCallback("Twist Begin",onCommitParametric,this);
        mSpinTwistBegin->setValidateBeforeCommit( precommitValidate );
-        mSpinTwist = gUICtrlFactory->getSpinnerByName(this,"Twist End");
+        mSpinTwist = getChild<LLSpinCtrl>("Twist End");
        childSetCommitCallback("Twist End",onCommitParametric,this);
        mSpinTwist->setValidateBeforeCommit( &precommitValidate );
        // Scale
-        mSpinScaleX = gUICtrlFactory->getSpinnerByName(this,"Taper Scale X");
+        mSpinScaleX = getChild<LLSpinCtrl>("Taper Scale X");
        childSetCommitCallback("Taper Scale X",onCommitParametric,this);
        mSpinScaleX->setValidateBeforeCommit( &precommitValidate );
-        mSpinScaleY = gUICtrlFactory->getSpinnerByName(this,"Taper Scale Y");
+        mSpinScaleY = getChild<LLSpinCtrl>("Taper Scale Y");
        childSetCommitCallback("Taper Scale Y",onCommitParametric,this);
        mSpinScaleY->setValidateBeforeCommit( &precommitValidate );
        // Shear
-        mLabelShear = gUICtrlFactory->getTextBoxByName(this,"text topshear");
+        mLabelShear = getChild<LLTextBox>("text topshear");
-        mSpinShearX = gUICtrlFactory->getSpinnerByName(this,"Shear X");
+        mSpinShearX = getChild<LLSpinCtrl>("Shear X");
        childSetCommitCallback("Shear X",onCommitParametric,this);
        mSpinShearX->setValidateBeforeCommit( &precommitValidate );
-        mSpinShearY = gUICtrlFactory->getSpinnerByName(this,"Shear Y");
+        mSpinShearY = getChild<LLSpinCtrl>("Shear Y");
        childSetCommitCallback("Shear Y",onCommitParametric,this);
        mSpinShearY->setValidateBeforeCommit( &precommitValidate );
        // Path / Profile
-        mCtrlPathBegin = gUICtrlFactory->getSpinnerByName(this,"Path Limit Begin");
+        mCtrlPathBegin = getChild<LLSpinCtrl>("Path Limit Begin");
        childSetCommitCallback("Path Limit Begin",onCommitParametric,this);
        mCtrlPathBegin->setValidateBeforeCommit( &precommitValidate );
-        mCtrlPathEnd = gUICtrlFactory->getSpinnerByName(this,"Path Limit End");
+        mCtrlPathEnd = getChild<LLSpinCtrl>("Path Limit End");
        childSetCommitCallback("Path Limit End",onCommitParametric,this);
        mCtrlPathEnd->setValidateBeforeCommit( &precommitValidate );
        // Taper
-        mLabelTaper = gUICtrlFactory->getTextBoxByName(this,"text taper2");
+        mLabelTaper = getChild<LLTextBox>("text taper2");
-        mSpinTaperX = gUICtrlFactory->getSpinnerByName(this,"Taper X");
+        mSpinTaperX = getChild<LLSpinCtrl>("Taper X");
        childSetCommitCallback("Taper X",onCommitParametric,this);
        mSpinTaperX->setValidateBeforeCommit( precommitValidate );
-        mSpinTaperY = gUICtrlFactory->getSpinnerByName(this,"Taper Y");
+        mSpinTaperY = getChild<LLSpinCtrl>("Taper Y");
        childSetCommitCallback("Taper Y",onCommitParametric,this);
        mSpinTaperY->setValidateBeforeCommit( precommitValidate );
        
        // Radius Offset / Revolutions
-        mLabelRadiusOffset = gUICtrlFactory->getTextBoxByName(this,"text radius delta");
+        mLabelRadiusOffset = getChild<LLTextBox>("text radius delta");
-        mLabelRevolutions = gUICtrlFactory->getTextBoxByName(this,"text revolutions");
+        mLabelRevolutions = getChild<LLTextBox>("text revolutions");
-        mSpinRadiusOffset = gUICtrlFactory->getSpinnerByName(this,"Radius Offset");
+        mSpinRadiusOffset = getChild<LLSpinCtrl>("Radius Offset");
        childSetCommitCallback("Radius Offset",onCommitParametric,this);
        mSpinRadiusOffset->setValidateBeforeCommit( &precommitValidate );
-        mSpinRevolutions = gUICtrlFactory->getSpinnerByName(this,"Revolutions");
+        mSpinRevolutions = getChild<LLSpinCtrl>("Revolutions");
        childSetCommitCallback("Revolutions",onCommitParametric,this);
        mSpinRevolutions->setValidateBeforeCommit( &precommitValidate );
@@ -272,7 +272,7 @@ BOOL	LLPanelObject::postBuild()
                // Allow any texture to be used during non-immediate mode.
                mCtrlSculptTexture->setNonImmediateFilterPermMask(PERM_NONE);
                LLAggregatePermissions texture_perms;
-                if (gSelectMgr->selectGetAggregateTexturePermissions(texture_perms))
+                if (LLSelectMgr::getInstance()->selectGetAggregateTexturePermissions(texture_perms))
                {
                        BOOL can_copy =
                                texture_perms.getValue(PERM_COPY) == LLAggregatePermissions::AP_EMPTY ||
@@ -288,8 +288,8 @@ BOOL	LLPanelObject::postBuild()
                }
        }
-        mLabelSculptType = gUICtrlFactory->getTextBoxByName(this, "label sculpt type");
+        mLabelSculptType = getChild<LLTextBox>("label sculpt type");
-        mCtrlSculptType = gUICtrlFactory->getComboBoxByName(this, "sculpt type control");
+        mCtrlSculptType = getChild<LLComboBox>( "sculpt type control");
        childSetCommitCallback("sculpt type control", onCommitSculptType, this);
        
@@ -317,11 +317,11 @@ LLPanelObject::~LLPanelObject()
 void LLPanelObject::getState( )
 {
-        LLViewerObject* objectp = gSelectMgr->getSelection()->getFirstRootObject();
+        LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject();
        LLViewerObject* root_objectp = objectp;
        if(!objectp)
        {
-                objectp = gSelectMgr->getSelection()->getFirstObject();
+                objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
                // *FIX: shouldn't we just keep the child?
                if (objectp)
                {
@@ -430,13 +430,13 @@ void LLPanelObject::getState( )
        BOOL owners_identical;
        LLUUID owner_id;
        LLString owner_name;
-        owners_identical = gSelectMgr->selectGetOwner(owner_id, owner_name);
+        owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
        // BUG? Check for all objects being editable?
-        S32 roots_selected = gSelectMgr->getSelection()->getRootObjectCount();
+        S32 roots_selected = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
        BOOL editable = root_objectp->permModify();
-        S32 selected_count = gSelectMgr->getSelection()->getObjectCount();
+        S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
-        BOOL single_volume = (gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME ))
+        BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ))
                                                 && (selected_count == 1);
        // Select Single Message
@@ -460,7 +460,7 @@ void LLPanelObject::getState( )
        BOOL valid;
        U32 owner_mask_on;
        U32 owner_mask_off;
-        valid = gSelectMgr->selectGetPerm(PERM_OWNER, &owner_mask_on, &owner_mask_off);
+        valid = LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER, &owner_mask_on, &owner_mask_off);
        if(valid)
        {
@@ -517,7 +517,7 @@ void LLPanelObject::getState( )
                        return object->getMaterial();
                }
        } func;
-        bool material_same = gSelectMgr->getSelection()->getSelectedTEValue( &func, material_code );
+        bool material_same = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, material_code );
        
        if (editable && single_volume && material_same)
        {
@@ -1054,10 +1054,9 @@ void LLPanelObject::getState( )
        mLabelRevolutions->setVisible( revolutions_visible );
        mSpinRevolutions ->setVisible( revolutions_visible );
-        bool sculpt_type_visible = FALSE; // currently not visible - for LSL setting only
        mCtrlSculptTexture->setVisible(sculpt_texture_visible);
-        mLabelSculptType->setVisible(sculpt_texture_visible && sculpt_type_visible);
+        mLabelSculptType->setVisible(sculpt_texture_visible);
-        mCtrlSculptType->setVisible(sculpt_texture_visible && sculpt_type_visible);
+        mCtrlSculptType->setVisible(sculpt_texture_visible);
        // sculpt texture
@@ -1076,7 +1075,7 @@ void LLPanelObject::getState( )
                                mSculptTypeRevert    = sculpt_params->getSculptType();
                        }
                
-                        LLTextureCtrl*  mTextureCtrl = LLViewerUICtrlFactory::getTexturePickerByName(this,"sculpt texture control");
+                        LLTextureCtrl*  mTextureCtrl = getChild<LLTextureCtrl>("sculpt texture control");
                        if(mTextureCtrl)
                        {
                                mTextureCtrl->setTentative(FALSE);
@@ -1123,7 +1122,7 @@ void LLPanelObject::sendIsPhysical()
        BOOL value = mCheckPhysics->get();
        if( mIsPhysical != value )
        {
-                gSelectMgr->selectionUpdatePhysics(value);
+                LLSelectMgr::getInstance()->selectionUpdatePhysics(value);
                mIsPhysical = value;
                llinfos << "update physics sent" << llendl;
@@ -1139,7 +1138,7 @@ void LLPanelObject::sendIsTemporary()
        BOOL value = mCheckTemporary->get();
        if( mIsTemporary != value )
        {
-                gSelectMgr->selectionUpdateTemporary(value);
+                LLSelectMgr::getInstance()->selectionUpdateTemporary(value);
                mIsTemporary = value;
                llinfos << "update temporary sent" << llendl;
@@ -1156,7 +1155,7 @@ void LLPanelObject::sendIsPhantom()
        BOOL value = mCheckPhantom->get();
        if( mIsPhantom != value )
        {
-                gSelectMgr->selectionUpdatePhantom(value);
+                LLSelectMgr::getInstance()->selectionUpdatePhantom(value);
                mIsPhantom = value;
                llinfos << "update phantom sent" << llendl;
@@ -1172,7 +1171,7 @@ void LLPanelObject::sendCastShadows()
        BOOL value = mCheckCastShadows->get();
        if( mCastShadows != value )
        {
-                gSelectMgr->selectionUpdateCastShadows(value);
+                LLSelectMgr::getInstance()->selectionUpdateCastShadows(value);
                mCastShadows = value;
                llinfos << "update cast shadows sent" << llendl;
@@ -1196,7 +1195,7 @@ void LLPanelObject::onCommitMaterial( LLUICtrl* ctrl, void* userdata )
                if (material_name != LEGACY_FULLBRIGHT_DESC)
                {
                        U8 material_code = LLMaterialTable::basic.getMCode(material_name.c_str());
-                        gSelectMgr->selectionSetMaterial(material_code);
+                        LLSelectMgr::getInstance()->selectionSetMaterial(material_code);
                }
        }
 }
@@ -1574,7 +1573,7 @@ void LLPanelObject::sendRotation()
                mObject->setRotation(rotation, TRUE );
-                gSelectMgr->sendMultipleUpdate(UPD_ROTATION);
+                LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_ROTATION);
        }
 }
@@ -1596,13 +1595,13 @@ void LLPanelObject::sendScale()
                BOOL dont_stretch_textures = !LLManipScale::getStretchTextures();
                if (dont_stretch_textures)
                {
-                        gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_SCALE);
+                        LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_SCALE);
                }
                mObject->setScale(newscale, TRUE);
-                gSelectMgr->sendMultipleUpdate(UPD_SCALE | UPD_POSITION);
+                LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_SCALE | UPD_POSITION);
-                gSelectMgr->adjustTexturesByScale(TRUE, !dont_stretch_textures);
+                LLSelectMgr::getInstance()->adjustTexturesByScale(TRUE, !dont_stretch_textures);
 //              llinfos << "scale sent" << llendl;
        }
        else
@@ -1621,8 +1620,8 @@ void LLPanelObject::sendPosition()
                
        // Clamp the Z height
        const F32 height = newpos.mV[VZ];
-        const F32 min_height = gWorldp->getMinAllowedZ(mObject);
+        const F32 min_height = LLWorld::getInstance()->getMinAllowedZ(mObject);
-        const F32 max_height = gWorldPointer->getRegionMaxHeight();
+        const F32 max_height = LLWorld::getInstance()->getRegionMaxHeight();
        if (!mObject->isAttachment())
        {
@@ -1640,7 +1639,7 @@ void LLPanelObject::sendPosition()
                // Grass is always drawn on the ground, so clamp its position to the ground
                if (mObject->getPCode() == LL_PCODE_LEGACY_GRASS)
                {
-                        mCtrlPosZ->set(gWorldp->resolveLandHeightAgent(newpos) + 1.f);
+                        mCtrlPosZ->set(LLWorld::getInstance()->resolveLandHeightAgent(newpos) + 1.f);
                }
        }
@@ -1648,7 +1647,7 @@ void LLPanelObject::sendPosition()
        // won't get dumped by the simulator.
        LLVector3d new_pos_global = regionp->getPosGlobalFromRegion(newpos);
-        if ( gWorldPointer->positionRegionValidGlobal(new_pos_global) )
+        if ( LLWorld::getInstance()->positionRegionValidGlobal(new_pos_global) )
        {
                // send only if the position is changed, that is, the delta vector is not zero
                LLVector3d old_pos_global = mObject->getPositionGlobal();
@@ -1666,16 +1665,9 @@ void LLPanelObject::sendPosition()
                        {
                                mObject->setPositionEdit(newpos);
                        }
-                        gSelectMgr->sendMultipleUpdate(UPD_POSITION);
+                        LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
-                        //mRootObject->sendPositionUpdate();
-                        gSelectMgr->updateSelectionCenter();
+                        LLSelectMgr::getInstance()->updateSelectionCenter();
-//                      llinfos << "position sent" << llendl;
-                }
-                else
-                {
-//                      llinfos << "position not changed" << llendl;
                }
        }
        else
@@ -1727,9 +1719,9 @@ void LLPanelObject::draw()
        const LLColor4  blue(   0.f,    0.5f,   1.0f,   1);
        // Tune the colors of the labels
-        LLTool* tool = gToolMgr->getCurrentTool();
+        LLTool* tool = LLToolMgr::getInstance()->getCurrentTool();
-        if (tool == gToolTranslate)
+        if (tool == LLToolCompTranslate::getInstance())
        {
                mCtrlPosX       ->setLabelColor(red);
                mCtrlPosY       ->setLabelColor(green);
@@ -1743,7 +1735,7 @@ void LLPanelObject::draw()
                mCtrlRotY       ->setLabelColor(white);
                mCtrlRotZ       ->setLabelColor(white);
        }
-        else if ( tool == gToolStretch )
+        else if ( tool == LLToolCompScale::getInstance() )
        {
                mCtrlPosX       ->setLabelColor(white);
                mCtrlPosY       ->setLabelColor(white);
@@ -1757,7 +1749,7 @@ void LLPanelObject::draw()
                mCtrlRotY       ->setLabelColor(white);
                mCtrlRotZ       ->setLabelColor(white);
        }
-        else if ( tool == gToolRotate )
+        else if ( tool == LLToolCompRotate::getInstance() )
        {
                mCtrlPosX       ->setLabelColor(white);
                mCtrlPosY       ->setLabelColor(white);
@@ -1823,7 +1815,7 @@ void LLPanelObject::clearCtrls()
        mLabelRadiusOffset->setEnabled( FALSE );
        mLabelRevolutions->setEnabled( FALSE );
-        childSetVisible("select_single", TRUE);
+        childSetVisible("select_single", FALSE);
        childSetVisible("edit_object", TRUE);   
        childSetEnabled("edit_object", FALSE);
        
@@ -1847,7 +1839,7 @@ void LLPanelObject::onCommitLock(LLUICtrl *ctrl, void *data)
        BOOL new_state = self->mCheckLock->get();
        
-        gSelectMgr->selectionSetObjectPermissions(PERM_OWNER, !new_state, PERM_MOVE | PERM_MODIFY);
+        LLSelectMgr::getInstance()->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 cd97d0c..ea742ba 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -61,7 +61,7 @@
 #include "llfloatergroups.h"
 #include "llnamebox.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "roles_constants.h"
 ///----------------------------------------------------------------------------
@@ -109,7 +109,7 @@ BOOL LLPanelPermissions::postBuild()
        this->childSetCommitCallback("clickaction",LLPanelPermissions::onCommitClickAction,this);
        this->childSetCommitCallback("search_check",LLPanelPermissions::onCommitIncludeInSearch,this);
        
-        LLTextBox* group_rect_proxy = gUICtrlFactory->getTextBoxByName(this,"Group Name Proxy");
+        LLTextBox* group_rect_proxy = getChild<LLTextBox>("Group Name Proxy");
        if(group_rect_proxy )
        {
                mLabelGroupName = new LLNameBox("Group Name", group_rect_proxy->getRect());
@@ -132,7 +132,7 @@ LLPanelPermissions::~LLPanelPermissions()
 void LLPanelPermissions::refresh()
 {
-        LLButton*       BtnDeedToGroup = gUICtrlFactory->getButtonByName(this,"button deed");
+        LLButton*       BtnDeedToGroup = getChild<LLButton>("button deed");
        if(BtnDeedToGroup)
        {       
                LLString deedText;
@@ -148,16 +148,16 @@ void LLPanelPermissions::refresh()
                BtnDeedToGroup->setLabelUnselected(deedText);
        }
        BOOL root_selected = TRUE;
-        LLSelectNode* nodep = gSelectMgr->getSelection()->getFirstRootNode();
+        LLSelectNode* nodep = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
-        S32 object_count = gSelectMgr->getSelection()->getRootObjectCount();
+        S32 object_count = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
        if(!nodep || 0 == object_count)
        {
-                nodep = gSelectMgr->getSelection()->getFirstNode();
+                nodep = LLSelectMgr::getInstance()->getSelection()->getFirstNode();
-                object_count = gSelectMgr->getSelection()->getObjectCount();
+                object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
                root_selected = FALSE;
        }
-        //BOOL attachment_selected = gSelectMgr->getSelection()->isAttachment();
+        //BOOL attachment_selected = LLSelectMgr::getInstance()->getSelection()->isAttachment();
        //attachment_selected = false;
        LLViewerObject* objectp = NULL;
        if(nodep) objectp = nodep->getObject();
@@ -222,7 +222,7 @@ void LLPanelPermissions::refresh()
                childSetValue("search_check", FALSE);
                childSetEnabled("search_check", false);
                
-                LLRadioGroup*   RadioSaleType = gUICtrlFactory->getRadioGroupByName(this,"sale type");
+                LLRadioGroup*   RadioSaleType = getChild<LLRadioGroup>("sale type");
                if(RadioSaleType)
                {
                        RadioSaleType->setSelectedIndex(-1);
@@ -234,7 +234,7 @@ void LLPanelPermissions::refresh()
                childSetEnabled("EdCost",false);
                
                childSetEnabled("label click action",false);
-                LLComboBox*     ComboClickAction = gUICtrlFactory->getComboBoxByName(this,"clickaction");
+                LLComboBox*     ComboClickAction = getChild<LLComboBox>("clickaction");
                if(ComboClickAction)
                {
                        ComboClickAction->setEnabled(FALSE);
@@ -254,9 +254,9 @@ 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->getSelection()->getFirstRootNode() 
+        BOOL is_perm_modify = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() 
-                                                        && gSelectMgr->selectGetRootsModify()) 
+                                                        && LLSelectMgr::getInstance()->selectGetRootsModify()) 
-                                                        || gSelectMgr->selectGetModify();
+                                                        || LLSelectMgr::getInstance()->selectGetModify();
        const LLView* keyboard_focus_view = gFocusMgr.getKeyboardFocus();
        S32 string_index = 0;
        LLString MODIFY_INFO_STRINGS[] =
@@ -283,7 +283,7 @@ void LLPanelPermissions::refresh()
        childSetEnabled("Creator:",true);
        BOOL creators_identical;
        LLString creator_name;
-        creators_identical = gSelectMgr->selectGetCreator(mCreatorID,
+        creators_identical = LLSelectMgr::getInstance()->selectGetCreator(mCreatorID,
                                                                                                          creator_name);
        childSetText("Creator Name",creator_name);
@@ -295,13 +295,13 @@ void LLPanelPermissions::refresh()
        BOOL owners_identical;
        LLString owner_name;
-        owners_identical = gSelectMgr->selectGetOwner(mOwnerID, owner_name);
+        owners_identical = LLSelectMgr::getInstance()->selectGetOwner(mOwnerID, owner_name);
 //      llinfos << "owners_identical " << (owners_identical ? "TRUE": "FALSE") << llendl;
        if (mOwnerID.isNull())
        {
-                if(gSelectMgr->selectIsGroupOwned())
+                if(LLSelectMgr::getInstance()->selectIsGroupOwned())
                {
                        // Group owned already displayed by selectGetOwner
                }
@@ -309,7 +309,7 @@ void LLPanelPermissions::refresh()
                {
                        // Display last owner if public
                        LLString last_owner_name;
-                        gSelectMgr->selectGetLastOwner(mLastOwnerID, last_owner_name);
+                        LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, last_owner_name);
                        // It should never happen that the last owner is null and the owner
                        // is null, but it seems to be a bug in the simulator right now. JC
@@ -323,12 +323,12 @@ void LLPanelPermissions::refresh()
        childSetText("Owner Name",owner_name);
        childSetEnabled("Owner Name",TRUE);
-        childSetEnabled("button owner profile",owners_identical && (mOwnerID.notNull() || gSelectMgr->selectIsGroupOwned()));
+        childSetEnabled("button owner profile",owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
        // update group text field
        childSetEnabled("Group:",true);
        LLUUID group_id;
-        BOOL groups_identical = gSelectMgr->selectGetGroup(group_id);
+        BOOL groups_identical = LLSelectMgr::getInstance()->selectGetGroup(group_id);
        if (groups_identical)
        {
                if(mLabelGroupName)
@@ -348,14 +348,14 @@ void LLPanelPermissions::refresh()
        if(is_one_object)
        {
                childSetEnabled("Name:",true);
-                LLLineEditor* LineEditorObjectName = gUICtrlFactory->getLineEditorByName(this,"Object Name");
+                LLLineEditor* LineEditorObjectName = getChild<LLLineEditor>("Object Name");
                if(keyboard_focus_view != LineEditorObjectName)
                {
                        childSetText("Object Name",nodep->mName);
                }
                childSetEnabled("Description:",true);
-                LLLineEditor*   LineEditorObjectDesc = gUICtrlFactory->getLineEditorByName(this,"Object Description");
+                LLLineEditor*   LineEditorObjectDesc = getChild<LLLineEditor>("Object Description");
                if(LineEditorObjectDesc)
                {
                        if(keyboard_focus_view != LineEditorObjectDesc)
@@ -378,8 +378,8 @@ void LLPanelPermissions::refresh()
        // Pre-compute object info string
-        S32 prim_count = gSelectMgr->getSelection()->getObjectCount();
+        S32 prim_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
-        S32 obj_count = gSelectMgr->getSelection()->getRootObjectCount();
+        S32 obj_count = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
        LLString object_info_string;
        if (1 == obj_count)
@@ -406,17 +406,17 @@ void LLPanelPermissions::refresh()
        childSetEnabled("prim info",true);
        S32 price;
-        BOOL is_for_sale = gSelectMgr->selectIsForSale(price);
+        BOOL is_for_sale = LLSelectMgr::getInstance()->selectIsForSale(price);
        if (!is_for_sale)
        {
                price = DEFAULT_PRICE;
        }
        BOOL self_owned = (gAgent.getID() == mOwnerID);
-        BOOL group_owned = gSelectMgr->selectIsGroupOwned() ;
+        BOOL group_owned = LLSelectMgr::getInstance()->selectIsGroupOwned() ;
-        BOOL public_owned = (mOwnerID.isNull() && !gSelectMgr->selectIsGroupOwned());
+        BOOL public_owned = (mOwnerID.isNull() && !LLSelectMgr::getInstance()->selectIsGroupOwned());
-        BOOL can_transfer = gSelectMgr->selectGetRootsTransfer();
+        BOOL can_transfer = LLSelectMgr::getInstance()->selectGetRootsTransfer();
-        BOOL can_copy = gSelectMgr->selectGetRootsCopy();
+        BOOL can_copy = LLSelectMgr::getInstance()->selectGetRootsCopy();
        if(!owners_identical)
        {
@@ -426,7 +426,7 @@ void LLPanelPermissions::refresh()
        }
        else if(self_owned || (group_owned && gAgent.hasPowerInGroup(group_id,GP_OBJECT_SET_SALE)))
        {
-                LLLineEditor*   EditPrice = gUICtrlFactory->getLineEditorByName(this,"EdCost");
+                LLLineEditor*   EditPrice = getChild<LLLineEditor>("EdCost");
                if(keyboard_focus_view != EditPrice)
                {
                        childSetText("EdCost",llformat("%d",price));
@@ -478,23 +478,23 @@ void LLPanelPermissions::refresh()
        U32 next_owner_mask_on = 0;
        U32 next_owner_mask_off = 0;
-        valid_base_perms = gSelectMgr->selectGetPerm(PERM_BASE,
+        valid_base_perms = LLSelectMgr::getInstance()->selectGetPerm(PERM_BASE,
                                                                          &base_mask_on,
                                                                          &base_mask_off);
-        valid_owner_perms = gSelectMgr->selectGetPerm(PERM_OWNER,
+        valid_owner_perms = LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER,
                                                                          &owner_mask_on,
                                                                          &owner_mask_off);
-        valid_group_perms = gSelectMgr->selectGetPerm(PERM_GROUP,
+        valid_group_perms = LLSelectMgr::getInstance()->selectGetPerm(PERM_GROUP,
                                                                          &group_mask_on,
                                                                          &group_mask_off);
        
-        valid_everyone_perms = gSelectMgr->selectGetPerm(PERM_EVERYONE,
+        valid_everyone_perms = LLSelectMgr::getInstance()->selectGetPerm(PERM_EVERYONE,
                                                                          &everyone_mask_on,
                                                                          &everyone_mask_off);
        
-        valid_next_perms = gSelectMgr->selectGetPerm(PERM_NEXT_OWNER,
+        valid_next_perms = LLSelectMgr::getInstance()->selectGetPerm(PERM_NEXT_OWNER,
                                                                          &next_owner_mask_on,
                                                                          &next_owner_mask_off);
@@ -724,10 +724,10 @@ void LLPanelPermissions::refresh()
        // reflect sale information
        LLSaleInfo sale_info;
-        BOOL valid_sale_info = gSelectMgr->selectGetSaleInfo(sale_info);
+        BOOL valid_sale_info = LLSelectMgr::getInstance()->selectGetSaleInfo(sale_info);
        LLSaleInfo::EForSale sale_type = sale_info.getSaleType();
-        LLRadioGroup* RadioSaleType = gUICtrlFactory->getRadioGroupByName(this,"sale type");
+        LLRadioGroup* RadioSaleType = getChild<LLRadioGroup>("sale type");
        if(RadioSaleType)
        {
                if (valid_sale_info)
@@ -753,18 +753,18 @@ void LLPanelPermissions::refresh()
        }
                
        // Check search status of objects
-        BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
+        BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME );
        bool include_in_search;
-        bool all_include_in_search = gSelectMgr->selectionGetIncludeInSearch(&include_in_search);
+        bool all_include_in_search = LLSelectMgr::getInstance()->selectionGetIncludeInSearch(&include_in_search);
        childSetEnabled("search_check", has_change_sale_ability && all_volume);
        childSetValue("search_check", include_in_search);
        childSetTentative("search_check", ! all_include_in_search);
        // Click action (touch, sit, buy)
        U8 click_action = 0;
-        if (gSelectMgr->selectionGetClickAction(&click_action))
+        if (LLSelectMgr::getInstance()->selectionGetClickAction(&click_action))
        {
-                LLComboBox*     ComboClickAction = gUICtrlFactory->getComboBoxByName(this,"clickaction");
+                LLComboBox*     ComboClickAction = getChild<LLComboBox>("clickaction");
                if(ComboClickAction)
                {
                        ComboClickAction->setCurrentByIndex((S32)click_action);
@@ -779,14 +779,14 @@ void LLPanelPermissions::refresh()
 void LLPanelPermissions::onClickClaim(void*)
 {
        // try to claim ownership
-        gSelectMgr->sendOwner(gAgent.getID(), gAgent.getGroupID());
+        LLSelectMgr::getInstance()->sendOwner(gAgent.getID(), gAgent.getGroupID());
 }
 // static
 void LLPanelPermissions::onClickRelease(void*)
 {
        // try to release ownership
-        gSelectMgr->sendOwner(LLUUID::null, LLUUID::null);
+        LLSelectMgr::getInstance()->sendOwner(LLUUID::null, LLUUID::null);
 }
 // static
@@ -802,10 +802,10 @@ void LLPanelPermissions::onClickOwner(void *data)
 {
        LLPanelPermissions *self = (LLPanelPermissions *)data;
-        if (gSelectMgr->selectIsGroupOwned())
+        if (LLSelectMgr::getInstance()->selectIsGroupOwned())
        {
                LLUUID group_id;
-                gSelectMgr->selectGetGroup(group_id);
+                LLSelectMgr::getInstance()->selectGetGroup(group_id);
                LLFloaterGroupInfo::showFromUUID(group_id);
        }
        else
@@ -819,7 +819,7 @@ void LLPanelPermissions::onClickGroup(void* data)
        LLPanelPermissions* panelp = (LLPanelPermissions*)data;
        LLUUID owner_id;
        LLString name;
-        BOOL owners_identical = gSelectMgr->selectGetOwner(owner_id, name);
+        BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, name);
        LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
        if(owners_identical && (owner_id == gAgent.getID()))
@@ -845,7 +845,7 @@ void LLPanelPermissions::cbGroupID(LLUUID group_id, void* userdata)
        {
                self->mLabelGroupName->setNameID(group_id, TRUE);
        }
-        gSelectMgr->sendGroup(group_id);
+        LLSelectMgr::getInstance()->sendGroup(group_id);
 }
 void callback_deed_to_group(S32 option, void*)
@@ -853,11 +853,11 @@ void callback_deed_to_group(S32 option, void*)
        if (0 == option)
        {
                LLUUID group_id;
-                BOOL groups_identical = gSelectMgr->selectGetGroup(group_id);
+                BOOL groups_identical = LLSelectMgr::getInstance()->selectGetGroup(group_id);
                if(groups_identical && (gAgent.hasPowerInGroup(group_id, GP_OBJECT_DEED)))
                {
-                        gSelectMgr->sendOwner(LLUUID::null, group_id, FALSE);
+                        LLSelectMgr::getInstance()->sendOwner(LLUUID::null, group_id, FALSE);
-//                      gViewerStats->incStat(LLViewerStats::ST_RELEASE_COUNT);
+//                      LLViewerStats::getInstance()->incStat(LLViewerStats::ST_RELEASE_COUNT);
                }
        }
 }
@@ -875,7 +875,7 @@ void LLPanelPermissions::onClickDeedToGroup(void* data)
 // static
 void LLPanelPermissions::onCommitPerm(LLUICtrl *ctrl, void *data, U8 field, U32 perm)
 {
-        LLViewerObject* object = gSelectMgr->getSelection()->getFirstRootObject();
+        LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject();
        if(!object) return;
        // Checkbox will have toggled itself
@@ -883,7 +883,7 @@ void LLPanelPermissions::onCommitPerm(LLUICtrl *ctrl, void *data, U8 field, U32
        LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
        BOOL new_state = check->get();
        
-        gSelectMgr->selectionSetObjectPermissions(field, new_state, perm);
+        LLSelectMgr::getInstance()->selectionSetObjectPermissions(field, new_state, perm);
 }
 // static
@@ -931,11 +931,11 @@ void LLPanelPermissions::onCommitName(LLUICtrl*, void* data)
 {
        //llinfos << "LLPanelPermissions::onCommitName()" << llendl;
        LLPanelPermissions* self = (LLPanelPermissions*)data;
-        LLLineEditor*   tb = gUICtrlFactory->getLineEditorByName(self,"Object Name");
+        LLLineEditor*   tb = self->getChild<LLLineEditor>("Object Name");
        if(tb)
        {
-                gSelectMgr->selectionSetObjectName(tb->getText());
+                LLSelectMgr::getInstance()->selectionSetObjectName(tb->getText());
-//              gSelectMgr->selectionSetObjectName(self->mLabelObjectName->getText());
+//              LLSelectMgr::getInstance()->selectionSetObjectName(self->mLabelObjectName->getText());
        }
 }
@@ -945,10 +945,10 @@ void LLPanelPermissions::onCommitDesc(LLUICtrl*, void* data)
 {
        //llinfos << "LLPanelPermissions::onCommitDesc()" << llendl;
        LLPanelPermissions* self = (LLPanelPermissions*)data;
-        LLLineEditor*   le = gUICtrlFactory->getLineEditorByName(self,"Object Description");
+        LLLineEditor*   le = self->getChild<LLLineEditor>("Object Description");
        if(le)
        {
-                gSelectMgr->selectionSetObjectDescription(le->getText());
+                LLSelectMgr::getInstance()->selectionSetObjectDescription(le->getText());
        }
 }
@@ -971,11 +971,11 @@ void LLPanelPermissions::setAllSaleInfo()
        llinfos << "LLPanelPermissions::setAllSaleInfo()" << llendl;
        LLSaleInfo::EForSale sale_type = LLSaleInfo::FS_NOT;
-        LLCheckBoxCtrl* mCheckPurchase = gUICtrlFactory->getCheckBoxByName(this,"checkbox for sale");
+        LLCheckBoxCtrl* mCheckPurchase = getChild<LLCheckBoxCtrl>("checkbox for sale");
        if(mCheckPurchase && mCheckPurchase->get())
        {
-                LLRadioGroup* RadioSaleType = gUICtrlFactory->getRadioGroupByName(this,"sale type");
+                LLRadioGroup* RadioSaleType = getChild<LLRadioGroup>("sale type");
                if(RadioSaleType)
                {
                        switch(RadioSaleType->getSelectedIndex())
@@ -995,7 +995,7 @@ void LLPanelPermissions::setAllSaleInfo()
                        }
                }
        }
-        LLLineEditor*   mEditPrice = gUICtrlFactory->getLineEditorByName(this,"EdCost");
+        LLLineEditor*   mEditPrice = getChild<LLLineEditor>("EdCost");
        S32 price = -1;
        if(mEditPrice)
@@ -1010,17 +1010,17 @@ void LLPanelPermissions::setAllSaleInfo()
        }
        LLSaleInfo sale_info(sale_type, price);
-        gSelectMgr->selectionSetObjectSaleInfo(sale_info);
+        LLSelectMgr::getInstance()->selectionSetObjectSaleInfo(sale_info);
        // If turned off for-sale, make sure click-action buy is turned
        // off as well
        if (sale_type == LLSaleInfo::FS_NOT)
        {
                U8 click_action = 0;
-                gSelectMgr->selectionGetClickAction(&click_action);
+                LLSelectMgr::getInstance()->selectionGetClickAction(&click_action);
                if (click_action == CLICK_ACTION_BUY)
                {
-                        gSelectMgr->selectionSetClickAction(CLICK_ACTION_TOUCH);
+                        LLSelectMgr::getInstance()->selectionSetClickAction(CLICK_ACTION_TOUCH);
                }
        }
 }
@@ -1046,14 +1046,14 @@ void LLPanelPermissions::onCommitClickAction(LLUICtrl* ctrl, void*)
        if (click_action == CLICK_ACTION_BUY)
        {
                LLSaleInfo sale_info;
-                gSelectMgr->selectGetSaleInfo(sale_info);
+                LLSelectMgr::getInstance()->selectGetSaleInfo(sale_info);
                if (!sale_info.isForSale())
                {
                        gViewerWindow->alertXml("CantSetBuyObject");
                        // Set click action back to its old value
                        U8 click_action = 0;
-                        gSelectMgr->selectionGetClickAction(&click_action);
+                        LLSelectMgr::getInstance()->selectionGetClickAction(&click_action);
                        box->setCurrentByIndex((S32)click_action);
                        return;
@@ -1063,14 +1063,14 @@ void LLPanelPermissions::onCommitClickAction(LLUICtrl* ctrl, void*)
        {
                // Verify object has script with money() handler
                LLSelectionPayable payable;
-                bool can_pay = gSelectMgr->getSelection()->applyToObjects(&payable);
+                bool can_pay = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&payable);
                if (!can_pay)
                {
                        // Warn, but do it anyway.
                        gViewerWindow->alertXml("ClickActionNotPayable");
                }
        }
-        gSelectMgr->selectionSetClickAction(click_action);
+        LLSelectMgr::getInstance()->selectionSetClickAction(click_action);
 }
 // static
@@ -1079,6 +1079,6 @@ void LLPanelPermissions::onCommitIncludeInSearch(LLUICtrl* ctrl, void*)
        LLCheckBoxCtrl* box = (LLCheckBoxCtrl*)ctrl;
        llassert(box);
-        gSelectMgr->selectionSetIncludeInSearch(box->get());
+        LLSelectMgr::getInstance()->selectionSetIncludeInSearch(box->get());
 }
diff --git a/linden/indra/newview/llpanelpick.cpp b/linden/indra/newview/llpanelpick.cpp
index eddbc45..32894ce 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -52,7 +52,7 @@
 #include "lltexturectrl.h"
 #include "lluiconstants.h"
 #include "llviewergenericmessage.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerparcelmgr.h"
 #include "llworldmap.h"
 #include "llfloaterworldmap.h"
@@ -88,11 +88,11 @@ LLPanelPick::LLPanelPick(BOOL top_pick)
        std::string pick_def_file;
        if (top_pick)
        {
-                gUICtrlFactory->buildPanel(this, "panel_top_pick.xml");
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_top_pick.xml");
        }
        else
        {
-                gUICtrlFactory->buildPanel(this, "panel_avatar_pick.xml");
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_avatar_pick.xml");
        }       
 }
@@ -121,44 +121,44 @@ void LLPanelPick::reset()
 BOOL LLPanelPick::postBuild()
 {
-    mSnapshotCtrl = LLViewerUICtrlFactory::getTexturePickerByName(this, "snapshot_ctrl");
+    mSnapshotCtrl = getChild<LLTextureCtrl>("snapshot_ctrl");
        mSnapshotCtrl->setCommitCallback(onCommitAny);
        mSnapshotCtrl->setCallbackUserData(this);
-    mNameEditor = LLViewerUICtrlFactory::getLineEditorByName(this, "given_name_editor");
+    mNameEditor = getChild<LLLineEditor>("given_name_editor");
        mNameEditor->setCommitOnFocusLost(TRUE);
        mNameEditor->setCommitCallback(onCommitAny);
        mNameEditor->setCallbackUserData(this);
-    mDescEditor = LLUICtrlFactory::getTextEditorByName(this, "desc_editor");
+    mDescEditor = getChild<LLTextEditor>("desc_editor");
        mDescEditor->setCommitOnFocusLost(TRUE);
        mDescEditor->setCommitCallback(onCommitAny);
        mDescEditor->setCallbackUserData(this);
        mDescEditor->setTabsToNextField(TRUE);
-    mLocationEditor = LLViewerUICtrlFactory::getLineEditorByName(this, "location_editor");
+    mLocationEditor = getChild<LLLineEditor>("location_editor");
-    mSetBtn = LLViewerUICtrlFactory::getButtonByName(this, "set_location_btn");
+    mSetBtn = getChild<LLButton>( "set_location_btn");
    mSetBtn->setClickedCallback(onClickSet);
    mSetBtn->setCallbackUserData(this);
-    mTeleportBtn = LLViewerUICtrlFactory::getButtonByName(this, "pick_teleport_btn");
+    mTeleportBtn = getChild<LLButton>( "pick_teleport_btn");
    mTeleportBtn->setClickedCallback(onClickTeleport);
    mTeleportBtn->setCallbackUserData(this);
-    mMapBtn = LLViewerUICtrlFactory::getButtonByName(this, "pick_map_btn");
+    mMapBtn = getChild<LLButton>( "pick_map_btn");
    mMapBtn->setClickedCallback(onClickMap);
    mMapBtn->setCallbackUserData(this);
-        mSortOrderText = LLViewerUICtrlFactory::getTextBoxByName(this, "sort_order_text");
+        mSortOrderText = getChild<LLTextBox>("sort_order_text");
-        mSortOrderEditor = LLViewerUICtrlFactory::getLineEditorByName(this, "sort_order_editor");
+        mSortOrderEditor = getChild<LLLineEditor>("sort_order_editor");
        mSortOrderEditor->setPrevalidate(LLLineEditor::prevalidateInt);
        mSortOrderEditor->setCommitOnFocusLost(TRUE);
        mSortOrderEditor->setCommitCallback(onCommitAny);
        mSortOrderEditor->setCallbackUserData(this);
-        mEnabledCheck = LLViewerUICtrlFactory::getCheckBoxByName(this, "enabled_check");
+        mEnabledCheck = getChild<LLCheckBoxCtrl>( "enabled_check");
        mEnabledCheck->setCommitCallback(onCommitAny);
        mEnabledCheck->setCallbackUserData(this);
@@ -176,7 +176,7 @@ void LLPanelPick::initNewPick()
        mPosGlobal = gAgent.getPositionGlobal();
        // Try to fill in the current parcel
-        LLParcel* parcel = gParcelMgr->getAgentParcel();
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (parcel)
        {
                mNameEditor->setText(parcel->getName());
@@ -367,12 +367,9 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
 void LLPanelPick::draw()
 {
-        if (getVisible())
+        refresh();
-        {
-                refresh();
-                LLPanel::draw();
+        LLPanel::draw();
-        }
 }
diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index 2b50a9d..e7dc08f 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -52,7 +52,7 @@
 #include "lltexturectrl.h"
 #include "llworldmap.h"
 #include "llviewerregion.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 //#include "llviewermenu.h"     // create_landmark()
 #include "llweb.h"
 #include "llsdutil.h"
@@ -85,33 +85,33 @@ BOOL LLPanelPlace::postBuild()
        // Since this is only used in the directory browser, always
        // disable the snapshot control. Otherwise clicking on it will
        // open a texture picker.
-        mSnapshotCtrl = LLViewerUICtrlFactory::getTexturePickerByName(this, "snapshot_ctrl");
+        mSnapshotCtrl = getChild<LLTextureCtrl>("snapshot_ctrl");
        mSnapshotCtrl->setEnabled(FALSE);
-    mNameEditor = LLViewerUICtrlFactory::getTextBoxByName(this, "name_editor");
+    mNameEditor = getChild<LLTextBox>("name_editor");
        // Text boxes appear to have a " " in them by default.  This breaks the
        // emptiness test for filling in data from the network.  Slam to empty.
        mNameEditor->setText( LLString::null );
-    mDescEditor = LLUICtrlFactory::getTextEditorByName(this, "desc_editor");
+    mDescEditor = getChild<LLTextEditor>("desc_editor");
-        mInfoEditor = LLViewerUICtrlFactory::getTextBoxByName(this, "info_editor");
+        mInfoEditor = getChild<LLTextBox>("info_editor");
-    mLocationEditor = LLViewerUICtrlFactory::getTextBoxByName(this, "location_editor");
+    mLocationEditor = getChild<LLTextBox>("location_editor");
-        mTeleportBtn = LLViewerUICtrlFactory::getButtonByName(this, "teleport_btn");
+        mTeleportBtn = getChild<LLButton>( "teleport_btn");
        mTeleportBtn->setClickedCallback(onClickTeleport);
        mTeleportBtn->setCallbackUserData(this);
-        mMapBtn = LLViewerUICtrlFactory::getButtonByName(this, "map_btn");
+        mMapBtn = getChild<LLButton>( "map_btn");
        mMapBtn->setClickedCallback(onClickMap);
        mMapBtn->setCallbackUserData(this);
-        //mLandmarkBtn = LLViewerUICtrlFactory::getButtonByName(this, "landmark_btn");
+        //mLandmarkBtn = getChild<LLButton>( "landmark_btn");
        //mLandmarkBtn->setClickedCallback(onClickLandmark);
        //mLandmarkBtn->setCallbackUserData(this);
-        mAuctionBtn = LLViewerUICtrlFactory::getButtonByName(this, "auction_btn");
+        mAuctionBtn = getChild<LLButton>( "auction_btn");
        mAuctionBtn->setClickedCallback(onClickAuction);
        mAuctionBtn->setCallbackUserData(this);
@@ -371,9 +371,9 @@ void LLPanelPlace::onClickTeleport(void* data)
        LLPanelPlace* self = (LLPanelPlace*)data;
        LLView* parent_viewp = self->getParent();
-        if (parent_viewp->getWidgetType() == WIDGET_TYPE_FLOATER)
+        LLFloater* parent_floaterp = dynamic_cast<LLFloater*>(parent_viewp);
+        if (parent_floaterp)
        {
-                LLFloater* parent_floaterp = (LLFloater*)parent_viewp;
                parent_floaterp->close();
        }
        // LLFloater* parent_floaterp = (LLFloater*)self->getParent();
diff --git a/linden/indra/newview/llpanelvolume.cpp b/linden/indra/newview/llpanelvolume.cpp
index 285750a..23ca7c4 100644
--- a/linden/indra/newview/llpanelvolume.cpp
+++ b/linden/indra/newview/llpanelvolume.cpp
@@ -74,7 +74,7 @@
 #include "pipeline.h"
 #include "lldrawpool.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 // "Features" Tab
@@ -139,11 +139,11 @@ LLPanelVolume::~LLPanelVolume()
 void LLPanelVolume::getState( )
 {
-        LLViewerObject* objectp = gSelectMgr->getSelection()->getFirstRootObject();
+        LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject();
        LLViewerObject* root_objectp = objectp;
        if(!objectp)
        {
-                objectp = gSelectMgr->getSelection()->getFirstObject();
+                objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
                // *FIX: shouldn't we just keep the child?
                if (objectp)
                {
@@ -183,12 +183,12 @@ void LLPanelVolume::getState( )
        BOOL owners_identical;
        LLUUID owner_id;
        LLString owner_name;
-        owners_identical = gSelectMgr->selectGetOwner(owner_id, owner_name);
+        owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
        // BUG? Check for all objects being editable?
        BOOL editable = root_objectp->permModify();
-        BOOL single_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME )
+        BOOL single_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME )
-                && gSelectMgr->getSelection()->getObjectCount() == 1;
+                && LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1;
        // Select Single Message
        if (single_volume)
@@ -232,9 +232,9 @@ void LLPanelVolume::getState( )
        }
        else
        {
-                ((LLPanel *) getChildByName ("Light Intensity", true))->clear();
+                getChild<LLSpinCtrl>("Light Intensity", true)->clear();
-                ((LLPanel *) getChildByName ("Light Radius", true))->clear();
+                getChild<LLSpinCtrl>("Light Radius", true)->clear();
-                ((LLPanel *) getChildByName ("Light Falloff", true))->clear();
+                getChild<LLSpinCtrl>("Light Falloff", true)->clear();
                childSetEnabled("label color",false);   
                LLColorSwatchCtrl* LightColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
@@ -292,14 +292,14 @@ void LLPanelVolume::getState( )
        }
        else
        {
-                ((LLPanel *) getChildByName ("FlexNumSections", true))->clear();
+                getChild<LLSpinCtrl>("FlexNumSections", true)->clear();
-                ((LLPanel *) getChildByName ("FlexGravity", true))->clear();
+                getChild<LLSpinCtrl>("FlexGravity", true)->clear();
-                ((LLPanel *) getChildByName ("FlexTension", true))->clear();
+                getChild<LLSpinCtrl>("FlexTension", true)->clear();
-                ((LLPanel *) getChildByName ("FlexFriction", true))->clear();
+                getChild<LLSpinCtrl>("FlexFriction", true)->clear();
-                ((LLPanel *) getChildByName ("FlexWind", true))->clear();
+                getChild<LLSpinCtrl>("FlexWind", true)->clear();
-                ((LLPanel *) getChildByName ("FlexForceX", true))->clear();
+                getChild<LLSpinCtrl>("FlexForceX", true)->clear();
-                ((LLPanel *) getChildByName ("FlexForceY", true))->clear();
+                getChild<LLSpinCtrl>("FlexForceY", true)->clear();
-                ((LLPanel *) getChildByName ("FlexForceZ", true))->clear();
+                getChild<LLSpinCtrl>("FlexForceZ", true)->clear();
                childSetEnabled("FlexNumSections",false);
                childSetEnabled("FlexGravity",false);
@@ -412,7 +412,7 @@ void LLPanelVolume::sendIsFlexible()
                if (objectp->getClickAction() == CLICK_ACTION_SIT)
                {
-                        gSelectMgr->selectionSetClickAction(CLICK_ACTION_NONE);
+                        LLSelectMgr::getInstance()->selectionSetClickAction(CLICK_ACTION_NONE);
                }
        }
@@ -420,7 +420,7 @@ void LLPanelVolume::sendIsFlexible()
        if (volobjp->setIsFlexible(is_flexible))
        {
                mObject->sendShapeUpdate();
-                gSelectMgr->selectionUpdatePhantom(volobjp->flagPhantom());
+                LLSelectMgr::getInstance()->selectionUpdatePhantom(volobjp->flagPhantom());
        }
        llinfos << "update flexible sent" << llendl;
diff --git a/linden/indra/newview/llpanelweb.cpp b/linden/indra/newview/llpanelweb.cpp
index 0de828a..13ed9bf 100644
--- a/linden/indra/newview/llpanelweb.cpp
+++ b/linden/indra/newview/llpanelweb.cpp
@@ -46,7 +46,7 @@
 #include "llui.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "llmediamanager.h"
@@ -92,7 +92,7 @@ void free_web_media(LLMediaBase *media_source)
 LLPanelWeb::LLPanelWeb()
 {
-        gUICtrlFactory->buildPanel(this, "panel_preferences_web.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_web.xml");
 }
 BOOL LLPanelWeb::postBuild()
@@ -138,7 +138,7 @@ void LLPanelWeb::refresh()
        mWebProxyAddress = gSavedSettings.getString("BrowserProxyAddress");
        mWebProxyPort =  gSavedSettings.getS32("BrowserProxyPort");
        
-        LLLineEditor* web_proxy_editor = gUICtrlFactory->getLineEditorByName(this, "web_proxy_editor");
+        LLLineEditor* web_proxy_editor = getChild<LLLineEditor>("web_proxy_editor");
        if (web_proxy_editor)
        {
                web_proxy_editor->setText( gSavedSettings.getString("BrowserProxyAddress") );
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 9d8e910..3236f79 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -33,8 +33,9 @@
 #include "llviewerprecompiledheaders.h"
 #include "llprefschat.h"
+#include "lltexteditor.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 class LLPrefsChatImpl : public LLPanel
 {
@@ -53,6 +54,7 @@ protected:
        S32     mChatMaxLines;
        LLColor4 mSystemChatColor;
        LLColor4 mAgentChatColor;
+        LLColor4 mIMChatColor;
        LLColor4 mObjectChatColor;
        LLColor4 mOwnerSayChatColor;
        LLColor4 mBGChatColor;
@@ -73,7 +75,7 @@ protected:
 LLPrefsChatImpl::LLPrefsChatImpl()
 :       LLPanel("Chat Panel")
 {
-        gUICtrlFactory->buildPanel(this, "panel_preferences_chat.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_chat.xml");
        refresh();
 }
@@ -88,6 +90,7 @@ void LLPrefsChatImpl::refresh()
        mChatMaxLines = gSavedSettings.getS32("ConsoleMaxLines");
        mSystemChatColor = gSavedSettings.getColor4("SystemChatColor");
        mAgentChatColor = gSavedSettings.getColor4("AgentChatColor");
+        mIMChatColor = gSavedSettings.getColor4("IMChatColor");
        mObjectChatColor = gSavedSettings.getColor4("ObjectChatColor");
        mOwnerSayChatColor = gSavedSettings.getColor4("llOwnerSayChatColor");
        mBGChatColor = gSavedSettings.getColor4("BackgroundChatColor");
@@ -110,6 +113,7 @@ void LLPrefsChatImpl::cancel()
        gSavedSettings.setS32("ConsoleMaxLines", mChatMaxLines);
        gSavedSettings.setColor4("SystemChatColor", mSystemChatColor);
        gSavedSettings.setColor4("AgentChatColor", mAgentChatColor);
+        gSavedSettings.setColor4("IMChatColor", mIMChatColor);
        gSavedSettings.setColor4("ObjectChatColor", mObjectChatColor);
        gSavedSettings.setColor4("llOwnerSayChatColor", mOwnerSayChatColor);
        gSavedSettings.setColor4("BackgroundChatColor", mBGChatColor);
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 168d218..fff10c7 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -42,7 +42,7 @@
 #include "llagent.h"
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "lldirpicker.h"
@@ -91,7 +91,7 @@ protected:
 LLPrefsIMImpl::LLPrefsIMImpl()
 : LLPanel("IM Prefs Panel")
 {
-        gUICtrlFactory->buildPanel(this, "panel_preferences_im.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_im.xml");
 }
 void LLPrefsIMImpl::refresh()
@@ -187,7 +187,7 @@ void LLPrefsIMImpl::enableHistory()
 void LLPrefsIMImpl::apply()
 {
-        LLTextEditor* busy = LLUICtrlFactory::getTextEditorByName(this, "busy_response");
+        LLTextEditor* busy = getChild<LLTextEditor>("busy_response");
        LLWString busy_response;
        if (busy) busy_response = busy->getWText(); 
        LLWString::replaceTabsWithSpaces(busy_response, 4);
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index 773ddfe..22a0115 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -38,12 +38,12 @@
 #include "llcombobox.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llmodaldialog.h"
 #include "llkeyboard.h"
 #include "llfocusmgr.h"
-#include "llfloatervoicewizard.h"
+#include "llfloatervoicedevicesettings.h"
 #include "llappviewer.h"
@@ -62,7 +62,7 @@ public:
        {
                mOldFrontmost = gFloaterView->getFrontmost();
-                gUICtrlFactory->buildFloater(this, "floater_select_key.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_select_key.xml");
                
                childSetAction("Cancel", LLVoiceHotkeySelectDialog::onCancel, this );
                childSetFocus("Cancel");
@@ -71,14 +71,17 @@ public:
        /*virtual*/ void setFocus( BOOL b )
        {
                LLFloater::setFocus(b);
-                
                // This forces keyboard processing to happen at the raw key level instead of going through handleUnicodeChar.
-                gFocusMgr.removeKeyboardFocusWithoutCallback(gFocusMgr.getKeyboardFocus());
+                if (b)
+                {
+                        gFocusMgr.setKeystrokesOnly(TRUE);
+                }
        }
        static void onCancel( void* userdata );
-        BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent );
+        BOOL handleKeyHere(KEY key, MASK mask);
 };
@@ -98,11 +101,14 @@ void LLPrefsVoiceLogic::init()
        mPushToTalkToggle = gSavedSettings.getBOOL("PushToTalkToggle");
        mEarLocation = gSavedSettings.getS32("VoiceEarLocation");
-        mCtrlEarLocation = LLUICtrlFactory::getSelectionInterfaceByName(mPanel, "ear_location");
+        LLUICtrl* ear_location = mPanel->getChild<LLUICtrl>("ear_location");
-        mCtrlEarLocation->selectByValue(LLSD(gSavedSettings.getS32("VoiceEarLocation")));
+        mCtrlEarLocation = ear_location->getSelectionInterface();
+        if (mCtrlEarLocation)
+        {
+                mCtrlEarLocation->selectByValue(LLSD(gSavedSettings.getS32("VoiceEarLocation")));
+        }
        mPanel->childSetCommitCallback("ear_location", onEarLocationCommit, this );
-        mPanel->childSetAction("launch_voice_wizard_button", onClickLaunchWizard, mPanel);
        mPanel->childSetAction("set_voice_hotkey_button", onClickSetKey, this);
        mPanel->childSetAction("set_voice_middlemouse_button", onClickSetMiddleMouse, this);
@@ -112,11 +118,12 @@ void LLPrefsVoiceLogic::init()
 void LLPrefsVoiceLogic::refresh()
 {
-        mPanel->childSetVisible("voice_unavailable", gDisableVoice);
+    BOOL voiceDisabled = gSavedSettings.getBOOL("CmdLineDisableVoice");
-        mPanel->childSetVisible("enable_voice_check", !gDisableVoice);
+        mPanel->childSetVisible("voice_unavailable", voiceDisabled);
-        mPanel->childSetEnabled("enable_voice_check", !gDisableVoice);
+        mPanel->childSetVisible("enable_voice_check", !voiceDisabled);
+        mPanel->childSetEnabled("enable_voice_check", !voiceDisabled);
        
-        bool enable = !gDisableVoice && gSavedSettings.getBOOL("EnableVoiceChat");
+        bool enable = !voiceDisabled && gSavedSettings.getBOOL("EnableVoiceChat");
        
        mPanel->childSetEnabled("friends_only_check", enable);
        mPanel->childSetEnabled("push_to_talk_check", enable);
@@ -152,18 +159,6 @@ void LLPrefsVoiceLogic::onEarLocationCommit(LLUICtrl* ctrl, void* user_data)
        }
 }
-//static
-void LLPrefsVoiceLogic::onClickLaunchWizard(void* user_data)
-{
-        LLPrefsVoice* prefs = (LLPrefsVoice*)user_data;
-        LLFloaterVoiceWizard* floaterp = LLFloaterVoiceWizard::showInstance();
-        LLFloater* parent_floater = gFloaterView->getParentFloater(prefs);
-        if (parent_floater)
-        {
-                parent_floater->addDependentFloater(floaterp, FALSE);
-        }
-}
 // static
 void LLPrefsVoiceLogic::onClickSetKey(void* user_data)
 {
@@ -209,7 +204,7 @@ void LLVoiceHotkeySelectDialog::onCancel( void* userdata )
        self->mOldFrontmost->setFrontmost(TRUE);
 }
-BOOL LLVoiceHotkeySelectDialog::handleKey(KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLVoiceHotkeySelectDialog::handleKeyHere(KEY key, MASK mask)
 {
        BOOL result = TRUE;
        
@@ -236,13 +231,13 @@ BOOL LLVoiceHotkeySelectDialog::handleKey(KEY key, MASK mask, BOOL called_from_p
 LLPrefsVoice::LLPrefsVoice()
 :       LLPanel("Voice Chat Panel")
 { 
-        gUICtrlFactory->buildPanel(this, "panel_preferences_voice.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_voice.xml");
        mLogic = new LLPrefsVoiceLogic(this);
-        childSetAction("device_settings_btn", onClickDeviceSettingsBtn, this);
+        childSetAction("device_settings_btn", onClickVoiceDeviceSettingsBtn, this);
        // create floater immediately and keep it hidden
        // since it stores preference state for audio devices
-        mDeviceSettings = LLFloaterDeviceSettings::getInstance();
+        mVoiceDeviceSettings = LLFloaterVoiceDeviceSettings::getInstance();
 }
 LLPrefsVoice::~LLPrefsVoice()
@@ -252,34 +247,35 @@ LLPrefsVoice::~LLPrefsVoice()
 void LLPrefsVoice::draw()
 {
-        bool enable = !gDisableVoice && gSavedSettings.getBOOL("EnableVoiceChat");
+        bool enable = !gSavedSettings.getBOOL("CmdLineDisableVoice")
+                  && gSavedSettings.getBOOL("EnableVoiceChat");
        childSetEnabled("device_settings_btn", enable);
        mLogic->refresh();
-        mDeviceSettings->refresh();
+        mVoiceDeviceSettings->refresh();
        LLPanel::draw();
 }
 void LLPrefsVoice::apply()
 {
        mLogic->apply();
-        mDeviceSettings->apply();
+        mVoiceDeviceSettings->apply();
 }
 void LLPrefsVoice::cancel()
 {
        mLogic->cancel();
-        mDeviceSettings->cancel();
+        mVoiceDeviceSettings->cancel();
 }
 //static 
-void LLPrefsVoice::onClickDeviceSettingsBtn(void* user_data)
+void LLPrefsVoice::onClickVoiceDeviceSettingsBtn(void* user_data)
 {
        LLPrefsVoice* prefs = (LLPrefsVoice*)user_data;
-        prefs->mDeviceSettings->open();
+        prefs->mVoiceDeviceSettings->open();
        LLFloater* parent_floater = gFloaterView->getParentFloater(prefs);
        if (parent_floater)
        {
-                parent_floater->addDependentFloater(prefs->mDeviceSettings, FALSE);
+                parent_floater->addDependentFloater(prefs->mVoiceDeviceSettings, FALSE);
        }
 }
diff --git a/linden/indra/newview/llprefsvoice.h b/linden/indra/newview/llprefsvoice.h
index bb47b85..1fb5c66 100644
--- a/linden/indra/newview/llprefsvoice.h
+++ b/linden/indra/newview/llprefsvoice.h
@@ -34,7 +34,7 @@
 #include "llpanel.h"
-class LLFloaterDeviceSettings;
+class LLFloaterVoiceDeviceSettings;
 class LLPrefsVoiceLogic
 {
@@ -55,7 +55,6 @@ protected:
        static void onClickSetKey(void* user_data);
        static void onClickSetMiddleMouse(void* user_data);
        static void onEarLocationCommit(LLUICtrl* ctrl, void* user_data);
-        static void onClickLaunchWizard(void* user_data);
        BOOL mEnableVoice;
        BOOL mVoiceCallsFriendsOnly;
@@ -81,10 +80,10 @@ public:
        void cancel();
 protected:
-        static void onClickDeviceSettingsBtn(void* user_data);
+        static void onClickVoiceDeviceSettingsBtn(void* user_data);
        LLPrefsVoiceLogic* mLogic;
-        LLFloaterDeviceSettings* mDeviceSettings;
+        LLFloaterVoiceDeviceSettings* mVoiceDeviceSettings;
 };
 #endif // LLPREFSVOICE_H
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 8827598..39bdfd4 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -231,11 +231,11 @@ void LLPreview::onCommit()
                                        LLViewerObject* obj = avatar->getWornAttachment( item->getUUID() );
                                        if( obj )
                                        {
-                                                gSelectMgr->deselectAll();
+                                                LLSelectMgr::getInstance()->deselectAll();
-                                                gSelectMgr->addAsIndividual( obj, SELECT_ALL_TES, FALSE );
+                                                LLSelectMgr::getInstance()->addAsIndividual( obj, SELECT_ALL_TES, FALSE );
-                                                gSelectMgr->selectionSetObjectDescription( childGetText("desc") );
+                                                LLSelectMgr::getInstance()->selectionSetObjectDescription( childGetText("desc") );
-                                                gSelectMgr->deselectAll();
+                                                LLSelectMgr::getInstance()->deselectAll();
                                        }
                                }
                        }
@@ -374,7 +374,7 @@ BOOL LLPreview::handleMouseDown(S32 x, S32 y, MASK mask)
                S32 screen_x;
                S32 screen_y;
                localPointToScreen(x, y, &screen_x, &screen_y );
-                gToolDragAndDrop->setDragStart(screen_x, screen_y);
+                LLToolDragAndDrop::getInstance()->setDragStart(screen_x, screen_y);
                return TRUE;
        }
        return LLFloater::handleMouseDown(x, y, mask);
@@ -402,7 +402,7 @@ BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask)
                if(item
                   && item->getPermissions().allowCopyBy(gAgent.getID(),
                                                                                                 gAgent.getGroupID())
-                   && gToolDragAndDrop->isOverThreshold(screen_x, screen_y))
+                   && LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y))
                {
                        EDragAndDropType type;
                        type = LLAssetType::lookupDragAndDropType(item->getType());
@@ -415,11 +415,11 @@ BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask)
                        {
                                src = LLToolDragAndDrop::SOURCE_AGENT;
                        }
-                        gToolDragAndDrop->beginDrag(type,
+                        LLToolDragAndDrop::getInstance()->beginDrag(type,
                                                                                item->getUUID(),
                                                                                src,
                                                                                mObjectUUID);
-                        return gToolDragAndDrop->handleHover(x, y, mask );
+                        return LLToolDragAndDrop::getInstance()->handleHover(x, y, mask );
                }
        }
        return LLFloater::handleHover(x,y,mask);
diff --git a/linden/indra/newview/llpreviewanim.cpp b/linden/indra/newview/llpreviewanim.cpp
index ff8b3b5..c7b1dc7 100644
--- a/linden/indra/newview/llpreviewanim.cpp
+++ b/linden/indra/newview/llpreviewanim.cpp
@@ -42,14 +42,14 @@
 #include "llfilepicker.h"
 #include "lllineeditor.h"
 #include "lluictrlfactory.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 extern LLAgent gAgent;
 LLPreviewAnim::LLPreviewAnim(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const S32& activate, const LLUUID& object_uuid )   :
        LLPreview( name, rect, title, item_uuid, object_uuid)
 {
-        gUICtrlFactory->buildFloater(this,"floater_preview_animation.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_animation.xml");
        childSetAction("Anim play btn",playAnim,this);
        childSetAction("Anim audition btn",auditionAnim,this);
@@ -116,7 +116,7 @@ void LLPreviewAnim::playAnim( void *userdata )
        {
                LLUUID itemID=item->getAssetUUID();
-                LLButton* btn = LLUICtrlFactory::getButtonByName(self, "Anim play btn");
+                LLButton* btn = self->getChild<LLButton>("Anim play btn");
                if (btn)
                {
                        btn->toggleState();
@@ -153,7 +153,7 @@ void LLPreviewAnim::auditionAnim( void *userdata )
        {
                LLUUID itemID=item->getAssetUUID();
-                LLButton* btn = LLUICtrlFactory::getButtonByName(self, "Anim audition btn");
+                LLButton* btn = self->getChild<LLButton>("Anim audition btn");
                if (btn)
                {
                        btn->toggleState();
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp
index 3594642..4ca6009 100644
--- a/linden/indra/newview/llpreviewgesture.cpp
+++ b/linden/indra/newview/llpreviewgesture.cpp
@@ -49,6 +49,7 @@
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
 #include "llcombobox.h"
+#include "lldelayedgestureerror.h"
 #include "llfloatergesture.h" // for some label constants
 #include "llgesturemgr.h"
 #include "llinventorymodel.h"
@@ -58,7 +59,7 @@
 #include "llradiogroup.h"
 #include "llscrolllistctrl.h"
 #include "lltextbox.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerinventory.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
@@ -133,7 +134,7 @@ LLPreviewGesture* LLPreviewGesture::show(const std::string& title, const LLUUID&
        self->init(item_id, object_id);
        // Builds and adds to gFloaterView
-        gUICtrlFactory->buildFloater(self, "floater_preview_gesture.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(self, "floater_preview_gesture.xml");
        self->setTitle(title);
        // Move window to top-left of screen
@@ -184,18 +185,15 @@ LLPreviewGesture* LLPreviewGesture::show(const std::string& title, const LLUUID&
 // virtual
-BOOL LLPreviewGesture::handleKeyHere(KEY key, MASK mask,
+BOOL LLPreviewGesture::handleKeyHere(KEY key, MASK mask)
-                                                                          BOOL called_from_parent)
 {
-        if(getVisible() && getEnabled())
+        if(('S' == key) && (MASK_CONTROL == (mask & MASK_CONTROL)))
        {
-                if(('S' == key) && (MASK_CONTROL == (mask & MASK_CONTROL)))
+                saveIfNeeded();
-                {
+                return TRUE;
-                        saveIfNeeded();
-                        return TRUE;
-                }
        }
-        return LLPreview::handleKeyHere(key, mask, called_from_parent);
+        return LLPreview::handleKeyHere(key, mask);
 }
@@ -396,7 +394,7 @@ BOOL LLPreviewGesture::postBuild()
        LLTextBox* text;
        LLCheckBoxCtrl* check;
-        edit = LLViewerUICtrlFactory::getLineEditorByName(this, "trigger_editor");
+        edit = getChild<LLLineEditor>("trigger_editor");
        edit->setKeystrokeCallback(onKeystrokeCommit);
        edit->setCommitCallback(onCommitSetDirty);
        edit->setCommitOnFocusLost(TRUE);
@@ -404,11 +402,11 @@ BOOL LLPreviewGesture::postBuild()
        edit->setIgnoreTab(TRUE);
        mTriggerEditor = edit;
-        text = LLViewerUICtrlFactory::getTextBoxByName(this, "replace_text");
+        text = getChild<LLTextBox>("replace_text");
        text->setEnabled(FALSE);
        mReplaceText = text;
-        edit = LLViewerUICtrlFactory::getLineEditorByName(this, "replace_editor");
+        edit = getChild<LLLineEditor>("replace_editor");
        edit->setEnabled(FALSE);
        edit->setKeystrokeCallback(onKeystrokeCommit);
        edit->setCommitCallback(onCommitSetDirty);
@@ -417,76 +415,76 @@ BOOL LLPreviewGesture::postBuild()
        edit->setIgnoreTab(TRUE);
        mReplaceEditor = edit;
-        combo = LLViewerUICtrlFactory::getComboBoxByName(this, "modifier_combo");
+        combo = getChild<LLComboBox>( "modifier_combo");
        combo->setCommitCallback(onCommitSetDirty);
        combo->setCallbackUserData(this);
        mModifierCombo = combo;
-        combo = LLViewerUICtrlFactory::getComboBoxByName(this, "key_combo");
+        combo = getChild<LLComboBox>( "key_combo");
        combo->setCommitCallback(onCommitSetDirty);
        combo->setCallbackUserData(this);
        mKeyCombo = combo;
-        list = LLViewerUICtrlFactory::getScrollListByName(this, "library_list");
+        list = getChild<LLScrollListCtrl>("library_list");
        list->setCommitCallback(onCommitLibrary);
        list->setDoubleClickCallback(onClickAdd);
        list->setCallbackUserData(this);
        mLibraryList = list;
-        btn = LLViewerUICtrlFactory::getButtonByName(this, "add_btn");
+        btn = getChild<LLButton>( "add_btn");
        btn->setClickedCallback(onClickAdd);
        btn->setCallbackUserData(this);
        btn->setEnabled(FALSE);
        mAddBtn = btn;
-        btn = LLViewerUICtrlFactory::getButtonByName(this, "up_btn");
+        btn = getChild<LLButton>( "up_btn");
        btn->setClickedCallback(onClickUp);
        btn->setCallbackUserData(this);
        btn->setEnabled(FALSE);
        mUpBtn = btn;
-        btn = LLViewerUICtrlFactory::getButtonByName(this, "down_btn");
+        btn = getChild<LLButton>( "down_btn");
        btn->setClickedCallback(onClickDown);
        btn->setCallbackUserData(this);
        btn->setEnabled(FALSE);
        mDownBtn = btn;
-        btn = LLViewerUICtrlFactory::getButtonByName(this, "delete_btn");
+        btn = getChild<LLButton>( "delete_btn");
        btn->setClickedCallback(onClickDelete);
        btn->setCallbackUserData(this);
        btn->setEnabled(FALSE);
        mDeleteBtn = btn;
-        list = LLViewerUICtrlFactory::getScrollListByName(this, "step_list");
+        list = getChild<LLScrollListCtrl>("step_list");
        list->setCommitCallback(onCommitStep);
        list->setCallbackUserData(this);
        mStepList = list;
        // Options
-        text = LLViewerUICtrlFactory::getTextBoxByName(this, "options_text");
+        text = getChild<LLTextBox>("options_text");
        text->setBorderVisible(TRUE);
        mOptionsText = text;
-        combo = LLViewerUICtrlFactory::getComboBoxByName(this, "animation_list");
+        combo = getChild<LLComboBox>( "animation_list");
        combo->setVisible(FALSE);
        combo->setCommitCallback(onCommitAnimation);
        combo->setCallbackUserData(this);
        mAnimationCombo = combo;
        LLRadioGroup* group;
-        group = LLViewerUICtrlFactory::getRadioGroupByName(this, "animation_trigger_type");
+        group = getChild<LLRadioGroup>("animation_trigger_type");
        group->setVisible(FALSE);
        group->setCommitCallback(onCommitAnimationTrigger);
        group->setCallbackUserData(this);
        mAnimationRadio = group;
-        combo = LLViewerUICtrlFactory::getComboBoxByName(this, "sound_list");
+        combo = getChild<LLComboBox>( "sound_list");
        combo->setVisible(FALSE);
        combo->setCommitCallback(onCommitSound);
        combo->setCallbackUserData(this);
        mSoundCombo = combo;
-        edit = LLViewerUICtrlFactory::getLineEditorByName(this, "chat_editor");
+        edit = getChild<LLLineEditor>("chat_editor");
        edit->setVisible(FALSE);
        edit->setCommitCallback(onCommitChat);
        //edit->setKeystrokeCallback(onKeystrokeCommit);
@@ -495,19 +493,19 @@ BOOL LLPreviewGesture::postBuild()
        edit->setIgnoreTab(TRUE);
        mChatEditor = edit;
-        check = LLViewerUICtrlFactory::getCheckBoxByName(this, "wait_anim_check");
+        check = getChild<LLCheckBoxCtrl>( "wait_anim_check");
        check->setVisible(FALSE);
        check->setCommitCallback(onCommitWait);
        check->setCallbackUserData(this);
        mWaitAnimCheck = check;
-        check = LLViewerUICtrlFactory::getCheckBoxByName(this, "wait_time_check");
+        check = getChild<LLCheckBoxCtrl>( "wait_time_check");
        check->setVisible(FALSE);
        check->setCommitCallback(onCommitWait);
        check->setCallbackUserData(this);
        mWaitTimeCheck = check;
-        edit = LLViewerUICtrlFactory::getLineEditorByName(this, "wait_time_editor");
+        edit = getChild<LLLineEditor>("wait_time_editor");
        edit->setEnabled(FALSE);
        edit->setVisible(FALSE);
        edit->setPrevalidate(LLLineEditor::prevalidateFloat);
@@ -519,17 +517,17 @@ BOOL LLPreviewGesture::postBuild()
        mWaitTimeEditor = edit;
        // Buttons at the bottom
-        check = LLViewerUICtrlFactory::getCheckBoxByName(this, "active_check");
+        check = getChild<LLCheckBoxCtrl>( "active_check");
        check->setCommitCallback(onCommitActive);
        check->setCallbackUserData(this);
        mActiveCheck = check;
-        btn = LLViewerUICtrlFactory::getButtonByName(this, "save_btn");
+        btn = getChild<LLButton>( "save_btn");
        btn->setClickedCallback(onClickSave);
        btn->setCallbackUserData(this);
        mSaveBtn = btn;
-        btn = LLViewerUICtrlFactory::getButtonByName(this, "preview_btn");
+        btn = getChild<LLButton>( "preview_btn");
        btn->setClickedCallback(onClickPreview);
        btn->setCallbackUserData(this);
        mPreviewBtn = btn;
@@ -955,24 +953,16 @@ void LLPreviewGesture::onLoadComplete(LLVFS *vfs,
                }
                else
                {
-                        // Get missing gesture's name. Use UUID if name can't be found.
+                        LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                        LLStringBase<char>::format_map_t args;
-                        LLInventoryItem *item = gInventory.getItem( *item_idp );
-                        args["[NAME]"] = item ? item->getName() : LLString( item_idp->asString() );
-                        if( gViewerStats )
-                        {
-                                gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                        }
                        if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
                                LL_ERR_FILE_EMPTY == status)
                        {
-                                LLNotifyBox::showXml("GestureMissing", args);
+                                LLDelayedGestureError::gestureMissing( *item_idp );
                        }
                        else
                        {
-                                LLNotifyBox::showXml("UnableToLoadGesture", args);
+                                LLDelayedGestureError::gestureFailedToLoad( *item_idp );
                        }
                        llwarns << "Problem loading gesture: " << status << llendl;
@@ -992,7 +982,7 @@ void LLPreviewGesture::loadUIFromGesture(LLMultiGesture* gesture)
        
        if (item)
        {
-                LLLineEditor* descEditor = LLUICtrlFactory::getLineEditorByName(this, "desc");
+                LLLineEditor* descEditor = getChild<LLLineEditor>("desc");
                descEditor->setText(item->getDescription());
        }*/
@@ -1183,7 +1173,7 @@ void LLPreviewGesture::saveIfNeeded()
                        }
                        else if (gAssetStorage)
                        {
-                                LLLineEditor* descEditor = LLUICtrlFactory::getLineEditorByName(this, "desc");
+                                LLLineEditor* descEditor = getChild<LLLineEditor>("desc");
                                LLSaveInfo* info = new LLSaveInfo(mItemUUID, mObjectUUID, descEditor->getText(), tid);
                                gAssetStorage->storeAssetData(tid, LLAssetType::AT_GESTURE, onSaveComplete, info, FALSE);
                        }
diff --git a/linden/indra/newview/llpreviewgesture.h b/linden/indra/newview/llpreviewgesture.h
index ea26769..ec80c45 100644
--- a/linden/indra/newview/llpreviewgesture.h
+++ b/linden/indra/newview/llpreviewgesture.h
@@ -53,7 +53,7 @@ public:
        static LLPreviewGesture* show(const std::string& title, const LLUUID& item_id, const LLUUID& object_id, BOOL take_focus = TRUE);
        // LLView
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
        virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                                                                         EDragAndDropType cargo_type,
                                                                         void* cargo_data,
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index af49aee..adb6db1 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -56,7 +56,7 @@
 #include "llviewercontrol.h"
 #include "llviewerregion.h"
 #include "llviewerstats.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
@@ -89,7 +89,7 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
 {
        
        mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this);
-        gUICtrlFactory->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
        /*
        childSetCommitCallback("desc_editor", LLPreview::onText, this);
@@ -166,26 +166,23 @@ const LLColor4& LLPreviewLandmark::getMarkerColor() const
 void LLPreviewLandmark::draw()
 {
-        if( getVisible() )
+        const LLInventoryItem *item = getItem();
-        {
-                const LLInventoryItem *item = getItem();
-                if( item && !mLandmark )
+        if( item && !mLandmark )
+        {
+                mLandmark = gLandmarkList.getAsset( item->getAssetUUID() );
+                if(mLandmark && mPlacePanel)
                {
-                        mLandmark = gLandmarkList.getAsset( item->getAssetUUID() );
+                        LLVector3 pos_region = mLandmark->getRegionPos();       // always have this
-                        if(mLandmark && mPlacePanel)
+                        LLUUID landmark_asset_id = item->getAssetUUID();        // always have this
-                        {
+                        LLUUID region_id;
-                                LLVector3 pos_region = mLandmark->getRegionPos();       // always have this
+                        mLandmark->getRegionID(region_id);              // might find null?
-                                LLUUID landmark_asset_id = item->getAssetUUID();        // always have this
+                        LLVector3d pos_global = getPositionGlobal();    // might be 0
-                                LLUUID region_id;
+                        mPlacePanel->displayParcelInfo(pos_region, landmark_asset_id, region_id, pos_global);
-                                mLandmark->getRegionID(region_id);              // might find null?
-                                LLVector3d pos_global = getPositionGlobal();    // might be 0
-                                mPlacePanel->displayParcelInfo(pos_region, landmark_asset_id, region_id, pos_global);
-                        }
                }
-                LLPreview::draw();
        }
+        LLPreview::draw();
 }
 void LLPreviewLandmark::loadAsset()
@@ -213,7 +210,7 @@ void* LLPreviewLandmark::createPlaceDetail(void* userdata)
 {
        LLPreviewLandmark *self = (LLPreviewLandmark*)userdata;
        self->mPlacePanel = new LLPanelPlace();
-        gUICtrlFactory->buildPanel(self->mPlacePanel, "panel_place.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(self->mPlacePanel, "panel_place.xml");
        const LLInventoryItem* item = self->getItem();
        self->mPlacePanel->displayItemInfo(item);
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp
index 6d7884b..9e4272f 100644
--- a/linden/indra/newview/llpreviewnotecard.cpp
+++ b/linden/indra/newview/llpreviewnotecard.cpp
@@ -58,7 +58,7 @@
 #include "llviewercontrol.h"            // gSavedSettings
 #include "llappviewer.h"                // app_abort_quit()
 #include "lllineeditor.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
@@ -99,13 +99,13 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name,
        if (show_keep_discard)
        {
-                gUICtrlFactory->buildFloater(this,"floater_preview_notecard_keep_discard.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_notecard_keep_discard.xml");
                childSetAction("Keep",onKeepBtn,this);
                childSetAction("Discard",onDiscardBtn,this);
        }
        else
        {
-                gUICtrlFactory->buildFloater(this,"floater_preview_notecard.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_notecard.xml");
                childSetAction("Save",onClickSave,this);
                
                if( mAssetID.isNull() )
@@ -136,7 +136,7 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name,
        setTitle(title);
        
-        LLViewerTextEditor* editor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "Notecard Editor");
+        LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
        if (editor)
        {
@@ -154,7 +154,7 @@ LLPreviewNotecard::~LLPreviewNotecard()
 BOOL LLPreviewNotecard::postBuild()
 {
-        LLViewerTextEditor *ed = (LLViewerTextEditor *)gUICtrlFactory->getTextEditorByName(this, "Notecard Editor");
+        LLViewerTextEditor *ed = getChild<LLViewerTextEditor>("Notecard Editor");
        if (ed)
        {
                ed->setNotecardInfo(mNotecardItemID, mObjectID);
@@ -181,7 +181,7 @@ bool LLPreviewNotecard::saveItem(LLPointer<LLInventoryItem>* itemptr)
 void LLPreviewNotecard::setEnabled( BOOL enabled )
 {
-        LLViewerTextEditor* editor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "Notecard Editor");
+        LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
        childSetEnabled("Notecard Editor", enabled);
        childSetVisible("lock", !enabled);
@@ -197,7 +197,7 @@ void LLPreviewNotecard::draw()
        //childSetFocus("Save", FALSE);
-        LLViewerTextEditor* editor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "Notecard Editor");
+        LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
        BOOL script_changed = !editor->isPristine();
        
        childSetEnabled("Save", script_changed && getEnabled());
@@ -206,24 +206,21 @@ void LLPreviewNotecard::draw()
 }
 // virtual
-BOOL LLPreviewNotecard::handleKeyHere(KEY key, MASK mask,
+BOOL LLPreviewNotecard::handleKeyHere(KEY key, MASK mask)
-                                                                          BOOL called_from_parent)
 {
-        if(getVisible() && getEnabled())
+        if(('S' == key) && (MASK_CONTROL == (mask & MASK_CONTROL)))
        {
-                if(('S' == key) && (MASK_CONTROL == (mask & MASK_CONTROL)))
+                saveIfNeeded();
-                {
+                return TRUE;
-                        saveIfNeeded();
-                        return TRUE;
-                }
        }
-        return LLPreview::handleKeyHere(key, mask, called_from_parent);
+        return LLPreview::handleKeyHere(key, mask);
 }
 // virtual
 BOOL LLPreviewNotecard::canClose()
 {
-        LLViewerTextEditor* editor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "Notecard Editor");
+        LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
        if(mForceClose || editor->isPristine())
        {
@@ -242,7 +239,7 @@ BOOL LLPreviewNotecard::canClose()
 const LLInventoryItem* LLPreviewNotecard::getDragItem()
 {
-        LLViewerTextEditor* editor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "Notecard Editor");
+        LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
        if(editor)
        {
@@ -254,9 +251,7 @@ const LLInventoryItem* LLPreviewNotecard::getDragItem()
 bool LLPreviewNotecard::hasEmbeddedInventory()
 {
        LLViewerTextEditor* editor = NULL;
-        editor = LLViewerUICtrlFactory::getViewerTextEditorByName(
+        editor = getChild<LLViewerTextEditor>("Notecard Editor");
-                this,
-                "Notecard Editor");
        if (!editor) return false;
        return editor->hasEmbeddedInventory();
 }
@@ -271,7 +266,7 @@ void LLPreviewNotecard::loadAsset()
 {
        // request the asset.
        const LLInventoryItem* item = getItem();
-        LLViewerTextEditor* editor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "Notecard Editor");
+        LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
        if (!editor)
                return;
@@ -377,7 +372,7 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
                        buffer[file_length] = 0;
                        
-                        LLViewerTextEditor* previewEditor = LLViewerUICtrlFactory::getViewerTextEditorByName(preview, "Notecard Editor");
+                        LLViewerTextEditor* previewEditor = preview->getChild<LLViewerTextEditor>("Notecard Editor");
                        if( (file_length > 19) && !strncmp( buffer, "Linden text version", 19 ) )
                        {
@@ -403,10 +398,7 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
                }
                else
                {
-                        if( gViewerStats )
+                        LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                        {
-                                gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                        }
                        if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
                                LL_ERR_FILE_EMPTY == status)
@@ -475,7 +467,7 @@ bool LLPreviewNotecard::saveIfNeeded(LLInventoryItem* copyitem)
        }
        
-        LLViewerTextEditor* editor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "Notecard Editor");
+        LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
        if(!editor->isPristine())
        {
@@ -592,7 +584,7 @@ void LLPreviewNotecard::onSaveComplete(const LLUUID& asset_uuid, void* user_data
                // Perform item copy to inventory
                if (info->mCopyItem.notNull())
                {
-                        LLViewerTextEditor* editor = LLViewerUICtrlFactory::getViewerTextEditorByName(info->mSelf, "Notecard Editor");
+                        LLViewerTextEditor* editor = info->mSelf->getChild<LLViewerTextEditor>("Notecard Editor");
                        if (editor)
                        {
                                editor->copyInventory(info->mCopyItem);
diff --git a/linden/indra/newview/llpreviewnotecard.h b/linden/indra/newview/llpreviewnotecard.h
index 6977da4..9e90f18 100644
--- a/linden/indra/newview/llpreviewnotecard.h
+++ b/linden/indra/newview/llpreviewnotecard.h
@@ -61,7 +61,7 @@ public:
        // llview
        virtual void draw();
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
        virtual void setEnabled( BOOL enabled );
        virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 2f3a8a2..6acd6bf 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -78,7 +78,7 @@
 #include "llviewerstats.h"
 #include "llviewertexteditor.h"
 #include "llviewerwindow.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llwebbrowserctrl.h"
 #include "lluictrlfactory.h"
@@ -176,7 +176,7 @@ LLFloaterScriptSearch::LLFloaterScriptSearch(std::string title, LLRect rect, LLS
                : LLFloater("script search",rect,title), mEditorCore(editor_core)
 {
        
-        gUICtrlFactory->buildFloater(this,"floater_script_search.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_search.xml");
        childSetAction("search_btn", onBtnSearch,this);
        childSetAction("replace_btn", onBtnReplace,this);
@@ -198,9 +198,10 @@ LLFloaterScriptSearch::LLFloaterScriptSearch(std::string title, LLRect rect, LLS
        LLView* viewp = (LLView*)editor_core;
        while(viewp)
        {
-                if (viewp->getWidgetType() == WIDGET_TYPE_FLOATER)
+                LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
+                if (floaterp)
                {
-                        ((LLFloater*)viewp)->addDependentFloater(this);
+                        floaterp->addDependentFloater(this);
                        break;
                }
                viewp = viewp->getParent();
@@ -243,7 +244,7 @@ void LLFloaterScriptSearch::onBtnSearch(void *userdata)
 void LLFloaterScriptSearch::handleBtnSearch()
 {
-        LLCheckBoxCtrl* caseChk = LLUICtrlFactory::getCheckBoxByName(this,"case_text");
+        LLCheckBoxCtrl* caseChk = getChild<LLCheckBoxCtrl>("case_text");
        mEditorCore->mEditor->selectNext(childGetText("search_text"), caseChk->get());
 }
@@ -256,7 +257,7 @@ void LLFloaterScriptSearch::onBtnReplace(void *userdata)
 void LLFloaterScriptSearch::handleBtnReplace()
 {
-        LLCheckBoxCtrl* caseChk = LLUICtrlFactory::getCheckBoxByName(this,"case_text");
+        LLCheckBoxCtrl* caseChk = getChild<LLCheckBoxCtrl>("case_text");
        mEditorCore->mEditor->replaceText(childGetText("search_text"), childGetText("replace_text"), caseChk->get());
 }
@@ -269,7 +270,7 @@ void LLFloaterScriptSearch::onBtnReplaceAll(void *userdata)
 void LLFloaterScriptSearch::handleBtnReplaceAll()
 {
-        LLCheckBoxCtrl* caseChk = LLUICtrlFactory::getCheckBoxByName(this,"case_text");
+        LLCheckBoxCtrl* caseChk = getChild<LLCheckBoxCtrl>("case_text");
        mEditorCore->mEditor->replaceTextAll(childGetText("search_text"), childGetText("replace_text"), caseChk->get());
 }
@@ -311,16 +312,15 @@ LLScriptEdCore::LLScriptEdCore(
        setBorderVisible(FALSE);
        
-        gUICtrlFactory->buildPanel(this, "floater_script_ed_panel.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this, "floater_script_ed_panel.xml");
        
-        mErrorList = LLUICtrlFactory::getScrollListByName(this, "lsl errors");
+        mErrorList = getChild<LLScrollListCtrl>("lsl errors");
-        mFunctions = LLUICtrlFactory::getComboBoxByName(this, "Insert...");
+        mFunctions = getChild<LLComboBox>( "Insert...");
        
        childSetCommitCallback("Insert...", &LLScriptEdCore::onBtnInsertFunction, this);
-        mEditor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "Script Editor");
+        mEditor = getChild<LLViewerTextEditor>("Script Editor");
-        mEditor->setReadOnlyBgColor(gColors.getColor( "ScriptBgReadOnlyColor" ) );
        mEditor->setFollowsAll();
        mEditor->setHandleEditKeysDirectly(TRUE);
        mEditor->setEnabled(TRUE);
@@ -389,47 +389,47 @@ LLScriptEdCore::~LLScriptEdCore()
 void LLScriptEdCore::initMenu()
 {
-        LLMenuItemCallGL* menuItem = LLUICtrlFactory::getMenuItemCallByName(this, "Save");
+        LLMenuItemCallGL* menuItem = getChild<LLMenuItemCallGL>("Save");
        menuItem->setMenuCallback(onBtnSave, this);
        menuItem->setEnabledCallback(hasChanged);
        
-        menuItem = LLUICtrlFactory::getMenuItemCallByName(this, "Revert All Changes");
+        menuItem = getChild<LLMenuItemCallGL>("Revert All Changes");
        menuItem->setMenuCallback(onBtnUndoChanges, this);
        menuItem->setEnabledCallback(hasChanged);
-        menuItem = LLUICtrlFactory::getMenuItemCallByName(this, "Undo");
+        menuItem = getChild<LLMenuItemCallGL>("Undo");
        menuItem->setMenuCallback(onUndoMenu, this);
        menuItem->setEnabledCallback(enableUndoMenu);
-        menuItem = LLUICtrlFactory::getMenuItemCallByName(this, "Redo");
+        menuItem = getChild<LLMenuItemCallGL>("Redo");
        menuItem->setMenuCallback(onRedoMenu, this);
        menuItem->setEnabledCallback(enableRedoMenu);
-        menuItem = LLUICtrlFactory::getMenuItemCallByName(this, "Cut");
+        menuItem = getChild<LLMenuItemCallGL>("Cut");
        menuItem->setMenuCallback(onCutMenu, this);
        menuItem->setEnabledCallback(enableCutMenu);
-        menuItem = LLUICtrlFactory::getMenuItemCallByName(this, "Copy");
+        menuItem = getChild<LLMenuItemCallGL>("Copy");
        menuItem->setMenuCallback(onCopyMenu, this);
        menuItem->setEnabledCallback(enableCopyMenu);
-        menuItem = LLUICtrlFactory::getMenuItemCallByName(this, "Paste");
+        menuItem = getChild<LLMenuItemCallGL>("Paste");
        menuItem->setMenuCallback(onPasteMenu, this);
        menuItem->setEnabledCallback(enablePasteMenu);
-        menuItem = LLUICtrlFactory::getMenuItemCallByName(this, "Select All");
+        menuItem = getChild<LLMenuItemCallGL>("Select All");
        menuItem->setMenuCallback(onSelectAllMenu, this);
        menuItem->setEnabledCallback(enableSelectAllMenu);
-        menuItem = LLUICtrlFactory::getMenuItemCallByName(this, "Search / Replace...");
+        menuItem = getChild<LLMenuItemCallGL>("Search / Replace...");
        menuItem->setMenuCallback(onSearchMenu, this);
        menuItem->setEnabledCallback(NULL);
-        menuItem = LLUICtrlFactory::getMenuItemCallByName(this, "Help...");
+        menuItem = getChild<LLMenuItemCallGL>("Help...");
        menuItem->setMenuCallback(onBtnHelp, this);
        menuItem->setEnabledCallback(NULL);
-        menuItem = LLUICtrlFactory::getMenuItemCallByName(this, "LSL Wiki Help...");
+        menuItem = getChild<LLMenuItemCallGL>("LSL Wiki Help...");
        menuItem->setMenuCallback(onBtnDynamicHelp, this);
        menuItem->setEnabledCallback(NULL);
 }
@@ -472,8 +472,8 @@ void LLScriptEdCore::updateDynamicHelp(BOOL immediate)
        if (!help_floater) return;
        // update back and forward buttons
-        LLButton* fwd_button = LLUICtrlFactory::getButtonByName(help_floater, "fwd_btn");
+        LLButton* fwd_button = help_floater->getChild<LLButton>("fwd_btn");
-        LLButton* back_button = LLUICtrlFactory::getButtonByName(help_floater, "back_btn");
+        LLButton* back_button = help_floater->getChild<LLButton>("back_btn");
        LLWebBrowserCtrl* browser = help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
        back_button->setEnabled(browser->canNavigateBack());
        fwd_button->setEnabled(browser->canNavigateForward());
@@ -536,7 +536,7 @@ void LLScriptEdCore::setHelpPage(const LLString& help_string)
        LLWebBrowserCtrl* web_browser = help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
        if (!web_browser) return;
-        LLComboBox* history_combo = gUICtrlFactory->getComboBoxByName(help_floater, "history_combo");
+        LLComboBox* history_combo = help_floater->getChild<LLComboBox>("history_combo");
        if (!history_combo) return;
        LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
@@ -556,7 +556,7 @@ void LLScriptEdCore::addHelpItemToHistory(const LLString& help_string)
        LLFloater* help_floater = mLiveHelpHandle.get();
        if (!help_floater) return;
-        LLComboBox* history_combo = gUICtrlFactory->getComboBoxByName(help_floater, "history_combo");
+        LLComboBox* history_combo = help_floater->getChild<LLComboBox>("history_combo");
        if (!history_combo) return;
        // separate history items from full item list
@@ -670,7 +670,7 @@ void LLScriptEdCore::onBtnDynamicHelp(void* userdata)
        }
        live_help_floater = new LLFloater("lsl_help");
-        gUICtrlFactory->buildFloater(live_help_floater, "floater_lsl_guide.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(live_help_floater, "floater_lsl_guide.xml");
        ((LLFloater*)corep->getParent())->addDependentFloater(live_help_floater, TRUE);
        live_help_floater->childSetCommitCallback("lock_check", onCheckLock, userdata);
        live_help_floater->childSetValue("lock_check", gSavedSettings.getBOOL("ScriptHelpFollowsCursor"));
@@ -681,7 +681,7 @@ void LLScriptEdCore::onBtnDynamicHelp(void* userdata)
        LLWebBrowserCtrl* browser = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
        browser->setAlwaysRefresh(TRUE);
-        LLComboBox* help_combo = LLUICtrlFactory::getComboBoxByName(live_help_floater, "history_combo");
+        LLComboBox* help_combo = live_help_floater->getChild<LLComboBox>("history_combo");
        LLKeywordToken *token;
        LLKeywords::keyword_iterator_t token_it;
        for (token_it = corep->mEditor->keywordsBegin(); 
@@ -789,10 +789,7 @@ void LLScriptEdCore::onBtnInsertFunction(LLUICtrl *ui, void* userdata)
 // static 
 void LLScriptEdCore::doSave( void* userdata, BOOL close_after_save )
 {
-        if( gViewerStats )
+        LLViewerStats::getInstance()->incStat( LLViewerStats::ST_LSL_SAVE_COUNT );
-        {
-                gViewerStats->incStat( LLViewerStats::ST_LSL_SAVE_COUNT );
-        }
        LLScriptEdCore* self = (LLScriptEdCore*) userdata;
@@ -1015,33 +1012,31 @@ void LLScriptEdCore::deleteBridges()
 }
 // virtual
-BOOL LLScriptEdCore::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLScriptEdCore::handleKeyHere(KEY key, MASK mask)
 {
-        if(getVisible() && getEnabled())
+        bool just_control = MASK_CONTROL == (mask & MASK_MODIFIERS);
-        {
-                bool just_control = MASK_CONTROL == (mask & MASK_MODIFIERS);
-                if(('S' == key) && just_control)
+        if(('S' == key) && just_control)
+        {
+                if(mSaveCallback)
                {
-                        if(mSaveCallback)
+                        // don't close after saving
-                        {
+                        mSaveCallback(mUserdata, FALSE);
-                                // don't close after saving
-                                mSaveCallback(mUserdata, FALSE);
-                        }
-        
-                        return TRUE;
                }
-                if(('F' == key) && just_control)
+                return TRUE;
+        }
+        if(('F' == key) && just_control)
+        {
+                if(mSearchReplaceCallback)
                {
-                        if(mSearchReplaceCallback)
+                        mSearchReplaceCallback(mUserdata);
-                        {
-                                mSearchReplaceCallback(mUserdata);
-                        }
-        
-                        return TRUE;
                }
+                return TRUE;
        }
        return FALSE;
 }
@@ -1096,7 +1091,7 @@ LLPreviewLSL::LLPreviewLSL(const std::string& name, const LLRect& rect,
        factory_map["script panel"] = LLCallbackMap(LLPreviewLSL::createScriptEdPanel, this);
-        gUICtrlFactory->buildFloater(this,"floater_script_preview.xml", &factory_map);
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_preview.xml", &factory_map);
        const LLInventoryItem* item = getItem();        
@@ -1316,7 +1311,7 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
                                                                          const LLUUID& item_id,
                                                                          const LLTransactionID& tid)
 {
-        LLLineEditor* descEditor = LLUICtrlFactory::getLineEditorByName(this, "desc");
+        LLLineEditor* descEditor = getChild<LLLineEditor>("desc");
        LLScriptSaveInfo* info = new LLScriptSaveInfo(item_id,
                                                                descEditor->getText(),
                                                                tid);
@@ -1517,10 +1512,7 @@ void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAsset
                }
                else
                {
-                        if( gViewerStats )
+                        LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                        {
-                                gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                        }
                        if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
                                LL_ERR_FILE_EMPTY == status)
@@ -1627,7 +1619,7 @@ LLLiveLSLEditor::LLLiveLSLEditor(const std::string& name,
        LLCallbackMap::map_t factory_map;
        factory_map["script ed panel"] = LLCallbackMap(LLLiveLSLEditor::createScriptEdPanel, this);
-        gUICtrlFactory->buildFloater(this,"floater_live_lsleditor.xml", &factory_map);
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_live_lsleditor.xml", &factory_map);
        childSetCommitCallback("running", LLLiveLSLEditor::onRunningCheckboxClicked, this);
@@ -1830,10 +1822,7 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
                }
                else
                {
-                        if( gViewerStats )
+                        LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                        {
-                                gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                        }
                        if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
                                LL_ERR_FILE_EMPTY == status)
@@ -1913,7 +1902,7 @@ void LLLiveLSLEditor::onRunningCheckboxClicked( LLUICtrl*, void* userdata )
 {
        LLLiveLSLEditor* self = (LLLiveLSLEditor*) userdata;
        LLViewerObject* object = gObjectList.findObject( self->mObjectID );
-        LLCheckBoxCtrl* runningCheckbox = LLUICtrlFactory::getCheckBoxByName(self, "running");
+        LLCheckBoxCtrl* runningCheckbox = self->getChild<LLCheckBoxCtrl>("running");
        BOOL running =  runningCheckbox->get();
        //self->mRunningCheckbox->get();
        if( object )
@@ -1961,39 +1950,37 @@ void LLLiveLSLEditor::onReset(void *userdata)
 void LLLiveLSLEditor::draw()
 {
-        if(getVisible())
+        LLViewerObject* object = gObjectList.findObject(mObjectID);
+        LLCheckBoxCtrl* runningCheckbox = getChild<LLCheckBoxCtrl>( "running");
+                if(object && mAskedForRunningInfo && mHaveRunningInfo)
        {
-                LLViewerObject* object = gObjectList.findObject(mObjectID);
+                if(object->permAnyOwner())
-                LLCheckBoxCtrl* runningCheckbox = LLUICtrlFactory::getCheckBoxByName(this, "running");
-                        if(object && mAskedForRunningInfo && mHaveRunningInfo)
                {
-                        if(object->permAnyOwner())
+                        runningCheckbox->setLabel(getString("script_running"));
-                        {
+                        runningCheckbox->setEnabled(TRUE);
-                                runningCheckbox->setLabel(getString("script_running"));
-                                runningCheckbox->setEnabled(TRUE);
-                        }
-                        else
-                        {
-                                runningCheckbox->setLabel(getString("public_objects_can_not_run"));
-                                runningCheckbox->setEnabled(FALSE);
-                                // *FIX: Set it to false so that the ui is correct for
-                                // a box that is released to public. It could be
-                                // incorrect after a release/claim cycle, but will be
-                                // correct after clicking on it.
-                                runningCheckbox->set(FALSE);
-                        }
                }
-                else if(!object)
+                else
                {
-                        // HACK: Display this information in the title bar.
+                        runningCheckbox->setLabel(getString("public_objects_can_not_run"));
-                        // Really ought to put in main window.
-                        setTitle("Script (object out of range)");
                        runningCheckbox->setEnabled(FALSE);
-                        // object may have fallen out of range.
+                        // *FIX: Set it to false so that the ui is correct for
-                        mHaveRunningInfo = FALSE;
+                        // a box that is released to public. It could be
+                        // incorrect after a release/claim cycle, but will be
+                        // correct after clicking on it.
+                        runningCheckbox->set(FALSE);
                }
-                LLFloater::draw();
        }
+        else if(!object)
+        {
+                // HACK: Display this information in the title bar.
+                // Really ought to put in main window.
+                setTitle("Script (object out of range)");
+                runningCheckbox->setEnabled(FALSE);
+                // object may have fallen out of range.
+                mHaveRunningInfo = FALSE;
+        }
+        LLFloater::draw();
 }
@@ -2103,7 +2090,7 @@ void LLLiveLSLEditor::saveIfNeeded()
        std::string url = gAgent.getRegion()->getCapability("UpdateScriptTaskInventory");
        getWindow()->incBusyCount();
        mPendingUploads++;
-        BOOL is_running = LLUICtrlFactory::getCheckBoxByName(this, "running")->get();
+        BOOL is_running = getChild<LLCheckBoxCtrl>( "running")->get();
        if (!url.empty())
        {
                uploadAssetViaCaps(url, filename, mObjectID,
@@ -2221,7 +2208,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
        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");
+        LLCheckBoxCtrl* runningCheckbox = getChild<LLCheckBoxCtrl>( "running");
        runningCheckbox->setLabel(getString("script_running"));
        runningCheckbox->setEnabled(TRUE);
 }
@@ -2389,7 +2376,7 @@ void LLLiveLSLEditor::processScriptRunningReply(LLMessageSystem* msg, void**)
                instance->mHaveRunningInfo = TRUE;
                BOOL running;
                msg->getBOOLFast(_PREHASH_Script, _PREHASH_Running, running);
-                LLCheckBoxCtrl* runningCheckbox = LLUICtrlFactory::getCheckBoxByName(instance, "running");
+                LLCheckBoxCtrl* runningCheckbox = instance->getChild<LLCheckBoxCtrl>("running");
                runningCheckbox->set(running);
        }
 }
diff --git a/linden/indra/newview/llpreviewscript.h b/linden/indra/newview/llpreviewscript.h
index 21b8844..e4c165f 100644
--- a/linden/indra/newview/llpreviewscript.h
+++ b/linden/indra/newview/llpreviewscript.h
@@ -52,12 +52,11 @@ class LLMenuBarGL;
 class LLFloaterScriptSearch;
 class LLKeywordToken;
-// Inner, implementation class.  LLPreviewScript and LLLiveScriptEditor each own one of these.
+// Inner, implementation class.  LLPreviewScript and LLLiveLSLEditor each own one of these.
 class LLScriptEdCore : public LLPanel
 {
        friend class LLPreviewScript;
        friend class LLPreviewLSL;
-        friend class LLLiveScriptEditor;
        friend class LLLiveLSLEditor;
        friend class LLFloaterScriptSearch;
@@ -118,7 +117,7 @@ public:
        void selectFirstError();
-        virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL handleKeyHere(KEY key, MASK mask);
 protected:
        void deleteBridges();
diff --git a/linden/indra/newview/llpreviewsound.cpp b/linden/indra/newview/llpreviewsound.cpp
index 212ceb9..9ba6fd5 100644
--- a/linden/indra/newview/llpreviewsound.cpp
+++ b/linden/indra/newview/llpreviewsound.cpp
@@ -41,7 +41,7 @@
 #include "llresmgr.h"
 #include "llviewercontrol.h"
 #include "llviewermessage.h"  // send_guid_sound_trigger
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 extern LLAudioEngine* gAudiop;
 extern LLAgent gAgent;
@@ -52,15 +52,15 @@ LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, cons
        LLPreview( name, rect, title, item_uuid, object_uuid)
 {
        
-        gUICtrlFactory->buildFloater(this,"floater_preview_sound.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_sound.xml");
        childSetAction("Sound play btn",&LLPreviewSound::playSound,this);
        childSetAction("Sound audition btn",&LLPreviewSound::auditionSound,this);
-        LLButton* button = LLUICtrlFactory::getButtonByName(this, "Sound play btn");
+        LLButton* button = getChild<LLButton>("Sound play btn");
        button->setSoundFlags(LLView::SILENT);
        
-        button = LLUICtrlFactory::getButtonByName(this, "Sound audition btn");
+        button = getChild<LLButton>("Sound audition btn");
        button->setSoundFlags(LLView::SILENT);
        const LLInventoryItem* item = getItem();
diff --git a/linden/indra/newview/llpreviewtexture.cpp b/linden/indra/newview/llpreviewtexture.cpp
index 9f401f4..fe94fa4 100644
--- a/linden/indra/newview/llpreviewtexture.cpp
+++ b/linden/indra/newview/llpreviewtexture.cpp
@@ -45,7 +45,7 @@
 #include "llui.h"
 #include "llviewerimage.h"
 #include "llviewerimagelist.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "lllineeditor.h"
@@ -159,14 +159,14 @@ void LLPreviewTexture::init()
        
        if (mCopyToInv) 
        {
-                gUICtrlFactory->buildFloater(this,"floater_preview_embedded_texture.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_embedded_texture.xml");
                childSetAction("Copy To Inventory",LLPreview::onBtnCopyToInv,this);
        }
        else if (mShowKeepDiscard)
        {
-                gUICtrlFactory->buildFloater(this,"floater_preview_texture_keep_discard.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_texture_keep_discard.xml");
                childSetAction("Keep",onKeepBtn,this);
                childSetAction("Discard",onDiscardBtn,this);
@@ -174,7 +174,7 @@ void LLPreviewTexture::init()
        else 
        {
-                gUICtrlFactory->buildFloater(this,"floater_preview_texture.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_texture.xml");
        }
@@ -193,100 +193,97 @@ void LLPreviewTexture::init()
 void LLPreviewTexture::draw()
 {
-        if( getVisible() )
+        updateDimensions();
+        LLPreview::draw();
+        if (!isMinimized())
        {
-                updateAspectRatio();
+                LLGLSUIDefault gls_ui;
+                LLGLSNoTexture gls_notex;
+                
+                const LLRect& border = mClientRect;
+                LLRect interior = mClientRect;
+                interior.stretch( -PREVIEW_BORDER_WIDTH );
-                LLPreview::draw();
+                // ...border
+                gl_rect_2d( border, LLColor4(0.f, 0.f, 0.f, 1.f));
+                gl_rect_2d_checkerboard( interior );
-                if (!isMinimized())
+                if ( mImage.notNull() )
                {
-                        LLGLSUIDefault gls_ui;
+                        // Draw the texture
-                        LLGLSNoTexture gls_notex;
+                        glColor3f( 1.f, 1.f, 1.f );
-                        
+                        gl_draw_scaled_image(interior.mLeft,
-                        const LLRect& border = mClientRect;
+                                                                interior.mBottom,
-                        LLRect interior = mClientRect;
+                                                                interior.getWidth(),
-                        interior.stretch( -PREVIEW_BORDER_WIDTH );
+                                                                interior.getHeight(),
+                                                                mImage);
-                        // ...border
-                        gl_rect_2d( border, LLColor4(0.f, 0.f, 0.f, 1.f));
+                        // Pump the texture priority
-                        gl_rect_2d_checkerboard( interior );
+                        F32 pixel_area = mLoadingFullImage ? (F32)MAX_IMAGE_AREA  : (F32)(interior.getWidth() * interior.getHeight() );
+                        mImage->addTextureStats( pixel_area );
-                        if ( mImage.notNull() )
+                        // Don't bother decoding more than we can display, unless
+                        // we're loading the full image.
+                        if (!mLoadingFullImage)
                        {
-                                // Draw the texture
+                                S32 int_width = interior.getWidth();
-                                glColor3f( 1.f, 1.f, 1.f );
+                                S32 int_height = interior.getHeight();
-                                gl_draw_scaled_image(interior.mLeft,
+                                mImage->setKnownDrawSize(int_width, int_height);
-                                                                        interior.mBottom,
+                        }
-                                                                        interior.getWidth(),
+                        else
-                                                                        interior.getHeight(),
+                        {
-                                                                        mImage);
+                                // Don't use this feature
+                                mImage->setKnownDrawSize(0, 0);
-                                // 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 )
+                        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 = getRect().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)
                                {
-                                        LLFontGL::sSansSerif->renderUTF8("Receiving:", 0,
+                                        // Downloaded bytes
-                                                interior.mLeft + 4, 
+                                        right = left + llfloor(data_progress * (F32)bar_width);
-                                                interior.mBottom + 4,
+                                        if (right > left)
-                                                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 = getRect().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
+                                                gl_rect_2d(left, top, right, bottom, downloaded_color);
-                                                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);
-                                }
                        }
-                } 
+                        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);
+                        }
+                }
+        } 
 }
@@ -380,7 +377,7 @@ void LLPreviewTexture::onFileLoadedForSave(BOOL success,
 // It takes a while until we get height and width information.
 // When we receive it, reshape the window accordingly.
-void LLPreviewTexture::updateAspectRatio()
+void LLPreviewTexture::updateDimensions()
 {
        if (!mImage) return;
@@ -389,24 +386,21 @@ void LLPreviewTexture::updateAspectRatio()
        // Attempt to make the image 1:1 on screen.
        // If that fails, cut width by half.
        S32 client_width = image_width;
+        S32 client_height = image_height;
        S32 horiz_pad = 2 * (LLPANEL_BORDER_WIDTH + PREVIEW_PAD) + PREVIEW_RESIZE_HANDLE_SIZE;
        S32 vert_pad = PREVIEW_HEADER_SIZE + 2 * CLIENT_RECT_VPAD + LLPANEL_BORDER_WIDTH;       
-        S32 screen_width = gViewerWindow->getWindowWidth();
+        S32 max_client_width = gViewerWindow->getWindowWidth() - horiz_pad;
-        S32 max_client_width = screen_width - horiz_pad;
        S32 max_client_height = gViewerWindow->getWindowHeight() - vert_pad;
-        F32 inv_aspect_ratio = (F32) image_height / (F32) image_width;
-        while ((client_width > max_client_width) || ( llround(client_width * inv_aspect_ratio) > max_client_height ) )
+        while ((client_width > max_client_width) ||
+               (client_height > max_client_height ) )
        {
                client_width /= 2;
+                client_height /= 2;
        }
        S32 view_width = client_width + horiz_pad;
-        // Adjust the height based on the width computed above.
-        S32 client_height = llround(client_width * inv_aspect_ratio);
        S32 view_height = client_height + vert_pad;
        
        // set text on dimensions display (should be moved out of here and into a callback of some sort)
        childSetTextArg("dimensions", "[WIDTH]", llformat("%d", mImage->mFullWidth));
@@ -465,26 +459,20 @@ void LLPreviewTexture::updateAspectRatio()
        else
        {
                client_width = getRect().getWidth() - horiz_pad;
-                client_height = llround(client_width * inv_aspect_ratio);
+                client_height = getRect().getHeight() - vert_pad;
        }
+        S32 max_height = getRect().getHeight() - PREVIEW_BORDER - button_height
+                - CLIENT_RECT_VPAD - info_height - CLIENT_RECT_VPAD - PREVIEW_HEADER_SIZE;
+        S32 max_width = getRect().getWidth() - horiz_pad;
-        S32 max_height = getRect().getHeight() - PREVIEW_BORDER - button_height 
+        client_height = llclamp(client_height, 1, max_height);
-                                    - CLIENT_RECT_VPAD - info_height - CLIENT_RECT_VPAD - PREVIEW_HEADER_SIZE;
+        client_width = llclamp(client_width, 1, max_width);
-        max_height = llmax(max_height, 1);
-        if (client_height > max_height)
-        {
-                F32 aspect_ratio = (F32) image_width / (F32) image_height;
-                client_height = max_height;
-                client_width = llround(client_height * aspect_ratio);
-        }
        
        LLRect window_rect(0, getRect().getHeight(), getRect().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;
-        // 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);
 }
diff --git a/linden/indra/newview/llpreviewtexture.h b/linden/indra/newview/llpreviewtexture.h
index d1e9bb0..5a649da 100644
--- a/linden/indra/newview/llpreviewtexture.h
+++ b/linden/indra/newview/llpreviewtexture.h
@@ -78,11 +78,11 @@ public:
 protected:
        void                            init();
-        void                            updateAspectRatio();
        virtual const char *getTitleName() const { return "Texture"; }
        
-protected:
+private:
+        void                            updateDimensions();
        LLUUID                                          mImageID;
        LLPointer<LLViewerImage>                mImage;
        BOOL                            mLoadingFullImage;
diff --git a/linden/indra/newview/llprogressview.cpp b/linden/indra/newview/llprogressview.cpp
index 10b3115..b4f0704 100644
--- a/linden/indra/newview/llprogressview.cpp
+++ b/linden/indra/newview/llprogressview.cpp
@@ -51,6 +51,7 @@
 #include "llviewerimagelist.h"
 #include "llviewerwindow.h"
 #include "llappviewer.h"
+#include "llweb.h"
 LLProgressView* LLProgressView::sInstance = NULL;
@@ -66,11 +67,10 @@ const S32 ANIMATION_FRAMES = 1; //13;
 // XUI:translate
 LLProgressView::LLProgressView(const std::string& name, const LLRect &rect) 
-: LLPanel(name, rect, FALSE)
+:       LLPanel(name, rect, FALSE),
+        mPercentDone( 0.f ),
+        mMouseDownInActiveArea( false )
 {
-        mPercentDone = 0.f;
-        mDrawBackground = TRUE;
        const S32 CANCEL_BTN_WIDTH = 70;
        const S32 CANCEL_BTN_OFFSET = 16;
        LLRect r;
@@ -89,6 +89,8 @@ LLProgressView::LLProgressView(const std::string& name, const LLRect &rect)
        mFadeTimer.stop();
        setVisible(FALSE);
+        mOutlineRect.set( 0, 0, 0, 0 );
        sInstance = this;
 }
@@ -100,14 +102,44 @@ LLProgressView::~LLProgressView()
        sInstance = NULL;
 }
-EWidgetType LLProgressView::getWidgetType() const
+BOOL LLProgressView::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-        return WIDGET_TYPE_PROGRESS_VIEW;
+        if ( mOutlineRect.pointInRect( x, y ) )
+        {
+                mMouseDownInActiveArea = TRUE;
+                return TRUE;
+        };
+        return LLPanel::handleMouseDown(x, y, mask);
 }
-LLString LLProgressView::getWidgetTag() const
+BOOL LLProgressView::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-        return LL_PROGRESS_VIEW_TAG;
+        if ( mOutlineRect.pointInRect( x, y ) )
+        {
+                if ( mMouseDownInActiveArea )
+                {
+                        if ( ! mMessage.empty() )
+                        {
+                                std::string url_to_open( "" );
+                                size_t start_pos = mMessage.find( "http://" );
+                                if ( start_pos != std::string::npos )
+                                {
+                                        size_t end_pos = mMessage.find_first_of( " \n\r\t", start_pos );
+                                        if ( end_pos != std::string::npos )
+                                                url_to_open = mMessage.substr( start_pos, end_pos - start_pos );
+                                        else
+                                                url_to_open = mMessage.substr( start_pos );
+                                        LLWeb::loadURLExternal( url_to_open );
+                                };
+                        };
+                        return TRUE;
+                };
+        };
+        return LLPanel::handleMouseUp(x, y, mask);
 }
 BOOL LLProgressView::handleHover(S32 x, S32 y, MASK mask)
@@ -115,24 +147,27 @@ BOOL LLProgressView::handleHover(S32 x, S32 y, MASK mask)
        if( childrenHandleHover( x, y, mask ) == NULL )
        {
                lldebugst(LLERR_USER_INPUT) << "hover handled by LLProgressView" << llendl;
-                gViewerWindow->setCursor(UI_CURSOR_WAIT);
+                if ( mOutlineRect.pointInRect( x, y ) )
+                {
+                        gViewerWindow->setCursor(UI_CURSOR_ARROW);
+                }
+                else
+                {
+                        gViewerWindow->setCursor(UI_CURSOR_WAIT);
+                }
        }
        return TRUE;
 }
-BOOL LLProgressView::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLProgressView::handleKeyHere(KEY key, MASK mask)
 {
-        if( getVisible() )
+        // Suck up all keystokes except CTRL-Q.
+        if( ('Q' == key) && (MASK_CONTROL == mask) )
        {
-                // Suck up all keystokes except CTRL-Q.
+                LLAppViewer::instance()->userQuit();
-                if( ('Q' == key) && (MASK_CONTROL == mask) )
-                {
-                        LLAppViewer::instance()->userQuit();
-                }
-                return TRUE;
        }
-        return FALSE;
+        return TRUE;
 }
 void LLProgressView::setVisible(BOOL visible)
@@ -144,6 +179,7 @@ void LLProgressView::setVisible(BOOL visible)
        else if (!getVisible() && visible)
        {
                gFocusMgr.setTopCtrl(this);
+                setFocus(TRUE);
                mFadeTimer.stop();
                mProgressTimer.start();
                LLView::setVisible(visible);
@@ -169,39 +205,37 @@ void LLProgressView::draw()
        }
        // Paint bitmap if we've got one
-        if (mDrawBackground)
+        glPushMatrix();
+        if (gStartImageGL)
        {
-                glPushMatrix();
+                LLGLSUIDefault gls_ui;
-                if (gStartImageGL)
+                LLViewerImage::bindTexture(gStartImageGL);
+                gGL.color4f(1.f, 1.f, 1.f, mFadeTimer.getStarted() ? clamp_rescale(mFadeTimer.getElapsedTimeF32(), 0.f, FADE_IN_TIME, 1.f, 0.f) : 1.f);
+                F32 image_aspect = (F32)gStartImageWidth / (F32)gStartImageHeight;
+                F32 view_aspect = (F32)width / (F32)height;
+                // stretch image to maintain aspect ratio
+                if (image_aspect > view_aspect)
                {
-                        LLGLSUIDefault gls_ui;
+                        glTranslatef(-0.5f * (image_aspect / view_aspect - 1.f) * width, 0.f, 0.f);
-                        LLViewerImage::bindTexture(gStartImageGL);
+                        glScalef(image_aspect / view_aspect, 1.f, 1.f);
-                        gGL.color4f(1.f, 1.f, 1.f, mFadeTimer.getStarted() ? clamp_rescale(mFadeTimer.getElapsedTimeF32(), 0.f, FADE_IN_TIME, 1.f, 0.f) : 1.f);
-                        F32 image_aspect = (F32)gStartImageWidth / (F32)gStartImageHeight;
-                        F32 view_aspect = (F32)width / (F32)height;
-                        // stretch image to maintain aspect ratio
-                        if (image_aspect > view_aspect)
-                        {
-                                glTranslatef(-0.5f * (image_aspect / view_aspect - 1.f) * width, 0.f, 0.f);
-                                glScalef(image_aspect / view_aspect, 1.f, 1.f);
-                        }
-                        else
-                        {
-                                glTranslatef(0.f, -0.5f * (view_aspect / image_aspect - 1.f) * height, 0.f);
-                                glScalef(1.f, view_aspect / image_aspect, 1.f);
-                        }
-                        gl_rect_2d_simple_tex( getRect().getWidth(), getRect().getHeight() );
-                        gStartImageGL->unbindTexture(0, GL_TEXTURE_2D);
                }
                else
                {
-                        LLGLSNoTexture gls_no_texture;
+                        glTranslatef(0.f, -0.5f * (view_aspect / image_aspect - 1.f) * height, 0.f);
-                        gGL.color4f(0.f, 0.f, 0.f, 1.f);
+                        glScalef(1.f, view_aspect / image_aspect, 1.f);
-                        gl_rect_2d(getRect());
                }
-                glPopMatrix();
+                gl_rect_2d_simple_tex( getRect().getWidth(), getRect().getHeight() );
+                gStartImageGL->unbindTexture(0, GL_TEXTURE_2D);
        }
+        else
+        {
+                LLGLSNoTexture gls_no_texture;
+                gGL.color4f(0.f, 0.f, 0.f, 1.f);
+                gl_rect_2d(getRect());
+        }
+        glPopMatrix();
+        // Handle fade-in animation
        if (mFadeTimer.getStarted())
        {
                LLView::draw();
@@ -220,63 +254,96 @@ void LLProgressView::draw()
        S32 line_two_y = line_one_y - LINE_SPACING;
        const LLFontGL* font = LLFontGL::sSansSerif;
-        LLViewerImage* shadow_imagep = gImageList.getImage(LLUUID(gViewerArt.getString("rounded_square_soft.tga")), MIPMAP_FALSE, TRUE);
+        LLUIImagePtr shadow_imagep = LLUI::getUIImage("rounded_square_soft.tga");
-        LLViewerImage* bar_imagep = gImageList.getImage(LLUUID(gViewerArt.getString("rounded_square.tga")), MIPMAP_FALSE, TRUE);
+        LLUIImagePtr bar_fg_imagep = LLUI::getUIImage("progressbar_fill.tga");
+        LLUIImagePtr bar_bg_imagep = LLUI::getUIImage("progressbar_track.tga");
-        //LLColor4 background_color = gColors.getColor("DefaultShadowLight");
+        LLUIImagePtr bar_imagep = LLUI::getUIImage("rounded_square.tga");
-        LLColor4 background_color = LLColor4(0.3254f, 0.4f, 0.5058f, 1.0f);
+        
+        LLColor4 background_color = gColors.getColor("LoginProgressBarBgColor");
        F32 alpha = 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32()));
        // background_color.mV[3] = background_color.mV[3]*alpha;
        LLString top_line = LLAppViewer::instance()->getSecondLifeTitle();
+        S32 bar_bottom = line_two_y - 30;
+        S32 bar_height = 18;
+        S32 bar_width = getRect().getWidth() * 2 / 3;
+        S32 bar_left = (getRect().getWidth() / 2) - (bar_width / 2);
+        // translucent outline box
+        S32 background_box_left = ( ( ( getRect().getWidth() / 2 ) - ( bar_width / 2 ) ) / 4 ) * 3;
+        S32 background_box_top = ( getRect().getHeight() / 2 ) + LINE_SPACING * 5;
+        S32 background_box_right = getRect().getWidth() - background_box_left;
+        S32 background_box_bottom = ( getRect().getHeight() / 2 ) - LINE_SPACING * 5;
+        S32 background_box_width = background_box_right - background_box_left + 1;
+        S32 background_box_height = background_box_top - background_box_bottom + 1;
+//      shadow_imagep->draw( background_box_left + 2, 
+//                                                                      background_box_bottom - 2, 
+//                                                                      background_box_width, 
+//                                                                      background_box_height,
+//                                                                      gColors.getColor( "LoginProgressBoxShadowColor" ) );
+//      bar_outline_imagep->draw( background_box_left, 
+//                                                                      background_box_bottom, 
+//                                                                      background_box_width, 
+//                                                                      background_box_height,
+//                                                                      gColors.getColor("LoginProgressBoxBorderColor") );
+        bar_imagep->draw( background_box_left + 1,
+                                                                        background_box_bottom + 1, 
+                                                                        background_box_width - 2,
+                                                                        background_box_height - 2,
+                                                                        gColors.getColor("LoginProgressBoxCenterColor") );
+        // we'll need this later for catching a click if it looks like it contains a link
+        if ( mMessage.find( "http://" ) != std::string::npos )
+                mOutlineRect.set( background_box_left, background_box_top, background_box_right, background_box_bottom );
+        else
+                mOutlineRect.set( 0, 0, 0, 0 );
+        // draw loading bar
        font->renderUTF8(top_line, 0,
                line_x, line_one_y,
-                LLColor4::white,
+                //LLColor4::white,
+                gColors.getColor("LoginProgressBoxTextColor"),
                LLFontGL::HCENTER, LLFontGL::BASELINE,
                LLFontGL::DROP_SHADOW);
        font->renderUTF8(mText, 0,
                line_x, line_two_y,
-                LLColor4::white,
+                //LLColor4::white,
+                gColors.getColor("LoginProgressBoxTextColor"),
                LLFontGL::HCENTER, LLFontGL::BASELINE,
                LLFontGL::DROP_SHADOW);
+                
-        S32 bar_bottom = line_two_y - 30;
+//      shadow_imagep->draw(
-        S32 bar_height = 18;
+//              bar_left + 2, 
-        S32 bar_width = getRect().getWidth() * 2 / 3;
+//              bar_bottom - 2, 
-        S32 bar_left = (getRect().getWidth() / 2) - (bar_width / 2);
+//              bar_width, 
+//              bar_height,
-        gl_draw_scaled_image_with_border(
+//              gColors.getColor("LoginProgressBoxShadowColor"));
+//      bar_imagep->draw(
+//              bar_left, 
+//              bar_bottom, 
+//              bar_width, 
+//              bar_height,
+//              LLColor4(0.7f, 0.7f, 0.8f, 1.0f));
+        bar_bg_imagep->draw(
                bar_left + 2, 
-                bar_bottom - 2, 
+                bar_bottom + 2,
-                16, 
+                bar_width - 4, 
-                16,
+                bar_height - 4,
-                bar_width, 
-                bar_height,
-                shadow_imagep,
-                gColors.getColor("ColorDropShadow"));
-        gl_draw_scaled_image_with_border(
-                bar_left, 
-                bar_bottom, 
-                16, 
-                16,
-                bar_width, 
-                bar_height,
-                bar_imagep,
-                LLColor4(0.7f, 0.7f, 0.8f, 1.0f));
-        gl_draw_scaled_image_with_border(bar_left + 2, bar_bottom + 2, 16, 16,
-                bar_width - 4, bar_height - 4,
-                bar_imagep,
                background_color);
-        LLColor4 bar_color = LLColor4(0.5764f, 0.6627f, 0.8352f, 1.0f);
+        LLColor4 bar_color = gColors.getColor("LoginProgressBarFgColor");
        bar_color.mV[3] = alpha;
-        gl_draw_scaled_image_with_border(bar_left + 2, bar_bottom + 2, 16, 16,
+        bar_fg_imagep->draw(
-                llround((bar_width - 4) * (mPercentDone / 100.f)), bar_height - 4,
+                bar_left + 2, 
-                bar_imagep,
+                bar_bottom + 2,
+                llround((bar_width - 4) * (mPercentDone / 100.f)), 
+                bar_height - 4,
                bar_color);
        S32 line_three_y = line_two_y - LINE_SPACING * 3;
@@ -284,6 +351,7 @@ void LLProgressView::draw()
        // draw the message if there is one
        if(!mMessage.empty())
        {
+                LLColor4 text_message_color = gColors.getColor("LoginProgressBoxTextColor");
                LLWString wmessage = utf8str_to_wstring(mMessage);
                const F32 MAX_PIXELS = 640.0f;
                S32 chars_left = wmessage.length();
@@ -298,7 +366,8 @@ void LLProgressView::draw()
                        LLWString wbuffer = wmessage.substr(msgidx, chars_this_time);
                        font->render(wbuffer, 0,
                                                 (F32)line_x, (F32)line_three_y,
-                                                 LLColor4::white,
+                                                 //LLColor4::white,
+                                                 gColors.getColor("LoginProgressBoxTextColor"),
                                                 LLFontGL::HCENTER, LLFontGL::BASELINE,
                                                 LLFontGL::DROP_SHADOW);
                        msgidx += chars_this_time;
diff --git a/linden/indra/newview/llprogressview.h b/linden/indra/newview/llprogressview.h
index 2573bd1..853bab7 100644
--- a/linden/indra/newview/llprogressview.h
+++ b/linden/indra/newview/llprogressview.h
@@ -44,12 +44,12 @@ public:
        LLProgressView(const std::string& name, const LLRect& rect);
        virtual ~LLProgressView();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        /*virtual*/ void draw();
+        /*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*/ BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
        /*virtual*/ void setVisible(BOOL visible);
        void setText(const LLString& text);
@@ -63,13 +63,14 @@ public:
        static void onCancelButtonClicked( void* );
 protected:
-        BOOL mDrawBackground;
        F32 mPercentDone;
        LLString mText;
        LLString mMessage;
        LLButton*       mCancelBtn;
        LLFrameTimer    mFadeTimer;
        LLFrameTimer mProgressTimer;
+        LLRect mOutlineRect;
+        bool mMouseDownInActiveArea;
        static LLProgressView* sInstance;
 };
diff --git a/linden/indra/newview/llregionposition.cpp b/linden/indra/newview/llregionposition.cpp
index 49a747e..de2c11d 100644
--- a/linden/indra/newview/llregionposition.cpp
+++ b/linden/indra/newview/llregionposition.cpp
@@ -85,7 +85,7 @@ LLVector3d LLRegionPosition::getPositionGlobal() const
 void LLRegionPosition::setPositionGlobal(const LLVector3d& position_global )
 {
-        mRegionp = gWorldPointer->getRegionFromPosGlobal(position_global);
+        mRegionp = LLWorld::getInstance()->getRegionFromPosGlobal(position_global);
        if (mRegionp)
        {
                mPositionRegion = mRegionp->getPosRegionFromGlobal(position_global);
diff --git a/linden/indra/newview/llsphere.cpp b/linden/indra/newview/llrendersphere.cpp
index 663537c..6e5c850 100644
--- a/linden/indra/newview/llsphere.cpp
+++ b/linden/indra/newview/llrendersphere.cpp
@@ -1,27 +1,17 @@
 /** 
- * @file llsphere.cpp
+ * @file llrendersphere.cpp
- * @brief implementation of the LLSphere class.
+ * @brief implementation of the LLRenderSphere class.
 *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * $LicenseInfo:firstyear=2001&license=internal$
 * 
 * Copyright (c) 2001-2008, Linden Research, Inc.
 * 
- * Second Life Viewer Source Code
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
- * The source code in this file ("Source Code") is provided by Linden Lab
+ * this source code is governed by the Linden Lab Source Code Disclosure
- * to you under the terms of the GNU General Public License, version 2.0
+ * Agreement ("Agreement") previously entered between you and Linden
- * ("GPL"), unless you have obtained a separate licensing agreement
+ * Lab. By accessing, using, copying, modifying or distributing this
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * software, you acknowledge that you have been informed of your
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * obligations under the Agreement and agree to abide by those obligations.
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
 * 
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
@@ -34,13 +24,13 @@
 //      per viewer - then call the appropriate list.  
 #include "llviewerprecompiledheaders.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llerror.h"
-#include "llvertexbuffer.h"
 #include "llglheaders.h"
 GLUquadricObj *gQuadObj2 = NULL;
-LLSphere gSphere;
+LLRenderSphere gSphere;
 void drawSolidSphere(GLdouble radius, GLint slices, GLint stacks);
@@ -108,7 +98,7 @@ void lat2xyz_rad(LLVector3 * result, F32 lat, F32 lon)
 // A couple thoughts on sphere drawing:
 // 1) You need more slices than stacks, but little less than 2:1
 // 2) At low LOD, setting stacks to an odd number avoids a "band" around the equator, making things look smoother
-void LLSphere::prerender()
+void LLRenderSphere::prerender()
 {
        //  Create a series of display lists for different LODs
        mDList[0] = glGenLists(1);
@@ -132,7 +122,7 @@ void LLSphere::prerender()
        glEndList();
 }
-void LLSphere::cleanupGL()
+void LLRenderSphere::cleanupGL()
 {
        for (S32 detail = 0; detail < 4; detail++)
        {
@@ -151,7 +141,7 @@ void LLSphere::cleanupGL()
 //
 // The toughest adjustment is the cutoff for the lowest LOD
 // Maybe we should have more LODs at the low end?
-void LLSphere::render(F32 pixel_area)
+void LLRenderSphere::render(F32 pixel_area)
 {
        S32 level_of_detail;
@@ -171,13 +161,11 @@ void LLSphere::render(F32 pixel_area)
        {
                level_of_detail = 3;
        }
-        LLVertexBuffer::unbind();
        glCallList(mDList[level_of_detail]);
 }
-void LLSphere::render()
+void LLRenderSphere::render()
 {
-        LLVertexBuffer::unbind();
        glCallList(mDList[0]);
 }
diff --git a/linden/indra/newview/llrendersphere.h b/linden/indra/newview/llrendersphere.h
new file mode 100644
index 0000000..ace57e4
--- /dev/null
+++ b/linden/indra/newview/llrendersphere.h
@@ -0,0 +1,47 @@
+/** 
+ * @file llrendersphere.h
+ * @brief interface for the LLRenderSphere class.
+ *
+ * $LicenseInfo:firstyear=2001&license=internal$
+ * 
+ * Copyright (c) 2001-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LL_LLRENDERSPHERE_H
+#define LL_LLRENDERSPHERE_H
+#include "llmath.h"
+#include "v3math.h"
+#include "v4math.h"
+#include "m3math.h"
+#include "m4math.h"
+#include "v4color.h"
+#include "llgl.h"
+void lat2xyz(LLVector3 * result, F32 lat, F32 lon);                     // utility routine
+class LLRenderSphere  
+{
+public:
+        LLGLuint        mDList[5];
+        void prerender();
+        void cleanupGL();
+        void render(F32 pixel_area);            // of a box of size 1.0 at that position
+        void render();                                          // render at highest LOD
+};
+extern LLRenderSphere gSphere;
+#endif
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 366f770..e13d8ea 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -101,7 +101,6 @@ extern LLVector3d		gLastHitObjectOffset;
 //
 // Globals
 //
-LLSelectMgr* gSelectMgr = NULL;
 BOOL gDebugSelectMgr = FALSE;
@@ -157,8 +156,6 @@ static LLPointer<LLObjectSelection> sNullSelection;
 void LLSelectMgr::cleanupGlobals()
 {
-        delete gSelectMgr;
-        gSelectMgr = NULL;
        sNullSelection = NULL;
 }
@@ -507,7 +504,7 @@ BOOL LLSelectMgr::removeObjectFromSelections(const LLUUID &id)
        LLTool *tool = NULL;
        if (!gNoRender)
        {
-                tool = gToolMgr->getCurrentTool();
+                tool = LLToolMgr::getInstance()->getCurrentTool();
                // It's possible that the tool is editing an object that is not selected
                LLViewerObject* tool_editing_object = tool->getEditingObject();
@@ -1432,7 +1429,7 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
                        {
                                object->sendTEUpdate();
                                // 1 particle effect per object                         
-                                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
+                                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
                                effectp->setSourceObject(gAgent.getAvatarObject());
                                effectp->setTargetObject(object);
                                effectp->setDuration(LL_HUD_DUR_SHORT);
@@ -2787,28 +2784,28 @@ 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);
-                        gSelectMgr->sendListToRegions("DeRezObject",
+                        LLSelectMgr::getInstance()->sendListToRegions("DeRezObject",
                                                                                  packDeRezHeader,
                                                                                  packObjectLocalID,
                                                                                  (void*)info,
                                                                                  SEND_ONLY_ROOTS);
                        // VEFFECT: Delete Object - one effect for all deletes
-                        if (gSelectMgr->mSelectedObjects->mSelectType != SELECT_TYPE_HUD)
+                        if (LLSelectMgr::getInstance()->mSelectedObjects->mSelectType != SELECT_TYPE_HUD)
                        {
-                                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
+                                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
-                                effectp->setPositionGlobal( gSelectMgr->getSelectionCenterGlobal() );
+                                effectp->setPositionGlobal( LLSelectMgr::getInstance()->getSelectionCenterGlobal() );
                                effectp->setColor(LLColor4U(gAgent.getEffectColor()));
                                F32 duration = 0.5f;
-                                duration += gSelectMgr->mSelectedObjects->getObjectCount() / 64.f;
+                                duration += LLSelectMgr::getInstance()->mSelectedObjects->getObjectCount() / 64.f;
                                effectp->setDuration(duration);
                        }
                        gAgent.setLookAt(LOOKAT_TARGET_CLEAR);
                        // Keep track of how many objects have been deleted.
-                        F64 obj_delete_count = gViewerStats->getStat(LLViewerStats::ST_OBJECT_DELETE_COUNT);
+                        F64 obj_delete_count = LLViewerStats::getInstance()->getStat(LLViewerStats::ST_OBJECT_DELETE_COUNT);
-                        obj_delete_count += gSelectMgr->mSelectedObjects->getObjectCount();
+                        obj_delete_count += LLSelectMgr::getInstance()->mSelectedObjects->getObjectCount();
-                        gViewerStats->setStat(LLViewerStats::ST_OBJECT_DELETE_COUNT, obj_delete_count );
+                        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_OBJECT_DELETE_COUNT, obj_delete_count );
                }
                break;
        case 1:
@@ -3360,6 +3357,36 @@ void LLSelectMgr::deselectAll()
        updatePointAt();
 }
+void LLSelectMgr::deselectAllForStandingUp()
+{
+        /*
+        This function is similar deselectAll() except for the first if statement
+        which was removed. This is needed as a workaround for DEV-2854
+        */
+        // Zap the angular velocity, as the sim will set it to zero
+        for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
+                 iter != mSelectedObjects->end(); iter++ )
+        {
+                LLViewerObject *objectp = (*iter)->getObject();
+                objectp->setAngularVelocity( 0,0,0 );
+                objectp->setVelocity( 0,0,0 );
+        }
+        sendListToRegions(
+                "ObjectDeselect",
+                packAgentAndSessionID,
+                packObjectLocalID,
+                NULL,
+                SEND_INDIVIDUALS);
+        removeAll();
+        
+        mLastSentSelectionCenterGlobal.clearVec();
+        updatePointAt();
+}
 void LLSelectMgr::deselectUnused()
 {
        // no more outstanding references to this selection
@@ -3496,7 +3523,7 @@ void LLSelectMgr::sendAttach(U8 attachment_point)
                return;
        }
-        BOOL build_mode = gToolMgr->inEdit();
+        BOOL build_mode = LLToolMgr::getInstance()->inEdit();
        // Special case: Attach to default location for this object.
        if (0 == attachment_point ||
                get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, (S32)attachment_point, (LLViewerJointAttachment*)NULL))
@@ -4283,7 +4310,7 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
                                return (node->getObject() && node->getObject()->mID == mID);
                        }
                } func(id);
-                LLSelectNode* node = gSelectMgr->getSelection()->getFirstNode(&func);
+                LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode(&func);
                if (node)
                {
@@ -4426,7 +4453,7 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
                        return (node->getObject() && node->getObject()->mID == mID);
                }
        } func(id);
-        LLSelectNode* node = gSelectMgr->getHoverObjects()->getFirstNode(&func);
+        LLSelectNode* node = LLSelectMgr::getInstance()->getHoverObjects()->getFirstNode(&func);
        if (node)
        {
@@ -4452,7 +4479,7 @@ void LLSelectMgr::processForceObjectSelect(LLMessageSystem* msg, void**)
        if (reset_list)
        {
-                gSelectMgr->deselectAll();
+                LLSelectMgr::getInstance()->deselectAll();
        }
        LLUUID full_id;
@@ -4478,7 +4505,7 @@ void LLSelectMgr::processForceObjectSelect(LLMessageSystem* msg, void**)
        }
        // Don't select, just highlight
-        gSelectMgr->highlightObjectAndFamily(objects);
+        LLSelectMgr::getInstance()->highlightObjectAndFamily(objects);
 }
@@ -4493,9 +4520,7 @@ void LLSelectMgr::updateSilhouettes()
        if (!mSilhouetteImagep)
        {
-                LLUUID id;
+                mSilhouetteImagep = gImageList.getImageFromFile("silhouette.j2c", TRUE, TRUE);
-                id.set( gViewerArt.getString("silhouette.tga") );
-                mSilhouetteImagep = gImageList.getImage(id, TRUE, TRUE);
        }
        mHighlightedObjects->cleanupNodes();
@@ -4547,7 +4572,7 @@ void LLSelectMgr::updateSilhouettes()
                                {
                                        if (num_sils_genned++ < MAX_SILS_PER_FRAME)// && objectp->mDrawable->isVisible())
                                        {
-                                                generateSilhouette(node, gCamera->getOrigin());
+                                                generateSilhouette(node, LLViewerCamera::getInstance()->getOrigin());
                                                changed_objects.push_back(objectp);
                                        }
                                        else if (objectp->isAttachment())
@@ -4712,7 +4737,7 @@ void LLSelectMgr::updateSilhouettes()
                                {
                                        if (num_sils_genned++ < MAX_SILS_PER_FRAME)
                                        {
-                                                generateSilhouette(node, gCamera->getOrigin());
+                                                generateSilhouette(node, LLViewerCamera::getInstance()->getOrigin());
                                                changed_objects.push_back(objectp);                     
                                        }
                                        else if (objectp->isAttachment() && objectp->getRootEdit()->mDrawable.notNull())
@@ -4782,7 +4807,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
                glPushMatrix();
                glLoadIdentity();
                F32 depth = llmax(1.f, hud_bbox.getExtentLocal().mV[VX] * 1.1f);
-                glOrtho(-0.5f * gCamera->getAspect(), 0.5f * gCamera->getAspect(), -0.5f, 0.5f, 0.f, depth);
+                glOrtho(-0.5f * LLViewerCamera::getInstance()->getAspect(), 0.5f * LLViewerCamera::getInstance()->getAspect(), -0.5f, 0.5f, 0.f, depth);
                glMatrixMode(GL_MODELVIEW);
                glPushMatrix();
@@ -5225,8 +5250,8 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                }
                else
                {
-                        LLVector3 view_vector = gCamera->getOrigin() - objectp->getRenderPosition();
+                        LLVector3 view_vector = LLViewerCamera::getInstance()->getOrigin() - objectp->getRenderPosition();
-                        silhouette_thickness = view_vector.magVec() * LLSelectMgr::sHighlightThickness * (gCamera->getView() / gCamera->getDefaultFOV());
+                        silhouette_thickness = view_vector.magVec() * LLSelectMgr::sHighlightThickness * (LLViewerCamera::getInstance()->getView() / LLViewerCamera::getInstance()->getDefaultFOV());
                }               
                F32 animationTime = (F32)LLFrameTimer::getElapsedSeconds();
@@ -5240,10 +5265,10 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                        gGL.blendFunc(GL_SRC_COLOR, GL_ONE);
                        LLGLEnable fog(GL_FOG);
                        glFogi(GL_FOG_MODE, GL_LINEAR);
-                        float d = (gCamera->getPointOfInterest()-gCamera->getOrigin()).magVec();
+                        float d = (LLViewerCamera::getInstance()->getPointOfInterest()-LLViewerCamera::getInstance()->getOrigin()).magVec();
-                        LLColor4 fogCol = color * (F32)llclamp((gSelectMgr->getSelectionCenterGlobal()-gAgent.getCameraPositionGlobal()).magVec()/(gSelectMgr->getBBoxOfSelection().getExtentLocal().magVec()*4), 0.0, 1.0);
+                        LLColor4 fogCol = color * (F32)llclamp((LLSelectMgr::getInstance()->getSelectionCenterGlobal()-gAgent.getCameraPositionGlobal()).magVec()/(LLSelectMgr::getInstance()->getBBoxOfSelection().getExtentLocal().magVec()*4), 0.0, 1.0);
                        glFogf(GL_FOG_START, d);
-                        glFogf(GL_FOG_END, d*(1 + (gCamera->getView() / gCamera->getDefaultFOV())));
+                        glFogf(GL_FOG_END, d*(1 + (LLViewerCamera::getInstance()->getView() / LLViewerCamera::getInstance()->getDefaultFOV())));
                        glFogfv(GL_FOG_COLOR, fogCol.mV);
                        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GEQUAL);
@@ -5371,7 +5396,7 @@ S32 get_family_count(LLViewerObject *parent)
                }
                else
                {
-                        if (gSelectMgr->canSelectObject(child))
+                        if (LLSelectMgr::getInstance()->canSelectObject(child))
                        {
                                count += get_family_count( child );
                        }
@@ -5463,9 +5488,9 @@ void LLSelectMgr::updateSelectionCenter()
        }
        
-        if ( !(gAgentID == LLUUID::null) && gToolMgr) 
+        if ( !(gAgentID == LLUUID::null)) 
        {
-                LLTool          *tool = gToolMgr->getCurrentTool();
+                LLTool          *tool = LLToolMgr::getInstance()->getCurrentTool();
                if (mShowSelection)
                {
                        LLVector3d select_center_global;
@@ -5654,9 +5679,9 @@ void LLSelectMgr::validateSelection()
        {
                virtual bool apply(LLViewerObject* object)
                {
-                        if (!gSelectMgr->canSelectObject(object))
+                        if (!LLSelectMgr::getInstance()->canSelectObject(object))
                        {
-                                gSelectMgr->deselectObjectOnly(object);
+                                LLSelectMgr::getInstance()->deselectObjectOnly(object);
                        }
                        return true;
                }
@@ -6216,4 +6241,199 @@ LLViewerObject* LLObjectSelection::getFirstMoveableObject(BOOL get_parent)
        return getFirstSelectedObject(&func, get_parent);
 }
+//-----------------------------------------------------------------------------
+// Position + Rotation update methods called from LLViewerJoystick
+//-----------------------------------------------------------------------------
+bool LLSelectMgr::selectionMove(const LLVector3& displ,
+                                  F32 roll, F32 pitch, F32 yaw, U32 update_type)
+{
+        if (update_type == UPD_NONE)
+        {
+                return false;
+        }
+        
+        LLVector3 displ_global;
+        bool update_success = true;
+        bool update_position = update_type & UPD_POSITION;
+        bool update_rotation = update_type & UPD_ROTATION;
+        const bool noedit_linked_parts = !gSavedSettings.getBOOL("EditLinkedParts");
+        
+        if (update_position)
+        {
+                // calculate the distance of the object closest to the camera origin
+                F32 min_dist = 1e+30f;
+                LLVector3 obj_pos;
+                for (LLObjectSelection::root_iterator it = getSelection()->root_begin();
+                         it != getSelection()->root_end(); ++it)
+                {
+                        obj_pos = (*it)->getObject()->getPositionEdit();
+                        
+                        F32 obj_dist = dist_vec(obj_pos, LLViewerCamera::getInstance()->getOrigin());
+                        if (obj_dist < min_dist)
+                        {
+                                min_dist = obj_dist;
+                        }
+                }
+                
+                // factor the distance inside the displacement vector. This will get us
+                // equally visible movements for both close and far away selections.
+                min_dist = sqrt(min_dist) / 2;
+                displ_global.setVec(displ.mV[0]*min_dist, 
+                                                        displ.mV[1]*min_dist, 
+                                                        displ.mV[2]*min_dist);
+                // equates to: Displ_global = Displ * M_cam_axes_in_global_frame
+                displ_global = LLViewerCamera::getInstance()->rotateToAbsolute(displ_global);
+        }
+        LLQuaternion new_rot;
+        if (update_rotation)
+        {
+                // let's calculate the rotation around each camera axes 
+                LLQuaternion qx(roll, LLViewerCamera::getInstance()->getAtAxis());
+                LLQuaternion qy(pitch, LLViewerCamera::getInstance()->getLeftAxis());
+                LLQuaternion qz(yaw, LLViewerCamera::getInstance()->getUpAxis());
+                new_rot.setQuat(qx * qy * qz);
+        }
+        
+        LLViewerObject *obj;
+        S32 obj_count = getSelection()->getObjectCount();
+        for (LLObjectSelection::root_iterator it = getSelection()->root_begin();
+                 it != getSelection()->root_end(); ++it )
+        {
+                obj = (*it)->getObject();
+                bool enable_pos = false, enable_rot = false;
+                bool perm_move = obj->permMove();
+                bool perm_mod = obj->permModify();
+                
+                LLVector3d sel_center(getSelectionCenterGlobal());
+                
+                if (update_rotation)
+                {
+                        enable_rot = perm_move 
+                                && ((perm_mod && !obj->isAttachment()) || noedit_linked_parts);
+                        if (enable_rot)
+                        {
+                                int children_count = obj->getChildren().size();
+                                if (obj_count > 1 && children_count > 0)
+                                {
+                                        // for linked sets, rotate around the group center
+                                        const LLVector3 t(obj->getPositionGlobal() - sel_center);
+                                        // Ra = T x R x T^-1
+                                        LLMatrix4 mt;   mt.setTranslation(t);
+                                        const LLMatrix4 mnew_rot(new_rot);
+                                        LLMatrix4 mt_1; mt_1.setTranslation(-t);
+                                        mt *= mnew_rot;
+                                        mt *= mt_1;
+                                        
+                                        // Rfin = Rcur * Ra
+                                        obj->setRotation(obj->getRotationEdit() * mt.quaternion());
+                                        displ_global += mt.getTranslation();
+                                }
+                                else
+                                {
+                                        obj->setRotation(obj->getRotationEdit() * new_rot);
+                                }
+                        }
+                        else
+                        {
+                                update_success = false;
+                        }
+                }
+                if (update_position)
+                {
+                        // establish if object can be moved or not
+                        enable_pos = perm_move && !obj->isAttachment() 
+                        && (perm_mod || noedit_linked_parts);
+                        
+                        if (enable_pos)
+                        {
+                                obj->setPosition(obj->getPositionEdit() + displ_global);
+                        }
+                        else
+                        {
+                                update_success = false;
+                        }
+                }
+                
+                if (enable_pos && enable_rot && obj->mDrawable.notNull())
+                {
+                        gPipeline.markMoved(obj->mDrawable, TRUE);
+                }
+        }
+        
+        if (update_position && update_success && obj_count > 1)
+        {
+                updateSelectionCenter();
+        }
+        
+        return update_success;
+}
+void LLSelectMgr::sendSelectionMove()
+{
+        LLSelectNode *node = mSelectedObjects->getFirstRootNode();
+        if (node == NULL)
+        {
+                return;
+        }
+        
+        //saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+        
+        U32 update_type = UPD_POSITION | UPD_ROTATION;
+        LLViewerRegion *last_region, *curr_region = node->getObject()->getRegion();
+        S32 objects_in_this_packet = 0;
+        // apply to linked objects if unable to select their individual parts 
+        if (!gSavedSettings.getBOOL("EditLinkedParts") && !getTEMode())
+        {
+                // tell simulator to apply to whole linked sets
+                update_type |= UPD_LINKED_SETS;
+        }
+        // prepare first bulk message
+        gMessageSystem->newMessage("MultipleObjectUpdate");
+        packAgentAndSessionID(&update_type);
+        LLViewerObject *obj = NULL;
+        for (LLObjectSelection::root_iterator it = getSelection()->root_begin();
+                 it != getSelection()->root_end(); ++it)
+        {
+                obj = (*it)->getObject();
+                // note: following code adapted from sendListToRegions() (@3924)
+                last_region = curr_region;
+                curr_region = obj->getRegion();
+                // if not simulator or message too big
+                if (curr_region != last_region
+                        || gMessageSystem->isSendFull(NULL)
+                        || objects_in_this_packet >= MAX_OBJECTS_PER_PACKET)
+                {
+                        // send sim the current message and start new one
+                        gMessageSystem->sendReliable(last_region->getHost());
+                        objects_in_this_packet = 0;
+                        gMessageSystem->newMessage("MultipleObjectUpdate");
+                        packAgentAndSessionID(&update_type);
+                }
+                // add another instance of the body of data
+                packMultipleUpdate(*it, &update_type);
+                ++objects_in_this_packet;
+        }
+        // flush remaining messages
+        if (gMessageSystem->getCurrentSendTotal() > 0)
+        {
+                gMessageSystem->sendReliable(curr_region->getHost());
+        }
+        else
+        {
+                gMessageSystem->clearMessage();
+        }
+        //saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+}
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index 0f1ea4c..80ba192 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -321,7 +321,7 @@ public:
        bool applyToRootNodes(LLSelectedNodeFunctor* func, bool firstonly = false);
        bool applyToNodes(LLSelectedNodeFunctor* func, bool firstonly = false);
-        ESelectType getSelectType() { return mSelectType; }
+        ESelectType getSelectType() const { return mSelectType; }
 private:
        const LLObjectSelection &operator=(const LLObjectSelection &);
@@ -333,7 +333,7 @@ private:
 typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle;
-class LLSelectMgr : public LLEditMenuHandler
+class LLSelectMgr : public LLEditMenuHandler, public LLSingleton<LLSelectMgr>
 {
 public:
        static BOOL                                     sRectSelectInclusive;   // do we need to surround an object to pick it?
@@ -419,6 +419,7 @@ public:
        // Send deselect messages to simulator, then clear the list
        void deselectAll();
+        void deselectAllForStandingUp();
        // deselect only if nothing else currently referencing the selection
        void deselectUnused();
@@ -515,6 +516,10 @@ public:
        void selectionResetRotation();                          // sets rotation quat to identity
        void selectionRotateAroundZ(F32 degrees);
+        bool selectionMove(const LLVector3& displ, F32 rx, F32 ry, F32 rz,
+                                           U32 update_type);
+        void sendSelectionMove();
        void sendGodlikeRequest(const LLString& request, const LLString& parameter);
@@ -707,8 +712,6 @@ private:
        LLAnimPauseRequest              mPauseRequest;
 };
-extern LLSelectMgr* gSelectMgr;
 // Utilities
 void dialog_refresh_all();              // Update subscribers to the selection list
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index b6fbfbf..7d715be 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -1806,7 +1806,7 @@ S32 LLSpatialPartition::cull(LLCamera &camera, std::vector<LLDrawable *>* result
 BOOL earlyFail(LLCamera* camera, LLSpatialGroup* group)
 {
-        const F32 vel = (gCamera->getVelocityStat()->getCurrent()+0.2f);
+        const F32 vel = (LLViewerCamera::getInstance()->getVelocityStat()->getCurrent()+0.2f);
        LLVector3 c = group->mBounds[0];
        LLVector3 r = group->mBounds[1]*SG_OCCLUSION_FUDGE + LLVector3(vel,vel,vel);
    
@@ -2497,7 +2497,7 @@ void LLSpatialPartition::renderDebug()
        if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY))
        {
                //sLastMaxTexPriority = lerp(sLastMaxTexPriority, sCurMaxTexPriority, gFrameIntervalSeconds);
-                sLastMaxTexPriority = (F32) gCamera->getScreenPixelArea();
+                sLastMaxTexPriority = (F32) LLViewerCamera::getInstance()->getScreenPixelArea();
                sCurMaxTexPriority = 0.f;
        }
@@ -2510,7 +2510,7 @@ void LLSpatialPartition::renderDebug()
        gPipeline.disableLights();
        LLSpatialBridge* bridge = asBridge();
-        LLCamera* camera = gCamera;
+        LLCamera* camera = LLViewerCamera::getInstance();
        
        if (bridge)
        {
@@ -2527,7 +2527,7 @@ void LLSpatialPartition::renderDebug()
 BOOL LLSpatialPartition::isVisible(const LLVector3& v)
 {
-        if (!gCamera->sphereInFrustum(v, 4.0f))
+        if (!LLViewerCamera::getInstance()->sphereInFrustum(v, 4.0f))
        {
                return FALSE;
        }
@@ -2650,6 +2650,10 @@ void LLCullResult::clear()
        for (U32 i = 0; i < LLRenderPass::NUM_RENDER_TYPES; i++)
        {
+                for (U32 j = 0; j < mRenderMapSize[i]; j++)
+                {
+                        mRenderMap[i][j] = 0;
+                }
                mRenderMapSize[i] = 0;
        }
 }
diff --git a/linden/indra/newview/llsprite.cpp b/linden/indra/newview/llsprite.cpp
index 092d49f..624e03d 100644
--- a/linden/indra/newview/llsprite.cpp
+++ b/linden/indra/newview/llsprite.cpp
@@ -92,7 +92,7 @@ LLSprite::~LLSprite()
 void LLSprite::updateFace(LLFace &face)
 {
-        LLViewerCamera &camera = *gCamera;
+        LLViewerCamera &camera = *LLViewerCamera::getInstance();
        // First, figure out how many vertices/indices we need.
        U32 num_vertices, num_indices;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 36809ee..914b993 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -45,13 +45,10 @@
 #include "audioengine_fmod.h"
 #endif
-#include "audiosettings.h"
 #include "llares.h"
 #include "llcachename.h"
-#include "llcameraview.h"
 #include "llviewercontrol.h"
 #include "lldir.h"
-#include "lleconomy.h"
 #include "llerrorcontrol.h"
 #include "llfiltersd2xmlrpc.h"
 #include "llfocusmgr.h"
@@ -84,6 +81,7 @@
 #include "llcolorscheme.h"
 #include "llconsole.h"
 #include "llcontainerview.h"
+#include "llfloaterstats.h"
 #include "lldebugview.h"
 #include "lldrawable.h"
 #include "lleventnotifier.h"
@@ -91,8 +89,10 @@
 #include "llfeaturemanager.h"
 #include "llfirstuse.h"
 #include "llfloateractivespeakers.h"
+#include "llfloatercamera.h"
 #include "llfloaterchat.h"
 #include "llfloatergesture.h"
+#include "llfloaterhud.h"
 #include "llfloaterland.h"
 #include "llfloatertopobjects.h"
 #include "llfloatertos.h"
@@ -322,8 +322,6 @@ BOOL idle_startup()
        static LLString password;
        static std::vector<const char*> requested_options;
-        static U32 region_size = 256;
-        static F32 region_scale = 1.f;
        static U64 first_sim_handle = 0;
        static LLHost first_sim;
        static std::string first_sim_seed_cap;
@@ -374,11 +372,11 @@ BOOL idle_startup()
                // Initialize stuff that doesn't need data from simulators
                //
-                if (gFeatureManagerp->isSafe())
+                if (LLFeatureManager::getInstance()->isSafe())
                {
                        gViewerWindow->alertXml("DisplaySetToSafe");
                }
-                else if ((gSavedSettings.getS32("LastFeatureVersion") < gFeatureManagerp->getVersion()) &&
+                else if ((gSavedSettings.getS32("LastFeatureVersion") < LLFeatureManager::getInstance()->getVersion()) &&
                                 (gSavedSettings.getS32("LastFeatureVersion") != 0))
                {
                        gViewerWindow->alertXml("DisplaySetToRecommended");
@@ -388,7 +386,7 @@ BOOL idle_startup()
                        gViewerWindow->alertXml(gViewerWindow->getInitAlert());
                }
                        
-                gSavedSettings.setS32("LastFeatureVersion", gFeatureManagerp->getVersion());
+                gSavedSettings.setS32("LastFeatureVersion", LLFeatureManager::getInstance()->getVersion());
                LLString xml_file = LLUI::locateSkin("xui_version.xml");
                LLXMLNodePtr root;
@@ -445,7 +443,7 @@ BOOL idle_startup()
                {
                        fclose(found_template);
-                        U32 port = gAgent.mViewerPort;
+                        U32 port = gSavedSettings.getU32("UserConnectionPort");
                        if ((NET_USE_OS_ASSIGNED_PORT == port) &&   // if nothing specified on command line (-port)
                            (gSavedSettings.getBOOL("ConnectionPortEnabled")))
@@ -495,7 +493,7 @@ BOOL idle_startup()
                                                                  invalid_message_callback,
                                                                  NULL);
-                        if (gSavedSettings.getBOOL("LogMessages") || gLogMessages)
+                        if (gSavedSettings.getBOOL("LogMessages"))
                        {
                                llinfos << "Message logging activated!" << llendl;
                                msg->startLogging();
@@ -514,32 +512,32 @@ BOOL idle_startup()
                        }
                        gAssetStorage = new LLViewerAssetStorage(msg, gXferManager, gVFS);
-                        msg->mPacketRing.setDropPercentage(gPacketDropPercentage);
-                        if (gInBandwidth != 0.f)
+                        F32 dropPercent = gSavedSettings.getF32("PacketDropPercentage");
+                        msg->mPacketRing.setDropPercentage(dropPercent);
+            F32 inBandwidth = gSavedSettings.getF32("InBandwidth"); 
+            F32 outBandwidth = gSavedSettings.getF32("OutBandwidth"); 
+                        if (inBandwidth != 0.f)
                        {
-                                llinfos << "Setting packetring incoming bandwidth to " << gInBandwidth << llendl;
+                                llinfos << "Setting packetring incoming bandwidth to " << inBandwidth << llendl;
                                msg->mPacketRing.setUseInThrottle(TRUE);
-                                msg->mPacketRing.setInBandwidth(gInBandwidth);
+                                msg->mPacketRing.setInBandwidth(inBandwidth);
                        }
-                        if (gOutBandwidth != 0.f)
+                        if (outBandwidth != 0.f)
                        {
-                                llinfos << "Setting packetring outgoing bandwidth to " << gOutBandwidth << llendl;
+                                llinfos << "Setting packetring outgoing bandwidth to " << outBandwidth << llendl;
                                msg->mPacketRing.setUseOutThrottle(TRUE);
-                                msg->mPacketRing.setOutBandwidth(gOutBandwidth);
+                                msg->mPacketRing.setOutBandwidth(outBandwidth);
                        }
                }
-                // initialize the economy
-                gGlobalEconomy = new LLGlobalEconomy();
                //-------------------------------------------------
                // Init audio, which may be needed for prefs dialog
                // or audio cues in connection UI.
                //-------------------------------------------------
-                if (gUseAudio)
+                if (FALSE == gSavedSettings.getBOOL("NoAudio"))
                {
 #if LL_FMOD
                        gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD();
@@ -584,14 +582,13 @@ BOOL idle_startup()
                        show_connect_box = FALSE;
                }
-                else if( !gCmdLineFirstName.empty() 
+        else if(gSavedSettings.getLLSD("UserLoginInfo").size() == 3)
-                        && !gCmdLineLastName.empty() 
+        {
-                        && !gCmdLinePassword.empty())
+            LLSD cmd_line_login = gSavedSettings.getLLSD("UserLoginInfo");
-                {
+                        firstname = cmd_line_login[0].asString();
-                        firstname = gCmdLineFirstName;
+                        lastname = cmd_line_login[1].asString();
-                        lastname = gCmdLineLastName;
-                        LLMD5 pass((unsigned char*)gCmdLinePassword.c_str());
+                        LLMD5 pass((unsigned char*)cmd_line_login[2].asString().c_str());
                        char md5pass[33];               /* Flawfinder: ignore */
                        pass.hex_digest(md5pass);
                        password = md5pass;
@@ -602,9 +599,9 @@ BOOL idle_startup()
 #else
                        show_connect_box = FALSE;
 #endif
-                        gAutoLogin = TRUE;
+                        gSavedSettings.setBOOL("AutoLogin", TRUE);
-                }
+        }
-                else if (gAutoLogin || gSavedSettings.getBOOL("AutoLogin"))
+                else if (gSavedSettings.getBOOL("AutoLogin"))
                {
                        firstname = gSavedSettings.getString("FirstName");
                        lastname = gSavedSettings.getString("LastName");
@@ -695,24 +692,19 @@ BOOL idle_startup()
                        // skip directly to message template verification
                        LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
                }
-                
-                // Create selection manager
+                // *NOTE: This is where LLViewerParcelMgr::getInstance() used to get allocated before becoming LLViewerParcelMgr::getInstance().
-                // Must be done before menus created, because many enabled callbacks
-                // require its existance.
+                // *NOTE: This is where gHUDManager used to bet allocated before becoming LLHUDManager::getInstance().
-                gSelectMgr = new LLSelectMgr();
-                gParcelMgr = new LLViewerParcelMgr();
+                // *NOTE: This is where gMuteList used to get allocated before becoming LLMuteList::getInstance().
-                gHUDManager = new LLHUDManager();
-                gMuteListp = new LLMuteList();
                // Initialize UI
                if (!gNoRender)
                {
                        // Initialize all our tools.  Must be done after saved settings loaded.
-                        if ( gToolMgr == NULL )
+                        // NOTE: This also is where gToolMgr used to be instantiated before being turned into a singleton.
-                        {
+                        LLToolMgr::getInstance()->initTools();
-                                gToolMgr = new LLToolMgr();
-                                gToolMgr->initTools();
-                        }
                        // Quickly get something onscreen to look at.
                        gViewerWindow->initWorldUI();
@@ -779,19 +771,17 @@ BOOL idle_startup()
                // create necessary directories
                // *FIX: these mkdir's should error check
                gDirUtilp->setLindenUserDir(firstname.c_str(), lastname.c_str());
+        LLFile::mkdir(gDirUtilp->getLindenUserDir().c_str());
+        // Set PerAccountSettingsFile to the default value.
+                gSavedSettings.setString("PerAccountSettingsFile",
+                        gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, 
+                                LLAppViewer::instance()->getSettingsFileName("PerAccount")
+                                )
+                        );
-                LLFile::mkdir(gDirUtilp->getLindenUserDir().c_str());
+                // Overwrite default user settings with user settings                                                            
+                LLAppViewer::instance()->loadSettingsFromDirectory(LL_PATH_PER_SL_ACCOUNT);
-                // the mute list is loaded in the llmutelist class.
-                gSavedSettings.loadFromFile(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,"overrides.xml"));
-                // handle the per account settings setup
-                gPerAccountSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, DEFAULT_SETTINGS_FILE);
-                // per account settings.  Set defaults here if not found.  If we get a bunch of these, eventually move to a function.
-                gSavedPerAccountSettings.loadFromFile(gPerAccountSettingsFileName);
                // Need to set the LastLogoff time here if we don't have one.  LastLogoff is used for "Recent Items" calculation
                // and startup time is close enough if we don't have a real value.
@@ -826,7 +816,7 @@ BOOL idle_startup()
                        gSavedSettings.setS32("ServerChoice", gGridChoice);
                        if (gGridChoice == GRID_INFO_OTHER)
                        {
-                                snprintf(gGridName, MAX_STRING, "%s", server_label.c_str());/* Flawfinder: ignore */
+                                gGridName = server_label;/* Flawfinder: ignore */
                        }
                        
                        if ( user_picked_server )
@@ -919,18 +909,15 @@ BOOL idle_startup()
 //#define LL_MINIMIAL_REQUESTED_OPTIONS
                gDebugInfo["GridName"] = gGridInfo[gGridChoice].mLabel;
-                lldebugs << "STATE_LOGIN_AUTH_INIT" << llendl;
+                // *Note: this is where gUserAuth used to be created.
-                if (!gUserAuthp)
-                {
-                        gUserAuthp = new LLUserAuth();
-                }
                requested_options.clear();
                requested_options.push_back("inventory-root");
                requested_options.push_back("inventory-skeleton");
                //requested_options.push_back("inventory-meat");
                //requested_options.push_back("inventory-skel-targets");
 #if (!defined LL_MINIMIAL_REQUESTED_OPTIONS)
-                if(gRequestInventoryLibrary)
+                if(FALSE == gSavedSettings.getBOOL("NoInventoryLibrary"))
                {
                        requested_options.push_back("inventory-lib-root");
                        requested_options.push_back("inventory-lib-owner");
@@ -947,9 +934,10 @@ BOOL idle_startup()
                requested_options.push_back("buddy-list");
                requested_options.push_back("ui-config");
 #endif
+                requested_options.push_back("tutorial_setting");
                requested_options.push_back("login-flags");
                requested_options.push_back("global-textures");
-                if(gGodConnect)
+                if(gSavedSettings.getBOOL("ConnectAsGod"))
                {
                        gSavedSettings.setBOOL("UseDebugMenus", TRUE);
                        requested_options.push_back("god-connect");
@@ -1008,7 +996,7 @@ BOOL idle_startup()
                // TODO if statement here to use web_login_key
                sAuthUriNum = llclamp(sAuthUriNum, 0, (S32)sAuthUris.size()-1);
-                gUserAuthp->authenticate(
+                LLUserAuth::getInstance()->authenticate(
                        sAuthUris[sAuthUriNum].c_str(),
                        auth_method.c_str(),
                        firstname.c_str(),
@@ -1019,7 +1007,6 @@ BOOL idle_startup()
                        gSkipOptionalUpdate,
                        gAcceptTOS,
                        gAcceptCriticalMessage,
-                        gViewerDigest,
                        gLastExecEvent,
                        requested_options,
                        hashed_mac_string,
@@ -1039,17 +1026,13 @@ BOOL idle_startup()
                // in curl, so take "may appear frozen" out of progress bar. JC
                auth_desc = "Logging in...";
                set_startup_status(progress, auth_desc.c_str(), auth_message.c_str());
-                if (!gUserAuthp)
-                {
-                        llerrs << "No userauth in STATE_LOGIN_NO_DATA_YET!" << llendl;
-                }
                // Process messages to keep from dropping circuit.
                LLMessageSystem* msg = gMessageSystem;
                while (msg->checkAllMessages(gFrameCount, gServicePump))
                {
                }
                msg->processAcks();
-                LLUserAuth::UserAuthcode error = gUserAuthp->authResponse();
+                LLUserAuth::UserAuthcode error = LLUserAuth::getInstance()->authResponse();
                if(LLUserAuth::E_NO_RESPONSE_YET == error)
                {
                        //llinfos << "waiting..." << llendl;
@@ -1064,17 +1047,13 @@ BOOL idle_startup()
        if(STATE_LOGIN_DOWNLOADING == LLStartUp::getStartupState())
        {
                lldebugs << "STATE_LOGIN_DOWNLOADING" << llendl;
-                if (!gUserAuthp)
-                {
-                        llerrs << "No userauth in STATE_LOGIN_DOWNLOADING!" << llendl;
-                }
                // Process messages to keep from dropping circuit.
                LLMessageSystem* msg = gMessageSystem;
                while (msg->checkAllMessages(gFrameCount, gServicePump))
                {
                }
                msg->processAcks();
-                LLUserAuth::UserAuthcode error = gUserAuthp->authResponse();
+                LLUserAuth::UserAuthcode error = LLUserAuth::getInstance()->authResponse();
                if(LLUserAuth::E_DOWNLOADING == error)
                {
                        //llinfos << "downloading..." << llendl;
@@ -1095,14 +1074,14 @@ BOOL idle_startup()
                const char* reason_response = NULL;
                const char* message_response = NULL;
                BOOL successful_login = FALSE;
-                LLUserAuth::UserAuthcode error = gUserAuthp->authResponse();
+                LLUserAuth::UserAuthcode error = LLUserAuth::getInstance()->authResponse();
                // reset globals
                gAcceptTOS = FALSE;
                gAcceptCriticalMessage = FALSE;
                switch(error)
                {
                case LLUserAuth::E_OK:
-                        login_response = gUserAuthp->getResponse("login");
+                        login_response = LLUserAuth::getInstance()->getResponse("login");
                        if(login_response && (0 == strcmp(login_response, "true")))
                        {
                                // Yay, login!
@@ -1111,10 +1090,10 @@ BOOL idle_startup()
                        else if(login_response && (0 == strcmp(login_response, "indeterminate")))
                        {
                                llinfos << "Indeterminate login..." << llendl;
-                                sAuthUris = LLSRV::rewriteURI(gUserAuthp->getResponse("next_url"));
+                                sAuthUris = LLSRV::rewriteURI(LLUserAuth::getInstance()->getResponse("next_url"));
                                sAuthUriNum = 0;
-                                auth_method = gUserAuthp->getResponse("next_method");
+                                auth_method = LLUserAuth::getInstance()->getResponse("next_method");
-                                auth_message = gUserAuthp->getResponse("message");
+                                auth_message = LLUserAuth::getInstance()->getResponse("message");
                                if(auth_method.substr(0, 5) == "login")
                                {
                                        auth_desc.assign("Authenticating...");
@@ -1131,8 +1110,8 @@ BOOL idle_startup()
                        else
                        {
                                emsg << "Login failed.\n";
-                                reason_response = gUserAuthp->getResponse("reason");
+                                reason_response = LLUserAuth::getInstance()->getResponse("reason");
-                                message_response = gUserAuthp->getResponse("message");
+                                message_response = LLUserAuth::getInstance()->getResponse("message");
                                if (gHideLinks && reason_response && (0 == strcmp(reason_response, "disabled")))
                                {
@@ -1195,7 +1174,7 @@ BOOL idle_startup()
                                }
                                if(reason_response && (0 == strcmp(reason_response, "update")))
                                {
-                                        auth_message = gUserAuthp->getResponse("message");
+                                        auth_message = LLUserAuth::getInstance()->getResponse("message");
                                        if (show_connect_box)
                                        {
                                                update_app(TRUE, auth_message);
@@ -1210,7 +1189,7 @@ BOOL idle_startup()
                                if(reason_response && (0 == strcmp(reason_response, "optional")))
                                {
                                        llinfos << "Login got optional update" << llendl;
-                                        auth_message = gUserAuthp->getResponse("message");
+                                        auth_message = LLUserAuth::getInstance()->getResponse("message");
                                        if (show_connect_box)
                                        {
                                                update_app(FALSE, auth_message);
@@ -1230,7 +1209,7 @@ BOOL idle_startup()
                        if (sAuthUriNum >= (int) sAuthUris.size() - 1)
                        {
                                emsg << "Unable to connect to " << LLAppViewer::instance()->getSecondLifeTitle() << ".\n";
-                                emsg << gUserAuthp->errorMessage();
+                                emsg << LLUserAuth::getInstance()->errorMessage();
                        } else {
                                sAuthUriNum++;
                                std::ostringstream s;
@@ -1238,7 +1217,6 @@ BOOL idle_startup()
                                  << (sAuthUriNum + 1) << ".  ";
                                auth_desc = s.str();
                                LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE );
-                                sAuthUriNum++;
                                return do_normal_idle;
                        }
                        break;
@@ -1247,33 +1225,27 @@ BOOL idle_startup()
                // Version update and we're not showing the dialog
                if(quit)
                {
-                        delete gUserAuthp;
+                        LLUserAuth::getInstance()->reset();
-                        gUserAuthp = NULL;
                        LLAppViewer::instance()->forceQuit();
                        return FALSE;
                }
                if(successful_login)
                {
-                    if (!gUserAuthp)
-                    {
-                            llerrs << "No userauth on successful login!" << llendl;
-                    }
                        // unpack login data needed by the application
                        const char* text;
-                        text = gUserAuthp->getResponse("agent_id");
+                        text = LLUserAuth::getInstance()->getResponse("agent_id");
                        if(text) gAgentID.set(text);
                        gDebugInfo["AgentID"] = text;
                        
-                        text = gUserAuthp->getResponse("session_id");
+                        text = LLUserAuth::getInstance()->getResponse("session_id");
                        if(text) gAgentSessionID.set(text);
                        gDebugInfo["SessionID"] = text;
                        
-                        text = gUserAuthp->getResponse("secure_session_id");
+                        text = LLUserAuth::getInstance()->getResponse("secure_session_id");
                        if(text) gAgent.mSecureSessionID.set(text);
-                        text = gUserAuthp->getResponse("first_name");
+                        text = LLUserAuth::getInstance()->getResponse("first_name");
                        if(text) 
                        {
                                // Remove quotes from string.  Login.cgi sends these to force
@@ -1282,7 +1254,7 @@ BOOL idle_startup()
                                LLString::replaceChar(firstname, '"', ' ');
                                LLString::trim(firstname);
                        }
-                        text = gUserAuthp->getResponse("last_name");
+                        text = LLUserAuth::getInstance()->getResponse("last_name");
                        if(text) lastname.assign(text);
                        gSavedSettings.setString("FirstName", firstname);
                        gSavedSettings.setString("LastName", lastname);
@@ -1298,7 +1270,7 @@ BOOL idle_startup()
                        gSavedSettings.setBOOL("RememberPassword", remember_password);
                        gSavedSettings.setBOOL("LoginLastLocation", gSavedSettings.getBOOL("LoginLastLocation"));
-                        text = gUserAuthp->getResponse("agent_access");
+                        text = LLUserAuth::getInstance()->getResponse("agent_access");
                        if(text && (text[0] == 'M'))
                        {
                                gAgent.setTeen(false);
@@ -1308,15 +1280,15 @@ BOOL idle_startup()
                                gAgent.setTeen(true);
                        }
-                        text = gUserAuthp->getResponse("start_location");
+                        text = LLUserAuth::getInstance()->getResponse("start_location");
                        if(text) agent_start_location.assign(text);
-                        text = gUserAuthp->getResponse("circuit_code");
+                        text = LLUserAuth::getInstance()->getResponse("circuit_code");
                        if(text)
                        {
                                gMessageSystem->mOurCircuitCode = strtoul(text, NULL, 10);
                        }
-                        const char* sim_ip_str = gUserAuthp->getResponse("sim_ip");
+                        const char* sim_ip_str = LLUserAuth::getInstance()->getResponse("sim_ip");
-                        const char* sim_port_str = gUserAuthp->getResponse("sim_port");
+                        const char* sim_port_str = LLUserAuth::getInstance()->getResponse("sim_port");
                        if(sim_ip_str && sim_port_str)
                        {
                                U32 sim_port = strtoul(sim_port_str, NULL, 10);
@@ -1326,8 +1298,8 @@ BOOL idle_startup()
                                        gMessageSystem->enableCircuit(first_sim, TRUE);
                                }
                        }
-                        const char* region_x_str = gUserAuthp->getResponse("region_x");
+                        const char* region_x_str = LLUserAuth::getInstance()->getResponse("region_x");
-                        const char* region_y_str = gUserAuthp->getResponse("region_y");
+                        const char* region_y_str = LLUserAuth::getInstance()->getResponse("region_y");
                        if(region_x_str && region_y_str)
                        {
                                U32 region_x = strtoul(region_x_str, NULL, 10);
@@ -1335,7 +1307,7 @@ BOOL idle_startup()
                                first_sim_handle = to_region_handle(region_x, region_y);
                        }
                        
-                        const char* look_at_str = gUserAuthp->getResponse("look_at");
+                        const char* look_at_str = LLUserAuth::getInstance()->getResponse("look_at");
                        if (look_at_str)
                        {
 #if !LL_WINDOWS && !LL_DARWIN
@@ -1348,10 +1320,10 @@ BOOL idle_startup()
                                agent_start_look_at = ll_vector3_from_sd(sd);
                        }
-                        text = gUserAuthp->getResponse("seed_capability");
+                        text = LLUserAuth::getInstance()->getResponse("seed_capability");
                        if (text) first_sim_seed_cap = text;
                                                
-                        text = gUserAuthp->getResponse("seconds_since_epoch");
+                        text = LLUserAuth::getInstance()->getResponse("seconds_since_epoch");
                        if(text)
                        {
                                U32 server_utc_time = strtoul(text, NULL, 10);
@@ -1362,7 +1334,7 @@ BOOL idle_startup()
                                }
                        }
-                        const char* home_location = gUserAuthp->getResponse("home");
+                        const char* home_location = LLUserAuth::getInstance()->getResponse("home");
                        if(home_location)
                        {
 #if !LL_WINDOWS && !LL_DARWIN
@@ -1379,9 +1351,9 @@ BOOL idle_startup()
                                gAgent.setHomePosRegion(region_handle, position);
                        }
-                        gAgent.mMOTD.assign(gUserAuthp->getResponse("message"));
+                        gAgent.mMOTD.assign(LLUserAuth::getInstance()->getResponse("message"));
                        LLUserAuth::options_t options;
-                        if(gUserAuthp->getOptions("inventory-root", options))
+                        if(LLUserAuth::getInstance()->getOptions("inventory-root", options))
                        {
                                LLUserAuth::response_t::iterator it;
                                it = options[0].find("folder_id");
@@ -1393,7 +1365,7 @@ BOOL idle_startup()
                        }
                        options.clear();
-                        if(gUserAuthp->getOptions("login-flags", options))
+                        if(LLUserAuth::getInstance()->getOptions("login-flags", options))
                        {
                                LLUserAuth::response_t::iterator it;
                                LLUserAuth::response_t::iterator no_flag = options[0].end();
@@ -1421,7 +1393,7 @@ BOOL idle_startup()
                                }
                        }
                        options.clear();
-                        if (gUserAuthp->getOptions("initial-outfit", options)
+                        if (LLUserAuth::getInstance()->getOptions("initial-outfit", options)
                                && !options.empty())
                        {
                                LLUserAuth::response_t::iterator it;
@@ -1439,7 +1411,7 @@ BOOL idle_startup()
                        }
                        options.clear();
-                        if(gUserAuthp->getOptions("global-textures", options))
+                        if(LLUserAuth::getInstance()->getOptions("global-textures", options))
                        {
                                // Extract sun and moon texture IDs.  These are used
                                // in the LLVOSky constructor, but I can't figure out
@@ -1488,7 +1460,7 @@ BOOL idle_startup()
                                args["[ERROR_MESSAGE]"] = emsg.str();
                                gViewerWindow->alertXml("ErrorMessage", args, login_alert_done);
                                reset_login();
-                                gAutoLogin = FALSE;
+                                gSavedSettings.setBOOL("AutoLogin", FALSE);
                                show_connect_box = TRUE;
                        }
                        
@@ -1508,7 +1480,7 @@ BOOL idle_startup()
                        args["[ERROR_MESSAGE]"] = emsg.str();
                        gViewerWindow->alertXml("ErrorMessage", args, login_alert_done);
                        reset_login();
-                        gAutoLogin = FALSE;
+                        gSavedSettings.setBOOL("AutoLogin", FALSE);
                        show_connect_box = TRUE;
                        // Don't save an incorrect password to disk.
                        save_password_to_disk(NULL);
@@ -1532,7 +1504,7 @@ BOOL idle_startup()
                // Since we connected, save off the settings so the user doesn't have to
                // type the name/password again if we crash.
-                gSavedSettings.saveToFile(gSettingsFileName, TRUE);
+                gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
                //
                // Initialize classes w/graphics stuff.
@@ -1554,11 +1526,11 @@ BOOL idle_startup()
                display_startup();
+                // This is where we used to initialize gWorldp. Original comment said:
                // World initialization must be done after above window init
-                gWorldp = new LLWorld(region_size, region_scale);
                // User might have overridden far clip
-                gWorldp->setLandFarClip( gAgent.mDrawDistance );
+                LLWorld::getInstance()->setLandFarClip( gAgent.mDrawDistance );
                // Before we create the first region, we need to set the agent's mOriginGlobal
                // This is necessary because creating objects before this is set will result in a
@@ -1566,9 +1538,9 @@ BOOL idle_startup()
                gAgent.initOriginGlobal(from_region_handle(first_sim_handle));
-                gWorldp->addRegion(first_sim_handle, first_sim);
+                LLWorld::getInstance()->addRegion(first_sim_handle, first_sim);
-                LLViewerRegion *regionp = gWorldp->getRegionFromHandle(first_sim_handle);
+                LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(first_sim_handle);
                llinfos << "Adding initial simulator " << regionp->getOriginGlobal() << llendl;
                
                LLStartUp::setStartupState( STATE_SEED_GRANTED_WAIT );
@@ -1604,7 +1576,7 @@ BOOL idle_startup()
        {
                update_texture_fetch();
-                if ( gViewerWindow != NULL && gToolMgr != NULL )
+                if ( gViewerWindow != NULL)
                {       // This isn't the first logon attempt, so show the UI
                        gViewerWindow->setNormalControlsVisible( TRUE );
                }       
@@ -1615,11 +1587,16 @@ BOOL idle_startup()
                if (gSavedSettings.getBOOL("ShowCameraControls"))
                {
-                        LLFloaterCamera::show(NULL);
+                        LLFloaterCamera::showInstance();
                }
                if (gSavedSettings.getBOOL("ShowMovementControls"))
                {
-                        LLFloaterMove::show(NULL);
+                        LLFloaterMove::showInstance();
+                }
+                if (gSavedSettings.getBOOL("ShowActiveSpeakers"))
+                {
+                        LLFloaterActiveSpeakers::showInstance();
                }
                if (!gNoRender)
@@ -1630,7 +1607,7 @@ BOOL idle_startup()
                        LLError::logToFixedBuffer(gDebugView->mDebugConsolep);
                        // set initial visibility of debug console
                        gDebugView->mDebugConsolep->setVisible(gSavedSettings.getBOOL("ShowDebugConsole"));
-                        gDebugView->mStatViewp->setVisible(gSavedSettings.getBOOL("ShowDebugStats"));
+                        gDebugView->mFloaterStatsp->setVisible(gSavedSettings.getBOOL("ShowDebugStats"));
                }
                //
@@ -1660,18 +1637,14 @@ BOOL idle_startup()
            LLAppViewer::instance()->loadNameCache();
                }
-                // Data storage for map of world.
+                // *Note: this is where gWorldMap used to be initialized.
-                if ( gWorldMap == NULL )
-                {
-                        gWorldMap = new LLWorldMap();
-                }
                // register null callbacks for audio until the audio system is initialized
                gMessageSystem->setHandlerFuncFast(_PREHASH_SoundTrigger, null_message_callback, NULL);
                gMessageSystem->setHandlerFuncFast(_PREHASH_AttachedSound, null_message_callback, NULL);
                //reset statistics
-                gViewerStats->resetStats();
+                LLViewerStats::getInstance()->resetStats();
                if (!gNoRender)
                {
@@ -1701,14 +1674,14 @@ BOOL idle_startup()
                }
                // Make sure agent knows correct aspect ratio
-                gCamera->setViewHeightInPixels(gViewerWindow->getWindowDisplayHeight());
+                LLViewerCamera::getInstance()->setViewHeightInPixels(gViewerWindow->getWindowDisplayHeight());
                if (gViewerWindow->mWindow->getFullscreen())
                {
-                        gCamera->setAspect(gViewerWindow->getDisplayAspectRatio());
+                        LLViewerCamera::getInstance()->setAspect(gViewerWindow->getDisplayAspectRatio());
                }
                else
                {
-                        gCamera->setAspect( (F32) gViewerWindow->getWindowWidth() / (F32) gViewerWindow->getWindowHeight());
+                        LLViewerCamera::getInstance()->setAspect( (F32) gViewerWindow->getWindowWidth() / (F32) gViewerWindow->getWindowHeight());
                }
                // Move agent to starting location. The position handed to us by
@@ -1821,10 +1794,10 @@ BOOL idle_startup()
                // But not on first login, because you can't see your avatar then
                if (!gAgent.isFirstLogin())
                {
-                        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
+                        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
                        effectp->setPositionGlobal(gAgent.getPositionGlobal());
                        effectp->setColor(LLColor4U(gAgent.getEffectColor()));
-                        gHUDManager->sendEffects();
+                        LLHUDManager::getInstance()->sendEffects();
                }
                LLStartUp::setStartupState( STATE_AGENT_WAIT );         // Go to STATE_AGENT_WAIT
@@ -1870,17 +1843,12 @@ BOOL idle_startup()
        //---------------------------------------------------------------------
        if (STATE_INVENTORY_SEND == LLStartUp::getStartupState())
        {
-                if (!gUserAuthp)
-                {
-                        llerrs << "No userauth in STATE_INVENTORY_SEND!" << llendl;
-                }
                // unpack thin inventory
                LLUserAuth::options_t options;
                options.clear();
                //bool dump_buffer = false;
                
-                if(gUserAuthp->getOptions("inventory-lib-root", options)
+                if(LLUserAuth::getInstance()->getOptions("inventory-lib-root", options)
                        && !options.empty())
                {
                        // should only be one
@@ -1892,7 +1860,7 @@ BOOL idle_startup()
                        }
                }
                options.clear();
-                if(gUserAuthp->getOptions("inventory-lib-owner", options)
+                if(LLUserAuth::getInstance()->getOptions("inventory-lib-owner", options)
                        && !options.empty())
                {
                        // should only be one
@@ -1904,7 +1872,7 @@ BOOL idle_startup()
                        }
                }
                options.clear();
-                if(gUserAuthp->getOptions("inventory-skel-lib", options)
+                if(LLUserAuth::getInstance()->getOptions("inventory-skel-lib", options)
                        && gInventoryLibraryOwner.notNull())
                {
                        if(!gInventory.loadSkeleton(options, gInventoryLibraryOwner))
@@ -1913,7 +1881,7 @@ BOOL idle_startup()
                        }
                }
                options.clear();
-                if(gUserAuthp->getOptions("inventory-skeleton", options))
+                if(LLUserAuth::getInstance()->getOptions("inventory-skeleton", options))
                {
                        if(!gInventory.loadSkeleton(options, gAgent.getID()))
                        {
@@ -1923,7 +1891,7 @@ BOOL idle_startup()
                }
                options.clear();
-                if(gUserAuthp->getOptions("buddy-list", options))
+                if(LLUserAuth::getInstance()->getOptions("buddy-list", options))
                {
                        LLUserAuth::options_t::iterator it = options.begin();
                        LLUserAuth::options_t::iterator end = options.end();
@@ -1954,7 +1922,7 @@ BOOL idle_startup()
                }
                options.clear();
-                if(gUserAuthp->getOptions("ui-config", options))
+                if(LLUserAuth::getInstance()->getOptions("ui-config", options))
                {
                        LLUserAuth::options_t::iterator it = options.begin();
                        LLUserAuth::options_t::iterator end = options.end();
@@ -1971,18 +1939,41 @@ BOOL idle_startup()
                                }
                        }
                }
+                options.clear();
+                if(LLUserAuth::getInstance()->getOptions("tutorial_setting", options))
+                {
+                        LLUserAuth::options_t::iterator it = options.begin();
+                        LLUserAuth::options_t::iterator end = options.end();
+                        for (; it != end; ++it)
+                        {
+                                LLUserAuth::response_t::const_iterator option_it;
+                                option_it = (*it).find("tutorial_url");
+                                if(option_it != (*it).end())
+                                {
+                                        LLFloaterHUD::sTutorialUrl = option_it->second;
+                                }
+                                option_it = (*it).find("use_tutorial");
+                                if(option_it != (*it).end())
+                                {
+                                        if (option_it->second == "true")
+                                        {
+                                                LLFloaterHUD::show();
+                                        }
+                                }
+                        }
+                }
                options.clear();
-                if(gUserAuthp->getOptions("event_categories", options))
+                if(LLUserAuth::getInstance()->getOptions("event_categories", options))
                {
                        LLEventInfo::loadCategories(options);
                }
-                if(gUserAuthp->getOptions("event_notifications", options))
+                if(LLUserAuth::getInstance()->getOptions("event_notifications", options))
                {
                        gEventNotifier.load(options);
                }
                options.clear();
-                if(gUserAuthp->getOptions("classified_categories", options))
+                if(LLUserAuth::getInstance()->getOptions("classified_categories", options))
                {
                        LLClassifiedInfo::loadCategories(options);
                }
@@ -1997,7 +1988,7 @@ BOOL idle_startup()
                LLLandmark::registerCallbacks(msg);
                // request mute list
-                gMuteListp->requestFromServer(gAgent.getID());
+                LLMuteList::getInstance()->requestFromServer(gAgent.getID());
                // Get L$ and ownership credit information
                msg->newMessageFast(_PREHASH_MoneyBalanceRequest);
@@ -2035,13 +2026,12 @@ BOOL idle_startup()
                // We have a region, and just did a big inventory download.
                // We can estimate the user's connection speed, and set their
                // max bandwidth accordingly.  JC
-                if (gSavedSettings.getBOOL("FirstLoginThisInstall")
+                if (gSavedSettings.getBOOL("FirstLoginThisInstall"))
-                        && gUserAuthp)
                {
                        // This is actually a pessimistic computation, because TCP may not have enough
                        // time to ramp up on the (small) default inventory file to truly measure max
                        // bandwidth. JC
-                        F64 rate_bps = gUserAuthp->getLastTransferRateBPS();
+                        F64 rate_bps = LLUserAuth::getInstance()->getLastTransferRateBPS();
                        const F32 FAST_RATE_BPS = 600.f * 1024.f;
                        const F32 FASTER_RATE_BPS = 750.f * 1024.f;
                        F32 max_bandwidth = gViewerThrottle.getMaxBandwidth();
@@ -2076,7 +2066,7 @@ BOOL idle_startup()
                        gSavedSettings.setString( "NextLoginLocation", "" );
                        // and make sure it's saved
-                        gSavedSettings.saveToFile( gSettingsFileName, TRUE );
+                        gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
                };
                if (!gNoRender)
@@ -2088,7 +2078,7 @@ BOOL idle_startup()
                        // many gesture downloads, if this is the user's first
                        // time on this machine or -purge has been run.
                        LLUserAuth::options_t gesture_options;
-                        if (gUserAuthp->getOptions("gestures", gesture_options))
+                        if (LLUserAuth::getInstance()->getOptions("gestures", gesture_options))
                        {
                                llinfos << "Gesture Manager loading " << gesture_options.size()
                                        << llendl;
@@ -2228,8 +2218,9 @@ BOOL idle_startup()
                else
                {
                        update_texture_fetch();
-                        set_startup_status(0.60f + 0.40f * timeout_frac, "Precaching...",
+                        set_startup_status(0.60f + 0.40f * timeout_frac,
-                                                           gAgent.mMOTD.c_str());
+                                "Loading world...",
+                                        gAgent.mMOTD.c_str());
                }
                return do_normal_idle;
@@ -2251,7 +2242,7 @@ BOOL idle_startup()
                else if (wearables_time > MAX_WEARABLES_TIME)
                {
                        gViewerWindow->alertXml("ClothingLoading");
-                        gViewerStats->incStat(LLViewerStats::ST_WEARABLES_TOO_LONG);
+                        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_WEARABLES_TOO_LONG);
                        LLStartUp::setStartupState( STATE_CLEANUP );
                }
                else
@@ -2298,9 +2289,6 @@ BOOL idle_startup()
                // On first start, ask user for gender
                dialog_choose_gender_first_start();
-                // setup voice
-                LLFirstUse::useVoice();
                // Start automatic replay if the flag is set.
                if (gSavedSettings.getBOOL("StatsAutoRun"))
                {
@@ -2311,13 +2299,9 @@ BOOL idle_startup()
                // If we've got a startup URL, dispatch it
                LLStartUp::dispatchURL();
-                
                // Clean up the userauth stuff.
-                if (gUserAuthp)
+                LLUserAuth::getInstance()->reset();
-                {
-                        delete gUserAuthp;
-                        gUserAuthp = NULL;
-                }
                LLStartUp::setStartupState( STATE_STARTED );
@@ -2367,7 +2351,7 @@ void login_show()
        if( GRID_INFO_OTHER == gGridChoice )
        {
-                   LLPanelLogin::addServer( gGridName, GRID_INFO_OTHER );
+                   LLPanelLogin::addServer( gGridName.c_str(), GRID_INFO_OTHER );
        }
        else
        {
@@ -2415,7 +2399,7 @@ void login_callback(S32 option, void *userdata)
                {
                        // turn off the setting and write out to disk
                        gSavedSettings.setBOOL("RememberPassword", FALSE);
-                        gSavedSettings.saveToFile(gSettingsFileName, TRUE);
+                        gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
                        // stomp the saved password on disk
                        save_password_to_disk(NULL);
@@ -2609,7 +2593,7 @@ void login_alert_status(S32 option, void* user_data)
 void update_app(BOOL mandatory, const std::string& auth_msg)
 {
        // store off config state, as we might quit soon
-        gSavedSettings.saveToFile(gSettingsFileName, TRUE);
+        gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);        
        std::ostringstream message;
@@ -2709,7 +2693,7 @@ void update_dialog_callback(S32 option, void *userdata)
        // *TODO change userserver to be grid on both viewer and sim, since
        // userserver no longer exists.
        query_map["userserver"] = gGridName;
-        query_map["channel"] = gChannelName;
+        query_map["channel"] = gSavedSettings.getString("VersionChannelName");
        // *TODO constantize this guy
        LLURI update_url = LLURI::buildHTTP("secondlife.com", 80, "update.php", query_map);
        
@@ -3037,7 +3021,7 @@ void init_stat_view()
        LLRect rect;
        LLStatBar *stat_barp;
-        rect = gDebugView->mStatViewp->getRect();
+        rect = gDebugView->mFloaterStatsp->getRect();
        //
        // Viewer advanced stats
@@ -3048,9 +3032,9 @@ void init_stat_view()
        // Viewer Basic
        //
        stat_viewp = new LLStatView("basic stat view", "Basic", "OpenDebugStatBasic", rect);
-        gDebugView->mStatViewp->addChildAtEnd(stat_viewp);
+        gDebugView->mFloaterStatsp->addStatView(stat_viewp);
-        stat_barp = stat_viewp->addStat("FPS", &(gViewerStats->mFPSStat));
+        stat_barp = stat_viewp->addStat("FPS", &(LLViewerStats::getInstance()->mFPSStat));
        stat_barp->setUnitLabel(" fps");
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 45.f;
@@ -3060,7 +3044,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = TRUE;
        stat_barp->mDisplayHistory = TRUE;
-        stat_barp = stat_viewp->addStat("Bandwidth", &(gViewerStats->mKBitStat));
+        stat_barp = stat_viewp->addStat("Bandwidth", &(LLViewerStats::getInstance()->mKBitStat));
        stat_barp->setUnitLabel(" kbps");
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 900.f;
@@ -3069,7 +3053,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = TRUE;
        stat_barp->mDisplayHistory = FALSE;
-        stat_barp = stat_viewp->addStat("Packet Loss", &(gViewerStats->mPacketsLostPercentStat));
+        stat_barp = stat_viewp->addStat("Packet Loss", &(LLViewerStats::getInstance()->mPacketsLostPercentStat));
        stat_barp->setUnitLabel(" %");
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 5.f;
@@ -3080,7 +3064,7 @@ void init_stat_view()
        stat_barp->mDisplayMean = TRUE;
        stat_barp->mPrecision = 1;
-        stat_barp = stat_viewp->addStat("Ping Sim", &(gViewerStats->mSimPingStat));
+        stat_barp = stat_viewp->addStat("Ping Sim", &(LLViewerStats::getInstance()->mSimPingStat));
        stat_barp->setUnitLabel(" msec");
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 1000.f;
@@ -3092,7 +3076,7 @@ void init_stat_view()
        stat_viewp = new LLStatView("advanced stat view", "Advanced", "OpenDebugStatAdvanced", rect);
-        gDebugView->mStatViewp->addChildAtEnd(stat_viewp);
+        gDebugView->mFloaterStatsp->addStatView(stat_viewp);
        LLStatView *render_statviewp;
@@ -3200,31 +3184,31 @@ void init_stat_view()
        net_statviewp = new LLStatView("network stat view", "Network", "OpenDebugStatNet", rect);
        stat_viewp->addChildAtEnd(net_statviewp);
-        stat_barp = net_statviewp->addStat("Packets In", &(gViewerStats->mPacketsInStat));
+        stat_barp = net_statviewp->addStat("Packets In", &(LLViewerStats::getInstance()->mPacketsInStat));
        stat_barp->setUnitLabel("/sec");
        stat_barp->mDisplayBar = FALSE;
-        stat_barp = net_statviewp->addStat("Packets Out", &(gViewerStats->mPacketsOutStat));
+        stat_barp = net_statviewp->addStat("Packets Out", &(LLViewerStats::getInstance()->mPacketsOutStat));
        stat_barp->setUnitLabel("/sec");
        stat_barp->mDisplayBar = FALSE;
-        stat_barp = net_statviewp->addStat("Objects", &(gViewerStats->mObjectKBitStat));
+        stat_barp = net_statviewp->addStat("Objects", &(LLViewerStats::getInstance()->mObjectKBitStat));
        stat_barp->setUnitLabel(" kbps");
        stat_barp->mDisplayBar = FALSE;
-        stat_barp = net_statviewp->addStat("Texture", &(gViewerStats->mTextureKBitStat));
+        stat_barp = net_statviewp->addStat("Texture", &(LLViewerStats::getInstance()->mTextureKBitStat));
        stat_barp->setUnitLabel(" kbps");
        stat_barp->mDisplayBar = FALSE;
-        stat_barp = net_statviewp->addStat("Asset", &(gViewerStats->mAssetKBitStat));
+        stat_barp = net_statviewp->addStat("Asset", &(LLViewerStats::getInstance()->mAssetKBitStat));
        stat_barp->setUnitLabel(" kbps");
        stat_barp->mDisplayBar = FALSE;
-        stat_barp = net_statviewp->addStat("Layers", &(gViewerStats->mLayersKBitStat));
+        stat_barp = net_statviewp->addStat("Layers", &(LLViewerStats::getInstance()->mLayersKBitStat));
        stat_barp->setUnitLabel(" kbps");
        stat_barp->mDisplayBar = FALSE;
-        stat_barp = net_statviewp->addStat("Actual In", &(gViewerStats->mActualInKBitStat));
+        stat_barp = net_statviewp->addStat("Actual In", &(LLViewerStats::getInstance()->mActualInKBitStat));
        stat_barp->setUnitLabel(" kbps");
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 1024.f;
@@ -3233,7 +3217,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = TRUE;
        stat_barp->mDisplayHistory = FALSE;
-        stat_barp = net_statviewp->addStat("Actual Out", &(gViewerStats->mActualOutKBitStat));
+        stat_barp = net_statviewp->addStat("Actual Out", &(LLViewerStats::getInstance()->mActualOutKBitStat));
        stat_barp->setUnitLabel(" kbps");
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 512.f;
@@ -3242,7 +3226,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = TRUE;
        stat_barp->mDisplayHistory = FALSE;
-        stat_barp = net_statviewp->addStat("VFS Pending Ops", &(gViewerStats->mVFSPendingOperations));
+        stat_barp = net_statviewp->addStat("VFS Pending Ops", &(LLViewerStats::getInstance()->mVFSPendingOperations));
        stat_barp->setUnitLabel(" ");
        stat_barp->mPerSec = FALSE;
        stat_barp->mDisplayBar = FALSE;
@@ -3250,9 +3234,9 @@ void init_stat_view()
        // Simulator stats
        LLStatView *sim_statviewp = new LLStatView("sim stat view", "Simulator", "OpenDebugStatSim", rect);
-        gDebugView->mStatViewp->addChildAtEnd(sim_statviewp);
+        gDebugView->mFloaterStatsp->addStatView(sim_statviewp);
-        stat_barp = sim_statviewp->addStat("Time Dilation", &(gViewerStats->mSimTimeDilation));
+        stat_barp = sim_statviewp->addStat("Time Dilation", &(LLViewerStats::getInstance()->mSimTimeDilation));
        stat_barp->mPrecision = 2;
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 1.f;
@@ -3262,7 +3246,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Sim FPS", &(gViewerStats->mSimFPS));
+        stat_barp = sim_statviewp->addStat("Sim FPS", &(LLViewerStats::getInstance()->mSimFPS));
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 200.f;
        stat_barp->mTickSpacing = 20.f;
@@ -3271,7 +3255,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Physics FPS", &(gViewerStats->mSimPhysicsFPS));
+        stat_barp = sim_statviewp->addStat("Physics FPS", &(LLViewerStats::getInstance()->mSimPhysicsFPS));
        stat_barp->mPrecision = 1;
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 66.f;
@@ -3281,7 +3265,42 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Agent Updates/Sec", &(gViewerStats->mSimAgentUPS));
+        LLStatView *phys_details_viewp;
+        phys_details_viewp = new LLStatView("phys detail view", "Physics Details", "", rect);
+        sim_statviewp->addChildAtEnd(phys_details_viewp);
+        stat_barp = phys_details_viewp->addStat("Pinned Objects", &(LLViewerStats::getInstance()->mPhysicsPinnedTasks));
+        stat_barp->mPrecision = 0;
+        stat_barp->mMinBar = 0.f;
+        stat_barp->mMaxBar = 500.f;
+        stat_barp->mTickSpacing = 10.f;
+        stat_barp->mLabelSpacing = 40.f;
+        stat_barp->mPerSec = FALSE;
+        stat_barp->mDisplayBar = FALSE;
+        stat_barp->mDisplayMean = FALSE;
+        stat_barp = phys_details_viewp->addStat("Low LOD Objects", &(LLViewerStats::getInstance()->mPhysicsLODTasks));
+        stat_barp->mPrecision = 0;
+        stat_barp->mMinBar = 0.f;
+        stat_barp->mMaxBar = 500.f;
+        stat_barp->mTickSpacing = 10.f;
+        stat_barp->mLabelSpacing = 40.f;
+        stat_barp->mPerSec = FALSE;
+        stat_barp->mDisplayBar = FALSE;
+        stat_barp->mDisplayMean = FALSE;
+        stat_barp = phys_details_viewp->addStat("Memory Allocated", &(LLViewerStats::getInstance()->mPhysicsMemoryAllocated));
+        stat_barp->setUnitLabel(" MB");
+        stat_barp->mPrecision = 0;
+        stat_barp->mMinBar = 0.f;
+        stat_barp->mMaxBar = 1024.f;
+        stat_barp->mTickSpacing = 128.f;
+        stat_barp->mLabelSpacing = 256.f;
+        stat_barp->mPerSec = FALSE;
+        stat_barp->mDisplayBar = FALSE;
+        stat_barp->mDisplayMean = FALSE;
+        stat_barp = sim_statviewp->addStat("Agent Updates/Sec", &(LLViewerStats::getInstance()->mSimAgentUPS));
        stat_barp->mPrecision = 1;
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 100.f;
@@ -3291,7 +3310,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Main Agents", &(gViewerStats->mSimMainAgents));
+        stat_barp = sim_statviewp->addStat("Main Agents", &(LLViewerStats::getInstance()->mSimMainAgents));
        stat_barp->mPrecision = 0;
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 80.f;
@@ -3301,7 +3320,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Child Agents", &(gViewerStats->mSimChildAgents));
+        stat_barp = sim_statviewp->addStat("Child Agents", &(LLViewerStats::getInstance()->mSimChildAgents));
        stat_barp->mPrecision = 0;
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 40.f;
@@ -3311,7 +3330,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Objects", &(gViewerStats->mSimObjects));
+        stat_barp = sim_statviewp->addStat("Objects", &(LLViewerStats::getInstance()->mSimObjects));
        stat_barp->mPrecision = 0;
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 30000.f;
@@ -3321,7 +3340,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Active Objects", &(gViewerStats->mSimActiveObjects));
+        stat_barp = sim_statviewp->addStat("Active Objects", &(LLViewerStats::getInstance()->mSimActiveObjects));
        stat_barp->mPrecision = 0;
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 800.f;
@@ -3331,7 +3350,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Active Scripts", &(gViewerStats->mSimActiveScripts));
+        stat_barp = sim_statviewp->addStat("Active Scripts", &(LLViewerStats::getInstance()->mSimActiveScripts));
        stat_barp->mPrecision = 0;
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 800.f;
@@ -3341,7 +3360,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Script Perf", &(gViewerStats->mSimLSLIPS));
+        stat_barp = sim_statviewp->addStat("Script Perf", &(LLViewerStats::getInstance()->mSimLSLIPS));
        stat_barp->setUnitLabel(" ips");
        stat_barp->mPrecision = 0;
        stat_barp->mMinBar = 0.f;
@@ -3352,7 +3371,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Packets In", &(gViewerStats->mSimInPPS));
+        stat_barp = sim_statviewp->addStat("Packets In", &(LLViewerStats::getInstance()->mSimInPPS));
        stat_barp->setUnitLabel(" pps");
        stat_barp->mPrecision = 0;
        stat_barp->mMinBar = 0.f;
@@ -3363,7 +3382,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Packets Out", &(gViewerStats->mSimOutPPS));
+        stat_barp = sim_statviewp->addStat("Packets Out", &(LLViewerStats::getInstance()->mSimOutPPS));
        stat_barp->setUnitLabel(" pps");
        stat_barp->mPrecision = 0;
        stat_barp->mMinBar = 0.f;
@@ -3374,7 +3393,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Pending Downloads", &(gViewerStats->mSimPendingDownloads));
+        stat_barp = sim_statviewp->addStat("Pending Downloads", &(LLViewerStats::getInstance()->mSimPendingDownloads));
        stat_barp->mPrecision = 0;
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 800.f;
@@ -3384,7 +3403,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Pending Uploads", &(gViewerStats->mSimPendingUploads));
+        stat_barp = sim_statviewp->addStat("Pending Uploads", &(LLViewerStats::getInstance()->mSimPendingUploads));
        stat_barp->mPrecision = 0;
        stat_barp->mMinBar = 0.f;
        stat_barp->mMaxBar = 100.f;
@@ -3394,7 +3413,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_statviewp->addStat("Total Unacked Bytes", &(gViewerStats->mSimTotalUnackedBytes));
+        stat_barp = sim_statviewp->addStat("Total Unacked Bytes", &(LLViewerStats::getInstance()->mSimTotalUnackedBytes));
        stat_barp->setUnitLabel(" kb");
        stat_barp->mPrecision = 0;
        stat_barp->mMinBar = 0.f;
@@ -3409,7 +3428,7 @@ void init_stat_view()
        sim_time_viewp = new LLStatView("sim perf view", "Time (ms)", "", rect);
        sim_statviewp->addChildAtEnd(sim_time_viewp);
-        stat_barp = sim_time_viewp->addStat("Total Frame Time", &(gViewerStats->mSimFrameMsec));
+        stat_barp = sim_time_viewp->addStat("Total Frame Time", &(LLViewerStats::getInstance()->mSimFrameMsec));
        stat_barp->setUnitLabel("ms");
        stat_barp->mPrecision = 1;
        stat_barp->mMinBar = 0.f;
@@ -3420,7 +3439,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_time_viewp->addStat("Net Time", &(gViewerStats->mSimNetMsec));
+        stat_barp = sim_time_viewp->addStat("Net Time", &(LLViewerStats::getInstance()->mSimNetMsec));
        stat_barp->setUnitLabel("ms");
        stat_barp->mPrecision = 1;
        stat_barp->mMinBar = 0.f;
@@ -3431,7 +3450,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_time_viewp->addStat("Sim Time (Physics)", &(gViewerStats->mSimSimPhysicsMsec));
+        stat_barp = sim_time_viewp->addStat("Sim Time (Physics)", &(LLViewerStats::getInstance()->mSimSimPhysicsMsec));
        stat_barp->setUnitLabel("ms");
        stat_barp->mPrecision = 1;
        stat_barp->mMinBar = 0.f;
@@ -3442,7 +3461,45 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_time_viewp->addStat("Sim Time (Other)", &(gViewerStats->mSimSimOtherMsec));
+        LLStatView *physics_time_viewp;
+        physics_time_viewp = new LLStatView("physics perf view", "Physics Details (ms)", "", rect);
+        sim_time_viewp->addChildAtEnd(physics_time_viewp);
+        {
+                stat_barp = physics_time_viewp->addStat("Physics Step", &(LLViewerStats::getInstance()->mSimSimPhysicsStepMsec));
+                stat_barp->setUnitLabel("ms");
+                stat_barp->mPrecision = 1;
+                stat_barp->mMinBar = 0.f;
+                stat_barp->mMaxBar = 40.f;
+                stat_barp->mTickSpacing = 10.f;
+                stat_barp->mLabelSpacing = 20.f;
+                stat_barp->mPerSec = FALSE;
+                stat_barp->mDisplayBar = FALSE;
+                stat_barp->mDisplayMean = FALSE;
+                stat_barp = physics_time_viewp->addStat("Update Shapes", &(LLViewerStats::getInstance()->mSimSimPhysicsShapeUpdateMsec));
+                stat_barp->setUnitLabel("ms");
+                stat_barp->mPrecision = 1;
+                stat_barp->mMinBar = 0.f;
+                stat_barp->mMaxBar = 40.f;
+                stat_barp->mTickSpacing = 10.f;
+                stat_barp->mLabelSpacing = 20.f;
+                stat_barp->mPerSec = FALSE;
+                stat_barp->mDisplayBar = FALSE;
+                stat_barp->mDisplayMean = FALSE;
+                stat_barp = physics_time_viewp->addStat("Other", &(LLViewerStats::getInstance()->mSimSimPhysicsOtherMsec));
+                stat_barp->setUnitLabel("ms");
+                stat_barp->mPrecision = 1;
+                stat_barp->mMinBar = 0.f;
+                stat_barp->mMaxBar = 40.f;
+                stat_barp->mTickSpacing = 10.f;
+                stat_barp->mLabelSpacing = 20.f;
+                stat_barp->mPerSec = FALSE;
+                stat_barp->mDisplayBar = FALSE;
+                stat_barp->mDisplayMean = FALSE;
+        }
+        stat_barp = sim_time_viewp->addStat("Sim Time (Other)", &(LLViewerStats::getInstance()->mSimSimOtherMsec));
        stat_barp->setUnitLabel("ms");
        stat_barp->mPrecision = 1;
        stat_barp->mMinBar = 0.f;
@@ -3453,7 +3510,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_time_viewp->addStat("Agent Time", &(gViewerStats->mSimAgentMsec));
+        stat_barp = sim_time_viewp->addStat("Agent Time", &(LLViewerStats::getInstance()->mSimAgentMsec));
        stat_barp->setUnitLabel("ms");
        stat_barp->mPrecision = 1;
        stat_barp->mMinBar = 0.f;
@@ -3464,7 +3521,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_time_viewp->addStat("Images Time", &(gViewerStats->mSimImagesMsec));
+        stat_barp = sim_time_viewp->addStat("Images Time", &(LLViewerStats::getInstance()->mSimImagesMsec));
        stat_barp->setUnitLabel("ms");
        stat_barp->mPrecision = 1;
        stat_barp->mMinBar = 0.f;
@@ -3475,7 +3532,7 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        stat_barp = sim_time_viewp->addStat("Script Time", &(gViewerStats->mSimScriptMsec));
+        stat_barp = sim_time_viewp->addStat("Script Time", &(LLViewerStats::getInstance()->mSimScriptMsec));
        stat_barp->setUnitLabel("ms");
        stat_barp->mPrecision = 1;
        stat_barp->mMinBar = 0.f;
@@ -3486,10 +3543,10 @@ void init_stat_view()
        stat_barp->mDisplayBar = FALSE;
        stat_barp->mDisplayMean = FALSE;
-        LLRect r = gDebugView->mStatViewp->getRect();
+        LLRect r = gDebugView->mFloaterStatsp->getRect();
        // Reshape based on the parameters we set.
-        gDebugView->mStatViewp->reshape(r.getWidth(), r.getHeight());
+        gDebugView->mFloaterStatsp->reshape(r.getWidth(), r.getHeight());
 }
 void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32)
diff --git a/linden/indra/newview/llstatbar.cpp b/linden/indra/newview/llstatbar.cpp
index 15dcd75..13b8358 100644
--- a/linden/indra/newview/llstatbar.cpp
+++ b/linden/indra/newview/llstatbar.cpp
@@ -85,16 +85,6 @@ BOOL LLStatBar::handleMouseDown(S32 x, S32 y, MASK mask)
        return FALSE;
 }
-EWidgetType LLStatBar::getWidgetType() const
-{
-        return WIDGET_TYPE_STAT_BAR;
-}
-LLString LLStatBar::getWidgetTag() const
-{
-        return LL_STAT_BAR_TAG;
-}
 void LLStatBar::draw()
 {
        if (!mStatp)
diff --git a/linden/indra/newview/llstatbar.h b/linden/indra/newview/llstatbar.h
index 7969454..204a8da 100644
--- a/linden/indra/newview/llstatbar.h
+++ b/linden/indra/newview/llstatbar.h
@@ -42,9 +42,6 @@ class LLStatBar : public LLView
 public:
        LLStatBar(const std::string& name, const LLRect& rect);
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual void draw();
        virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/newview/llstatgraph.cpp b/linden/indra/newview/llstatgraph.cpp
index 3725228..c9969a2 100644
--- a/linden/indra/newview/llstatgraph.cpp
+++ b/linden/indra/newview/llstatgraph.cpp
@@ -63,75 +63,61 @@ LLStatGraph::LLStatGraph(const std::string& name, const LLRect& rect)
        mPrecision = 0;
 }
-EWidgetType LLStatGraph::getWidgetType() const
-{
-        return WIDGET_TYPE_STAT_GRAPH;
-}
-LLString LLStatGraph::getWidgetTag() const
-{
-        return LL_STAT_GRAPH_TAG;
-}
 void LLStatGraph::draw()
 {
-        if (getVisible())
+        F32 range, frac;
+        range = mMax - mMin;
+        if (mStatp)
        {
-                F32 range, frac;
+                if (mPerSec)
-                range = mMax - mMin;
-                if (mStatp)
                {
-                        if (mPerSec)
+                        mValue = mStatp->getMeanPerSec();
-                        {
-                                mValue = mStatp->getMeanPerSec();
-                        }
-                        else
-                        {
-                                mValue = mStatp->getMean();
-                        }
                }
-                frac = (mValue - mMin) / range;
+                else
-                frac = llmax(0.f, frac);
-                frac = llmin(1.f, frac);
-                if (mUpdateTimer.getElapsedTimeF32() > 0.5f)
                {
-                        std::string format_str;
+                        mValue = mStatp->getMean();
-                        std::string tmp_str;
-                        format_str = llformat("%%s%%.%df%%s", mPrecision);
-                        tmp_str = llformat(format_str.c_str(), mLabel.c_str(), mValue, mUnits.c_str());
-                        setToolTip(tmp_str);
-                        mUpdateTimer.reset();
                }
+        }
+        frac = (mValue - mMin) / range;
+        frac = llmax(0.f, frac);
+        frac = llmin(1.f, frac);
-                LLColor4 color;
+        if (mUpdateTimer.getElapsedTimeF32() > 0.5f)
+        {
+                std::string format_str;
+                std::string tmp_str;
+                format_str = llformat("%%s%%.%df%%s", mPrecision);
+                tmp_str = llformat(format_str.c_str(), mLabel.c_str(), mValue, mUnits.c_str());
+                setToolTip(tmp_str);
+                mUpdateTimer.reset();
+        }
-                S32 i;
+        LLColor4 color;
-                for (i = 0; i < mNumThresholds - 1; i++)
+        S32 i;
+        for (i = 0; i < mNumThresholds - 1; i++)
+        {
+                if (mThresholds[i] > mValue)
                {
-                        if (mThresholds[i] > mValue)
+                        break;
-                        {
-                                break;
-                        }
                }
-                //gl_drop_shadow(0,  getRect().getHeight(), getRect().getWidth(), 0,
-                //                              gColors.getColor("ColorDropShadow"), 
-                //                              (S32) gSavedSettings.getF32("DropShadowFloater") );
-                
-                color = gColors.getColor( "MenuDefaultBgColor" );
-                gGL.color4fv(color.mV);
-                gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, TRUE);
-                gGL.color4fv(LLColor4::black.mV);
-                gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, FALSE);
-                
-                color = mThresholdColors[i];
-                gGL.color4fv(color.mV);
-                gl_rect_2d(1, llround(frac*getRect().getHeight()), getRect().getWidth() - 1, 0, TRUE);
        }
+        //gl_drop_shadow(0,  getRect().getHeight(), getRect().getWidth(), 0,
+        //                              gColors.getColor("ColorDropShadow"), 
+        //                              (S32) gSavedSettings.getF32("DropShadowFloater") );
+        color = gColors.getColor( "MenuDefaultBgColor" );
+        gGL.color4fv(color.mV);
+        gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, TRUE);
+        gGL.color4fv(LLColor4::black.mV);
+        gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, FALSE);
+        
+        color = mThresholdColors[i];
+        gGL.color4fv(color.mV);
+        gl_rect_2d(1, llround(frac*getRect().getHeight()), getRect().getWidth() - 1, 0, TRUE);
 }
 void LLStatGraph::setValue(const LLSD& value)
diff --git a/linden/indra/newview/llstatgraph.h b/linden/indra/newview/llstatgraph.h
index be44985..db0e1ca 100644
--- a/linden/indra/newview/llstatgraph.h
+++ b/linden/indra/newview/llstatgraph.h
@@ -43,8 +43,6 @@ class LLStatGraph : public LLView
 public:
        LLStatGraph(const std::string& name, const LLRect& rect);
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual void draw();
        void setLabel(const char *label);
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 4e31151..c11d46d 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -74,7 +74,7 @@
 #include "llviewermenu.h"       // for gMenuBarView
 #include "llviewerparcelmgr.h"
 #include "llviewerthrottle.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llvoiceclient.h"      // for gVoiceClient
 #include "lltoolmgr.h"
@@ -137,7 +137,7 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
        mBalanceTimer = new LLFrameTimer();
        mHealthTimer = new LLFrameTimer();
-        gUICtrlFactory->buildPanel(this,"panel_status_bar.xml");
+        LLUICtrlFactory::getInstance()->buildPanel(this,"panel_status_bar.xml");
        // status bar can never get a tab
        setFocusRoot(FALSE);
@@ -145,11 +145,11 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
        // build date necessary data (must do after panel built)
        setupDate();
-        mTextParcelName = LLUICtrlFactory::getTextBoxByName( this, "ParcelNameText" );
+        mTextParcelName = getChild<LLTextBox>("ParcelNameText" );
-        mTextBalance = LLUICtrlFactory::getTextBoxByName( this, "BalanceText" );
+        mTextBalance = getChild<LLTextBox>("BalanceText" );
-        mTextHealth = LLUICtrlFactory::getTextBoxByName( this, "HealthText" );
+        mTextHealth = getChild<LLTextBox>("HealthText" );
-        mTextTime = LLUICtrlFactory::getTextBoxByName( this, "TimeText" );
+        mTextTime = getChild<LLTextBox>("TimeText" );
        
        childSetAction("scriptout", onClickScriptDebug, this);
        childSetAction("health", onClickHealth, this);
@@ -166,6 +166,7 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
        childSetVisible("search_editor", gSavedSettings.getBOOL("ShowSearchBar"));
        childSetVisible("search_btn", gSavedSettings.getBOOL("ShowSearchBar"));
+        childSetVisible("menubar_search_bevel_bg", gSavedSettings.getBOOL("ShowSearchBar"));
        childSetActionTextbox("ParcelNameText", onClickParcelInfo );
        childSetActionTextbox("BalanceText", onClickBalance );
@@ -177,7 +178,7 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
        r.set( x-SIM_STAT_WIDTH, y+MENU_BAR_HEIGHT-1, x, y+1);
        mSGBandwidth = new LLStatGraph("BandwidthGraph", r);
        mSGBandwidth->setFollows(FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
-        mSGBandwidth->setStat(&gViewerStats->mKBitStat);
+        mSGBandwidth->setStat(&LLViewerStats::getInstance()->mKBitStat);
        LLString text = childGetText("bandwidth_tooltip") + " ";
        LLUIString bandwidth_tooltip = text;    // get the text from XML until this widget is XML driven
        mSGBandwidth->setLabel(bandwidth_tooltip.getString().c_str());
@@ -190,7 +191,7 @@ LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
        r.set( x-SIM_STAT_WIDTH, y+MENU_BAR_HEIGHT-1, x, y+1);
        mSGPacketLoss = new LLStatGraph("PacketLossPercent", r);
        mSGPacketLoss->setFollows(FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
-        mSGPacketLoss->setStat(&gViewerStats->mPacketsLostPercentStat);
+        mSGPacketLoss->setStat(&LLViewerStats::getInstance()->mPacketsLostPercentStat);
        text = childGetText("packet_loss_tooltip") + " ";
        LLUIString packet_loss_tooltip = text;  // get the text from XML until this widget is XML driven
        mSGPacketLoss->setLabel(packet_loss_tooltip.getString().c_str());
@@ -220,18 +221,6 @@ LLStatusBar::~LLStatusBar()
        // LLView destructor cleans up children
 }
-//virtual
-EWidgetType LLStatusBar::getWidgetType() const
-{
-        return WIDGET_TYPE_STATUS_BAR;
-}
-//virtual
-LLString LLStatusBar::getWidgetTag() const
-{
-        return LL_STATUS_BAR_TAG;
-}
 //-----------------------------------------------------------------------
 // Overrides
 //-----------------------------------------------------------------------
@@ -321,7 +310,7 @@ void LLStatusBar::refresh()
        }
        LLViewerRegion *region = gAgent.getRegion();
-        LLParcel *parcel = gParcelMgr->getAgentParcel();
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        LLRect buttonRect;
@@ -464,7 +453,7 @@ void LLStatusBar::refresh()
        BOOL canBuyLand = parcel
                && !parcel->isPublic()
-                && gParcelMgr->canAgentBuyParcel(parcel, false);
+                && LLViewerParcelMgr::getInstance()->canAgentBuyParcel(parcel, false);
        childSetVisible("buyland", canBuyLand);
        if (canBuyLand)
        {
@@ -524,7 +513,7 @@ void LLStatusBar::refresh()
                        mRegionDetails.mZ = pos_z;
                        mRegionDetails.mArea = parcel->getArea();
                        mRegionDetails.mForSale = parcel->getForSale();
-                        mRegionDetails.mTraffic = gParcelMgr->getDwelling();
+                        mRegionDetails.mTraffic = LLViewerParcelMgr::getInstance()->getDwelling();
                        
                        if (parcel->isPublic())
                        {
@@ -599,15 +588,14 @@ void LLStatusBar::refresh()
        if (search_visible)
        {
                childGetRect("search_btn", r);
-                r.translate( new_right - r.mRight, 0);
+                //r.translate( new_right - r.mRight, 0);
-                childSetRect("search_btn", r);
+                //childSetRect("search_btn", r);
                new_right -= r.getWidth();
                childGetRect("search_editor", r);
-                r.translate( new_right - r.mRight, 0);
+                //r.translate( new_right - r.mRight, 0);
-                childSetRect("search_editor", r);
+                //childSetRect("search_editor", r);
                new_right -= r.getWidth() + 6;
        }
        else
        {
@@ -645,6 +633,7 @@ void LLStatusBar::refresh()
        // Set search bar visibility
        childSetVisible("search_editor", search_visible);
        childSetVisible("search_btn", search_visible);
+        childSetVisible("menubar_search_bevel_bg", search_visible);
        mSGBandwidth->setVisible(! search_visible);
        mSGPacketLoss->setVisible(! search_visible);
        childSetEnabled("stat_btn", ! search_visible);
@@ -674,7 +663,7 @@ void LLStatusBar::creditBalance(S32 credit)
 void LLStatusBar::setBalance(S32 balance)
 {
-        LLString money_str = gResMgr->getMonetaryString( balance );
+        LLString money_str = LLResMgr::getInstance()->getMonetaryString( balance );
        LLString balance_str = "L$";
        balance_str += money_str;
        mTextBalance->setText( balance_str );
@@ -768,7 +757,7 @@ S32 LLStatusBar::getSquareMetersLeft() const
 static void onClickParcelInfo(void* data)
 {
-        gParcelMgr->selectParcelAt(gAgent.getPositionGlobal());
+        LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
        LLFloaterLand::showInstance();
 }
@@ -832,8 +821,8 @@ static void onClickScripts(void*)
 static void onClickBuyLand(void*)
 {
-        gParcelMgr->selectParcelAt(gAgent.getPositionGlobal());
+        LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
-        gParcelMgr->startBuyLand();
+        LLViewerParcelMgr::getInstance()->startBuyLand();
 }
 // sets the static variables necessary for the date
@@ -917,7 +906,7 @@ void LLStatusBar::onClickSearch(void* data)
 // static
 void LLStatusBar::onClickStatGraph(void* data)
 {
-        LLFloaterLagMeter::show(data);
+        LLFloaterLagMeter::showInstance();
 }
 BOOL can_afford_transaction(S32 cost)
diff --git a/linden/indra/newview/llstatusbar.h b/linden/indra/newview/llstatusbar.h
index d6cf8de..ff898dc 100644
--- a/linden/indra/newview/llstatusbar.h
+++ b/linden/indra/newview/llstatusbar.h
@@ -88,9 +88,6 @@ public:
        LLStatusBar(const std::string& name, const LLRect& rect );
        /*virtual*/ ~LLStatusBar();
        
-        /*virtual*/ EWidgetType getWidgetType() const;
-        /*virtual*/ LLString getWidgetTag() const;
        /*virtual*/ void draw();
        // MANIPULATORS
diff --git a/linden/indra/newview/llstatview.cpp b/linden/indra/newview/llstatview.cpp
index 8a70508..221c4e1 100644
--- a/linden/indra/newview/llstatview.cpp
+++ b/linden/indra/newview/llstatview.cpp
@@ -67,16 +67,6 @@ LLStatView::~LLStatView()
        }
 }
-EWidgetType LLStatView::getWidgetType() const
-{
-        return WIDGET_TYPE_STAT_VIEW;
-}
-LLString LLStatView::getWidgetTag() const
-{
-        return LL_STAT_VIEW_TAG;
-}
 LLStatBar *LLStatView::addStat(const LLString& name, LLStat *statp)
 {
        LLStatBar *stat_barp;
diff --git a/linden/indra/newview/llstatview.h b/linden/indra/newview/llstatview.h
index 523b2af..cff5809 100644
--- a/linden/indra/newview/llstatview.h
+++ b/linden/indra/newview/llstatview.h
@@ -44,8 +44,6 @@ public:
        LLStatView(const LLString& name, const LLString& label, const LLString& setting, const LLRect& rect);
        ~LLStatView();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
 /*
        virtual void draw();
        virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index b5eb902..48e469b 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -175,7 +175,7 @@ void LLSurface::create(const S32 grids_per_edge,
        mOriginGlobal.setVec(origin_global);
-        mPVArray.create(mGridsPerEdge, mGridsPerPatchEdge, gWorldPointer->getRegionScale());
+        mPVArray.create(mGridsPerEdge, mGridsPerPatchEdge, LLWorld::getInstance()->getRegionScale());
        S32 number_of_grids = mGridsPerEdge * mGridsPerEdge;
diff --git a/linden/indra/newview/llsurfacepatch.cpp b/linden/indra/newview/llsurfacepatch.cpp
index 432ca01..5b03c98 100644
--- a/linden/indra/newview/llsurfacepatch.cpp
+++ b/linden/indra/newview/llsurfacepatch.cpp
@@ -845,7 +845,7 @@ void LLSurfacePatch::updateVisibility()
        LLVector3 radius = LLVector3(mRadius, mRadius, mRadius);
        // sphere in frustum on global coordinates
-        if (gCamera->AABBInFrustumNoFarClip(center, radius))
+        if (LLViewerCamera::getInstance()->AABBInFrustumNoFarClip(center, radius))
        {
                // We now need to calculate the render stride based on patchp's distance 
                // from LLCamera render_stride is governed by a relation something like this...
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index 78fb126..66d9a33 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -326,7 +326,7 @@ void LLTexLayerSetBuffer::readBackAndUpload(U8* baked_bump_data)
        stop_glerror();
        llinfos << "Baked " << mTexLayerSet->getBodyRegion() << llendl;
-        gViewerStats->incStat(LLViewerStats::ST_TEX_BAKES);
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_TEX_BAKES);
        llassert( gAgent.getAvatarObject() == mTexLayerSet->getAvatar() );
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 11fd348..c31fbba 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -50,15 +50,6 @@ 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:
@@ -97,10 +88,9 @@ public:
                                                 S32 imagesize, // for writes
                                                 LLTextureCache::Responder* responder)
                : LLWorkerClass(cache, "LLTextureCacheWorker"),
+                  mID(id),
                  mCache(cache),
                  mPriority(priority),
-                  mID(id),
-                  mState(INIT),
                  mReadData(NULL),
                  mWriteData(data),
                  mDataSize(datasize),
@@ -121,8 +111,10 @@ public:
                delete[] mReadData;
        }
-        bool doRead();
+        // override this interface
-        bool doWrite();
+        virtual bool doRead() = 0;
+        virtual bool doWrite() = 0;
        virtual bool doWork(S32 param); // Called from LLWorkerThread::processRequest()
        handle_t read() { addWork(0, LLWorkerThread::PRIORITY_HIGH | mPriority); return mRequestHandle; }
@@ -133,24 +125,23 @@ public:
                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:
+protected:
        LLTextureCache* mCache;
        U32 mPriority;
-        LLUUID mID;
+        LLUUID  mID;
-        e_state mState;
        
        U8* mReadData;
        U8* mWriteData;
        S32 mDataSize;
        S32 mOffset;
        S32 mImageSize;
-        S32 mImageFormat;
+        EImageCodec mImageFormat;
        BOOL mImageLocal;
        LLPointer<LLTextureCache::Responder> mResponder;
        LLLFSThread::handle_t mFileHandle;
@@ -158,19 +149,169 @@ private:
        LLAtomicS32 mBytesRead;
 };
+class LLTextureCacheLocalFileWorker : public LLTextureCacheWorker
+{
+public:
+        LLTextureCacheLocalFileWorker(LLTextureCache* cache, U32 priority, const LLString& filename, const LLUUID& id,
+                                                 U8* data, S32 datasize, S32 offset,
+                                                 S32 imagesize, // for writes
+                                                 LLTextureCache::Responder* responder) 
+                        : LLTextureCacheWorker(cache, priority, id, data, datasize, offset, imagesize, responder),
+                        mFileName(filename)
+        {
+        }
+        virtual bool doRead();
+        virtual bool doWrite();
+        
+private:
+        LLString        mFileName;
+};
+bool LLTextureCacheLocalFileWorker::doRead()
+{
+        S32 local_size = ll_apr_file_size(mFileName, mCache->getFileAPRPool());
+        if (local_size > 0 && mFileName.size() > 4)
+        {
+                mDataSize = local_size; // Only a complete file is valid
+                LLString extension = mFileName.substr(mFileName.size() - 3, 3);
+                mImageFormat = LLImageBase::getCodecFromExtension(extension);
+                if (mImageFormat == IMG_CODEC_INVALID)
+                {
+                        llwarns << "Unrecognized file extension " << extension << " for local texture " << mFileName << llendl;
+                        mDataSize = 0; // no data
+                        return true;
+                }
+        }
+        else
+        {
+                // file doesn't exist
+                mDataSize = 0; // no data
+                return true;
+        }
+#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(mFileName, mCache->getFileAPRPool(),
+                                                                                 mReadData, mOffset, mDataSize);
+        if (bytes_read != mDataSize)
+        {
+                llwarns << "Error reading file from local cache: " << mFileName
+                                << " Bytes: " << mDataSize << " Offset: " << mOffset
+                                << " / " << mDataSize << llendl;
+                mDataSize = 0;
+                delete[] mReadData;
+                mReadData = NULL;
+        }
+        else
+        {
+                mImageSize = local_size;
+                mImageLocal = TRUE;
+        }
+        return true;
+#endif
+}
+bool LLTextureCacheLocalFileWorker::doWrite()
+{
+        // no writes for local files
+        return false;
+}
+class LLTextureCacheRemoteWorker : public LLTextureCacheWorker
+{
+public:
+        LLTextureCacheRemoteWorker(LLTextureCache* cache, U32 priority, const LLUUID& id,
+                                                 U8* data, S32 datasize, S32 offset,
+                                                 S32 imagesize, // for writes
+                                                 LLTextureCache::Responder* responder) 
+                        : LLTextureCacheWorker(cache, priority, id, data, datasize, offset, imagesize, responder),
+                        mState(INIT)
+        {
+        }
+        virtual bool doRead();
+        virtual bool doWrite();
+private:
+        enum e_state
+        {
+                INIT = 0,
+                LOCAL = 1,
+                CACHE = 2,
+                HEADER = 3,
+                BODY = 4
+        };
+        e_state mState;
+};
 //virtual
 void LLTextureCacheWorker::startWork(S32 param)
 {
 }
-bool LLTextureCacheWorker::doRead()
+bool LLTextureCacheRemoteWorker::doRead()
 {
        S32 local_size = 0;
        std::string local_filename;
        
        if (mState == INIT)
        {
-                std::string filename = mCache->getLocalFileName(mID);
+                std::string filename = mCache->getLocalFileName(mID);   
                local_filename = filename + ".j2c";
                local_size = ll_apr_file_size(local_filename, mCache->getFileAPRPool());
                if (local_size == 0)
@@ -468,19 +609,13 @@ bool LLTextureCacheWorker::doRead()
        return false;
 }
-bool LLTextureCacheWorker::doWrite()
+bool LLTextureCacheRemoteWorker::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)
+        if (mState == INIT)
        {
                S32 cur_imagesize = 0;
                S32 offset = mOffset;
@@ -921,9 +1056,9 @@ struct lru_data
                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))
+                        if (a->time > b->time)
                                return true;
-                        else if (!(b->time < a->time))
+                        else if (b->time > a->time)
                                return false;
                        else
                                return a->index < b->index;
@@ -1250,13 +1385,27 @@ S32 LLTextureCache::getHeaderCacheEntry(const LLUUID& id, bool touch, S32* image
 // Calls from texture pipeline thread (i.e. LLTextureFetch)
+LLTextureCache::handle_t LLTextureCache::readFromCache(const LLString& filename, 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 LLTextureCacheLocalFileWorker(this, priority, filename, id,
+                                                                                                                        NULL, size, offset, 0,
+                                                                                                                        responder);
+        handle_t handle = worker->read();
+        mReaders[handle] = worker;
+        return handle;
+}
 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,
+        LLTextureCacheWorker* worker = new LLTextureCacheRemoteWorker(this, priority, id,
                                                                                                                        NULL, size, offset, 0,
                                                                                                                        responder);
        handle_t handle = worker->read();
@@ -1264,6 +1413,7 @@ LLTextureCache::handle_t LLTextureCache::readFromCache(const LLUUID& id, U32 pri
        return handle;
 }
 bool LLTextureCache::readComplete(handle_t handle, bool abort)
 {
        lockWorkers();
@@ -1306,7 +1456,7 @@ LLTextureCache::handle_t LLTextureCache::writeToCache(const LLUUID& id, U32 prio
        {
                LLMutexLock lock(&mWorkersMutex);
                llassert_always(imagesize > 0);
-                LLTextureCacheWorker* worker = new LLTextureCacheWorker(this, priority, id,
+                LLTextureCacheWorker* worker = new LLTextureCacheRemoteWorker(this, priority, id,
                                                                                                                                data, datasize, 0,
                                                                                                                                imagesize, responder);
                handle_t handle = worker->write();
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index c03576b..f083dd0 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -44,6 +44,8 @@ class LLTextureCacheWorker;
 class LLTextureCache : public LLWorkerThread
 {
        friend class LLTextureCacheWorker;
+        friend class LLTextureCacheRemoteWorker;
+        friend class LLTextureCacheLocalFileWorker;
 public:
@@ -81,6 +83,9 @@ public:
        void purgeCache(ELLPath location);
        S64 initCache(ELLPath location, S64 maxsize, BOOL read_only);
+        handle_t readFromCache(const LLString& local_filename, const LLUUID& id, U32 priority, S32 offset, S32 size,
+                                                   ReadResponder* responder);
        handle_t readFromCache(const LLUUID& id, U32 priority, S32 offset, S32 size,
                                                   ReadResponder* responder);
        bool readComplete(handle_t handle, bool abort);
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index ec8d91c..acf4a10 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -64,7 +64,7 @@
 #include "llviewerobject.h"
 #include "llviewercontrol.h"
 #include "llglheaders.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 static const S32 CLOSE_BTN_WIDTH = 100;
@@ -119,7 +119,7 @@ public:
                                                EAcceptance *accept,
                                                LLString& tooltip_msg);
        virtual void    draw();
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleKeyHere(KEY key, MASK mask);
        // LLFloater overrides
        virtual void    onClose(bool app_quitting);
@@ -214,11 +214,11 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
        mNonImmediateFilterPermMask(non_immediate_filter_perm_mask),
        mContextConeOpacity(0.f)
 {
-        gUICtrlFactory->buildFloater(this,"floater_texture_ctrl.xml");
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_texture_ctrl.xml");
-        mTentativeLabel = LLUICtrlFactory::getTextBoxByName(this,"Multiple");
+        mTentativeLabel = getChild<LLTextBox>("Multiple");
-        mResolutionLabel = LLUICtrlFactory::getTextBoxByName(this,"unknown");
+        mResolutionLabel = getChild<LLTextBox>("unknown");
        childSetAction("Default",LLFloaterTexturePicker::onBtnSetToDefault,this);
@@ -229,10 +229,10 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
        childSetCommitCallback("show_folders_check", onShowFolders, this);
        childSetVisible("show_folders_check", FALSE);
        
-        mSearchEdit = (LLSearchEditor*)getCtrlByNameAndType("inventory search editor", WIDGET_TYPE_SEARCH_EDITOR);
+        mSearchEdit = getChild<LLSearchEditor>("inventory search editor");
        mSearchEdit->setSearchCallback(onSearchEdit, this);
                
-        mInventoryPanel = (LLInventoryPanel*)this->getCtrlByNameAndType("inventory panel", WIDGET_TYPE_INVENTORY_PANEL);
+        mInventoryPanel = getChild<LLInventoryPanel>("inventory panel");
        if(mInventoryPanel)
        {
@@ -332,9 +332,9 @@ void LLFloaterTexturePicker::setCanApplyImmediately(BOOL b)
 void LLFloaterTexturePicker::stopUsingPipette()
 {
-        if (gToolMgr && gToolMgr->getCurrentTool() == gToolPipette)
+        if (LLToolMgr::getInstance()->getCurrentTool() == LLToolPipette::getInstance())
        {
-                gToolMgr->clearTransientTool();
+                LLToolMgr::getInstance()->clearTransientTool();
        }
 }
@@ -407,15 +407,15 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop(
        return handled;
 }
-BOOL LLFloaterTexturePicker::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
+BOOL LLFloaterTexturePicker::handleKeyHere(KEY key, MASK mask)
 {
        LLFolderView* root_folder = mInventoryPanel->getRootFolder();
        if (root_folder && mSearchEdit)
        {
-                if (!called_from_parent && mSearchEdit->hasFocus() &&
+                if (mSearchEdit->hasFocus() 
-                    (key == KEY_RETURN || key == KEY_DOWN) &&
+                        && (key == KEY_RETURN || key == KEY_DOWN) 
-                    mask == MASK_NONE)
+                        && mask == MASK_NONE)
                {
                        if (!root_folder->getCurSelectedItem())
                        {
@@ -442,7 +442,7 @@ BOOL LLFloaterTexturePicker::handleKeyHere(KEY key, MASK mask, BOOL called_from_
                }
        }
-        return LLFloater::handleKeyHere(key, mask, called_from_parent);
+        return LLFloater::handleKeyHere(key, mask);
 }
 // virtual
@@ -533,14 +533,14 @@ void LLFloaterTexturePicker::draw()
        // if we're inactive, gray out "apply immediate" checkbox
        childSetEnabled("show_folders_check", mActive && mCanApplyImmediately && !mNoCopyTextureSelected);
        childSetEnabled("Select", mActive);
-        childSetEnabled("Pipette", gToolMgr != NULL && mActive);
+        childSetEnabled("Pipette", mActive);
-        childSetValue("Pipette", gToolMgr && gToolMgr->getCurrentTool() == gToolPipette);
+        childSetValue("Pipette", LLToolMgr::getInstance()->getCurrentTool() == LLToolPipette::getInstance());
        //RN: reset search bar to reflect actual search query (all caps, for example)
        mSearchEdit->setText(mInventoryPanel->getFilterSubString());
        //BOOL allow_copy = FALSE;
-        if( getVisible() && mOwner) 
+        if( mOwner ) 
        {
                mTexturep = NULL;
                if(mImageAssetID.notNull())
@@ -739,18 +739,18 @@ void LLFloaterTexturePicker::onBtnPipette( void* userdata )
 {
        LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
-        if ( self && gToolMgr)
+        if ( self)
        {
                BOOL pipette_active = self->childGetValue("Pipette").asBoolean();
                pipette_active = !pipette_active;
                if (pipette_active)
                {
-                        gToolPipette->setSelectCallback(onTextureSelect, self);
+                        LLToolPipette::getInstance()->setSelectCallback(onTextureSelect, self);
-                        gToolMgr->setTransientTool(gToolPipette);
+                        LLToolMgr::getInstance()->setTransientTool(LLToolPipette::getInstance());
                }
                else
                {
-                        gToolMgr->clearTransientTool();
+                        LLToolMgr::getInstance()->clearTransientTool();
                }
        }
@@ -859,7 +859,7 @@ void LLFloaterTexturePicker::onTextureSelect( const LLTextureEntry& te, void *da
        LLUUID inventory_item_id = self->findItemID(te.getID(), TRUE);
        if (self && inventory_item_id.notNull())
        {
-                gToolPipette->setResult(TRUE, "");
+                LLToolPipette::getInstance()->setResult(TRUE, "");
                self->setImageID(te.getID());
                self->mNoCopyTextureSelected = FALSE;
@@ -875,13 +875,15 @@ void LLFloaterTexturePicker::onTextureSelect( const LLTextureEntry& te, void *da
        }
        else
        {
-                gToolPipette->setResult(FALSE, "You do not have a copy this \nof texture in your inventory");
+                LLToolPipette::getInstance()->setResult(FALSE, "You do not have a copy this \nof texture in your inventory");
        }
 }
 ///////////////////////////////////////////////////////////////////////
 // LLTextureCtrl
+static LLRegisterWidget<LLTextureCtrl> r("texture_picker");
 LLTextureCtrl::LLTextureCtrl(
        const std::string& name, 
        const LLRect &rect, 
@@ -933,6 +935,7 @@ LLTextureCtrl::LLTextureCtrl(
        LLRect border_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
        border_rect.mBottom += BTN_HEIGHT_SMALL;
        mBorder = new LLViewBorder("border", border_rect, LLViewBorder::BEVEL_IN);
+        mBorder->setFollowsAll();
        addChild(mBorder);
        setEnabled(TRUE); // for the tooltip
@@ -1276,50 +1279,47 @@ BOOL LLTextureCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask,
 void LLTextureCtrl::draw()
 {
-        if( getVisible() ) 
+        mBorder->setKeyboardFocusHighlight(hasFocus());
-        {
-                mBorder->setKeyboardFocusHighlight(hasFocus());
-                if (mImageAssetID.isNull() || !mValid)
+        if (mImageAssetID.isNull() || !mValid)
-                {
+        {
-                        mTexturep = NULL;
+                mTexturep = NULL;
-                }
+        }
-                else
+        else
-                {
+        {
-                        mTexturep = gImageList.getImage(mImageAssetID, MIPMAP_YES, IMMEDIATE_NO);
+                mTexturep = gImageList.getImage(mImageAssetID, MIPMAP_YES, IMMEDIATE_NO);
-                        mTexturep->setBoostLevel(LLViewerImage::BOOST_PREVIEW);
+                mTexturep->setBoostLevel(LLViewerImage::BOOST_PREVIEW);
-                }
+        }
-                
+        
-                // Border
+        // Border
-                LLRect border( 0, getRect().getHeight(), getRect().getWidth(), BTN_HEIGHT_SMALL );
+        LLRect border( 0, getRect().getHeight(), getRect().getWidth(), BTN_HEIGHT_SMALL );
-                gl_rect_2d( border, mBorderColor, FALSE );
+        gl_rect_2d( border, mBorderColor, FALSE );
-                // Interior
+        // Interior
-                LLRect interior = border;
+        LLRect interior = border;
-                interior.stretch( -1 ); 
+        interior.stretch( -1 ); 
-                if( mTexturep )
+        if( mTexturep )
+        {
+                if( mTexturep->getComponents() == 4 )
                {
-                        if( mTexturep->getComponents() == 4 )
+                        gl_rect_2d_checkerboard( interior );
-                        {
-                                gl_rect_2d_checkerboard( interior );
-                        }
-                        
-                        gl_draw_scaled_image( interior.mLeft, interior.mBottom, interior.getWidth(), interior.getHeight(), mTexturep);
-                        mTexturep->addTextureStats( (F32)(interior.getWidth() * interior.getHeight()) );
                }
-                else
+                
-                {
+                gl_draw_scaled_image( interior.mLeft, interior.mBottom, interior.getWidth(), interior.getHeight(), mTexturep);
-                        gl_rect_2d( interior, LLColor4::grey, TRUE );
+                mTexturep->addTextureStats( (F32)(interior.getWidth() * interior.getHeight()) );
+        }
+        else
+        {
+                gl_rect_2d( interior, LLColor4::grey, TRUE );
-                        // Draw X
+                // Draw X
-                        gl_draw_x( interior, LLColor4::black );
+                gl_draw_x( interior, LLColor4::black );
-                }
+        }
-                mTentativeLabel->setVisible( !mTexturep.isNull() && getTentative() );
+        mTentativeLabel->setVisible( !mTexturep.isNull() && getTentative() );
-                LLUICtrl::draw();
+        LLUICtrl::draw();
-        }
 }
 BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
@@ -1370,14 +1370,14 @@ BOOL LLTextureCtrl::doDrop(LLInventoryItem* item)
        return TRUE;
 }
-BOOL LLTextureCtrl::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent)
+BOOL LLTextureCtrl::handleUnicodeCharHere(llwchar uni_char)
 {
-        if( getVisible() && getEnabled() && !called_from_parent && ' ' == uni_char )
+        if( ' ' == uni_char )
        {
                showPicker(TRUE);
                return TRUE;
        }
-        return LLUICtrl::handleUnicodeCharHere(uni_char, called_from_parent);
+        return LLUICtrl::handleUnicodeCharHere(uni_char);
 }
 void LLTextureCtrl::setValue( const LLSD& value )
diff --git a/linden/indra/newview/lltexturectrl.h b/linden/indra/newview/lltexturectrl.h
index ec45159..36f6ea2 100644
--- a/linden/indra/newview/lltexturectrl.h
+++ b/linden/indra/newview/lltexturectrl.h
@@ -74,8 +74,6 @@ public:
        virtual ~LLTextureCtrl();
        // LLView interface
-        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_TEXTURE_PICKER; }
-        virtual LLString getWidgetTag() const { return LL_TEXTURE_CTRL_TAG; }
        virtual LLXMLNodePtr getXML(bool save_children = true) const;
        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
@@ -85,7 +83,7 @@ public:
                                                EAcceptance *accept,
                                                LLString& tooltip_msg);
        virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+        virtual BOOL    handleUnicodeCharHere(llwchar uni_char);
        virtual void    draw();
        virtual void    setVisible( BOOL visible );
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 3201055..9399ed3 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -52,8 +52,8 @@
 //static
 class LLTextureFetchWorker : public LLWorkerClass
 {
-        friend class LLTextureFetch;
+friend class LLTextureFetch;
-        
 private:
 #if 0
        class URLResponder : public LLHTTPClient::Responder
@@ -235,6 +235,7 @@ private:
        /*virtual*/ void startWork(S32 param); // called from addWork() (MAIN THREAD)
        /*virtual*/ void endWork(S32 param, bool aborted); // called from doWork() (MAIN THREAD)
+        virtual LLString getName() { return LLString::null; }
        void resetFormattedData();
        
        void setImagePriority(F32 priority);
@@ -339,6 +340,26 @@ private:
        U8 mImageCodec;
 };
+class LLTextureFetchLocalFileWorker : public LLTextureFetchWorker
+{
+friend class LLTextureFetch;
+protected:
+        LLTextureFetchLocalFileWorker(LLTextureFetch* fetcher, const LLString& filename, const LLUUID& id, const LLHost& host,
+                                                 F32 priority, S32 discard, S32 size)
+                :       LLTextureFetchWorker(fetcher, id, host, priority, discard, size),
+                        mFileName(filename)
+        {}
+private:
+        /*virtual*/ LLString getName() { return mFileName; }
+private:
+        LLString mFileName;
+};
 //static
 const char* LLTextureFetchWorker::sStateDescs[] = {
        "INVALID",
@@ -581,9 +602,19 @@ bool LLTextureFetchWorker::doWork(S32 param)
                        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,
+                        if (getName().empty())
-                                                                                                                                          offset, size, responder);
+                        {
+                                mCacheReadHandle = mFetcher->mTextureCache->readFromCache(mID, cache_priority,
+                                                                                                                                                  offset, size, responder);
+                        }
+                        else
+                        {
+                                // read file from local disk
+                                mCacheReadHandle = mFetcher->mTextureCache->readFromCache(getName(), mID, cache_priority,
+                                                                                                                                                  offset, size, responder);
+                        }
                }
                if (mLoaded)
@@ -608,6 +639,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
        if (mState == CACHE_POST)
        {
+                mDesiredSize = llmax(mDesiredSize, FIRST_PACKET_SIZE);
                mCachedSize = mFormattedImage.notNull() ? mFormattedImage->getDataSize() : 0;
                // Successfully loaded
                if ((mCachedSize >= mDesiredSize) || mHaveAllData)
@@ -619,6 +651,11 @@ bool LLTextureFetchWorker::doWork(S32 param)
                }
                else
                {
+                        if (!getName().empty())
+                        {
+                                // failed to load local file, we're done.
+                                return true;
+                        }
                        // need more data
                        mState = LOAD_FROM_NETWORK;
                        // fall through
@@ -1274,7 +1311,13 @@ LLTextureFetch::~LLTextureFetch()
 }
 bool LLTextureFetch::createRequest(const LLUUID& id, const LLHost& host, F32 priority,
-                                                                   S32 w, S32 h, S32 c, S32 discard, bool needs_aux)
+                                                                        S32 w, S32 h, S32 c, S32 desired_discard, bool needs_aux)
+{
+        return createRequest(LLString::null, id, host, priority, w, h, c, desired_discard, needs_aux);
+}
+bool LLTextureFetch::createRequest(const LLString& filename, const LLUUID& id, const LLHost& host, F32 priority,
+                                                                   S32 w, S32 h, S32 c, S32 desired_discard, bool needs_aux)
 {
        if (mDebugPause)
        {
@@ -1298,7 +1341,7 @@ bool LLTextureFetch::createRequest(const LLUUID& id, const LLHost& host, F32 pri
        }
        S32 desired_size;
-        if ((discard == 0) && worker && worker->mFileSize)
+        if ((desired_discard == 0) && worker && worker->mFileSize)
        {
                // if we want the entire image, and we know its size, then get it all
                // (calcDataSizeJ2C() below makes assumptions about how the image
@@ -1311,12 +1354,20 @@ bool LLTextureFetch::createRequest(const LLUUID& id, const LLHost& host, F32 pri
                // If the requester knows the dimentions of the image,
                // this will calculate how much data we need without having to parse the header
-                desired_size = LLImageJ2C::calcDataSizeJ2C(w, h, c, discard);
+                desired_size = LLImageJ2C::calcDataSizeJ2C(w, h, c, desired_discard);
        }
        else
        {
-                desired_size = FIRST_PACKET_SIZE;
+                if (desired_discard == 0)
-                discard = MAX_DISCARD_LEVEL;
+                {
+                        // If we want all of the image, request the maximum possible data
+                        desired_size = MAX_IMAGE_DATA_SIZE;
+                }
+                else
+                {
+                        desired_size = FIRST_PACKET_SIZE;
+                        desired_discard = MAX_DISCARD_LEVEL;
+                }
        }
        if (worker)
        {
@@ -1326,7 +1377,7 @@ bool LLTextureFetch::createRequest(const LLUUID& id, const LLHost& host, F32 pri
                }
                worker->lockWorkData();
                worker->setImagePriority(priority);
-                worker->setDesiredDiscard(discard, desired_size);
+                worker->setDesiredDiscard(desired_discard, desired_size);
                worker->unlockWorkData();
                if (!worker->haveWork())
                {
@@ -1336,12 +1387,21 @@ bool LLTextureFetch::createRequest(const LLUUID& id, const LLHost& host, F32 pri
        }
        else
        {
-                worker = new LLTextureFetchWorker(this, id, host, priority, discard, desired_size);
+                if (filename.empty())
+                {
+                        // do remote fetch
+                        worker = new LLTextureFetchWorker(this, id, host, priority, desired_discard, desired_size);
+                }
+                else
+                {
+                        // do local file fetch
+                        worker = new LLTextureFetchLocalFileWorker(this, filename, id, host, priority, desired_discard, desired_size);
+                }
                mRequestMap[id] = worker;
        }
        worker->mActiveCount++;
        worker->mNeedsAux = needs_aux;
-//      llinfos << "REQUESTED: " << id << " Discard: " << discard << llendl;
+//      llinfos << "REQUESTED: " << id << " Discard: " << desired_discard << llendl;
        return true;
 }
diff --git a/linden/indra/newview/lltexturefetch.h b/linden/indra/newview/lltexturefetch.h
index d196978..195cb98 100644
--- a/linden/indra/newview/lltexturefetch.h
+++ b/linden/indra/newview/lltexturefetch.h
@@ -55,6 +55,8 @@ public:
        bool createRequest(const LLUUID& id, const LLHost& host, F32 priority,
                                           S32 w, S32 h, S32 c, S32 discard, bool needs_aux);
+        bool createRequest(const LLString& filename, 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);
diff --git a/linden/indra/newview/lltextureview.cpp b/linden/indra/newview/lltextureview.cpp
index 09392f4..db2853e 100644
--- a/linden/indra/newview/lltextureview.cpp
+++ b/linden/indra/newview/lltextureview.cpp
@@ -89,9 +89,6 @@ public:
        {
        }
-        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.
@@ -376,9 +373,6 @@ public:
                setRect(LLRect(0,0,100,line_height * 4));
        }
-        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.
@@ -545,17 +539,6 @@ LLTextureView::~LLTextureView()
        mGLTexMemBar = 0;
 }
-EWidgetType LLTextureView::getWidgetType() const
-{
-        return WIDGET_TYPE_TEXTURE_VIEW;
-}
-LLString LLTextureView::getWidgetTag() const
-{
-        return LL_TEXTURE_VIEW_TAG;
-}
 typedef std::pair<F32,LLViewerImage*> decode_pair_t;
 struct compare_decode_pair
 {
@@ -637,7 +620,7 @@ void LLTextureView::draw()
                        if (!mOrderFetch)
                        {
 #if 1
-                        if (pri < HIGH_PRIORITY && gSelectMgr)
+                        if (pri < HIGH_PRIORITY && LLSelectMgr::getInstance())
                        {
                                struct f : public LLSelectedTEFunctor
                                {
@@ -649,7 +632,7 @@ void LLTextureView::draw()
                                        }
                                } func(imagep);
                                const bool firstonly = true;
-                                bool match = gSelectMgr->getSelection()->applyToTEs(&func, firstonly);
+                                bool match = LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func, firstonly);
                                if (match)
                                {
                                        pri += 3*HIGH_PRIORITY;
diff --git a/linden/indra/newview/lltextureview.h b/linden/indra/newview/lltextureview.h
index bf0c518..fd4b80d 100644
--- a/linden/indra/newview/lltextureview.h
+++ b/linden/indra/newview/lltextureview.h
@@ -46,9 +46,6 @@ public:
        LLTextureView(const std::string& name, const LLRect& rect);
        ~LLTextureView();
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        /*virtual*/ void draw();
        /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
        /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp
index 394b64d..00395e2 100644
--- a/linden/indra/newview/lltool.cpp
+++ b/linden/indra/newview/lltool.cpp
@@ -162,7 +162,7 @@ LLTool* LLTool::getOverrideTool(MASK mask)
 {
        if (mask & MASK_ALT)
        {
-                return gToolCamera;
+                return LLToolCamera::getInstance();
        }
        return NULL;
 }
diff --git a/linden/indra/newview/lltoolbar.cpp b/linden/indra/newview/lltoolbar.cpp
index 9edc469..8d103ce 100644
--- a/linden/indra/newview/lltoolbar.cpp
+++ b/linden/indra/newview/lltoolbar.cpp
@@ -57,7 +57,7 @@
 #include "llviewermenu.h"
 #include "llfirstuse.h"
 #include "llviewerparcelmgr.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 #include "lltoolgrab.h"
 #include "llcombobox.h"
@@ -158,10 +158,10 @@ BOOL LLToolBar::postBuild()
                 child_iter != getChildList()->end(); ++child_iter)
        {
                LLView *view = *child_iter;
-                if(view->getWidgetType() == WIDGET_TYPE_BUTTON)
+                LLButton* buttonp = dynamic_cast<LLButton*>(view);
+                if(buttonp)
                {
-                        LLButton* btn = (LLButton*)view;
+                        buttonp->setSoundFlags(LLView::SILENT);
-                        btn->setSoundFlags(LLView::SILENT);
                }
        }
@@ -171,6 +171,8 @@ BOOL LLToolBar::postBuild()
                LLRect rect(0, 0, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT);
                mResizeHandle = new LLFakeResizeHandle(LLString(""), rect, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT);
                this->addChildAtEnd(mResizeHandle);
+                LLLayoutStack* toolbar_stack = getChild<LLLayoutStack>("toolbar_stack");
+                toolbar_stack->reshape(toolbar_stack->getRect().getWidth() - RESIZE_HANDLE_WIDTH, toolbar_stack->getRect().getHeight());
        }
 #endif // LL_DARWIN
@@ -191,7 +193,7 @@ BOOL LLToolBar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                                                                         EAcceptance* accept,
                                                                         LLString& tooltip_msg)
 {
-        LLButton* inventory_btn = LLUICtrlFactory::getButtonByName(this, "inventory_btn");
+        LLButton* inventory_btn = getChild<LLButton>("inventory_btn");
        if (!inventory_btn) return FALSE;
        LLInventoryView* active_inventory = LLInventoryView::getActiveInventory();
@@ -238,19 +240,14 @@ BOOL LLToolBar::visible(void*)
 void LLToolBar::layoutButtons()
 {
-        // Always spans whole window. JC                                        
+#if LL_DARWIN
        const S32 FUDGE_WIDTH_OF_SCREEN = 4;                                    
-        S32 width = gViewerWindow->getWindowWidth() + FUDGE_WIDTH_OF_SCREEN;    
+        S32 width = gViewerWindow->getWindowWidth() + FUDGE_WIDTH_OF_SCREEN;   
-        S32 count = getChildCount();
        S32 pad = 2;
-#if LL_DARWIN
        // this function may be called before postBuild(), in which case mResizeHandle won't have been set up yet.
        if(mResizeHandle != NULL)
        {
-                // a resize handle has been added as a child, increasing the count by one.
-                count--;
-                
                if(!gViewerWindow->getWindow()->getFullscreen())
                {
                        // Only when running in windowed mode on the Mac, leave room for a resize widget on the right edge of the bar.
@@ -270,51 +267,6 @@ void LLToolBar::layoutButtons()
                }
        }
 #endif // LL_DARWIN
-        LLButton* chat_button = LLUICtrlFactory::getButtonByName(this, "chat_btn");
-        if (chat_button)
-        {
-                width -= chat_button->getRect().getWidth() + pad;
-        }
-        // We actually want to extend "pad" pixels off the right edge of the    
-        // screen, such that the rightmost button is aligned.                   
-        S32 segment_width = llround((F32)(width) / ((F32)count - 1.f)); // ignore chat button
-        S32 btn_width = segment_width - pad;
-        
-        // Evenly space all views
-        S32 height = -1;
-        S32 i = count - 1;
-        S32 x = pad;
-        for (child_list_const_reverse_iter_t child_iter = getChildList()->rbegin();
-                 child_iter != getChildList()->rend(); ++child_iter)
-        {
-                LLView *btn_view = *child_iter;
-                if(btn_view->getWidgetType() == WIDGET_TYPE_BUTTON || btn_view->getWidgetType() == WIDGET_TYPE_FLYOUT_BUTTON)
-                {
-                        if (height < 0)
-                        {
-                                height = btn_view->getRect().getHeight();
-                        }
-                        LLRect r;
-                        if (btn_view->getName() == "chat_btn")
-                        {
-                                r.setOriginAndSize(x, 0, btn_view->getRect().getWidth(), height);
-                                x += btn_view->getRect().getWidth() + pad;
-                        }
-                        else
-                        {
-                                r.setOriginAndSize(x, 0, btn_width, height);
-                                x += segment_width;
-                        }
-                        btn_view->setOrigin(r.mLeft, r.mBottom);
-                        btn_view->reshape(r.getWidth(), r.getHeight());
-                        i--;                                                            
-                }
-        }
 }
@@ -338,13 +290,13 @@ void LLToolBar::refresh()
        childSetEnabled("fly_btn", gAgent.canFly() || gAgent.getFlying() );
-        childSetEnabled("build_btn", gParcelMgr->agentCanBuild() );
+        childSetEnabled("build_btn", LLViewerParcelMgr::getInstance()->agentCanBuild() );
        // Check to see if we're in build mode
-        BOOL build_mode = gToolMgr->inEdit();
+        BOOL build_mode = LLToolMgr::getInstance()->inEdit();
        // And not just clicking on a scripted object
-        if (gToolGrab->getHideBuildHighlight())
+        if (LLToolGrab::getInstance()->getHideBuildHighlight())
        {
                build_mode = FALSE;
        }
@@ -355,69 +307,66 @@ void LLToolBar::refresh()
 void LLToolBar::updateCommunicateList()
 {
-        LLFlyoutButton* communicate_button = (LLFlyoutButton*)getChildByName("communicate_btn", TRUE);
+        LLFlyoutButton* communicate_button = getChild<LLFlyoutButton>("communicate_btn");
-        if (communicate_button)
+        LLSD selected = communicate_button->getValue();
-        {
-                LLSD selected = communicate_button->getValue();
-                communicate_button->removeall();
+        communicate_button->removeall();
-                LLFloater* frontmost_floater = LLFloaterChatterBox::getInstance()->getActiveFloater();
+        LLFloater* frontmost_floater = LLFloaterChatterBox::getInstance()->getActiveFloater();
-                LLScrollListItem* itemp = NULL;
+        LLScrollListItem* itemp = NULL;
-                itemp = communicate_button->add(LLFloaterMyFriends::getInstance()->getShortTitle(), LLSD("contacts"), ADD_TOP);
+        itemp = communicate_button->add(LLFloaterMyFriends::getInstance()->getShortTitle(), LLSD("contacts"), ADD_TOP);
-                if (LLFloaterMyFriends::getInstance() == frontmost_floater)
+        if (LLFloaterMyFriends::getInstance() == frontmost_floater)
+        {
+                ((LLScrollListText*)itemp->getColumn(0))->setFontStyle(LLFontGL::BOLD);
+                // make sure current tab is selected in list
+                if (selected.isUndefined())
                {
-                        ((LLScrollListText*)itemp->getColumn(0))->setFontStyle(LLFontGL::BOLD);
+                        selected = itemp->getValue();
-                        // make sure current tab is selected in list
-                        if (selected.isUndefined())
-                        {
-                                selected = itemp->getValue();
-                        }
                }
-                itemp = communicate_button->add(LLFloaterChat::getInstance()->getShortTitle(), LLSD("local chat"), ADD_TOP);
+        }
-                if (LLFloaterChat::getInstance() == frontmost_floater)
+        itemp = communicate_button->add(LLFloaterChat::getInstance()->getShortTitle(), LLSD("local chat"), ADD_TOP);
+        if (LLFloaterChat::getInstance() == frontmost_floater)
+        {
+                ((LLScrollListText*)itemp->getColumn(0))->setFontStyle(LLFontGL::BOLD);
+                if (selected.isUndefined())
                {
-                        ((LLScrollListText*)itemp->getColumn(0))->setFontStyle(LLFontGL::BOLD);
+                        selected = itemp->getValue();
-                        if (selected.isUndefined())
-                        {
-                                selected = itemp->getValue();
-                        }
                }
-                communicate_button->addSeparator(ADD_TOP);
+        }
-                communicate_button->add(getUIString("Redock Windows"), LLSD("redock"), ADD_TOP);
+        communicate_button->addSeparator(ADD_TOP);
-                communicate_button->addSeparator(ADD_TOP);
+        communicate_button->add(getUIString("Redock Windows"), LLSD("redock"), ADD_TOP);
-                communicate_button->add(LLFloaterMute::getInstance()->getShortTitle(), LLSD("mute list"), ADD_TOP);
+        communicate_button->addSeparator(ADD_TOP);
-                
+        communicate_button->add(LLFloaterMute::getInstance()->getShortTitle(), LLSD("mute list"), ADD_TOP);
-                std::set<LLHandle<LLFloater> >::const_iterator floater_handle_it;
+        
+        std::set<LLHandle<LLFloater> >::const_iterator floater_handle_it;
-                if (gIMMgr->getIMFloaterHandles().size() > 0)
+        if (gIMMgr->getIMFloaterHandles().size() > 0)
-                {
+        {
-                        communicate_button->addSeparator(ADD_TOP);
+                communicate_button->addSeparator(ADD_TOP);
-                }
+        }
-                for(floater_handle_it = gIMMgr->getIMFloaterHandles().begin(); floater_handle_it != gIMMgr->getIMFloaterHandles().end(); ++floater_handle_it)
+        for(floater_handle_it = gIMMgr->getIMFloaterHandles().begin(); floater_handle_it != gIMMgr->getIMFloaterHandles().end(); ++floater_handle_it)
+        {
+                LLFloaterIMPanel* im_floaterp = (LLFloaterIMPanel*)floater_handle_it->get();
+                if (im_floaterp)
                {
-                        LLFloaterIMPanel* im_floaterp = (LLFloaterIMPanel*)floater_handle_it->get();
+                        LLString floater_title = im_floaterp->getNumUnreadMessages() > 0 ? "*" : "";
-                        if (im_floaterp)
+                        floater_title.append(im_floaterp->getShortTitle());
+                        itemp = communicate_button->add(floater_title, im_floaterp->getSessionID(), ADD_TOP);
+                        if (im_floaterp  == frontmost_floater)
                        {
-                                LLString floater_title = im_floaterp->getNumUnreadMessages() > 0 ? "*" : "";
+                                ((LLScrollListText*)itemp->getColumn(0))->setFontStyle(LLFontGL::BOLD);
-                                floater_title.append(im_floaterp->getShortTitle());
+                                if (selected.isUndefined())
-                                itemp = communicate_button->add(floater_title, im_floaterp->getSessionID(), ADD_TOP);
-                                if (im_floaterp  == frontmost_floater)
                                {
-                                        ((LLScrollListText*)itemp->getColumn(0))->setFontStyle(LLFontGL::BOLD);
+                                        selected = itemp->getValue();
-                                        if (selected.isUndefined())
-                                        {
-                                                selected = itemp->getValue();
-                                        }
                                }
                        }
                }
-                communicate_button->setToggleState(gSavedSettings.getBOOL("ShowCommunicate"));
-                communicate_button->setValue(selected);
        }
+        communicate_button->setToggleState(gSavedSettings.getBOOL("ShowCommunicate"));
+        communicate_button->setValue(selected);
 }
@@ -425,7 +374,7 @@ void LLToolBar::updateCommunicateList()
 void LLToolBar::onClickCommunicate(LLUICtrl* ctrl, void* user_data)
 {
        LLToolBar* toolbar = (LLToolBar*)user_data;
-        LLFlyoutButton* communicate_button = (LLFlyoutButton*)toolbar->getChildByName("communicate_btn", TRUE);
+        LLFlyoutButton* communicate_button = toolbar->getChild<LLFlyoutButton>("communicate_btn");
        
        LLSD selected_option = communicate_button->getValue();
    
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 2db1d5b..9572440 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -62,8 +62,6 @@
 const std::string REGION_BLOCKS_TERRAFORM_MSG = "This region does not allow terraforming.\n"
                                "You will need to buy land in another part of the world to terraform it.";
-// Globals
-LLToolBrushLand *gToolLand = NULL;
 ///============================================================================
 /// Local function declarations, constants, enums, and typedefs
@@ -182,12 +180,12 @@ void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
 void LLToolBrushLand::modifyLandInSelectionGlobal()
 {
-        if (gParcelMgr->selectionEmpty())
+        if (LLViewerParcelMgr::getInstance()->selectionEmpty())
        {
                return;
        }
-        if (gToolMgr->getCurrentTool() == gToolParcel)
+        if (LLToolMgr::getInstance()->getCurrentTool() == LLToolSelectLand::getInstance())
        {
                // selecting land, don't do anything
                return;
@@ -196,7 +194,7 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
        LLVector3d min;
        LLVector3d max;
-        gParcelMgr->getSelection(min, max);
+        LLViewerParcelMgr::getInstance()->getSelection(min, max);
        S32 radioAction = gSavedSettings.getS32("RadioLandBrushAction");
@@ -306,8 +304,8 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
                msg->addF32Fast(_PREHASH_Seconds, seconds);
                msg->addF32Fast(_PREHASH_Height, mStartingZ);
-                BOOL parcel_selected = gParcelMgr->getParcelSelection()->getWholeParcelSelected();
+                BOOL parcel_selected = LLViewerParcelMgr::getInstance()->getParcelSelection()->getWholeParcelSelected();
-                LLParcel* selected_parcel = gParcelMgr->getParcelSelection()->getParcel();
+                LLParcel* selected_parcel = LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel();
                if (parcel_selected && selected_parcel)
                {
@@ -376,7 +374,7 @@ BOOL LLToolBrushLand::handleMouseDown(S32 x, S32 y, MASK mask)
                gIdleCallbacks.addFunction( &LLToolBrushLand::onIdle, (void*)this );
                setMouseCapture( TRUE );
-                gParcelMgr->setSelectionVisible(FALSE);
+                LLViewerParcelMgr::getInstance()->setSelectionVisible(FALSE);
                handled = TRUE;
        }
@@ -404,7 +402,7 @@ BOOL LLToolBrushLand::handleMouseUp(S32 x, S32 y, MASK mask)
                // Release the mouse
                setMouseCapture( FALSE );
-                gParcelMgr->setSelectionVisible(TRUE);
+                LLViewerParcelMgr::getInstance()->setSelectionVisible(TRUE);
                gIdleCallbacks.deleteFunction( &LLToolBrushLand::onIdle, (void*)this );
                handled = TRUE;
@@ -435,7 +433,7 @@ void LLToolBrushLand::handleDeselect()
        }
        mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
        gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
-        gParcelMgr->setSelectionVisible(TRUE);
+        LLViewerParcelMgr::getInstance()->setSelectionVisible(TRUE);
        mBrushSelected = FALSE;
 }
@@ -506,25 +504,25 @@ void LLToolBrushLand::determineAffectedRegions(region_list_t& regions,
        corner.mdV[VX] -= (LAND_BRUSH_SIZE[mBrushIndex] / 2);
        corner.mdV[VY] -= (LAND_BRUSH_SIZE[mBrushIndex] / 2);
        LLViewerRegion* region = NULL;
-        region = gWorldPointer->getRegionFromPosGlobal(corner);
+        region = LLWorld::getInstance()->getRegionFromPosGlobal(corner);
        if(region && regions.find(region) == regions.end())
        {
                regions.insert(region);
        }
        corner.mdV[VY] += LAND_BRUSH_SIZE[mBrushIndex];
-        region = gWorldPointer->getRegionFromPosGlobal(corner);
+        region = LLWorld::getInstance()->getRegionFromPosGlobal(corner);
        if(region && regions.find(region) == regions.end())
        {
                regions.insert(region);
        }
        corner.mdV[VX] += LAND_BRUSH_SIZE[mBrushIndex];
-        region = gWorldPointer->getRegionFromPosGlobal(corner);
+        region = LLWorld::getInstance()->getRegionFromPosGlobal(corner);
        if(region && regions.find(region) == regions.end())
        {
                regions.insert(region);
        }
        corner.mdV[VY] -= LAND_BRUSH_SIZE[mBrushIndex];
-        region = gWorldPointer->getRegionFromPosGlobal(corner);
+        region = LLWorld::getInstance()->getRegionFromPosGlobal(corner);
        if(region && regions.find(region) == regions.end())
        {
                regions.insert(region);
@@ -536,7 +534,7 @@ void LLToolBrushLand::onIdle( void* brush_tool )
 {
        LLToolBrushLand* self = reinterpret_cast<LLToolBrushLand*>(brush_tool);
-        if( gToolMgr->getCurrentTool() == self )
+        if( LLToolMgr::getInstance()->getCurrentTool() == self )
        {
                self->brush();
        }
diff --git a/linden/indra/newview/lltoolbrush.h b/linden/indra/newview/lltoolbrush.h
index 9a12a18..b3a5576 100644
--- a/linden/indra/newview/lltoolbrush.h
+++ b/linden/indra/newview/lltoolbrush.h
@@ -46,7 +46,7 @@ class LLViewerRegion;
 // A toolbrush that modifies the land.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLToolBrushLand : public LLTool, public LLEditMenuHandler
+class LLToolBrushLand : public LLTool, public LLEditMenuHandler, public LLSingleton<LLToolBrushLand>
 {
        typedef std::set<LLViewerRegion*> region_list_t;
@@ -103,6 +103,5 @@ protected:
        region_list_t mLastAffectedRegions;
 };
-extern LLToolBrushLand *gToolLand;
 #endif // LL_LLTOOLBRUSH_H
diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index 055cbb7..f840a15 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -46,7 +46,6 @@
 #include "lltoolgrab.h"
 #include "lltoolgun.h"
 #include "lltoolmgr.h"
-#include "lltoolselect.h"
 #include "lltoolselectrect.h"
 #include "lltoolplacer.h"
 #include "llviewermenu.h"
@@ -61,14 +60,6 @@ const S32 BUTTON_WIDTH_SMALL = 32;
 const S32 BUTTON_WIDTH_BIG = 48;
 const S32 HPAD = 4;
-// Globals
-LLToolCompInspect   *gToolInspect = NULL;
-LLToolCompTranslate     *gToolTranslate = NULL;
-LLToolCompScale         *gToolStretch = NULL;
-LLToolCompRotate        *gToolRotate = NULL;
-LLToolCompCreate        *gToolCreate = NULL;
-LLToolCompGun           *gToolGun = NULL;
 extern LLControlGroup gSavedSettings;
@@ -126,7 +117,7 @@ void LLToolComposite::handleSelect()
 {
        if (!gSavedSettings.getBOOL("EditLinkedParts"))
        {
-                gSelectMgr->promoteSelectionToRoot();
+                LLSelectMgr::getInstance()->promoteSelectionToRoot();
        }
        mCur = mDefault; 
        mCur->handleSelect(); 
@@ -162,27 +153,27 @@ void LLToolCompInspect::pickCallback(S32 x, S32 y, MASK mask)
 {
        LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
-        if (!gToolInspect->mMouseDown)
+        if (!LLToolCompInspect::getInstance()->mMouseDown)
        {
                // fast click on object, but mouse is already up...just do select
-                gToolInspect->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+                LLToolCompInspect::getInstance()->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
                return;
        }
        if( hit_obj )
        {
-                if (gSelectMgr->getSelection()->getObjectCount())
+                if (LLSelectMgr::getInstance()->getSelection()->getObjectCount())
                {
-                        LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
+                        LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
                }
-                gToolInspect->setCurrentTool( gToolInspect->mSelectRect );
+                LLToolCompInspect::getInstance()->setCurrentTool( LLToolCompInspect::getInstance()->mSelectRect );
-                gToolInspect->mSelectRect->handleMouseDown( x, y, mask );
+                LLToolCompInspect::getInstance()->mSelectRect->handleMouseDown( x, y, mask );
        }
        else
        {
-                gToolInspect->setCurrentTool( gToolInspect->mSelectRect );
+                LLToolCompInspect::getInstance()->setCurrentTool( LLToolCompInspect::getInstance()->mSelectRect );
-                gToolInspect->mSelectRect->handleMouseDown( x, y, mask);
+                LLToolCompInspect::getInstance()->mSelectRect->handleMouseDown( x, y, mask);
        }
 }
@@ -235,41 +226,41 @@ void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
 {
        LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
-        gToolTranslate->mManip->highlightManipulators(x, y);
+        LLToolCompTranslate::getInstance()->mManip->highlightManipulators(x, y);
-        if (!gToolTranslate->mMouseDown)
+        if (!LLToolCompTranslate::getInstance()->mMouseDown)
        {
                // fast click on object, but mouse is already up...just do select
-                gToolTranslate->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+                LLToolCompTranslate::getInstance()->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
                return;
        }
-        if( hit_obj || gToolTranslate->mManip->getHighlightedPart() != LLManip::LL_NO_PART )
+        if( hit_obj || LLToolCompTranslate::getInstance()->mManip->getHighlightedPart() != LLManip::LL_NO_PART )
        {
-                if (gToolTranslate->mManip->getSelection()->getObjectCount())
+                if (LLToolCompTranslate::getInstance()->mManip->getSelection()->getObjectCount())
                {
-                        LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
+                        LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
                }
-                BOOL can_move = gToolTranslate->mManip->canAffectSelection();
+                BOOL can_move = LLToolCompTranslate::getInstance()->mManip->canAffectSelection();
-                if(     LLManip::LL_NO_PART != gToolTranslate->mManip->getHighlightedPart() && can_move)
+                if(     LLManip::LL_NO_PART != LLToolCompTranslate::getInstance()->mManip->getHighlightedPart() && can_move)
                {
-                        gToolTranslate->setCurrentTool( gToolTranslate->mManip );
+                        LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mManip );
-                        gToolTranslate->mManip->handleMouseDownOnPart( x, y, mask );
+                        LLToolCompTranslate::getInstance()->mManip->handleMouseDownOnPart( x, y, mask );
                }
                else
                {
-                        gToolTranslate->setCurrentTool( gToolTranslate->mSelectRect );
+                        LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mSelectRect );
-                        gToolTranslate->mSelectRect->handleMouseDown( x, y, mask );
+                        LLToolCompTranslate::getInstance()->mSelectRect->handleMouseDown( x, y, mask );
                        // *TODO: add toggle to trigger old click-drag functionality
-                        // gToolTranslate->mManip->handleMouseDownOnPart( XY_part, x, y, mask);
+                        // LLToolCompTranslate::getInstance()->mManip->handleMouseDownOnPart( XY_part, x, y, mask);
                }
        }
        else
        {
-                gToolTranslate->setCurrentTool( gToolTranslate->mSelectRect );
+                LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mSelectRect );
-                gToolTranslate->mSelectRect->handleMouseDown( x, y, mask);
+                LLToolCompTranslate::getInstance()->mSelectRect->handleMouseDown( x, y, mask);
        }
 }
@@ -283,11 +274,11 @@ LLTool* LLToolCompTranslate::getOverrideTool(MASK mask)
 {
        if (mask == MASK_CONTROL)
        {
-                return gToolRotate;
+                return LLToolCompRotate::getInstance();
        }
        else if (mask == (MASK_CONTROL | MASK_SHIFT))
        {
-                return gToolStretch;
+                return LLToolCompScale::getInstance();
        }
        return LLToolComposite::getOverrideTool(mask);
 }
@@ -309,7 +300,7 @@ BOOL LLToolCompTranslate::handleDoubleClick(S32 x, S32 y, MASK mask)
 void LLToolCompTranslate::render()
 {
-        mCur->render();
+        mCur->render(); // removing this will not draw the RGB arrows and guidelines
        if( mCur != mManip )
        {
@@ -359,36 +350,36 @@ void LLToolCompScale::pickCallback(S32 x, S32 y, MASK mask)
 {
        LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
-        gToolStretch->mManip->highlightManipulators(x, y);
+        LLToolCompScale::getInstance()->mManip->highlightManipulators(x, y);
-        if (!gToolStretch->mMouseDown)
+        if (!LLToolCompScale::getInstance()->mMouseDown)
        {
                // fast click on object, but mouse is already up...just do select
-                gToolStretch->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+                LLToolCompScale::getInstance()->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
                return;
        }
-        if( hit_obj || gToolStretch->mManip->getHighlightedPart() != LLManip::LL_NO_PART)
+        if( hit_obj || LLToolCompScale::getInstance()->mManip->getHighlightedPart() != LLManip::LL_NO_PART)
        {
-                if (gToolStretch->mManip->getSelection()->getObjectCount())
+                if (LLToolCompScale::getInstance()->mManip->getSelection()->getObjectCount())
                {
-                        LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
+                        LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
                }
-                if(     LLManip::LL_NO_PART != gToolStretch->mManip->getHighlightedPart() )
+                if(     LLManip::LL_NO_PART != LLToolCompScale::getInstance()->mManip->getHighlightedPart() )
                {
-                        gToolStretch->setCurrentTool( gToolStretch->mManip );
+                        LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mManip );
-                        gToolStretch->mManip->handleMouseDownOnPart( x, y, mask );
+                        LLToolCompScale::getInstance()->mManip->handleMouseDownOnPart( x, y, mask );
                }
                else
                {
-                        gToolStretch->setCurrentTool( gToolStretch->mSelectRect );
+                        LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mSelectRect );
-                        gToolStretch->mSelectRect->handleMouseDown( x, y, mask );
+                        LLToolCompScale::getInstance()->mSelectRect->handleMouseDown( x, y, mask );
                }
        }
        else
        {
-                gToolStretch->setCurrentTool( gToolStretch->mSelectRect );
+                LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mSelectRect );
-                gToolStretch->mCur->handleMouseDown( x, y, mask );
+                LLToolCompScale::getInstance()->mCur->handleMouseDown( x, y, mask );
        }
 }
@@ -402,7 +393,7 @@ LLTool* LLToolCompScale::getOverrideTool(MASK mask)
 {
        if (mask == MASK_CONTROL)
        {
-                return gToolRotate;
+                return LLToolCompRotate::getInstance();
        }
        return LLToolComposite::getOverrideTool(mask);
@@ -489,8 +480,8 @@ void LLToolCompCreate::pickCallback(S32 x, S32 y, MASK mask)
        mask = (mask & ~MASK_SHIFT);
        mask = (mask & ~MASK_CONTROL);
-        gToolCreate->setCurrentTool( gToolCreate->mSelectRect );
+        LLToolCompCreate::getInstance()->setCurrentTool( LLToolCompCreate::getInstance()->mSelectRect );
-        gToolCreate->mSelectRect->handleMouseDown( x, y, mask);
+        LLToolCompCreate::getInstance()->mSelectRect->handleMouseDown( x, y, mask);
 }
 BOOL LLToolCompCreate::handleDoubleClick(S32 x, S32 y, MASK mask)
@@ -560,35 +551,35 @@ void LLToolCompRotate::pickCallback(S32 x, S32 y, MASK mask)
 {
        LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
-        gToolRotate->mManip->highlightManipulators(x, y);
+        LLToolCompRotate::getInstance()->mManip->highlightManipulators(x, y);
-        if (!gToolRotate->mMouseDown)
+        if (!LLToolCompRotate::getInstance()->mMouseDown)
        {
                // fast click on object, but mouse is already up...just do select
-                gToolRotate->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+                LLToolCompRotate::getInstance()->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
                return;
        }
        
-        if( hit_obj || gToolRotate->mManip->getHighlightedPart() != LLManip::LL_NO_PART)
+        if( hit_obj || LLToolCompRotate::getInstance()->mManip->getHighlightedPart() != LLManip::LL_NO_PART)
        {
-                if (gToolRotate->mManip->getSelection()->getObjectCount())
+                if (LLToolCompRotate::getInstance()->mManip->getSelection()->getObjectCount())
                {
-                        LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
+                        LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
                }
-                if(     LLManip::LL_NO_PART != gToolRotate->mManip->getHighlightedPart() )
+                if(     LLManip::LL_NO_PART != LLToolCompRotate::getInstance()->mManip->getHighlightedPart() )
                {
-                        gToolRotate->setCurrentTool( gToolRotate->mManip );
+                        LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mManip );
-                        gToolRotate->mManip->handleMouseDownOnPart( x, y, mask );
+                        LLToolCompRotate::getInstance()->mManip->handleMouseDownOnPart( x, y, mask );
                }
                else
                {
-                        gToolRotate->setCurrentTool( gToolRotate->mSelectRect );
+                        LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mSelectRect );
-                        gToolRotate->mSelectRect->handleMouseDown( x, y, mask );
+                        LLToolCompRotate::getInstance()->mSelectRect->handleMouseDown( x, y, mask );
                }
        }
        else
        {
-                gToolRotate->setCurrentTool( gToolRotate->mSelectRect );
+                LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mSelectRect );
-                gToolRotate->mCur->handleMouseDown( x, y, mask );
+                LLToolCompRotate::getInstance()->mCur->handleMouseDown( x, y, mask );
        }
 }
@@ -602,7 +593,7 @@ LLTool* LLToolCompRotate::getOverrideTool(MASK mask)
 {
        if (mask == (MASK_CONTROL | MASK_SHIFT))
        {
-                return gToolStretch;
+                return LLToolCompScale::getInstance();
        }
        return LLToolComposite::getOverrideTool(mask);
 }
@@ -671,7 +662,7 @@ BOOL LLToolCompGun::handleHover(S32 x, S32 y, MASK mask)
        // item selected from context menu.
        if ( mCur == mNull && !gPopupMenuView->getVisible() )
        {
-                gSelectMgr->deselectAll();
+                LLSelectMgr::getInstance()->deselectAll();
                setCurrentTool( (LLTool*) mGrab );
        }
@@ -712,9 +703,9 @@ BOOL LLToolCompGun::handleMouseDown(S32 x, S32 y, MASK mask)
        // On mousedown, start grabbing
        gGrabTransientTool = this;
-        gToolMgr->getCurrentToolset()->selectTool( (LLTool*) mGrab );
+        LLToolMgr::getInstance()->getCurrentToolset()->selectTool( (LLTool*) mGrab );
-        return gToolGrab->handleMouseDown(x, y, mask);
+        return LLToolGrab::getInstance()->handleMouseDown(x, y, mask);
 }
@@ -729,9 +720,9 @@ BOOL LLToolCompGun::handleDoubleClick(S32 x, S32 y, MASK mask)
        // On mousedown, start grabbing
        gGrabTransientTool = this;
-        gToolMgr->getCurrentToolset()->selectTool( (LLTool*) mGrab );
+        LLToolMgr::getInstance()->getCurrentToolset()->selectTool( (LLTool*) mGrab );
-        return gToolGrab->handleDoubleClick(x, y, mask);
+        return LLToolGrab::getInstance()->handleDoubleClick(x, y, mask);
 }
diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h
index ce4aec9..929a7e6 100644
--- a/linden/indra/newview/lltoolcomp.h
+++ b/linden/indra/newview/lltoolcomp.h
@@ -104,7 +104,7 @@ public:
 //-----------------------------------------------------------------------
 // LLToolCompTranslate
-class LLToolCompInspect : public LLToolComposite
+class LLToolCompInspect : public LLToolComposite, public LLSingleton<LLToolCompInspect>
 {
 public:
        LLToolCompInspect();
@@ -120,7 +120,7 @@ public:
 //-----------------------------------------------------------------------
 // LLToolCompTranslate
-class LLToolCompTranslate : public LLToolComposite
+class LLToolCompTranslate : public LLToolComposite, public LLSingleton<LLToolCompTranslate>
 {
 public:
        LLToolCompTranslate();
@@ -141,7 +141,7 @@ public:
 //-----------------------------------------------------------------------
 // LLToolCompScale
-class LLToolCompScale : public LLToolComposite
+class LLToolCompScale : public LLToolComposite, public LLSingleton<LLToolCompScale>
 {
 public:
        LLToolCompScale();
@@ -163,7 +163,7 @@ public:
 //-----------------------------------------------------------------------
 // LLToolCompRotate
-class LLToolCompRotate : public LLToolComposite
+class LLToolCompRotate : public LLToolComposite, public LLSingleton<LLToolCompRotate>
 {
 public:
        LLToolCompRotate();
@@ -186,7 +186,7 @@ protected:
 //-----------------------------------------------------------------------
 // LLToolCompCreate
-class LLToolCompCreate : public LLToolComposite
+class LLToolCompCreate : public LLToolComposite, public LLSingleton<LLToolCompCreate>
 {
 public:
        LLToolCompCreate();
@@ -211,7 +211,7 @@ class LLToolGun;
 class LLToolGrab;
 class LLToolSelect;
-class LLToolCompGun : public LLToolComposite
+class LLToolCompGun : public LLToolComposite, public LLSingleton<LLToolCompGun>
 {
 public:
        LLToolCompGun();
@@ -234,11 +234,5 @@ protected:
        LLTool*                         mNull;
 };
-extern LLToolCompInspect        *gToolInspect;
-extern LLToolCompTranslate      *gToolTranslate;
-extern LLToolCompScale          *gToolStretch;
-extern LLToolCompRotate         *gToolRotate;
-extern LLToolCompCreate         *gToolCreate;
-extern LLToolCompGun            *gToolGun;
 #endif  // LL_TOOLCOMP_H
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 9524fd8..67a2153 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -64,7 +64,6 @@
 #include "llworld.h"
 #include "object_flags.h"
-LLToolDragAndDrop *gToolDragAndDrop = NULL;
 // MAX ITEMS is based on (sizeof(uuid)+2) * count must be < MTUBYTES
 // or 18 * count < 1200 => count < 1200/18 => 66. I've cut it down a
@@ -78,37 +77,6 @@ const char* FOLDER_INCLUDES_ATTACHMENTS_BEING_WORN =
 // syntactic sugar
 #define callMemberFunction(object,ptrToMember)  ((object).*(ptrToMember))
-/*
-const LLUUID MULTI_CONTAINER_TEXTURE("b2181ea2-1937-2ee1-78b8-bf05c43536b7");
-LLUUID CONTAINER_TEXTURES[LLAssetType::AT_COUNT];
-const char* CONTAINER_TEXTURE_NAMES[LLAssetType::AT_COUNT] =
-{
-        "container_texture.tga",
-        "container_sound.tga",
-        "container_many_things.tga",
-        "container_landmark.tga",
-        "container_script.tga",
-        "container_clothing.tga",
-        "container_object.tga",
-        "container_many_things.tga",
-        "container_many_things.tga",
-        "container_many_things.tga",
-        "container_script.tga",
-        "container_script.tga",
-        "container_texture.tga",
-        "container_bodypart.tga",
-        "container_many_things.tga",
-        "container_many_things.tga",
-        "container_many_things.tga",
-        "container_sound.tga",
-        "container_texture.tga",
-        "container_texture.tga",
-        "container_animation.tga",
-        "container_gesture.tga"
-};
-*/
 class LLNoPreferredType : public LLInventoryCollectFunctor
 {
 public:
@@ -610,11 +578,7 @@ LLToolDragAndDrop::LLToolDragAndDrop()
         mDrop(FALSE),
         mCurItemIndex(0)
 {
-        // setup container texture ids
-        //for (S32 i = 0; i < LLAssetType::AT_COUNT; i++)
-        //{
-        //      CONTAINER_TEXTURES[i].set(gViewerArt.getString(CONTAINER_TEXTURE_NAMES[i]));
-        //}
 }
 void LLToolDragAndDrop::setDragStart(S32 x, S32 y)
@@ -650,7 +614,7 @@ void LLToolDragAndDrop::beginDrag(EDragAndDropType type,
        mObjectID = object_id;
        setMouseCapture( TRUE );
-        gToolMgr->setTransientTool( this );
+        LLToolMgr::getInstance()->setTransientTool( this );
        mCursor = UI_CURSOR_NO;
        if((mCargoTypes[0] == DAD_CATEGORY)
           && ((mSource == SOURCE_AGENT) || (mSource == SOURCE_LIBRARY)))
@@ -719,7 +683,7 @@ void LLToolDragAndDrop::beginMultiDrag(
        mSourceID = source_id;
        setMouseCapture( TRUE );
-        gToolMgr->setTransientTool( this );
+        LLToolMgr::getInstance()->setTransientTool( this );
        mCursor = UI_CURSOR_NO;
        if((mSource == SOURCE_AGENT) || (mSource == SOURCE_LIBRARY))
        {
@@ -766,14 +730,14 @@ void LLToolDragAndDrop::beginMultiDrag(
 void LLToolDragAndDrop::endDrag()
 {
-        gSelectMgr->unhighlightAll();
+        LLSelectMgr::getInstance()->unhighlightAll();
        setMouseCapture(FALSE);
 }
 void LLToolDragAndDrop::onMouseCaptureLost()
 {
        // Called whenever the drag ends or if mouse captue is simply lost
-        gToolMgr->clearTransientTool();
+        LLToolMgr::getInstance()->clearTransientTool();
        mCargoTypes.clear();
        mCargoIDs.clear();
        mSource = SOURCE_AGENT;
@@ -1045,7 +1009,7 @@ void LLToolDragAndDrop::pickCallback(S32 x, S32 y, MASK mask)
        S32     hit_face = -1;
        LLViewerObject* hit_obj = gViewerWindow->lastNonFloraObjectHit();
-        gSelectMgr->unhighlightAll();
+        LLSelectMgr::getInstance()->unhighlightAll();
        // Treat attachments as part of the avatar they are attached to.
        if (hit_obj)
@@ -1055,9 +1019,9 @@ void LLToolDragAndDrop::pickCallback(S32 x, S32 y, MASK mask)
                        LLVOAvatar* avatar = LLVOAvatar::findAvatarFromAttachment( hit_obj );
                        if( !avatar )
                        {
-                                gToolDragAndDrop->mLastAccept = ACCEPT_NO;
+                                LLToolDragAndDrop::getInstance()->mLastAccept = ACCEPT_NO;
-                                gToolDragAndDrop->mCursor = UI_CURSOR_NO;
+                                LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_NO;
-                                gViewerWindow->getWindow()->setCursor( gToolDragAndDrop->mCursor );
+                                gViewerWindow->getWindow()->setCursor( LLToolDragAndDrop::getInstance()->mCursor );
                                return;
                        }
                        
@@ -1083,11 +1047,11 @@ void LLToolDragAndDrop::pickCallback(S32 x, S32 y, MASK mask)
                        hit_face = gLastHitNonFloraObjectFace;
                        // if any item being dragged will be applied to the object under our cursor
                        // highlight that object
-                        for (S32 i = 0; i < (S32)gToolDragAndDrop->mCargoIDs.size(); i++)
+                        for (S32 i = 0; i < (S32)LLToolDragAndDrop::getInstance()->mCargoIDs.size(); i++)
                        {
-                                if (gToolDragAndDrop->mCargoTypes[i] != DAD_OBJECT || (mask & MASK_CONTROL))
+                                if (LLToolDragAndDrop::getInstance()->mCargoTypes[i] != DAD_OBJECT || (mask & MASK_CONTROL))
                                {
-                                        gSelectMgr->highlightObjectAndFamily(hit_obj);
+                                        LLSelectMgr::getInstance()->highlightObjectAndFamily(hit_obj);
                                        break;
                                }
                        }
@@ -1099,78 +1063,78 @@ void LLToolDragAndDrop::pickCallback(S32 x, S32 y, MASK mask)
                hit_face = -1;
        }
-        gToolDragAndDrop->mLastAccept = ACCEPT_YES_MULTI;
+        LLToolDragAndDrop::getInstance()->mLastAccept = ACCEPT_YES_MULTI;
-        for (gToolDragAndDrop->mCurItemIndex = 0; gToolDragAndDrop->mCurItemIndex < (S32)gToolDragAndDrop->mCargoIDs.size(); 
+        for (LLToolDragAndDrop::getInstance()->mCurItemIndex = 0; LLToolDragAndDrop::getInstance()->mCurItemIndex < (S32)LLToolDragAndDrop::getInstance()->mCargoIDs.size(); 
-                gToolDragAndDrop->mCurItemIndex++)
+                LLToolDragAndDrop::getInstance()->mCurItemIndex++)
        {
                // Call the right implementation function
-                gToolDragAndDrop->mLastAccept = (EAcceptance)llmin(
+                LLToolDragAndDrop::getInstance()->mLastAccept = (EAcceptance)llmin(
-                        (U32)gToolDragAndDrop->mLastAccept,
+                        (U32)LLToolDragAndDrop::getInstance()->mLastAccept,
-                        (U32)callMemberFunction((*gToolDragAndDrop), 
+                        (U32)callMemberFunction((*LLToolDragAndDrop::getInstance()), 
-                                gToolDragAndDrop->sDragAndDrop3d[gToolDragAndDrop->mCargoTypes[gToolDragAndDrop->mCurItemIndex]][target])
+                                LLToolDragAndDrop::getInstance()->sDragAndDrop3d[LLToolDragAndDrop::getInstance()->mCargoTypes[LLToolDragAndDrop::getInstance()->mCurItemIndex]][target])
                                (hit_obj, hit_face, mask, FALSE));
        }
-        if (gToolDragAndDrop->mDrop && (U32)gToolDragAndDrop->mLastAccept >= ACCEPT_YES_COPY_SINGLE)
+        if (LLToolDragAndDrop::getInstance()->mDrop && (U32)LLToolDragAndDrop::getInstance()->mLastAccept >= ACCEPT_YES_COPY_SINGLE)
        {
                // if target allows multi-drop, go ahead and start iteration at beginning of cargo list
-                if (gToolDragAndDrop->mLastAccept >= ACCEPT_YES_COPY_MULTI)
+                if (LLToolDragAndDrop::getInstance()->mLastAccept >= ACCEPT_YES_COPY_MULTI)
                {
-                        gToolDragAndDrop->mCurItemIndex = 0;
+                        LLToolDragAndDrop::getInstance()->mCurItemIndex = 0;
                }
                // otherwise start at end, to follow selection rules (last selected item is most current)
                else
                {
-                        gToolDragAndDrop->mCurItemIndex = gToolDragAndDrop->mCargoIDs.size() - 1;
+                        LLToolDragAndDrop::getInstance()->mCurItemIndex = LLToolDragAndDrop::getInstance()->mCargoIDs.size() - 1;
                }
-                for (; gToolDragAndDrop->mCurItemIndex < (S32)gToolDragAndDrop->mCargoIDs.size(); 
+                for (; LLToolDragAndDrop::getInstance()->mCurItemIndex < (S32)LLToolDragAndDrop::getInstance()->mCargoIDs.size(); 
-                        gToolDragAndDrop->mCurItemIndex++)
+                        LLToolDragAndDrop::getInstance()->mCurItemIndex++)
                {
                        // Call the right implementation function
-                        (U32)callMemberFunction((*gToolDragAndDrop), 
+                        (U32)callMemberFunction((*LLToolDragAndDrop::getInstance()), 
-                                gToolDragAndDrop->sDragAndDrop3d[gToolDragAndDrop->mCargoTypes[gToolDragAndDrop->mCurItemIndex]][target])
+                                LLToolDragAndDrop::getInstance()->sDragAndDrop3d[LLToolDragAndDrop::getInstance()->mCargoTypes[LLToolDragAndDrop::getInstance()->mCurItemIndex]][target])
                                (hit_obj, hit_face, mask, TRUE);
                }
        }
-        switch( gToolDragAndDrop->mLastAccept )
+        switch( LLToolDragAndDrop::getInstance()->mLastAccept )
        {
        case ACCEPT_YES_MULTI: 
-                if (gToolDragAndDrop->mCargoIDs.size() > 1)
+                if (LLToolDragAndDrop::getInstance()->mCargoIDs.size() > 1)
                {
-                        gToolDragAndDrop->mCursor = UI_CURSOR_ARROWDRAGMULTI;
+                        LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWDRAGMULTI;
                }
                else
                {
-                        gToolDragAndDrop->mCursor = UI_CURSOR_ARROWDRAG;
+                        LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWDRAG;
                }
                break;
        case ACCEPT_YES_SINGLE: 
-                gToolDragAndDrop->mCursor = UI_CURSOR_ARROWDRAG;
+                LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWDRAG;
                break;
        case ACCEPT_NO_LOCKED:
-                gToolDragAndDrop->mCursor = UI_CURSOR_NOLOCKED;
+                LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_NOLOCKED;
                break;
        case ACCEPT_NO:
-                gToolDragAndDrop->mCursor = UI_CURSOR_NO;
+                LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_NO;
                break;
        case ACCEPT_YES_COPY_MULTI:
-        if (gToolDragAndDrop->mCargoIDs.size() > 1)
+        if (LLToolDragAndDrop::getInstance()->mCargoIDs.size() > 1)
                {
-                        gToolDragAndDrop->mCursor = UI_CURSOR_ARROWCOPYMULTI;
+                        LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWCOPYMULTI;
                }
                else
                {
-                        gToolDragAndDrop->mCursor = UI_CURSOR_ARROWCOPY;
+                        LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWCOPY;
                }
                break;
        case ACCEPT_YES_COPY_SINGLE:
-                gToolDragAndDrop->mCursor = UI_CURSOR_ARROWCOPY;
+                LLToolDragAndDrop::getInstance()->mCursor = UI_CURSOR_ARROWCOPY;
                break;
        case ACCEPT_POSTPONED:
                break;
@@ -1178,10 +1142,10 @@ void LLToolDragAndDrop::pickCallback(S32 x, S32 y, MASK mask)
                llassert( FALSE );
        }
-        gToolDragAndDrop->mLastHitPos = gLastHitPosGlobal + gLastHitObjectOffset;
+        LLToolDragAndDrop::getInstance()->mLastHitPos = gLastHitPosGlobal + gLastHitObjectOffset;
-        gToolDragAndDrop->mLastCameraPos = gAgent.getCameraPositionGlobal();
+        LLToolDragAndDrop::getInstance()->mLastCameraPos = gAgent.getCameraPositionGlobal();
-        gViewerWindow->getWindow()->setCursor( gToolDragAndDrop->mCursor );
+        gViewerWindow->getWindow()->setCursor( LLToolDragAndDrop::getInstance()->mCursor );
 }
 // static
@@ -1294,7 +1258,7 @@ void LLToolDragAndDrop::dropTextureAllFaces(LLViewerObject* hit_obj,
                return;
        }
        LLViewerImage* image = gImageList.getImage(asset_id);
-        gViewerStats->incStat(LLViewerStats::ST_EDIT_TEXTURE_COUNT );
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_EDIT_TEXTURE_COUNT );
        S32 num_faces = hit_obj->getNumTEs();
        for( S32 face = 0; face < num_faces; face++ )
        {
@@ -1337,7 +1301,7 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj,
        }
        // update viewer side image in anticipation of update from simulator
        LLViewerImage* image = gImageList.getImage(asset_id);
-        gViewerStats->incStat(LLViewerStats::ST_EDIT_TEXTURE_COUNT );
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_EDIT_TEXTURE_COUNT );
        hit_obj->setTEImage(hit_face, image);
        dialog_refresh_all();
@@ -1354,8 +1318,8 @@ void LLToolDragAndDrop::dropScript(LLViewerObject* hit_obj,
 {
        // *HACK: In order to resolve SL-22177, we need to block drags
        // from notecards and objects onto other objects.
-        if((SOURCE_WORLD == gToolDragAndDrop->mSource)
+        if((SOURCE_WORLD == LLToolDragAndDrop::getInstance()->mSource)
-           || (SOURCE_NOTECARD == gToolDragAndDrop->mSource))
+           || (SOURCE_NOTECARD == LLToolDragAndDrop::getInstance()->mSource))
        {
                llwarns << "Call to LLToolDragAndDrop::dropScript() from world"
                        << " or notecard." << llendl;
@@ -1394,7 +1358,7 @@ void LLToolDragAndDrop::dropScript(LLViewerObject* hit_obj,
                gFloaterTools->dirty();
                // VEFFECT: SetScript
-                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
+                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
                effectp->setSourceObject(gAgent.getAvatarObject());
                effectp->setTargetObject(hit_obj);
                effectp->setDuration(LL_HUD_DUR_SHORT);
@@ -1407,7 +1371,7 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target,
                                                                   BOOL from_task_inventory,
                                                                   BOOL remove_from_inventory)
 {
-        LLViewerRegion* regionp = gWorldp->getRegionFromPosGlobal(mLastHitPos);
+        LLViewerRegion* regionp = LLWorld::getInstance()->getRegionFromPosGlobal(mLastHitPos);
        if (!regionp)
        {
                llwarns << "Couldn't find region to rez object" << llendl;
@@ -1463,8 +1427,21 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target,
        LLUUID source_id = from_task_inventory ? mSourceID : LLUUID::null;
        // Select the object only if we're editing.
-        BOOL rez_selected = gToolMgr->inEdit();
+        BOOL rez_selected = LLToolMgr::getInstance()->inEdit();
+        LLVector3 ray_start = regionp->getPosRegionFromGlobal(mLastCameraPos);
+        LLVector3 ray_end   = regionp->getPosRegionFromGlobal(mLastHitPos);
+        // currently the ray's end point is an approximation,
+        // and is sometimes too short (causing failure.)  so we
+        // double the ray's length:
+        if (bypass_sim_raycast == FALSE)
+        {
+                LLVector3 ray_direction = ray_start - ray_end;
+                ray_end = ray_end - ray_direction;
+        }
+        
+        
        // Message packing code should be it's own uninterrupted block
        LLMessageSystem* msg = gMessageSystem;
        if (mSource == SOURCE_NOTECARD)
@@ -1488,8 +1465,8 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target,
        // optimization.
        msg->addUUIDFast(_PREHASH_FromTaskID, source_id);
        msg->addU8Fast(_PREHASH_BypassRaycast, (U8) bypass_sim_raycast);
-        msg->addVector3Fast(_PREHASH_RayStart, regionp->getPosRegionFromGlobal(mLastCameraPos));
+        msg->addVector3Fast(_PREHASH_RayStart, ray_start);
-        msg->addVector3Fast(_PREHASH_RayEnd, regionp->getPosRegionFromGlobal(mLastHitPos));
+        msg->addVector3Fast(_PREHASH_RayEnd, ray_end);
        msg->addUUIDFast(_PREHASH_RayTargetID, ray_target_id );
        msg->addBOOLFast(_PREHASH_RayEndIsIntersection, FALSE);
        msg->addBOOLFast(_PREHASH_RezSelected, rez_selected);
@@ -1529,7 +1506,7 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target,
        // selected object.
        if (rez_selected)
        {
-                gSelectMgr->deselectAll();
+                LLSelectMgr::getInstance()->deselectAll();
                gViewerWindow->getWindow()->incBusyCount();
        }
@@ -1543,13 +1520,13 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target,
        }
        // VEFFECT: DropObject
-        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
+        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
        effectp->setSourceObject(gAgent.getAvatarObject());
        effectp->setPositionGlobal(mLastHitPos);
        effectp->setDuration(LL_HUD_DUR_SHORT);
        effectp->setColor(LLColor4U(gAgent.getEffectColor()));
-        gViewerStats->incStat(LLViewerStats::ST_REZ_COUNT);
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_REZ_COUNT);
 }
 void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj,
@@ -1559,8 +1536,8 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj,
 {
        // *HACK: In order to resolve SL-22177, we need to block drags
        // from notecards and objects onto other objects.
-        if((SOURCE_WORLD == gToolDragAndDrop->mSource)
+        if((SOURCE_WORLD == LLToolDragAndDrop::getInstance()->mSource)
-           || (SOURCE_NOTECARD == gToolDragAndDrop->mSource))
+           || (SOURCE_NOTECARD == LLToolDragAndDrop::getInstance()->mSource))
        {
                llwarns << "Call to LLToolDragAndDrop::dropInventory() from world"
                        << " or notecard." << llendl;
@@ -1606,7 +1583,7 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj,
        }
        // VEFFECT: AddToInventory
-        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
+        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
        effectp->setSourceObject(gAgent.getAvatarObject());
        effectp->setTargetObject(hit_obj);
        effectp->setDuration(LL_HUD_DUR_SHORT);
@@ -1710,7 +1687,7 @@ void LLToolDragAndDrop::commitGiveInventoryItem(const LLUUID& to_agent,
        gAgent.sendReliableMessage(); 
        // VEFFECT: giveInventory
-        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
+        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
        effectp->setSourceObject(gAgent.getAvatarObject());
        effectp->setTargetObject(gObjectList.findObject(to_agent));
        effectp->setDuration(LL_HUD_DUR_SHORT);
@@ -1912,7 +1889,7 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent,
                delete[] bucket;
                // VEFFECT: giveInventoryCategory
-                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
+                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
                effectp->setSourceObject(gAgent.getAvatarObject());
                effectp->setTargetObject(gObjectList.findObject(to_agent));
                effectp->setDuration(LL_HUD_DUR_SHORT);
@@ -2365,7 +2342,7 @@ EAcceptance LLToolDragAndDrop::dad3dTextureObject(
                }
                
                // VEFFECT: SetTexture
-                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
+                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
                effectp->setSourceObject(gAgent.getAvatarObject());
                effectp->setTargetObject(obj);
                effectp->setDuration(LL_HUD_DUR_SHORT);
diff --git a/linden/indra/newview/lltooldraganddrop.h b/linden/indra/newview/lltooldraganddrop.h
index 1d97c8f..eb99aa9 100644
--- a/linden/indra/newview/lltooldraganddrop.h
+++ b/linden/indra/newview/lltooldraganddrop.h
@@ -46,7 +46,7 @@ class LLToolDragAndDrop;
 class LLViewerRegion;
 class LLVOAvatar;
-class LLToolDragAndDrop : public LLTool
+class LLToolDragAndDrop : public LLTool, public LLSingleton<LLToolDragAndDrop>
 {
 public:
        LLToolDragAndDrop();
@@ -253,9 +253,6 @@ public:
                                                                          LLInventoryCategory* item);
 };
-// Singleton
-extern LLToolDragAndDrop *gToolDragAndDrop;
 // utility functions
 void pack_permissions_slam(LLMessageSystem* msg, U32 flags, const LLPermissions& perms);
diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp
index bb2fc04..071d5d2 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -47,9 +47,6 @@
 #include "llviewerwindow.h"
 #include "llfloatertools.h"
-// Globals
-LLToolFace *gToolFace = NULL;
 //
 // Member functions
 //
@@ -65,7 +62,7 @@ LLToolFace::~LLToolFace()
 BOOL LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
-        if (!gSelectMgr->getSelection()->isEmpty())
+        if (!LLSelectMgr::getInstance()->getSelection()->isEmpty())
        {
                // You should already have an object selected from the mousedown.
                // If so, show its properties
@@ -111,17 +108,17 @@ void LLToolFace::pickCallback(S32 x, S32 y, MASK mask)
                        if ( !hit_obj->isSelected() )
                        {
                                // object wasn't selected so add the object and face
-                                gSelectMgr->selectObjectOnly(hit_obj, hit_face);
+                                LLSelectMgr::getInstance()->selectObjectOnly(hit_obj, hit_face);
                        }
-                        else if (!gSelectMgr->getSelection()->contains(hit_obj, hit_face) )
+                        else if (!LLSelectMgr::getInstance()->getSelection()->contains(hit_obj, hit_face) )
                        {
                                // object is selected, but not this face, so add it.
-                                gSelectMgr->addAsIndividual(hit_obj, hit_face);
+                                LLSelectMgr::getInstance()->addAsIndividual(hit_obj, hit_face);
                        }
                        else
                        {
                                // object is selected, as is this face, so remove the face.
-                                gSelectMgr->remove(hit_obj, hit_face);
+                                LLSelectMgr::getInstance()->remove(hit_obj, hit_face);
                                // BUG: If you remove the last face, the simulator won't know about it.
                        }
@@ -130,15 +127,15 @@ void LLToolFace::pickCallback(S32 x, S32 y, MASK mask)
                {
                        // clicked without modifiers, select only
                        // this face
-                        gSelectMgr->deselectAll();
+                        LLSelectMgr::getInstance()->deselectAll();
-                        gSelectMgr->selectObjectOnly(hit_obj, hit_face);
+                        LLSelectMgr::getInstance()->selectObjectOnly(hit_obj, hit_face);
                }
        }
        else
        {
                if (!(mask == MASK_SHIFT))
                {
-                        gSelectMgr->deselectAll();
+                        LLSelectMgr::getInstance()->deselectAll();
                }
        }
 }
@@ -147,14 +144,14 @@ void LLToolFace::pickCallback(S32 x, S32 y, MASK mask)
 void LLToolFace::handleSelect()
 {
        // From now on, draw faces
-        gSelectMgr->setTEMode(TRUE);
+        LLSelectMgr::getInstance()->setTEMode(TRUE);
 }
 void LLToolFace::handleDeselect()
 {
        // Stop drawing faces
-        gSelectMgr->setTEMode(FALSE);
+        LLSelectMgr::getInstance()->setTEMode(FALSE);
 }
diff --git a/linden/indra/newview/lltoolface.h b/linden/indra/newview/lltoolface.h
index 600d2a6..b16aedc 100644
--- a/linden/indra/newview/lltoolface.h
+++ b/linden/indra/newview/lltoolface.h
@@ -37,7 +37,7 @@
 class LLViewerObject;
 class LLToolFace
-:       public LLTool
+:       public LLTool, public LLSingleton<LLToolFace>
 {
 public:
        LLToolFace();
@@ -52,6 +52,4 @@ public:
        static void pickCallback(S32 x, S32 y, MASK mask);
 };
-extern LLToolFace *gToolFace;
 #endif
diff --git a/linden/indra/newview/lltoolfocus.cpp b/linden/indra/newview/lltoolfocus.cpp
index 2e046c4..c526e6e 100644
--- a/linden/indra/newview/lltoolfocus.cpp
+++ b/linden/indra/newview/lltoolfocus.cpp
@@ -50,7 +50,6 @@
 #include "llselectmgr.h"
 #include "llstatusbar.h"
 #include "lltoolmgr.h"
-#include "lltoolselect.h"
 #include "llviewercamera.h"
 #include "llviewerobject.h"
 #include "llviewerwindow.h"
@@ -58,9 +57,9 @@
 #include "llmorphview.h"
 // Globals
-LLToolCamera    *gToolCamera = NULL;
 BOOL gCameraBtnOrbit = FALSE;
 BOOL gCameraBtnPan = FALSE;
 const S32 SLOP_RANGE = 4;
 const F32 FOCUS_OFFSET_FACTOR = 1.f;
@@ -133,13 +132,13 @@ BOOL LLToolCamera::handleMouseDown(S32 x, S32 y, MASK mask)
 void LLToolCamera::pickCallback(S32 x, S32 y, MASK mask)
 {
-        if (!gToolCamera->hasMouseCapture())
+        if (!LLToolCamera::getInstance()->hasMouseCapture())
        {
                return;
        }
-        gToolCamera->mMouseDownX = x;
+        LLToolCamera::getInstance()->mMouseDownX = x;
-        gToolCamera->mMouseDownY = y;
+        LLToolCamera::getInstance()->mMouseDownY = y;
        gViewerWindow->moveCursorToCenter();
@@ -149,17 +148,17 @@ void LLToolCamera::pickCallback(S32 x, S32 y, MASK mask)
        // Check for hit the sky, or some other invalid point
        if (!hit_obj && gLastHitPosGlobal.isExactlyZero())
        {
-                gToolCamera->mValidClickPoint = FALSE;
+                LLToolCamera::getInstance()->mValidClickPoint = FALSE;
                return;
        }
        // check for hud attachments
        if (hit_obj && hit_obj->isHUDAttachment())
        {
-                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
                if (!selection->getObjectCount() || selection->getSelectType() != SELECT_TYPE_HUD)
                {
-                        gToolCamera->mValidClickPoint = FALSE;
+                        LLToolCamera::getInstance()->mValidClickPoint = FALSE;
                        return;
                }
        }
@@ -185,7 +184,7 @@ void LLToolCamera::pickCallback(S32 x, S32 y, MASK mask)
                if( !good_customize_avatar_hit )
                {
-                        gToolCamera->mValidClickPoint = FALSE;
+                        LLToolCamera::getInstance()->mValidClickPoint = FALSE;
                        return;
                }
@@ -196,7 +195,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()->getName() == "Camera")) 
+                        (LLToolMgr::getInstance()->getCurrentTool()->getName() == "Camera")) 
        {
                LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
                if (hit_obj)
@@ -224,19 +223,19 @@ void LLToolCamera::pickCallback(S32 x, S32 y, MASK mask)
                        (hit_obj == gAgent.getAvatarObject() || 
                                (hit_obj && hit_obj->isAttachment() && LLVOAvatar::findAvatarFromAttachment(hit_obj)->mIsSelf)))
                {
-                        gToolCamera->mMouseSteering = TRUE;
+                        LLToolCamera::getInstance()->mMouseSteering = TRUE;
                }
        }
-        gToolCamera->mValidClickPoint = TRUE;
+        LLToolCamera::getInstance()->mValidClickPoint = TRUE;
        if( CAMERA_MODE_CUSTOMIZE_AVATAR == gAgent.getCameraMode() )
        {
                gAgent.setFocusOnAvatar(FALSE, FALSE);
                
                LLVector3d cam_pos = gAgent.getCameraPositionGlobal();
-                cam_pos -= LLVector3d(gCamera->getLeftAxis() * gAgent.calcCustomizeAvatarUIOffset( cam_pos ));
+                cam_pos -= LLVector3d(LLViewerCamera::getInstance()->getLeftAxis() * gAgent.calcCustomizeAvatarUIOffset( cam_pos ));
                gAgent.setCameraPosAndFocusGlobal( cam_pos, gLastHitObjectOffset + gLastHitPosGlobal, gLastHitObjectID);
        }
@@ -255,7 +254,7 @@ void LLToolCamera::releaseMouse()
        gViewerWindow->showCursor();
-        gToolMgr->clearTransientTool();
+        LLToolMgr::getInstance()->clearTransientTool();
        mMouseSteering = FALSE;
        mValidClickPoint = FALSE;
@@ -279,7 +278,7 @@ BOOL LLToolCamera::handleMouseUp(S32 x, S32 y, MASK mask)
                        {
                                LLCoordGL mouse_pos;
                                LLVector3 focus_pos = gAgent.getPosAgentFromGlobal(gAgent.getFocusGlobal());
-                                BOOL success = gCamera->projectPosAgentToScreen(focus_pos, mouse_pos);
+                                BOOL success = LLViewerCamera::getInstance()->projectPosAgentToScreen(focus_pos, mouse_pos);
                                if (success)
                                {
                                        LLUI::setCursorPositionScreen(mouse_pos.mX, mouse_pos.mY);
diff --git a/linden/indra/newview/lltoolfocus.h b/linden/indra/newview/lltoolfocus.h
index 2881a10..3f5b04c 100644
--- a/linden/indra/newview/lltoolfocus.h
+++ b/linden/indra/newview/lltoolfocus.h
@@ -35,7 +35,7 @@
 #include "lltool.h"
 class LLToolCamera
-:       public LLTool
+:       public LLTool, public LLSingleton<LLToolCamera>
 {
 public:
        LLToolCamera();
@@ -75,8 +75,6 @@ protected:
 };
-extern LLToolCamera *gToolCamera;
 extern BOOL gCameraBtnOrbit;
 extern BOOL gCameraBtnPan;
diff --git a/linden/indra/newview/lltoolgrab.cpp b/linden/indra/newview/lltoolgrab.cpp
index a60046b..a8e789d 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -69,7 +69,6 @@ const S32 SLOP_DIST_SQ = 4;
 BOOL gGrabBtnVertical = FALSE;
 BOOL gGrabBtnSpin = FALSE;
 LLTool* gGrabTransientTool = NULL;
-LLToolGrab *gToolGrab = NULL;
 extern BOOL gDebugClicks;
 //
@@ -151,26 +150,26 @@ void LLToolGrab::pickCallback(S32 x, S32 y, MASK mask)
        BOOL extend_select = (mask & MASK_SHIFT);
-        if (!extend_select && !gSelectMgr->getSelection()->isEmpty())
+        if (!extend_select && !LLSelectMgr::getInstance()->getSelection()->isEmpty())
        {
-                gSelectMgr->deselectAll();
+                LLSelectMgr::getInstance()->deselectAll();
-                gToolGrab->mDeselectedThisClick = TRUE;
+                LLToolGrab::getInstance()->mDeselectedThisClick = TRUE;
        }
        else
        {
-                gToolGrab->mDeselectedThisClick = FALSE;
+                LLToolGrab::getInstance()->mDeselectedThisClick = FALSE;
        }
        // if not over object, do nothing
        if (!objectp)
        {
-                gToolGrab->setMouseCapture(TRUE);
+                LLToolGrab::getInstance()->setMouseCapture(TRUE);
-                gToolGrab->mMode = GRAB_NOOBJECT;
+                LLToolGrab::getInstance()->mMode = GRAB_NOOBJECT;
-                gToolGrab->mHitObjectID.setNull();
+                LLToolGrab::getInstance()->mHitObjectID.setNull();
        }
        else
        {
-                gToolGrab->handleObjectHit(objectp, x, y, mask);
+                LLToolGrab::getInstance()->handleObjectHit(objectp, x, y, mask);
        }
 }
@@ -273,7 +272,7 @@ BOOL LLToolGrab::handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mas
                startSpin();
        }
-        gSelectMgr->updateSelectionCenter();            // update selection beam
+        LLSelectMgr::getInstance()->updateSelectionCenter();            // update selection beam
        // update point at
        LLViewerObject *edit_object = gObjectList.findObject(mHitObjectID);
@@ -505,7 +504,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
                        LLQuaternion rotation_around_vertical( dx*RADIANS_PER_PIXEL_X, up );
                        // y motion maps to rotation around left axis
-                        const LLVector3 &agent_left = gCamera->getLeftAxis();
+                        const LLVector3 &agent_left = LLViewerCamera::getInstance()->getLeftAxis();
                        LLQuaternion rotation_around_left( dy*RADIANS_PER_PIXEL_Y, agent_left );
                        // compose with current rotation
@@ -530,14 +529,14 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
                        //------------------------------------------------------
                        LLVector3d x_part;
-                        x_part.setVec(gCamera->getLeftAxis());
+                        x_part.setVec(LLViewerCamera::getInstance()->getLeftAxis());
                        x_part.mdV[VZ] = 0.0;
                        x_part.normVec();
                        LLVector3d y_part;
                        if( mVerticalDragging )
                        {
-                                y_part.setVec(gCamera->getUpAxis());
+                                y_part.setVec(LLViewerCamera::getInstance()->getUpAxis());
                                // y_part.setVec(0.f, 0.f, 1.f);
                        }
                        else
@@ -579,7 +578,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
                        */
                        // Don't let object centers go underground.
-                        F32 land_height = gWorldPointer->resolveLandHeightGlobal(grab_point_global);
+                        F32 land_height = LLWorld::getInstance()->resolveLandHeightGlobal(grab_point_global);
                        if (grab_point_global.mdV[VZ] < land_height)
                        {
@@ -592,7 +591,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
                                grab_point_global.mdV[VZ] = MAX_OBJECT_Z;
                        }
-                        grab_point_global = gWorldp->clipToVisibleRegions(mDragStartPointGlobal, grab_point_global);
+                        grab_point_global = LLWorld::getInstance()->clipToVisibleRegions(mDragStartPointGlobal, grab_point_global);
                        // propagate constrained grab point back to grab offset
                        mGrabHiddenOffsetFromCamera = grab_point_global - gAgent.getCameraPositionGlobal();
@@ -600,7 +599,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
                        LLVector3 grab_pos_agent = gAgent.getPosAgentFromGlobal( grab_point_global );
                        LLCoordGL grab_center_gl( gViewerWindow->getWindowWidth() / 2, gViewerWindow->getWindowHeight() / 2);
-                        gCamera->projectPosAgentToScreen(grab_pos_agent, grab_center_gl);
+                        LLViewerCamera::getInstance()->projectPosAgentToScreen(grab_pos_agent, grab_center_gl);
                        const S32 ROTATE_H_MARGIN = gViewerWindow->getWindowWidth() / 20;
                        const F32 ROTATE_ANGLE_PER_SECOND = 30.f * DEG_TO_RAD;
@@ -652,7 +651,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask)
                gViewerWindow->moveCursorToCenter();
-                gSelectMgr->updateSelectionCenter();
+                LLSelectMgr::getInstance()->updateSelectionCenter();
        }
@@ -804,7 +803,7 @@ void LLToolGrab::onMouseCaptureLost()
                        LLVector3 grab_point_agent = mGrabObject->getRenderPosition();
                        LLCoordGL gl_point;
-                        if (gCamera->projectPosAgentToScreen(grab_point_agent, gl_point))
+                        if (LLViewerCamera::getInstance()->projectPosAgentToScreen(grab_point_agent, gl_point))
                        {
                                LLUI::setCursorPositionScreen(gl_point.mX, gl_point.mY);
                        }
@@ -826,7 +825,7 @@ void LLToolGrab::onMouseCaptureLost()
        mGrabObject = NULL;
-        gSelectMgr->updateSelectionCenter();
+        LLSelectMgr::getInstance()->updateSelectionCenter();
        gAgent.setPointAt(POINTAT_TARGET_CLEAR);
        gAgent.setLookAt(LOOKAT_TARGET_CLEAR);
diff --git a/linden/indra/newview/lltoolgrab.h b/linden/indra/newview/lltoolgrab.h
index 7b3114b..c54b0ff 100644
--- a/linden/indra/newview/lltoolgrab.h
+++ b/linden/indra/newview/lltoolgrab.h
@@ -42,7 +42,7 @@ class LLView;
 class LLTextBox;
 class LLViewerObject;
-class LLToolGrab : public LLTool
+class LLToolGrab : public LLTool, public LLSingleton<LLToolGrab>
 {
 public:
        LLToolGrab( LLToolComposite* composite = NULL );
@@ -125,8 +125,6 @@ private:
        BOOL                    mHideBuildHighlight;
 };
-extern LLToolGrab *gToolGrab;
 extern BOOL gGrabBtnVertical;
 extern BOOL gGrabBtnSpin;
 extern LLTool* gGrabTransientTool;
diff --git a/linden/indra/newview/lltoolgun.cpp b/linden/indra/newview/lltoolgun.cpp
index 3385064..e4a7f6c 100644
--- a/linden/indra/newview/lltoolgun.cpp
+++ b/linden/indra/newview/lltoolgun.cpp
@@ -51,7 +51,6 @@ LLToolGun::LLToolGun( LLToolComposite* composite )
        :
        LLTool( "gun", composite )
 {
-        mCrosshairImg = gImageList.getImage( LLUUID( gSavedSettings.getString("UIImgCrosshairsUUID") ), MIPMAP_FALSE, TRUE );
 }
 void LLToolGun::handleSelect()
@@ -71,23 +70,19 @@ void LLToolGun::handleDeselect()
 BOOL LLToolGun::handleMouseDown(S32 x, S32 y, MASK mask)
 {
        gGrabTransientTool = this;
-        gToolMgr->getCurrentToolset()->selectTool( gToolGrab );
+        LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolGrab::getInstance() );
-        return gToolGrab->handleMouseDown(x, y, mask);
+        return LLToolGrab::getInstance()->handleMouseDown(x, y, mask);
 }
 BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask) 
 {
        if( gAgent.cameraMouselook() )
        {
-                #if 1 //LL_WINDOWS || LL_DARWIN
+                const F32 NOMINAL_MOUSE_SENSITIVITY = 0.0025f;
-                        const F32 NOMINAL_MOUSE_SENSITIVITY = 0.0025f;
-                #else
-                        const F32 NOMINAL_MOUSE_SENSITIVITY = 0.025f;
-                #endif
-                
+                F32 mouse_sensitivity = gSavedSettings.getF32("MouseSensitivity");
-                F32 mouse_sensitivity = clamp_rescale(gMouseSensitivity, 0.f, 15.f, 0.5f, 2.75f) * NOMINAL_MOUSE_SENSITIVITY;
+                mouse_sensitivity = clamp_rescale(mouse_sensitivity, 0.f, 15.f, 0.5f, 2.75f) * NOMINAL_MOUSE_SENSITIVITY;
                // ...move the view with the mouse
@@ -98,7 +93,7 @@ BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask)
                if (dx != 0 || dy != 0)
                {
                        // ...actually moved off center
-                        if (gInvertMouse)
+                        if (gSavedSettings.getBOOL("InvertMouse"))
                        {
                                gAgent.pitch(mouse_sensitivity * -dy);
                        }
@@ -111,9 +106,9 @@ BOOL LLToolGun::handleHover(S32 x, S32 y, MASK mask)
                        if (gSavedSettings.getBOOL("MouseSun"))
                        {
-                                gSky.setSunDirection(gCamera->getAtAxis(), LLVector3(0.f, 0.f, 0.f));
+                                gSky.setSunDirection(LLViewerCamera::getInstance()->getAtAxis(), LLVector3(0.f, 0.f, 0.f));
                                gSky.setOverrideSun(TRUE);
-                                gSavedSettings.setVector3("SkySunDefaultPosition", gCamera->getAtAxis());
+                                gSavedSettings.setVector3("SkySunDefaultPosition", LLViewerCamera::getInstance()->getAtAxis());
                        }
                        gViewerWindow->moveCursorToCenter();
@@ -137,9 +132,9 @@ void LLToolGun::draw()
 {
        if( gSavedSettings.getBOOL("ShowCrosshairs") )
        {
-                gl_draw_image(
+                LLUIImagePtr crosshair = LLUI::getUIImage("UIImgCrosshairsUUID");
-                        ( gViewerWindow->getWindowWidth() - mCrosshairImg->getWidth() ) / 2,
+                crosshair->draw(
-                        ( gViewerWindow->getWindowHeight() - mCrosshairImg->getHeight() ) / 2,
+                        ( gViewerWindow->getWindowWidth() - crosshair->getWidth() ) / 2,
-                        mCrosshairImg );
+                        ( gViewerWindow->getWindowHeight() - crosshair->getHeight() ) / 2);
        }
 }
diff --git a/linden/indra/newview/lltoolgun.h b/linden/indra/newview/lltoolgun.h
index 2a8ad1b..af8eed8 100644
--- a/linden/indra/newview/lltoolgun.h
+++ b/linden/indra/newview/lltoolgun.h
@@ -33,7 +33,7 @@
 #define LL_TOOLGUN_H
 #include "lltool.h"
-#include "llviewerimage.h"
+#include "llui.h"
 class LLToolGun : public LLTool
@@ -51,9 +51,6 @@ public:
        virtual LLTool* getOverrideTool(MASK mask) { return NULL; }
        virtual BOOL    clipMouseWhenDown()             { return FALSE; }
-private:
-        LLPointer<LLViewerImage>        mCrosshairImg;
 };
 #endif
diff --git a/linden/indra/newview/lltoolindividual.cpp b/linden/indra/newview/lltoolindividual.cpp
index 946a546..d7f7b12 100644
--- a/linden/indra/newview/lltoolindividual.cpp
+++ b/linden/indra/newview/lltoolindividual.cpp
@@ -49,7 +49,6 @@
 /// Globals
 ///----------------------------------------------------------------------------
-LLToolIndividual* gToolIndividual = NULL;
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
@@ -80,16 +79,16 @@ BOOL LLToolIndividual::handleMouseDown(S32 x, S32 y, MASK mask)
 void LLToolIndividual::pickCallback(S32 x, S32 y, MASK mask)
 {
        LLViewerObject* obj = gViewerWindow->lastObjectHit();
-        gSelectMgr->deselectAll();
+        LLSelectMgr::getInstance()->deselectAll();
        if(obj)
        {
-                gSelectMgr->selectObjectOnly(obj);
+                LLSelectMgr::getInstance()->selectObjectOnly(obj);
        }
 }
 BOOL LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
-        if(!gSelectMgr->getSelection()->isEmpty())
+        if(!LLSelectMgr::getInstance()->getSelection()->isEmpty())
        {
                // You should already have an object selected from the mousedown.
                // If so, show its inventory. 
@@ -109,11 +108,11 @@ BOOL LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
 void LLToolIndividual::handleSelect()
 {
        const BOOL children_ok = TRUE;
-        LLViewerObject* obj = gSelectMgr->getSelection()->getFirstRootObject(children_ok);
+        LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
-        gSelectMgr->deselectAll();
+        LLSelectMgr::getInstance()->deselectAll();
        if(obj)
        {
-                gSelectMgr->selectObjectOnly(obj);
+                LLSelectMgr::getInstance()->selectObjectOnly(obj);
        }
 }
diff --git a/linden/indra/newview/lltoolindividual.h b/linden/indra/newview/lltoolindividual.h
index 31c1235..12340fc 100644
--- a/linden/indra/newview/lltoolindividual.h
+++ b/linden/indra/newview/lltoolindividual.h
@@ -40,7 +40,7 @@
 // A tool to select individual objects rather than linked sets.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLToolIndividual : public LLTool
+class LLToolIndividual : public LLTool, public LLSingleton<LLToolIndividual>
 {
 public:
        LLToolIndividual();
@@ -58,7 +58,5 @@ protected:
 };
-extern LLToolIndividual* gToolIndividual;
 #endif // LL_LLTOOLINDIVIDUAL_H
diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 0a4a99d..b7a5ab9 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -46,13 +46,12 @@
 #include "lltoolmorph.h"
 #include "lltoolpie.h"
 #include "lltoolplacer.h"
-#include "lltoolselect.h"
 #include "lltoolselectland.h"
 #include "lltoolobjpicker.h"
 #include "lltoolpipette.h"
+#include "llagent.h"
+#include "llviewercontrol.h"
-// Globals (created and destroyed by LLAgent)
-LLToolMgr*              gToolMgr        = NULL;
 // Used when app not active to avoid processing hover.
 LLTool*                 gToolNull       = NULL;
@@ -87,179 +86,34 @@ LLToolMgr::LLToolMgr()
 void LLToolMgr::initTools()
 {
-        // Initialize all the tools
+        static BOOL initialized = FALSE;
-        // Variables that are reused for each tool
+        if(initialized)
-        LLTool*         tool    = NULL;
+        {
+                return;
-        //
+        }
-        // Pie tool (not visible in UI, implicit)
+        initialized = TRUE;
-        //
+        gBasicToolset->addTool( LLToolPie::getInstance() );
-        gToolPie = new LLToolPie();
+        gBasicToolset->addTool( LLToolCamera::getInstance() );
+        gCameraToolset->addTool( LLToolCamera::getInstance() );
-        gBasicToolset->addTool( gToolPie );
+        gBasicToolset->addTool( LLToolGrab::getInstance() );
-//      gCameraToolset->addTool( gToolPie );
+        gBasicToolset->addTool( LLToolCompTranslate::getInstance() );
-//      gLandToolset->addTool( gToolPie );
+        gBasicToolset->addTool( LLToolCompCreate::getInstance() );
+        gBasicToolset->addTool( LLToolBrushLand::getInstance() );
-        // Camera tool
+        gMouselookToolset->addTool( LLToolCompGun::getInstance() );
-        gToolCamera = new LLToolCamera();
+        gBasicToolset->addTool( LLToolCompInspect::getInstance() );
-        gBasicToolset   ->addTool( gToolCamera );
+        gFaceEditToolset->addTool( LLToolCamera::getInstance() );
-        gCameraToolset->addTool( gToolCamera );
-        //
-        // Grab tool
-        //
-        gToolGrab = new LLToolGrab();
-        tool = gToolGrab;
-                
-        gBasicToolset->addTool( tool );
-        //
-        // Translation tool
-        //
-        gToolTranslate = new LLToolCompTranslate();
-        tool = gToolTranslate;
-        gBasicToolset->addTool( tool );
-        //
-        // Scale ("Stretch") tool
-        //
-        gToolStretch = new LLToolCompScale();
-        tool = gToolStretch;
-        //
-        // Rotation tool
-        //
-        gToolRotate = new LLToolCompRotate();
-        tool = gToolRotate;
-        //
-        // Face tool
-        //
-        gToolFace = new LLToolFace();
-        tool = gToolFace;
-        //
-        // Pipette tool
-        //
-        gToolPipette = new LLToolPipette();
-        //
-        // Individual object selector
-        //
-        gToolIndividual = new LLToolIndividual();
-        
-        //
-        // Create object tool
-        //
-        gToolCreate = new LLToolCompCreate();
-        tool = gToolCreate;
-        gBasicToolset->addTool( tool );
-        //
-        // Land brush tool
-        //
-        gToolLand = new LLToolBrushLand();
-        tool = gToolLand;
-        gBasicToolset->addTool( tool );
-        //
-        // Land select tool
-        //
-        gToolParcel = new LLToolSelectLand();
-        tool = gToolParcel;
-        //
-        // Gun tool
-        //
-        gToolGun = new LLToolCompGun();
-        gMouselookToolset->addTool( gToolGun );
-        //
-        // Inspect tool
-        //
-        gToolInspect = new LLToolCompInspect();
-        gBasicToolset->addTool( gToolInspect );
-        //
-        // Face edit tool
-        //
-//      gToolMorph = new LLToolMorph();
-//      gFaceEditToolset->addTool( gToolMorph );
-        gFaceEditToolset->addTool( gToolCamera );
-        // Drag and drop tool
-        gToolDragAndDrop = new LLToolDragAndDrop();
-        gToolObjPicker = new LLToolObjPicker();
        // On startup, use "select" tool
        setCurrentToolset(gBasicToolset);
-        gBasicToolset->selectTool( gToolPie );
+        gBasicToolset->selectTool( LLToolPie::getInstance() );
 }
 LLToolMgr::~LLToolMgr()
 {
-        delete gToolPie;
-        gToolPie = NULL;
-        delete gToolInspect;
-        gToolInspect = NULL;
-        delete gToolGun;
-        gToolGun = NULL;
-        delete gToolCamera;
-        gToolCamera = NULL;
-//      delete gToolMorph;
-//      gToolMorph = NULL;
-        delete gToolDragAndDrop;
-        gToolDragAndDrop = NULL;
        delete gBasicToolset;
        gBasicToolset = NULL;
-        delete gToolGrab;
-        gToolGrab = NULL;
-        delete gToolRotate;
-        gToolRotate = NULL;
-        delete gToolTranslate;
-        gToolTranslate = NULL;
-        delete gToolStretch;
-        gToolStretch = NULL;
-        delete gToolIndividual;
-        gToolIndividual = NULL;
-        delete gToolPipette;
-        gToolPipette = NULL;
-        delete gToolCreate;
-        gToolCreate = NULL;
-        delete gToolFace;
-        gToolFace = NULL;
-        delete gToolLand;
-        gToolLand = NULL;
-        delete gToolParcel;
-        gToolParcel = NULL;
-        delete gToolObjPicker;
-        gToolObjPicker = NULL;
        delete gMouselookToolset;
        gMouselookToolset = NULL;
@@ -372,7 +226,20 @@ void LLToolMgr::updateToolStatus()
 BOOL LLToolMgr::inEdit()
 {
-        return mBaseTool != gToolPie && mBaseTool != gToolNull;
+        return mBaseTool != LLToolPie::getInstance() && mBaseTool != gToolNull;
+}
+bool LLToolMgr::inBuildMode()
+{
+        // when entering mouselook inEdit() immediately returns true before 
+        // cameraMouselook() actually starts returning true.  Also, appearance edit
+        // sets build mode to true, so let's exclude that.
+        bool b=(inEdit() 
+                        && gSavedSettings.getBOOL("BuildBtnState")
+                        && !gAgent.cameraMouselook()
+                        && mCurrentToolset != gFaceEditToolset);
+        
+        return b;
 }
 void LLToolMgr::setTransientTool(LLTool* tool)
@@ -449,7 +316,7 @@ void LLToolset::addTool(LLTool* tool)
 void LLToolset::selectTool(LLTool* tool)
 {
        mSelectedTool = tool;
-        gToolMgr->setCurrentTool( mSelectedTool );
+        LLToolMgr::getInstance()->setCurrentTool( mSelectedTool );
 }
@@ -459,7 +326,7 @@ void LLToolset::selectToolByIndex( S32 index )
        if (tool)
        {
                mSelectedTool = tool;
-                gToolMgr->setCurrentTool( tool );
+                LLToolMgr::getInstance()->setCurrentTool( tool );
        }
 }
@@ -473,10 +340,7 @@ BOOL LLToolset::isToolSelected( S32 index )
 void LLToolset::selectFirstTool()
 {
        mSelectedTool = (0 < mToolList.size()) ? mToolList[0] : NULL;
-        if (gToolMgr) 
+        LLToolMgr::getInstance()->setCurrentTool( mSelectedTool );
-        {
-                gToolMgr->setCurrentTool( mSelectedTool );
-        }
 }
@@ -497,7 +361,7 @@ void LLToolset::selectNextTool()
        if( next )
        {
                mSelectedTool = next;
-                gToolMgr->setCurrentTool( mSelectedTool );
+                LLToolMgr::getInstance()->setCurrentTool( mSelectedTool );
        }
        else
        {
@@ -522,17 +386,16 @@ void LLToolset::selectPrevTool()
        if( prev )
        {
                mSelectedTool = prev;
-                gToolMgr->setCurrentTool( mSelectedTool );
+                LLToolMgr::getInstance()->setCurrentTool( mSelectedTool );
        }
        else if (mToolList.size() > 0)
        {
                selectToolByIndex((S32)mToolList.size()-1);
        }
-        
 }
 void select_tool( void *tool_pointer )
 {
        LLTool *tool = (LLTool *)tool_pointer;
-        gToolMgr->getCurrentToolset()->selectTool( tool );
+        LLToolMgr::getInstance()->getCurrentToolset()->selectTool( tool );
 }
diff --git a/linden/indra/newview/lltoolmgr.h b/linden/indra/newview/lltoolmgr.h
index c193be3..10affff 100644
--- a/linden/indra/newview/lltoolmgr.h
+++ b/linden/indra/newview/lltoolmgr.h
@@ -45,7 +45,7 @@ const MASK MASK_ORBIT			= MASK_CONTROL;
 const MASK MASK_PAN                             = MASK_CONTROL | MASK_SHIFT;
 const MASK MASK_COPY                    = MASK_SHIFT;
-class LLToolMgr
+class LLToolMgr : public LLSingleton<LLToolMgr>
 {
 public:
        LLToolMgr();
@@ -58,6 +58,9 @@ public:
        LLTool*                 getBaseTool(); // returns active tool when overrides are deactivated
        BOOL                    inEdit();
+        
+        /* Determines if we are in Build mode or not. */
+        bool                    inBuildMode();
        void                    setTransientTool(LLTool* tool);
        void                    clearTransientTool();
@@ -115,8 +118,7 @@ protected:
 void select_tool(void *tool);
-// Globals (created and destroyed by LLViewerWindow)
+// Globals
-extern LLToolMgr*   gToolMgr;
 extern LLToolset* gBasicToolset;
 extern LLToolset *gCameraToolset;
diff --git a/linden/indra/newview/lltoolmorph.cpp b/linden/indra/newview/lltoolmorph.cpp
index 7368439..5b3f1eb 100644
--- a/linden/indra/newview/lltoolmorph.cpp
+++ b/linden/indra/newview/lltoolmorph.cpp
@@ -64,7 +64,6 @@
 #include "llvoavatar.h"
 #include "pipeline.h"
-//LLToolMorph *gToolMorph = NULL;
 //static
 LLVisualParamHint::instance_list_t LLVisualParamHint::sInstances;
@@ -94,9 +93,7 @@ LLVisualParamHint::LLVisualParamHint(
        mLastParamWeight(0.f)
 {
        LLVisualParamHint::sInstances.insert( this );
-        LLUUID id;
+        mBackgroundp = LLUI::getUIImage("avatar_thumb_bkgrnd.j2c");
-        id.set( gViewerArt.getString("avatar_thumb_bkgrnd.tga") );
-        mBackgroundp = gImageList.getImage(id, FALSE, TRUE);
        llassert(width != 0);
@@ -180,10 +177,7 @@ BOOL LLVisualParamHint::render()
        LLGLSUIDefault gls_ui;
        //LLGLState::verify(TRUE);
-        LLViewerImage::bindTexture(mBackgroundp);
+        mBackgroundp->draw(0, 0, mWidth, mHeight);
-        gGL.color4f(1.f, 1.f, 1.f, 1.f);
-        gl_rect_2d_simple_tex( mWidth, mHeight );
-        mBackgroundp->unbindTexture(0, GL_TEXTURE_2D);
        glMatrixMode(GL_PROJECTION);
        glPopMatrix();
@@ -229,13 +223,13 @@ BOOL LLVisualParamHint::render()
        LLVector3 camera_pos = target_joint_pos + (camera_snapshot_offset * avatar_rotation);
        
        gGL.stop();
-        gCamera->setAspect((F32)mWidth / (F32)mHeight);
+        LLViewerCamera::getInstance()->setAspect((F32)mWidth / (F32)mHeight);
-        gCamera->setOriginAndLookAt(
+        LLViewerCamera::getInstance()->setOriginAndLookAt(
                camera_pos,             // camera
                LLVector3(0.f, 0.f, 1.f),                                               // up
                target_pos );   // point of interest
-        gCamera->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
+        LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
        if (avatarp->mDrawable.notNull())
        {
diff --git a/linden/indra/newview/lltoolmorph.h b/linden/indra/newview/lltoolmorph.h
index b8f56d3..dbb2744 100644
--- a/linden/indra/newview/lltoolmorph.h
+++ b/linden/indra/newview/lltoolmorph.h
@@ -91,7 +91,7 @@ protected:
        LLRect                                  mRect;
        F32                                             mLastParamWeight;
-        LLPointer<LLViewerImage> mBackgroundp;
+        LLUIImagePtr mBackgroundp;
        typedef std::set<LLVisualParamHint*> instance_list_t;
        static instance_list_t sInstances;
diff --git a/linden/indra/newview/lltoolobjpicker.cpp b/linden/indra/newview/lltoolobjpicker.cpp
index 52469b7..f5d25d8 100644
--- a/linden/indra/newview/lltoolobjpicker.cpp
+++ b/linden/indra/newview/lltoolobjpicker.cpp
@@ -48,7 +48,6 @@
 #include "llviewerwindow.h"
 #include "lldrawable.h"
-LLToolObjPicker* gToolObjPicker = NULL;
 LLToolObjPicker::LLToolObjPicker()
 :       LLTool( "ObjPicker", NULL ),
@@ -98,8 +97,8 @@ void LLToolObjPicker::pickCallback(S32 x, S32 y, MASK mask)
        objectp = gObjectList.findObject( gLastHitObjectID );
        if (objectp)
        {
-                gToolObjPicker->mHitObjectID = objectp->mID;
+                LLToolObjPicker::getInstance()->mHitObjectID = objectp->mID;
-                gToolObjPicker->mPicked = TRUE;
+                LLToolObjPicker::getInstance()->mPicked = TRUE;
        }
 }
diff --git a/linden/indra/newview/lltoolobjpicker.h b/linden/indra/newview/lltoolobjpicker.h
index 3a3c628..e56b390 100644
--- a/linden/indra/newview/lltoolobjpicker.h
+++ b/linden/indra/newview/lltoolobjpicker.h
@@ -36,7 +36,7 @@
 #include "v3math.h"
 #include "lluuid.h"
-class LLToolObjPicker : public LLTool
+class LLToolObjPicker : public LLTool, public LLSingleton<LLToolObjPicker>
 {
 public:
        LLToolObjPicker();
@@ -63,6 +63,5 @@ protected:
        void                            *mExitCallbackData;
 };
-extern LLToolObjPicker* gToolObjPicker;
 #endif  
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index ab60c67..a9e733a 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -67,8 +67,6 @@
 #include "llui.h"
 #include "llweb.h"
-LLToolPie *gToolPie = NULL;
 LLPointer<LLViewerObject> LLToolPie::sClickActionObject;
 LLSafeHandle<LLObjectSelection> LLToolPie::sLeftClickSelection = NULL;
 U8 LLToolPie::sClickAction = 0;
@@ -94,8 +92,6 @@ LLToolPie::LLToolPie()
 BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-        if (!gCamera) return FALSE;
        gPickFaces = TRUE;
        //left mouse down always picks transparent
        gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, leftMouseCallback, 
@@ -107,7 +103,7 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 // static
 void LLToolPie::leftMouseCallback(S32 x, S32 y, MASK mask)
 {
-        gToolPie->pickAndShowMenu(x, y, mask, FALSE);
+        LLToolPie::getInstance()->pickAndShowMenu(x, y, mask, FALSE);
 }
 BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask)
@@ -125,7 +121,7 @@ BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask)
 // static
 void LLToolPie::rightMouseCallback(S32 x, S32 y, MASK mask)
 {
-        gToolPie->pickAndShowMenu(x, y, mask, TRUE);
+        LLToolPie::getInstance()->pickAndShowMenu(x, y, mask, TRUE);
 }
 // True if you selected an object.
@@ -133,12 +129,12 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
 {
        if (!always_show && gLastHitParcelWall)
        {
-                LLParcel* parcel = gParcelMgr->getCollisionParcel();
+                LLParcel* parcel = LLViewerParcelMgr::getInstance()->getCollisionParcel();
                if (parcel)
                {
-                        gParcelMgr->selectCollisionParcel();
+                        LLViewerParcelMgr::getInstance()->selectCollisionParcel();
                        if (parcel->getParcelFlag(PF_USE_PASS_LIST) 
-                                && !gParcelMgr->isCollisionBanned())
+                                && !LLViewerParcelMgr::getInstance()->isCollisionBanned())
                        {
                                // if selling passes, just buy one
                                void* deselect_when_done = (void*)TRUE;
@@ -161,7 +157,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
        mHitLand = !object && !gLastHitPosGlobal.isExactlyZero();
        if (!mHitLand)
        {
-                gParcelMgr->deselectLand();
+                LLViewerParcelMgr::getInstance()->deselectLand();
        }
        
        if (object)
@@ -198,8 +194,12 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                        // nothing
                        break;
                case CLICK_ACTION_SIT:
-                        handle_sit_or_stand();
+                        if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) // agent not already sitting
-                        return TRUE;
+                        {
+                                handle_sit_or_stand();
+                                return TRUE;
+                        } // else nothing (fall through to touch)
+                        
                case CLICK_ACTION_PAY:
                        if (object && object->flagTakesMoney()
                                || parent && parent->flagTakesMoney())
@@ -238,8 +238,8 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                !always_show)
        {
                gGrabTransientTool = this;
-                gToolMgr->getCurrentToolset()->selectTool( gToolGrab );
+                LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolGrab::getInstance() );
-                return gToolGrab->handleObjectHit( object, x, y, mask);
+                return LLToolGrab::getInstance()->handleObjectHit( object, x, y, mask);
        }
        
        if (!object && gLastHitHUDIcon && gLastHitHUDIcon->getSourceObject())
@@ -270,10 +270,10 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                if (object && object == gAgent.getAvatarObject())
                {
                        // we left clicked on avatar, switch to focus mode
-                        gToolMgr->setTransientTool(gToolCamera);
+                        LLToolMgr::getInstance()->setTransientTool(LLToolCamera::getInstance());
                        gViewerWindow->hideCursor();
-                        gToolCamera->setMouseCapture(TRUE);
+                        LLToolCamera::getInstance()->setMouseCapture(TRUE);
-                        gToolCamera->pickCallback(gViewerWindow->getCurrentMouseX(), gViewerWindow->getCurrentMouseY(), mask);
+                        LLToolCamera::getInstance()->pickCallback(gViewerWindow->getCurrentMouseX(), gViewerWindow->getCurrentMouseY(), mask);
                        gAgent.setFocusOnAvatar(TRUE, TRUE);
                        return TRUE;
@@ -297,12 +297,12 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
        // Spawn pie menu
        if (mHitLand)
        {
-                LLParcelSelectionHandle selection = gParcelMgr->selectParcelAt( gLastHitPosGlobal );
+                LLParcelSelectionHandle selection = LLViewerParcelMgr::getInstance()->selectParcelAt( gLastHitPosGlobal );
                gMenuHolder->setParcelSelection(selection);
                gPieLand->show(x, y, mPieMouseButtonDown);
                // VEFFECT: ShowPie
-                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
+                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
                effectp->setPositionGlobal(gLastHitPosGlobal);
                effectp->setColor(LLColor4U(gAgent.getEffectColor()));
                effectp->setDuration(0.25f);
@@ -313,7 +313,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
        }
        else if (object)
        {
-                gMenuHolder->setObjectSelection(gSelectMgr->getSelection());
+                gMenuHolder->setObjectSelection(LLSelectMgr::getInstance()->getSelection());
                if (object->isAvatar() 
                        || (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner()))
@@ -327,7 +327,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                        // Object is an avatar, so check for mute by id.
                        LLVOAvatar* avatar = (LLVOAvatar*)object;
                        LLString name = avatar->getFullname();
-                        if (gMuteListp->isMuted(avatar->getID(), name))
+                        if (LLMuteList::getInstance()->isMuted(avatar->getID(), name))
                        {
                                gMenuHolder->childSetText("Avatar Mute", LLString("Unmute")); // *TODO:Translate
                                //gMutePieMenu->setLabel("Unmute");
@@ -348,12 +348,12 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                {
                        // BUG: What about chatting child objects?
                        LLString name;
-                        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
+                        LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
                        if (node)
                        {
                                name = node->mName;
                        }
-                        if (gMuteListp->isMuted(object->getID(), name))
+                        if (LLMuteList::getInstance()->isMuted(object->getID(), name))
                        {
                                gMenuHolder->childSetText("Object Mute", LLString("Unmute")); // *TODO:Translate
                                //gMuteObjectPieMenu->setLabel("Unmute");
@@ -369,7 +369,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                        // VEFFECT: ShowPie object
                        // Don't show when you click on someone else, it freaks them
                        // out.
-                        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
+                        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
                        effectp->setPositionGlobal(gLastHitPosGlobal);
                        effectp->setColor(LLColor4U(gAgent.getEffectColor()));
                        effectp->setDuration(0.25f);
@@ -440,7 +440,10 @@ ECursorType cursor_from_object(LLViewerObject* object)
        switch(click_action)
        {
        case CLICK_ACTION_SIT:
-                cursor = UI_CURSOR_TOOLSIT;
+                if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) // not already sitting?
+                {
+                        cursor = UI_CURSOR_TOOLSIT;
+                }
                break;
        case CLICK_ACTION_BUY:
                cursor = UI_CURSOR_TOOLBUY;
@@ -476,7 +479,7 @@ void LLToolPie::selectionPropertiesReceived()
 {
        // Make sure all data has been received.
        // This function will be called repeatedly as the data comes in.
-        if (!gSelectMgr->selectGetAllValid())
+        if (!LLSelectMgr::getInstance()->selectGetAllValid())
        {
                return;
        }
@@ -594,7 +597,7 @@ BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask)
                }
        }
        mGrabMouseButtonDown = FALSE;
-        gToolMgr->clearTransientTool();
+        LLToolMgr::getInstance()->clearTransientTool();
        gAgent.setLookAt(LOOKAT_TARGET_CONVERSATION, obj); // maybe look at object/person clicked on
        return LLTool::handleMouseUp(x, y, mask);
 }
@@ -602,7 +605,7 @@ BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask)
 BOOL LLToolPie::handleRightMouseUp(S32 x, S32 y, MASK mask)
 {
        mPieMouseButtonDown = FALSE; 
-        gToolMgr->clearTransientTool();
+        LLToolMgr::getInstance()->clearTransientTool();
        return LLTool::handleRightMouseUp(x, y, mask);
 }
@@ -668,18 +671,18 @@ void LLToolPie::handleDeselect()
                setMouseCapture( FALSE );  // Calls onMouseCaptureLost() indirectly
        }
        // remove temporary selection for pie menu
-        gSelectMgr->validateSelection();
+        LLSelectMgr::getInstance()->validateSelection();
 }
 LLTool* LLToolPie::getOverrideTool(MASK mask)
 {
        if (mask == MASK_CONTROL)
        {
-                return gToolGrab;
+                return LLToolGrab::getInstance();
        }
        else if (mask == (MASK_CONTROL | MASK_SHIFT))
        {
-                return gToolGrab;
+                return LLToolGrab::getInstance();
        }
        return LLTool::getOverrideTool(mask);
@@ -716,7 +719,7 @@ void LLToolPie::render()
 static void handle_click_action_play()
 {
-        LLParcel* parcel = gParcelMgr->getAgentParcel();
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (!parcel) return;
        LLMediaBase::EStatus status = LLViewerParcelMedia::getStatus();
@@ -739,7 +742,7 @@ static void handle_click_action_play()
 static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp)
 {
        //FIXME: how do we handle object in different parcel than us?
-        LLParcel* parcel = gParcelMgr->getAgentParcel();
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (!parcel) return;
        // did we hit an object?
@@ -781,7 +784,7 @@ static ECursorType cursor_from_parcel_media(U8 click_action)
        
        //FIXME: how do we handle object in different parcel than us?
        ECursorType open_cursor = UI_CURSOR_ARROW;
-        LLParcel* parcel = gParcelMgr->getAgentParcel();
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (!parcel) return open_cursor;
        std::string media_url = std::string ( parcel->getMediaURL () );
diff --git a/linden/indra/newview/lltoolpie.h b/linden/indra/newview/lltoolpie.h
index 37ca5ea..1b03ef8 100644
--- a/linden/indra/newview/lltoolpie.h
+++ b/linden/indra/newview/lltoolpie.h
@@ -38,8 +38,7 @@
 class LLViewerObject;
 class LLObjectSelection;
-class LLToolPie 
+class LLToolPie : public LLTool, public LLSingleton<LLToolPie>
-:       public LLTool
 {
 public:
        LLToolPie( );
@@ -81,6 +80,5 @@ protected:
        static LLSafeHandle<LLObjectSelection> sLeftClickSelection;
 };
-extern LLToolPie *gToolPie;
 #endif
diff --git a/linden/indra/newview/lltoolpipette.cpp b/linden/indra/newview/lltoolpipette.cpp
index 67499cc..eaae390 100644
--- a/linden/indra/newview/lltoolpipette.cpp
+++ b/linden/indra/newview/lltoolpipette.cpp
@@ -46,9 +46,6 @@
 #include "llselectmgr.h"
 #include "lltoolmgr.h"
-// Globals
-LLToolPipette *gToolPipette = NULL;
 //
 // Member functions
 //
@@ -79,9 +76,9 @@ BOOL LLToolPipette::handleMouseDown(S32 x, S32 y, MASK mask)
 BOOL LLToolPipette::handleMouseUp(S32 x, S32 y, MASK mask)
 {
        mSuccess = TRUE;
-        gSelectMgr->unhighlightAll();
+        LLSelectMgr::getInstance()->unhighlightAll();
        // *NOTE: This assumes the pipette tool is a transient tool.
-        gToolMgr->clearTransientTool();
+        LLToolMgr::getInstance()->clearTransientTool();
        setMouseCapture(FALSE);
        return TRUE;
 }
@@ -113,7 +110,7 @@ BOOL LLToolPipette::handleToolTip(S32 x, S32 y, LLString& msg, LLRect *sticky_re
 void LLToolPipette::pickCallback(S32 x, S32 y, MASK mask)
 {
        LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
-        gSelectMgr->unhighlightAll();
+        LLSelectMgr::getInstance()->unhighlightAll();
        // if we clicked on a face of a valid prim, save off texture entry data
        if (hit_obj && 
@@ -121,11 +118,11 @@ void LLToolPipette::pickCallback(S32 x, S32 y, MASK mask)
                gLastHitObjectFace != -1)
        {
                //TODO: this should highlight the selected face only
-                gSelectMgr->highlightObjectOnly(hit_obj);
+                LLSelectMgr::getInstance()->highlightObjectOnly(hit_obj);
-                gToolPipette->mTextureEntry = *hit_obj->getTE(gLastHitObjectFace);
+                LLToolPipette::getInstance()->mTextureEntry = *hit_obj->getTE(gLastHitObjectFace);
-                if (gToolPipette->mSelectCallback)
+                if (LLToolPipette::getInstance()->mSelectCallback)
                {
-                        gToolPipette->mSelectCallback(gToolPipette->mTextureEntry, gToolPipette->mUserData);
+                        LLToolPipette::getInstance()->mSelectCallback(LLToolPipette::getInstance()->mTextureEntry, LLToolPipette::getInstance()->mUserData);
                }
        }
 }
diff --git a/linden/indra/newview/lltoolpipette.h b/linden/indra/newview/lltoolpipette.h
index db46769..28d0393 100644
--- a/linden/indra/newview/lltoolpipette.h
+++ b/linden/indra/newview/lltoolpipette.h
@@ -43,7 +43,7 @@
 class LLViewerObject;
 class LLToolPipette
-:       public LLTool
+:       public LLTool, public LLSingleton<LLToolPipette>
 {
 public:
        LLToolPipette();
@@ -68,6 +68,4 @@ protected:
        void*                   mUserData;
 };
-extern LLToolPipette *gToolPipette;
 #endif //LL_LLTOOLPIPETTE_H
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index bf8a400..a319236 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -117,7 +117,7 @@ BOOL LLToolPlacer::raycastForNewObjPos( S32 x, S32 y, LLViewerObject** hit_obj,
        }
        // Find the sim where the surface lives.
-        LLViewerRegion *regionp = gWorldp->getRegionFromPosGlobal(surface_pos_global);
+        LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromPosGlobal(surface_pos_global);
        if (!regionp)
        {
                llwarns << "Trying to add object outside of all known regions!" << llendl;
@@ -130,8 +130,8 @@ BOOL LLToolPlacer::raycastForNewObjPos( S32 x, S32 y, LLViewerObject** hit_obj,
        *region = regionp;
        *ray_start_region =     regionp->getPosRegionFromGlobal( ray_start_global );
-        F32 near_clip = gCamera->getNear() + 0.01f;  // Include an epsilon to avoid rounding issues.
+        F32 near_clip = LLViewerCamera::getInstance()->getNear() + 0.01f;  // Include an epsilon to avoid rounding issues.
-        *ray_start_region += gCamera->getAtAxis() * near_clip;
+        *ray_start_region += LLViewerCamera::getInstance()->getAtAxis() * near_clip;
        if( bypass_sim_raycast )
        {
@@ -415,18 +415,18 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
        // Spawns a message, so must be after above send
        if (create_selected)
        {
-                gSelectMgr->deselectAll();
+                LLSelectMgr::getInstance()->deselectAll();
                gViewerWindow->getWindow()->incBusyCount();
        }
        // VEFFECT: AddObject
-        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
+        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
        effectp->setSourceObject((LLViewerObject*)gAgent.getAvatarObject());
        effectp->setPositionGlobal(regionp->getPosGlobalFromRegion(ray_end_region));
        effectp->setDuration(LL_HUD_DUR_SHORT);
        effectp->setColor(LLColor4U(gAgent.getEffectColor()));
-        gViewerStats->incStat(LLViewerStats::ST_CREATE_COUNT);
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CREATE_COUNT);
        return TRUE;
 }
@@ -468,7 +468,7 @@ BOOL LLToolPlacer::addDuplicate(S32 x, S32 y)
                ray_target_id.setNull();
        }
-        gSelectMgr->selectDuplicateOnRay(ray_start_region,
+        LLSelectMgr::getInstance()->selectDuplicateOnRay(ray_start_region,
                                                                                ray_end_region,
                                                                                b_hit_land,                     // suppress raycast
                                                                                FALSE,                          // intersection
@@ -503,7 +503,7 @@ BOOL LLToolPlacer::placeObject(S32 x, S32 y, MASK mask)
        // ...and go back to the default tool
        if (added && !gSavedSettings.getBOOL("CreateToolKeepSelected"))
        {
-                gToolMgr->getCurrentToolset()->selectTool( gToolTranslate );
+                LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCompTranslate::getInstance() );
        }
        return added;
diff --git a/linden/indra/newview/lltoolselect.cpp b/linden/indra/newview/lltoolselect.cpp
index 4371cbe..d4a8153 100644
--- a/linden/indra/newview/lltoolselect.cpp
+++ b/linden/indra/newview/lltoolselect.cpp
@@ -51,7 +51,6 @@
 #include "llworld.h"
 // Globals
-LLToolSelect            *gToolSelect = NULL;
 extern BOOL gAllowSelectAvatar;
 const F32 SELECTION_ROTATION_TRESHOLD = 0.1f;
@@ -106,7 +105,7 @@ LLSafeHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObje
        {
                gSavedSettings.setBOOL("SelectOwnedOnly", FALSE);
                gSavedSettings.setBOOL("SelectMovableOnly", FALSE);
-                gSelectMgr->setForceSelection(TRUE);
+                LLSelectMgr::getInstance()->setForceSelection(TRUE);
        }
        BOOL extend_select = (mask == MASK_SHIFT) || (mask == MASK_CONTROL);
@@ -120,7 +119,7 @@ LLSafeHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObje
                }
                else if (!extend_select)
                {
-                        gSelectMgr->deselectAll();
+                        LLSelectMgr::getInstance()->deselectAll();
                }
        }
        else
@@ -133,22 +132,22 @@ LLSafeHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObje
                        {
                                if ( ignore_group )
                                {
-                                        gSelectMgr->deselectObjectOnly(object);
+                                        LLSelectMgr::getInstance()->deselectObjectOnly(object);
                                }
                                else
                                {
-                                        gSelectMgr->deselectObjectAndFamily(object, TRUE, TRUE);
+                                        LLSelectMgr::getInstance()->deselectObjectAndFamily(object, TRUE, TRUE);
                                }
                        }
                        else
                        {
                                if ( ignore_group )
                                {
-                                        gSelectMgr->selectObjectOnly(object, SELECT_ALL_TES);
+                                        LLSelectMgr::getInstance()->selectObjectOnly(object, SELECT_ALL_TES);
                                }
                                else
                                {
-                                        gSelectMgr->selectObjectAndFamily(object);
+                                        LLSelectMgr::getInstance()->selectObjectAndFamily(object);
                                }
                        }
                }
@@ -157,27 +156,27 @@ LLSafeHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObje
                        // Save the current zoom values because deselect resets them.
                        F32 target_zoom;
                        F32 current_zoom;
-                        gSelectMgr->getAgentHUDZoom(target_zoom, current_zoom);
+                        LLSelectMgr::getInstance()->getAgentHUDZoom(target_zoom, current_zoom);
                        // JC - Change behavior to make it easier to select children
                        // of linked sets. 9/3/2002
                        if( !already_selected || ignore_group)
                        {
                                // ...lose current selection in favor of just this object
-                                gSelectMgr->deselectAll();
+                                LLSelectMgr::getInstance()->deselectAll();
                        }
                        if ( ignore_group )
                        {
-                                gSelectMgr->selectObjectOnly(object, SELECT_ALL_TES);
+                                LLSelectMgr::getInstance()->selectObjectOnly(object, SELECT_ALL_TES);
                        }
                        else
                        {
-                                gSelectMgr->selectObjectAndFamily(object);
+                                LLSelectMgr::getInstance()->selectObjectAndFamily(object);
                        }
                        // restore the zoom to the previously stored values.
-                        gSelectMgr->setAgentHUDZoom(target_zoom, current_zoom);
+                        LLSelectMgr::getInstance()->setAgentHUDZoom(target_zoom, current_zoom);
                }
                if (!gAgent.getFocusOnAvatar() &&                                                                               // if camera not glued to avatar
@@ -185,7 +184,7 @@ LLSafeHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObje
                        object != gAgent.getAvatarObject())                                                                     // and it's not you
                {
                        // have avatar turn to face the selected object(s)
-                        LLVector3d selection_center = gSelectMgr->getSelectionCenterGlobal();
+                        LLVector3d selection_center = LLSelectMgr::getInstance()->getSelectionCenterGlobal();
                        selection_center = selection_center - gAgent.getPositionGlobal();
                        LLVector3 selection_dir;
                        selection_dir.setVec(selection_center);
@@ -204,7 +203,7 @@ LLSafeHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObje
                        if (!already_selected)
                        {
                                LLViewerObject* root_object = (LLViewerObject*)object->getRootEdit();
-                                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                                LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
                                // this is just a temporary selection
                                LLSelectNode* select_node = selection->findNode(root_object);
@@ -231,10 +230,10 @@ LLSafeHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObje
        {
                gSavedSettings.setBOOL("SelectOwnedOnly", select_owned);
                gSavedSettings.setBOOL("SelectMovableOnly", select_movable);
-                gSelectMgr->setForceSelection(FALSE);
+                LLSelectMgr::getInstance()->setForceSelection(FALSE);
        }
-        return gSelectMgr->getSelection();
+        return LLSelectMgr::getInstance()->getSelection();
 }
 BOOL LLToolSelect::handleMouseUp(S32 x, S32 y, MASK mask)
@@ -268,7 +267,7 @@ void LLToolSelect::onMouseCaptureLost()
 {
        // Finish drag
-        gSelectMgr->enableSilhouette(TRUE);
+        LLSelectMgr::getInstance()->enableSilhouette(TRUE);
        // Clean up drag-specific variables
        mIgnoreGroup = FALSE;
diff --git a/linden/indra/newview/lltoolselect.h b/linden/indra/newview/lltoolselect.h
index d9cb04b..a23729f 100644
--- a/linden/indra/newview/lltoolselect.h
+++ b/linden/indra/newview/lltoolselect.h
@@ -38,7 +38,7 @@
 class LLObjectSelection;
-class LLToolSelect : public LLTool
+class LLToolSelect : public LLTool, public LLSingleton<LLToolSelect>
 {
 public:
        LLToolSelect( LLToolComposite* composite );
@@ -59,6 +59,5 @@ protected:
        LLUUID                          mSelectObjectID;
 };
-extern LLToolSelect *gToolSelect;
 #endif  // LL_TOOLSELECTION_H
diff --git a/linden/indra/newview/lltoolselectland.cpp b/linden/indra/newview/lltoolselectland.cpp
index 11943cc..96e0de1 100644
--- a/linden/indra/newview/lltoolselectland.cpp
+++ b/linden/indra/newview/lltoolselectland.cpp
@@ -46,9 +46,6 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerwindow.h"
-// Globals
-LLToolSelectLand *gToolParcel = NULL;
 //
 // Member functions
 //
@@ -98,7 +95,7 @@ BOOL LLToolSelectLand::handleMouseDown(S32 x, S32 y, MASK mask)
                mMouseOutsideSlop = TRUE; //FALSE;
-                gParcelMgr->deselectLand();
+                LLViewerParcelMgr::getInstance()->deselectLand();
        }
        return hit_land;
@@ -112,7 +109,7 @@ BOOL LLToolSelectLand::handleDoubleClick(S32 x, S32 y, MASK mask)
        if (hit_land)
        {
                // Auto-select this parcel
-                gParcelMgr->selectParcelAt( pos_global );
+                LLViewerParcelMgr::getInstance()->selectParcelAt( pos_global );
                return TRUE;
        }
        return FALSE;
@@ -140,7 +137,7 @@ BOOL LLToolSelectLand::handleMouseUp(S32 x, S32 y, MASK mask)
                        roundXY(mEastNorthTop);
                        // Don't auto-select entire parcel.
-                        mSelection = gParcelMgr->selectLand( mWestSouthBottom, mEastNorthTop, FALSE );
+                        mSelection = LLViewerParcelMgr::getInstance()->selectLand( mWestSouthBottom, mEastNorthTop, FALSE );
                }
                mMouseOutsideSlop = FALSE;
@@ -212,7 +209,7 @@ void LLToolSelectLand::render()
 {
        if(     hasMouseCapture() && /*mMouseOutsideSlop &&*/ mDragEndValid)
        {
-                gParcelMgr->renderRect( mWestSouthBottom, mEastNorthTop );
+                LLViewerParcelMgr::getInstance()->renderRect( mWestSouthBottom, mEastNorthTop );
        }
 }
@@ -228,7 +225,7 @@ void LLToolSelectLand::handleDeselect()
 {
        mSelection = NULL;
        mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
-        //gParcelMgr->deselectLand();
+        //LLViewerParcelMgr::getInstance()->deselectLand();
        gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
 }
diff --git a/linden/indra/newview/lltoolselectland.h b/linden/indra/newview/lltoolselectland.h
index dafec66..1e1462b 100644
--- a/linden/indra/newview/lltoolselectland.h
+++ b/linden/indra/newview/lltoolselectland.h
@@ -38,7 +38,7 @@
 class LLParcelSelection;
 class LLToolSelectLand
-:       public LLTool
+:       public LLTool, public LLSingleton<LLToolSelectLand>
 {
 public:
        LLToolSelectLand( );
@@ -78,6 +78,5 @@ protected:
        LLSafeHandle<LLParcelSelection> mSelection;             // hold on to a parcel selection
 };
-extern LLToolSelectLand *gToolParcel;
 #endif
diff --git a/linden/indra/newview/lltoolselectrect.cpp b/linden/indra/newview/lltoolselectrect.cpp
index 6adca35..11cdf4b 100644
--- a/linden/indra/newview/lltoolselectrect.cpp
+++ b/linden/indra/newview/lltoolselectrect.cpp
@@ -106,11 +106,11 @@ BOOL LLToolSelectRect::handleMouseUp(S32 x, S32 y, MASK mask)
                
                if (mask == MASK_CONTROL)
                {
-                        gSelectMgr->deselectHighlightedObjects();
+                        LLSelectMgr::getInstance()->deselectHighlightedObjects();
                }
                else
                {
-                        gSelectMgr->selectHighlightedObjects();
+                        LLSelectMgr::getInstance()->selectHighlightedObjects();
                }
                return TRUE;
        }
@@ -130,7 +130,7 @@ BOOL LLToolSelectRect::handleHover(S32 x, S32 y, MASK mask)
                        if (!mMouseOutsideSlop && !(mask & MASK_SHIFT) && !(mask & MASK_CONTROL))
                        {
                                // just started rect select, and not adding to current selection
-                                gSelectMgr->deselectAll();
+                                LLSelectMgr::getInstance()->deselectAll();
                        }
                        mMouseOutsideSlop = TRUE;
                        mDragEndX = x;
diff --git a/linden/indra/newview/lltoolview.cpp b/linden/indra/newview/lltoolview.cpp
index ebdbcbb..13b6e2a 100644
--- a/linden/indra/newview/lltoolview.cpp
+++ b/linden/indra/newview/lltoolview.cpp
@@ -101,7 +101,7 @@ void LLToolView::addTool(const LLString& icon_off, const LLString& icon_on, LLPa
        mButtonCount++;
        const S32 LABEL_TOP_SPACING = 0;
-        const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF_SMALL );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
        S32 label_width = font->getWidth( label );
        LLRect label_rect;
        label_rect.setLeftTopAndSize( 
@@ -153,7 +153,7 @@ void LLToolView::draw()
 {
        // turn off highlighting for all containers 
        // and hide all option panels except for the selected one.
-        LLTool* selected = gToolMgr->getCurrentToolset()->getSelectedTool();
+        LLTool* selected = LLToolMgr::getInstance()->getCurrentToolset()->getSelectedTool();
        for (contain_list_t::iterator iter = mContainList.begin();
                 iter != mContainList.end(); ++iter)
        {
@@ -194,7 +194,7 @@ void LLToolView::onClickToolButton(void* userdata)
        LLToolContainer* clicked = (LLToolContainer*) userdata;
        // Switch to this one
-        gToolMgr->getCurrentToolset()->selectTool( clicked->mTool );
+        LLToolMgr::getInstance()->getCurrentToolset()->selectTool( clicked->mTool );
 }
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp
index c1c060c..9ff2e97 100644
--- a/linden/indra/newview/lltracker.cpp
+++ b/linden/indra/newview/lltracker.cpp
@@ -135,18 +135,14 @@ void LLTracker::drawHUDArrow()
                break;
        case TRACKING_LOCATION:
-                if (!gWorldp)
-                {
-                        break;
-                }
                // HACK -- try to keep the location just above the terrain
 #if 0
                // UNHACKED by CRO - keep location where the location is
                instance()->mTrackedPositionGlobal.mdV[VZ] = 
                                0.9f * instance()->mTrackedPositionGlobal.mdV[VZ]
-                                + 0.1f * (gWorldp->resolveLandHeightGlobal(getTrackedPositionGlobal()) + 1.5f);
+                                + 0.1f * (LLWorld::getInstance()->resolveLandHeightGlobal(getTrackedPositionGlobal()) + 1.5f);
 #endif
-                instance()->mTrackedPositionGlobal.mdV[VZ] = llclamp((F32)instance()->mTrackedPositionGlobal.mdV[VZ], gWorldp->resolveLandHeightGlobal(getTrackedPositionGlobal()) + 1.5f, (F32)instance()->getTrackedPositionGlobal().mdV[VZ]);
+                instance()->mTrackedPositionGlobal.mdV[VZ] = llclamp((F32)instance()->mTrackedPositionGlobal.mdV[VZ], LLWorld::getInstance()->resolveLandHeightGlobal(getTrackedPositionGlobal()) + 1.5f, (F32)instance()->getTrackedPositionGlobal().mdV[VZ]);
                instance()->drawMarker( getTrackedPositionGlobal(), gTrackColor );
                break;
@@ -480,14 +476,14 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
        F32 dist = (F32)to_vec.magVec();
        F32 color_frac = 1.f;
-        if (dist > 0.99f * gCamera->getFar())
+        if (dist > 0.99f * LLViewerCamera::getInstance()->getFar())
        {
                color_frac = 0.4f;
-        //      pos_global = gAgent.getCameraPositionGlobal() + 0.99f*(gCamera->getFar()/dist)*to_vec;
+        //      pos_global = gAgent.getCameraPositionGlobal() + 0.99f*(LLViewerCamera::getInstance()->getFar()/dist)*to_vec;
        }
        else
        {
-                color_frac = 1.f - 0.6f*(dist/gCamera->getFar());
+                color_frac = 1.f - 0.6f*(dist/LLViewerCamera::getInstance()->getFar());
        }
        LLColor4 fogged_color = color_frac * color + (1 - color_frac)*gSky.getFogColor();
@@ -512,9 +508,9 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
                const U32 BEACON_VERTS = 256;
                const F32 step = 1024.0f/BEACON_VERTS;
                
-                LLVector3 x_axis = gCamera->getLeftAxis();
+                LLVector3 x_axis = LLViewerCamera::getInstance()->getLeftAxis();
                F32 t = gRenderStartTime.getElapsedTimeF32();
-                F32 dr = dist/gCamera->getFar();
+                F32 dr = dist/LLViewerCamera::getInstance()->getFar();
                
                for (U32 i = 0; i < BEACON_VERTS; i++)
                {
@@ -645,11 +641,6 @@ void LLTracker::clearFocus()
 void LLTracker::drawMarker(const LLVector3d& pos_global, const LLColor4& color)
 {
-        if (!gCamera) 
-        {
-                return;
-        }
        // get position
        LLVector3 pos_local = gAgent.getPosAgentFromGlobal(pos_global);
@@ -659,8 +650,8 @@ void LLTracker::drawMarker(const LLVector3d& pos_global, const LLColor4& color)
        S32 y = 0;
        const BOOL CLAMP = TRUE;
-        if (gCamera->projectPosAgentToScreen(pos_local, screen, CLAMP)
+        if (LLViewerCamera::getInstance()->projectPosAgentToScreen(pos_local, screen, CLAMP)
-                || gCamera->projectPosAgentToScreenEdge(pos_local, screen) )
+                || LLViewerCamera::getInstance()->projectPosAgentToScreenEdge(pos_local, screen) )
        {
                gHUDView->screenPointToLocal(screen.mX, screen.mY, &x, &y);
@@ -727,7 +718,7 @@ void LLTracker::drawMarker(const LLVector3d& pos_global, const LLColor4& color)
                                                                         mHUDArrowCenterY - half_arrow_size, 
                                                                         HUD_ARROW_SIZE, HUD_ARROW_SIZE, 
                                                                         RAD_TO_DEG * angle, 
-                                                                         LLWorldMapView::sTrackArrowImage, 
+                                                                         LLWorldMapView::sTrackArrowImage->getImage(), 
                                                                         color);
        }
 }
diff --git a/linden/indra/newview/lluploaddialog.cpp b/linden/indra/newview/lluploaddialog.cpp
index 14128ee..edf5505 100644
--- a/linden/indra/newview/lluploaddialog.cpp
+++ b/linden/indra/newview/lluploaddialog.cpp
@@ -74,7 +74,7 @@ LLUploadDialog::LLUploadDialog( const std::string& msg)
        }
        LLUploadDialog::sDialog = this;
-        const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
        LLRect msg_rect;
        for (int line_num=0; line_num<16; ++line_num)
        {
@@ -90,7 +90,7 @@ LLUploadDialog::LLUploadDialog( const std::string& msg)
 void LLUploadDialog::setMessage( const std::string& msg)
 {
-        const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
        const S32 VPAD = 16;
        const S32 HPAD = 25;
diff --git a/linden/indra/newview/llurldispatcher.cpp b/linden/indra/newview/llurldispatcher.cpp
index 6c1514c..658cf39 100644
--- a/linden/indra/newview/llurldispatcher.cpp
+++ b/linden/indra/newview/llurldispatcher.cpp
@@ -89,6 +89,11 @@ private:
        static void regionHandleCallback(U64 handle, const std::string& url,
                const LLUUID& snapshot_id, bool teleport);
+                // Called by LLWorldMap when a location has been resolved to a
+            // region name
+        static void regionNameCallback(U64 handle, const std::string& url,
+                const LLUUID& snapshot_id, bool teleport);
                // Called by LLWorldMap when a region name has been resolved to a
                // location in-world, used by places-panel display.
@@ -219,15 +224,15 @@ bool LLURLDispatcherImpl::dispatchRegion(const std::string& url, BOOL right_mous
        url_displayp->setName(region_name);
        // Request a region handle by name
-        gWorldMap->sendNamedRegionRequest(region_name,
+        LLWorldMap::getInstance()->sendNamedRegionRequest(region_name,
-                LLURLDispatcherImpl::regionHandleCallback,
+                                                                          LLURLDispatcherImpl::regionNameCallback,
-                url,
+                                                                          url,
-                false); // don't teleport
+                                                                          false);       // don't teleport
        return true;
 }
 /*static*/
-void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)
+void LLURLDispatcherImpl::regionNameCallback(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)
 {
        std::string sim_string = stripProtocol(url);
        std::string region_name;
@@ -241,6 +246,54 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::str
        local_pos.mV[VY] = (F32)y;
        local_pos.mV[VZ] = (F32)z;
+        
+        // determine whether the point is in this region
+        if ((x >= 0) && (x < REGION_WIDTH_UNITS) &&
+                (y >= 0) && (y < REGION_WIDTH_UNITS))
+        {
+                // if so, we're done
+                regionHandleCallback(region_handle, url, snapshot_id, teleport);
+        }
+        else
+        {
+                // otherwise find the new region from the location
+                
+                // add the position to get the new region
+                LLVector3d global_pos = from_region_handle(region_handle) + LLVector3d(local_pos);
+                U64 new_region_handle = to_region_handle(global_pos);
+                LLWorldMap::getInstance()->sendHandleRegionRequest(new_region_handle,
+                                                                                   LLURLDispatcherImpl::regionHandleCallback,
+                                                                                   url, teleport);
+        }
+}
+/* static */
+void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)
+{
+        std::string sim_string = stripProtocol(url);
+        std::string region_name;
+        S32 x = 128;
+        S32 y = 128;
+        S32 z = 0;
+        LLURLSimString::parse(sim_string, &region_name, &x, &y, &z);
+        // remap x and y to local coordinates
+        S32 local_x = x % REGION_WIDTH_UNITS;
+        S32 local_y = y % REGION_WIDTH_UNITS;
+        if (local_x < 0)
+                local_x += REGION_WIDTH_UNITS;
+        if (local_y < 0)
+                local_y += REGION_WIDTH_UNITS;
+        
+        LLVector3 local_pos;
+        local_pos.mV[VX] = (F32)local_x;
+        local_pos.mV[VY] = (F32)local_y;
+        local_pos.mV[VZ] = (F32)z;
+        
        if (teleport)
        {
                LLVector3d global_pos = from_region_handle(region_handle);
@@ -322,7 +375,7 @@ public:
                {
                        url += tokens[i].asString() + "/";
                }
-                gWorldMap->sendNamedRegionRequest(region_name,
+                LLWorldMap::getInstance()->sendNamedRegionRequest(region_name,
                        LLURLDispatcherImpl::regionHandleCallback,
                        url,
                        true);  // teleport
diff --git a/linden/indra/newview/llurlsimstring.cpp b/linden/indra/newview/llurlsimstring.cpp
index 931cf7b..07669db 100644
--- a/linden/indra/newview/llurlsimstring.cpp
+++ b/linden/indra/newview/llurlsimstring.cpp
@@ -73,7 +73,7 @@ void LLURLSimString::setString(const LLString& sim_string)
 // "/100" -> 100
 // static
-S32 LLURLSimString::parseGridIdx(const LLString& in_string, S32 idx0, S32* res, S32 max)
+S32 LLURLSimString::parseGridIdx(const LLString& in_string, S32 idx0, S32* res)
 {
        if (idx0 == LLString::npos || in_string[idx0] != '/')
        {
@@ -86,7 +86,7 @@ S32 LLURLSimString::parseGridIdx(const LLString& in_string, S32 idx0, S32* res,
        if (!tstring.empty())
        {
                S32 val = atoi(tstring.c_str());
-                *res = llclamp(val,0,max);
+                *res = val;
        }
        return idx1;
 }
@@ -132,9 +132,9 @@ bool LLURLSimString::parse(const LLString& sim_string, std::string *region_name,
        {
                if (idx1 != std::string::npos)
                {
-                        idx1 = parseGridIdx(sim_string, idx1, x, 255);
+                        idx1 = parseGridIdx(sim_string, idx1, x);
-                        idx1 = parseGridIdx(sim_string, idx1, y, 255);
+                        idx1 = parseGridIdx(sim_string, idx1, y);
-                        idx1 = parseGridIdx(sim_string, idx1, z, 1000);
+                        idx1 = parseGridIdx(sim_string, idx1, z);
                }
                return true;
        }
diff --git a/linden/indra/newview/llurlsimstring.h b/linden/indra/newview/llurlsimstring.h
index 4d3c1ec..420030f 100644
--- a/linden/indra/newview/llurlsimstring.h
+++ b/linden/indra/newview/llurlsimstring.h
@@ -64,7 +64,7 @@ public:
        LLURLSimString() : mX(128), mY(128), mZ(0), mParseState(NOT_PARSED) {}
 private:
-        static S32 parseGridIdx(const LLString& in_string, S32 idx0, S32* res, S32 max);
+        static S32 parseGridIdx(const LLString& in_string, S32 idx0, S32* res);
 public:
        static LLURLSimString sInstance;
diff --git a/linden/indra/newview/lluserauth.cpp b/linden/indra/newview/lluserauth.cpp
index 44df12c..9e040d2 100644
--- a/linden/indra/newview/lluserauth.cpp
+++ b/linden/indra/newview/lluserauth.cpp
@@ -66,8 +66,6 @@ static const char* PLATFORM_STRING = "Sol";
 #error("Unknown platform defined!")
 #endif
-LLUserAuth *gUserAuthp = NULL;
 LLUserAuth::LLUserAuth() :
        mTransaction(NULL),
@@ -78,8 +76,15 @@ LLUserAuth::LLUserAuth() :
 LLUserAuth::~LLUserAuth()
 {
+        reset();
+}
+void LLUserAuth::reset()
+{
        delete mTransaction;
        mTransaction = NULL;
+        mResponses.clear();
+        mOptions.clear();
 }
@@ -93,7 +98,6 @@ void LLUserAuth::authenticate(
        BOOL skip_optional,
        BOOL accept_tos,
        BOOL accept_critical_message,
-        const LLUUID& viewer_digest,
        BOOL last_exec_froze, 
        const std::vector<const char*>& requested_options,
        const std::string& hashed_mac,
@@ -123,7 +127,7 @@ void LLUserAuth::authenticate(
        XMLRPC_VectorAppendString(params, "web_login_key", web_login_key.getString().c_str(), 0);
        XMLRPC_VectorAppendString(params, "start", start, 0);
        XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
-        XMLRPC_VectorAppendString(params, "channel", gChannelName.c_str(), 0);
+        XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
        XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
        XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
        // A bit of security through obscurity: id0 is volume_serial
@@ -140,7 +144,6 @@ void LLUserAuth::authenticate(
        {
                XMLRPC_VectorAppendString(params, "read_critical", "true", 0);
        }
-        XMLRPC_VectorAppendString(params, "viewer_digest", viewer_digest.asString().c_str(), 0);
        XMLRPC_VectorAppendInt(params, "last_exec_event", (int) last_exec_froze);
        // append optional requests in an array
@@ -178,7 +181,6 @@ void LLUserAuth::authenticate(
        BOOL skip_optional,
        BOOL accept_tos,
        BOOL accept_critical_message,
-        const LLUUID& viewer_digest,
        BOOL last_exec_froze, 
        const std::vector<const char*>& requested_options,
        const std::string& hashed_mac,
@@ -210,7 +212,7 @@ void LLUserAuth::authenticate(
        XMLRPC_VectorAppendString(params, "passwd", dpasswd.c_str(), 0);
        XMLRPC_VectorAppendString(params, "start", start, 0);
        XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
-        XMLRPC_VectorAppendString(params, "channel", gChannelName.c_str(), 0);
+        XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
        XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
        XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
        // A bit of security through obscurity: id0 is volume_serial
@@ -227,7 +229,6 @@ void LLUserAuth::authenticate(
        {
                XMLRPC_VectorAppendString(params, "read_critical", "true", 0);
        }
-        XMLRPC_VectorAppendString(params, "viewer_digest", viewer_digest.asString().c_str(), 0);
        XMLRPC_VectorAppendInt(params, "last_exec_event", (int) last_exec_froze);
        // append optional requests in an array
@@ -432,3 +433,4 @@ BOOL LLUserAuth::getOptions(const char* name, options_t& options) const
 }
diff --git a/linden/indra/newview/lluserauth.h b/linden/indra/newview/lluserauth.h
index 869b235..b59c3f3 100644
--- a/linden/indra/newview/lluserauth.h
+++ b/linden/indra/newview/lluserauth.h
@@ -70,7 +70,7 @@ class LLXMLRPCTransaction;
 // session-id = auth key
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLUserAuth
+class LLUserAuth : public LLSingleton<LLUserAuth>
 {
 public:
        LLUserAuth();
@@ -104,7 +104,6 @@ public:
                BOOL skip_optional_update,
                BOOL accept_tos,
                BOOL accept_critical_message,
-                const LLUUID& viewer_digest,
                BOOL last_exec_froze, 
                const std::vector<const char*>& requested_options,
                const std::string& hashed_mac,
@@ -121,13 +120,15 @@ public:
                BOOL skip_optional_update,
                BOOL accept_tos,
                BOOL accept_critical_message,
-                const LLUUID& viewer_digest,
                BOOL last_exec_froze, 
                const std::vector<const char*>& requested_options,
                const std::string& hashed_mac,
                const std::string& hashed_volume_serial);
        UserAuthcode authResponse();
+        // clears out internal data cache.
+        void reset();
        
        std::string errorMessage() const { return mErrorMessage; }
@@ -154,6 +155,4 @@ private:
        F64 mLastTransferRateBPS;       // bits per second, only valid after a big transfer like inventory
 };
-extern LLUserAuth *gUserAuthp;
 #endif /* LLUSERAUTH_H */
diff --git a/linden/indra/newview/llvectorperfoptions.cpp b/linden/indra/newview/llvectorperfoptions.cpp
index b228ed5..bb2ef99 100644
--- a/linden/indra/newview/llvectorperfoptions.cpp
+++ b/linden/indra/newview/llvectorperfoptions.cpp
@@ -31,101 +31,4 @@
 #include "llviewerprecompiledheaders.h"
-#include "llvectorperfoptions.h"
+// Deprecated - moved into llviewerjointmesh
-#include "llviewerjointmesh.h"
-#include "llviewercontrol.h"
-// Initially, we test the performance of the vectorization code, then
-// turn it off if it ends up being slower. JC
-BOOL    gVectorizePerfTest      = TRUE;
-BOOL    gVectorizeEnable        = FALSE;
-U32             gVectorizeProcessor     = 0;
-BOOL    gVectorizeSkin          = FALSE;
-void update_vector_performances(void)
-{
-        char *vp;
-        
-        switch(gVectorizeProcessor)
-        {
-                case 2: vp = "SSE2"; break;                                     // *TODO: replace the magic #s
-                case 1: vp = "SSE"; break;
-                default: vp = "COMPILER DEFAULT"; break;
-        }
-        llinfos << "Vectorization         : " << ( gVectorizeEnable ? "ENABLED" : "DISABLED" ) << llendl ;
-        llinfos << "Vector Processor      : " << vp << llendl ;
-        llinfos << "Vectorized Skinning   : " << ( gVectorizeSkin ? "ENABLED" : "DISABLED" ) << llendl ;
-        
-        if(gVectorizeEnable && gVectorizeSkin)
-        {
-                switch(gVectorizeProcessor)
-                {
-                        case 2:
-                                LLViewerJointMesh::sUpdateGeometryFunc = &LLViewerJointMesh::updateGeometrySSE2;
-                                break;
-                        case 1:
-                                LLViewerJointMesh::sUpdateGeometryFunc = &LLViewerJointMesh::updateGeometrySSE;
-                                break;
-                        default:
-                                LLViewerJointMesh::sUpdateGeometryFunc = &LLViewerJointMesh::updateGeometryVectorized;
-                                break;
-                }
-        }
-        else
-        {
-                LLViewerJointMesh::sUpdateGeometryFunc = &LLViewerJointMesh::updateGeometryOriginal;
-        }
-}
-class LLVectorizationEnableListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gVectorizeEnable = event->getValue().asBoolean();
-                update_vector_performances();
-                return true;
-        }
-};
-static LLVectorizationEnableListener vectorization_enable_listener;
-class LLVectorizeSkinListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gVectorizeSkin = event->getValue().asBoolean();
-                update_vector_performances();
-                return true;
-        }
-};
-static LLVectorizeSkinListener vectorize_skin_listener;
-class LLVectorProcessorListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gVectorizeProcessor = event->getValue().asInteger();
-                update_vector_performances();
-                return true;
-        }
-};
-static LLVectorProcessorListener vector_processor_listener;
-void LLVectorPerformanceOptions::initClass()
-{
-        gVectorizePerfTest = gSavedSettings.getBOOL("VectorizePerfTest");
-        gVectorizeEnable = gSavedSettings.getBOOL("VectorizeEnable");
-        gVectorizeProcessor = gSavedSettings.getU32("VectorizeProcessor");
-        gVectorizeSkin = gSavedSettings.getBOOL("VectorizeSkin");
-        update_vector_performances();
-        // these are currently static in this file, so they can't move to settings_setup_listeners
-        gSavedSettings.getControl("VectorizeEnable")->addListener(&vectorization_enable_listener);
-        gSavedSettings.getControl("VectorizeProcessor")->addListener(&vector_processor_listener);
-        gSavedSettings.getControl("VectorizeSkin")->addListener(&vectorize_skin_listener);
-}
-void LLVectorPerformanceOptions::cleanupClass()
-{
-}
diff --git a/linden/indra/newview/llvectorperfoptions.h b/linden/indra/newview/llvectorperfoptions.h
index da168ef..623cca6 100644
--- a/linden/indra/newview/llvectorperfoptions.h
+++ b/linden/indra/newview/llvectorperfoptions.h
@@ -32,10 +32,6 @@
 #ifndef LL_VECTORPERFOPTIONS_H
 #define LL_VECTORPERFOPTIONS_H
-namespace LLVectorPerformanceOptions
+// Deprecated - moved into llviewerjointmesh
-{
-        void initClass(); // Run after configuration files are read.
-        void cleanupClass();
-};
 #endif
diff --git a/linden/indra/newview/llvelocitybar.cpp b/linden/indra/newview/llvelocitybar.cpp
index 5073aea..169ecac 100644
--- a/linden/indra/newview/llvelocitybar.cpp
+++ b/linden/indra/newview/llvelocitybar.cpp
@@ -39,16 +39,6 @@
 #include "llvelocitybar.h"
-EWidgetType LLVelocityBar::getWidgetType() const
-{
-        return WIDGET_TYPE_VELOCITY_BAR;
-}
-LLString LLVelocityBar::getWidgetTag() const
-{
-        return LL_VELOCITY_BAR_TAG;
-}
 const char tab = '\t';
 void LLVelocityBar::draw()
@@ -61,11 +51,6 @@ void LLVelocityBar::draw()
        S32 left, top, right, bottom;
-        if (!getVisible())
-        {
-                return;
-        }
 //      const F32 MS_TO_SECONDS = 0.001f;
 //      const S32 WIDTH_IN_MS = 66;
 //      const F32 WIDGET_TIME_FOR_WIDTH = WIDTH_IN_MS * MS_TO_SECONDS;
diff --git a/linden/indra/newview/llvelocitybar.h b/linden/indra/newview/llvelocitybar.h
index ab73d51..667ae1c 100644
--- a/linden/indra/newview/llvelocitybar.h
+++ b/linden/indra/newview/llvelocitybar.h
@@ -47,9 +47,6 @@ public:
                setVisible(FALSE);
        };
-        virtual EWidgetType getWidgetType() const;
-        virtual LLString getWidgetTag() const;
        virtual void    draw();
 };
diff --git a/linden/indra/newview/llviewchildren.cpp b/linden/indra/newview/llviewchildren.cpp
index 5f579f9..b19a336 100644
--- a/linden/indra/newview/llviewchildren.cpp
+++ b/linden/indra/newview/llviewchildren.cpp
@@ -65,7 +65,7 @@ void LLViewChildren::enable(const char* id, bool enabled)
 void LLViewChildren::setText(
        const char* id, const std::string& text, bool visible)
 {
-        LLTextBox* child = LLUICtrlFactory::getTextBoxByName(&mParent, id);
+        LLTextBox* child = mParent.getChild<LLTextBox>(id);
        if (child)
        {
                child->setVisible(visible);
@@ -76,7 +76,7 @@ void LLViewChildren::setText(
 void LLViewChildren::setWrappedText(
        const char* id, const std::string& text, bool visible)
 {
-        LLTextBox* child = LLUICtrlFactory::getTextBoxByName(&mParent, id);
+        LLTextBox* child = mParent.getChild<LLTextBox>(id);
        if (child)
        {
                child->setVisible(visible);
@@ -86,33 +86,25 @@ void LLViewChildren::setWrappedText(
 void LLViewChildren::setBadge(const char* id, Badge badge, bool visible)
 {
-        static LLUUID badgeOK(gViewerArt.getString("badge_ok.tga"));
+        LLIconCtrl* child = mParent.getChild<LLIconCtrl>(id);
-        static LLUUID badgeNote(gViewerArt.getString("badge_note.tga"));
-        static LLUUID badgeWarn(gViewerArt.getString("badge_warn.tga"));
-        static LLUUID   badgeError(gViewerArt.getString("badge_error.tga"));
-        
-        LLUUID badgeUUID;
-        switch (badge)
-        {
-                default:
-                case BADGE_OK:          badgeUUID = badgeOK;    break;
-                case BADGE_NOTE:        badgeUUID = badgeNote;  break;
-                case BADGE_WARN:        badgeUUID = badgeWarn;  break;
-                case BADGE_ERROR:       badgeUUID = badgeError; break;
-        }
-        
-        LLIconCtrl* child = LLUICtrlFactory::getIconByName(&mParent, id);
        if (child)
        {
                child->setVisible(visible);
-                child->setImage(badgeUUID);
+                switch (badge)
+                {
+                        default:
+                        case BADGE_OK:          child->setImage("badge_ok.j2c");        break;
+                        case BADGE_NOTE:        child->setImage("badge_note.j2c");      break;
+                        case BADGE_WARN:        child->setImage("badge_warn.j2c");      break;
+                        case BADGE_ERROR:       child->setImage("badge_error.j2c");     break;
+                }
        }
 }
 void LLViewChildren::setAction(const char* id,
        void(*function)(void*), void* value)
 {
-        LLButton* button = LLUICtrlFactory::getButtonByName(&mParent, id);
+        LLButton* button = mParent.getChild<LLButton>(id);
        if (button)
        {
                button->setClickedCallback(function, value);
diff --git a/linden/indra/newview/llvieweraudio.cpp b/linden/indra/newview/llvieweraudio.cpp
index 499673f..122a0bc 100644
--- a/linden/indra/newview/llvieweraudio.cpp
+++ b/linden/indra/newview/llvieweraudio.cpp
@@ -32,7 +32,6 @@
 #include "llviewerprecompiledheaders.h"
 #include "audioengine.h"
-#include "audiosettings.h"
 #include "llagent.h"
 #include "llappviewer.h"
 #include "llvieweraudio.h"
@@ -57,15 +56,15 @@ void init_audio()
        lpos_global_f.setVec(lpos_global);
                                        
        gAudiop->setListener(lpos_global_f,
-                                                  LLVector3::zero,      // gCamera->getVelocity(),    // !!! BUG need to replace this with smoothed velocity!
+                                                  LLVector3::zero,      // LLViewerCamera::getInstance()->getVelocity(),    // !!! BUG need to replace this with smoothed velocity!
-                                                  gCamera->getUpAxis(),
+                                                  LLViewerCamera::getInstance()->getUpAxis(),
-                                                  gCamera->getAtAxis());
+                                                  LLViewerCamera::getInstance()->getAtAxis());
 // load up our initial set of sounds we'll want so they're in memory and ready to be played
        BOOL mute_audio = gSavedSettings.getBOOL("MuteAudio");
-        if (!mute_audio && gPreloadSounds)
+        if (!mute_audio && FALSE == gSavedSettings.getBOOL("NoPreload"))
        {
                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndAlert")));
                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndBadKeystroke")));
@@ -188,11 +187,11 @@ void audio_update_listener()
                lpos_global_f.setVec(lpos_global);
        
                gAudiop->setListener(lpos_global_f,
-                                                         // gCameraVelocitySmoothed, 
+                                                         // LLViewerCamera::getInstance()VelocitySmoothed, 
                                                         // LLVector3::zero,    
                                                         gAgent.getVelocity(),    // !!! *TODO: need to replace this with smoothed velocity!
-                                                         gCamera->getUpAxis(),
+                                                         LLViewerCamera::getInstance()->getUpAxis(),
-                                                         gCamera->getAtAxis());
+                                                         LLViewerCamera::getInstance()->getAtAxis());
        }
 }
diff --git a/linden/indra/newview/llvieweraudio.h b/linden/indra/newview/llvieweraudio.h
index 9b81058..6ab7c7f 100644
--- a/linden/indra/newview/llvieweraudio.h
+++ b/linden/indra/newview/llvieweraudio.h
@@ -32,6 +32,12 @@
 #ifndef LL_VIEWERAUDIO_H
 #define LL_VIEWERAUDIO_H
+// comment out to turn off wind
+#define kAUDIO_ENABLE_WIND 
+//#define kAUDIO_ENABLE_WATER 1 // comment out to turn off water
+#define kAUDIO_NUM_BUFFERS 30
+#define kAUDIO_NUM_SOURCES 30 
 void init_audio();
 void audio_update_volume(bool force_update = true);
 void audio_update_listener();
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index 7c4271a..07e3109 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -47,12 +47,12 @@
 #include "llviewerwindow.h"
 #include "llvovolume.h"
 #include "llworld.h"
+#include "lltoolmgr.h"
+#include "llviewerjoystick.h"
 GLfloat gGLZFar;
 GLfloat gGLZNear;
-LLViewerCamera *gCamera = NULL;
 //glu pick matrix implementation borrowed from Mesa3D
 glh::matrix4f gl_pick_matrix(GLfloat x, GLfloat y, GLfloat width, GLfloat height, GLint* viewport)
 {
@@ -99,6 +99,13 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
                                                                                        const LLVector3 &up_direction,
                                                                                        const LLVector3 &point_of_interest)
 {
+        // do not update if we are in build mode AND avatar didn't move
+        if (LLToolMgr::getInstance()->inBuildMode() 
+                && !LLViewerJoystick::getInstance()->getCameraNeedsUpdate())
+        {
+                return;
+        }
        LLVector3 last_position;
        LLVector3 last_axis;
        last_position = getOrigin();
@@ -170,7 +177,7 @@ void LLViewerCamera::calcProjection(const F32 far_distance) const
        f = 1/tan(fov_y*0.5f);
-        mProjectionMatrix.zero();
+        mProjectionMatrix.setZero();
        mProjectionMatrix.mMatrix[0][0] = f/aspect;
        mProjectionMatrix.mMatrix[1][1] = f;
        mProjectionMatrix.mMatrix[2][2] = (z_far + z_near)/(z_near - z_far);
diff --git a/linden/indra/newview/llviewercamera.h b/linden/indra/newview/llviewercamera.h
index df89c19..1f61ca9 100644
--- a/linden/indra/newview/llviewercamera.h
+++ b/linden/indra/newview/llviewercamera.h
@@ -50,7 +50,7 @@ const F32 OGL_TO_CFR_ROTATION[16] = {  0.f,  0.f, -1.f,  0.f, 	// -Z becomes X
 const BOOL FOR_SELECTION = TRUE;
 const BOOL NOT_FOR_SELECTION = FALSE;
-class LLViewerCamera : public LLCamera
+class LLViewerCamera : public LLCamera, public LLSingleton<LLViewerCamera>
 {
 public:
        LLViewerCamera();
@@ -111,7 +111,6 @@ protected:
 public:
 };
-extern LLViewerCamera *gCamera;
 extern F64 gGLModelView[16];
 extern F64 gGLLastModelView[16];
 extern F64 gGLProjection[16];
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 3a82c05..203f9c7 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -36,490 +36,524 @@
 #include "indra_constants.h"
-#include "v3math.h"
+// For Listeners
-#include "v3dmath.h"
+#include "audioengine.h"
-#include "llrect.h"
+#include "llagent.h"
-#include "v4color.h"
+#include "llconsole.h"
-#include "v4coloru.h"
+#include "lldrawpoolterrain.h"
-#include "v3color.h"
+#include "llflexibleobject.h"
+#include "llfeaturemanager.h"
-#include "llfloater.h"
+#include "llglslshader.h"
-#include "llvieweruictrlfactory.h"
+#include "llnetmap.h"
-#include "llfirstuse.h"
+#include "llpanelgeneral.h"
-#include "llcombobox.h"
+#include "llpanelinput.h"
-#include "llspinctrl.h"
+#include "llsky.h"
-#include "llcolorswatch.h"
+#include "llvieweraudio.h"
+#include "llviewerimagelist.h"
+#include "llviewerthrottle.h"
+#include "llviewerwindow.h"
+#include "llvoavatar.h"
+#include "llvoiceclient.h"
+#include "llvosky.h"
+#include "llvotree.h"
+#include "llvovolume.h"
+#include "llworld.h"
+#include "pipeline.h"
+#include "llviewerjoystick.h"
+#include "llviewerparcelmgr.h"
+#include "llparcel.h"
+#include "llnotify.h"
+#include "llkeyboard.h"
+#include "llerrorcontrol.h"
+#include "llversionviewer.h"
+#include "llappviewer.h"
+#include "llvosurfacepatch.h"
+#include "llvowlsky.h"
+#include "llglimmediate.h"
 #ifdef TOGGLE_HACKED_GODLIKE_VIEWER
 BOOL                            gHackGodmode = FALSE;
 #endif
-LLFloaterSettingsDebug* LLFloaterSettingsDebug::sInstance = NULL;
+std::map<LLString, LLControlGroup*> gSettings;
 LLControlGroup gSavedSettings;  // saved at end of session
 LLControlGroup gSavedPerAccountSettings; // saved at end of session
-LLControlGroup gViewerArt;              // read-only
 LLControlGroup gColors;                 // read-only
 LLControlGroup gCrashSettings;  // saved at end of session
 LLString gLastRunVersion;
 LLString gCurrentVersion;
-LLString gSettingsFileName;
+extern BOOL gResizeScreenTexture;
-LLString gPerAccountSettingsFileName;
-LLFloaterSettingsDebug::LLFloaterSettingsDebug() : LLFloater("Configuration Editor")
+////////////////////////////////////////////////////////////////////////////
+// Listeners
+static bool handleRenderAvatarMouselookChanged(const LLSD& newvalue)
+{
+        LLVOAvatar::sVisibleInFirstPerson = newvalue.asBoolean();
+        return true;
+}
+static bool handleRenderFarClipChanged(const LLSD& newvalue)
 {
+        F32 draw_distance = (F32) newvalue.asReal();
+        gAgent.mDrawDistance = draw_distance;
+        LLWorld::getInstance()->setLandFarClip(draw_distance);
+        return true;
 }
-LLFloaterSettingsDebug::~LLFloaterSettingsDebug()
+static bool handleTerrainDetailChanged(const LLSD& newvalue)
 {
-        sInstance = NULL;
+        LLDrawPoolTerrain::sDetailMode = newvalue.asInteger();
+        return true;
 }
-BOOL LLFloaterSettingsDebug::postBuild()
+static bool handleSetShaderChanged(const LLSD& newvalue)
 {
-        LLComboBox* settings_combo = LLUICtrlFactory::getComboBoxByName(this, "settings_combo");
+        LLShaderMgr::setShaders();
+        return true;
+}
-        LLControlGroup::ctrl_name_table_t::iterator name_it;
+static bool handleReleaseGLBufferChanged(const LLSD& newvalue)
-        for(name_it = gSavedSettings.mNameTable.begin(); name_it != gSavedSettings.mNameTable.end(); ++name_it)
+{
+        if (gPipeline.isInit())
        {
-                settings_combo->add(name_it->first, (void*)name_it->second);
+                gPipeline.releaseGLBuffers();
+                gPipeline.createGLBuffers();
        }
-        for(name_it = gSavedPerAccountSettings.mNameTable.begin(); name_it != gSavedPerAccountSettings.mNameTable.end(); ++name_it)
+        return true;
+}
+static bool handleVolumeLODChanged(const LLSD& newvalue)
+{
+        LLVOVolume::sLODFactor = (F32) newvalue.asReal();
+        LLVOVolume::sDistanceFactor = 1.f-LLVOVolume::sLODFactor * 0.1f;
+        return true;
+}
+static bool handleAvatarLODChanged(const LLSD& newvalue)
+{
+        LLVOAvatar::sLODFactor = (F32) newvalue.asReal();
+        return true;
+}
+static bool handleTerrainLODChanged(const LLSD& newvalue)
+{
+                LLVOSurfacePatch::sLODFactor = (F32)newvalue.asReal();
+                //sqaure lod factor to get exponential range of [0,4] and keep
+                //a value of 1 in the middle of the detail slider for consistency
+                //with other detail sliders (see panel_preferences_graphics1.xml)
+                LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor;
+                return true;
+}
+static bool handleTreeLODChanged(const LLSD& newvalue)
+{
+        LLVOTree::sTreeFactor = (F32) newvalue.asReal();
+        return true;
+}
+static bool handleFlexLODChanged(const LLSD& newvalue)
+{
+        LLVolumeImplFlexible::sUpdateFactor = (F32) newvalue.asReal();
+        return true;
+}
+static bool handleGammaChanged(const LLSD& newvalue)
+{
+        F32 gamma = (F32) newvalue.asReal();
+        if (gamma == 0.0f)
        {
-                settings_combo->add(name_it->first, (void*)name_it->second);
+                gamma = 1.0f; // restore normal gamma
        }
-        for(name_it = gColors.mNameTable.begin(); name_it != gColors.mNameTable.end(); ++name_it)
+        if (gViewerWindow && gViewerWindow->getWindow() && gamma != gViewerWindow->getWindow()->getGamma())
        {
-                settings_combo->add(name_it->first, (void*)name_it->second);
+                // Only save it if it's changed
+                if (!gViewerWindow->getWindow()->setGamma(gamma))
+                {
+                        llwarns << "setGamma failed!" << llendl;
+                }
        }
-        settings_combo->sortByName();
-        settings_combo->setCommitCallback(onSettingSelect);
-        settings_combo->setCallbackUserData(this);
-        settings_combo->updateSelection();
-        childSetCommitCallback("val_spinner_1", onCommitSettings);
-        childSetUserData("val_spinner_1", this);
-        childSetCommitCallback("val_spinner_2", onCommitSettings);
-        childSetUserData("val_spinner_2", this);
-        childSetCommitCallback("val_spinner_3", onCommitSettings);
-        childSetUserData("val_spinner_3", this);
-        childSetCommitCallback("val_spinner_4", onCommitSettings);
-        childSetUserData("val_spinner_4", this);
-        childSetCommitCallback("val_text", onCommitSettings);
-        childSetUserData("val_text", this);
-        childSetCommitCallback("boolean_combo", onCommitSettings);
-        childSetUserData("boolean_combo", this);
-        childSetCommitCallback("color_swatch", onCommitSettings);
-        childSetUserData("color_swatch", this);
-        childSetAction("default_btn", onClickDefault, this);
-        mComment = getChild<LLTextEditor>("comment_text");
-        return TRUE;
-}
-void LLFloaterSettingsDebug::draw()
-{
-        LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
-        LLControlBase* controlp = (LLControlBase*)settings_combo->getCurrentUserdata();
-        updateControl(controlp);
-        LLFloater::draw();
-}
-//static
-void LLFloaterSettingsDebug::show(void*)
-{
-        if (sInstance == NULL)
-        {
-                sInstance = new LLFloaterSettingsDebug();
-                gUICtrlFactory->buildFloater(sInstance, "floater_settings_debug.xml");
+        return true;
-        }
+}
-        sInstance->open();              /* Flawfinder: ignore */
+const F32 MAX_USER_FOG_RATIO = 10.f;
-}
+const F32 MIN_USER_FOG_RATIO = 0.5f;
-//static 
+static bool handleFogRatioChanged(const LLSD& newvalue)
-void LLFloaterSettingsDebug::onSettingSelect(LLUICtrl* ctrl, void* user_data)
+{
-{
+        F32 fog_ratio = llmax(MIN_USER_FOG_RATIO, llmin((F32) newvalue.asReal(), MAX_USER_FOG_RATIO));
-        LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
+        gSky.setFogRatio(fog_ratio);
-        LLComboBox* combo_box = (LLComboBox*)ctrl;
+        return true;
-        LLControlBase* controlp = (LLControlBase*)combo_box->getCurrentUserdata();
-        floaterp->updateControl(controlp);
-}
-//static
-void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
-{
-        LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
-        LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
-        LLControlBase* controlp = (LLControlBase*)settings_combo->getCurrentUserdata();
-        LLVector3 vector;
-        LLVector3d vectord;
-        LLRect rect;
-        LLColor4 col4;
-        LLColor3 col3;
-        LLColor4U col4U;
-        LLColor4 color_with_alpha;
-        switch(controlp->type())
-        {               
-          case TYPE_U32:
-                controlp->set(floaterp->childGetValue("val_spinner_1"));
-                break;
-          case TYPE_S32:
-                controlp->set(floaterp->childGetValue("val_spinner_1"));
-                break;
-          case TYPE_F32:
-                controlp->set(LLSD(floaterp->childGetValue("val_spinner_1").asReal()));
-                break;
-          case TYPE_BOOLEAN:
-                controlp->set(floaterp->childGetValue("boolean_combo"));
-                break;
-          case TYPE_STRING:
-                controlp->set(LLSD(floaterp->childGetValue("val_text").asString()));
-                break;
-          case TYPE_VEC3:
-                vector.mV[VX] = (F32)floaterp->childGetValue("val_spinner_1").asReal();
-                vector.mV[VY] = (F32)floaterp->childGetValue("val_spinner_2").asReal();
-                vector.mV[VZ] = (F32)floaterp->childGetValue("val_spinner_3").asReal();
-                controlp->set(vector.getValue());
-                break;
-          case TYPE_VEC3D:
-                vectord.mdV[VX] = floaterp->childGetValue("val_spinner_1").asReal();
-                vectord.mdV[VY] = floaterp->childGetValue("val_spinner_2").asReal();
-                vectord.mdV[VZ] = floaterp->childGetValue("val_spinner_3").asReal();
-                controlp->set(vectord.getValue());
-                break;
-          case TYPE_RECT:
-                rect.mLeft = floaterp->childGetValue("val_spinner_1").asInteger();
-                rect.mRight = floaterp->childGetValue("val_spinner_2").asInteger();
-                rect.mBottom = floaterp->childGetValue("val_spinner_3").asInteger();
-                rect.mTop = floaterp->childGetValue("val_spinner_4").asInteger();
-                controlp->set(rect.getValue());
-                break;
-          case TYPE_COL4:
-                col3.setValue(floaterp->childGetValue("color_swatch"));
-                col4 = LLColor4(col3, (F32)floaterp->childGetValue("val_spinner_4").asReal());
-                controlp->set(col4.getValue());
-                break;
-          case TYPE_COL3:
-                controlp->set(floaterp->childGetValue("color_swatch"));
-                //col3.mV[VRED] = (F32)floaterp->childGetValue("val_spinner_1").asC();
-                //col3.mV[VGREEN] = (F32)floaterp->childGetValue("val_spinner_2").asReal();
-                //col3.mV[VBLUE] = (F32)floaterp->childGetValue("val_spinner_3").asReal();
-                //controlp->set(col3.getValue());
-                break;
-          case TYPE_COL4U:
-                col3.setValue(floaterp->childGetValue("color_swatch"));
-                col4U.setVecScaleClamp(col3);
-                col4U.mV[VALPHA] = floaterp->childGetValue("val_spinner_4").asInteger();
-                controlp->set(col4U.getValue());
-                break;
-          default:
-                break;
-        }
 }
-// static
+static bool handleMaxPartCountChanged(const LLSD& newvalue)
-void LLFloaterSettingsDebug::onClickDefault(void* user_data)
 {
-        LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
+        LLViewerPartSim::setMaxPartCount(newvalue.asInteger());
-        LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
+        return true;
-        LLControlBase* controlp = (LLControlBase*)settings_combo->getCurrentUserdata();
+}
+const S32 MAX_USER_COMPOSITE_LIMIT = 100;
+const S32 MIN_USER_COMPOSITE_LIMIT = 0;
+static bool handleCompositeLimitChanged(const LLSD& newvalue)
+{
+        S32 composite_limit = llmax(MIN_USER_COMPOSITE_LIMIT,  llmin((S32)newvalue.asInteger(), MAX_USER_COMPOSITE_LIMIT));
+        LLVOAvatar::sMaxOtherAvatarsToComposite = composite_limit;
+        return true;
+}
+static bool handleVideoMemoryChanged(const LLSD& newvalue)
+{
+        gImageList.updateMaxResidentTexMem(newvalue.asInteger());
+        return true;
+}
+static bool handleBandwidthChanged(const LLSD& newvalue)
+{
+        gViewerThrottle.setMaxBandwidth((F32) newvalue.asReal());
+        return true;
+}
-        if (controlp)
+static bool handleChatFontSizeChanged(const LLSD& newvalue)
+{
+        if(gConsole)
        {
-                controlp->resetToDefault();
+                gConsole->setFontSize(newvalue.asInteger());
-                floaterp->updateControl(controlp);
        }
+        return true;
 }
-// we've switched controls, or doing per-frame update, so update spinners, etc.
+static bool handleChatPersistTimeChanged(const LLSD& newvalue)
-void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
 {
-        LLSpinCtrl* spinner1 = LLUICtrlFactory::getSpinnerByName(this, "val_spinner_1");
+        if(gConsole)
-        LLSpinCtrl* spinner2 = LLUICtrlFactory::getSpinnerByName(this, "val_spinner_2");
+        {
-        LLSpinCtrl* spinner3 = LLUICtrlFactory::getSpinnerByName(this, "val_spinner_3");
+                gConsole->setLinePersistTime((F32) newvalue.asReal());
-        LLSpinCtrl* spinner4 = LLUICtrlFactory::getSpinnerByName(this, "val_spinner_4");
+        }
-        LLColorSwatchCtrl* color_swatch = getChild<LLColorSwatchCtrl>("color_swatch");
+        return true;
+}
-        if (!spinner1 || !spinner2 || !spinner3 || !spinner4 || !color_swatch)
+static bool handleConsoleMaxLinesChanged(const LLSD& newvalue)
+{
+        if(gConsole)
        {
-                llwarns << "Could not find all desired controls by name"
+                gConsole->setMaxLines(newvalue.asInteger());
-                        << llendl;
-                return;
        }
+        return true;
+}
-        spinner1->setVisible(FALSE);
+static void handleAudioVolumeChanged(const LLSD& newvalue)
-        spinner2->setVisible(FALSE);
+{
-        spinner3->setVisible(FALSE);
+        audio_update_volume(true);
-        spinner4->setVisible(FALSE);
+}
-        color_swatch->setVisible(FALSE);
-        childSetVisible("val_text", FALSE);
-        mComment->setText(LLString::null);
-        if (controlp)
+static bool handleJoystickChanged(const LLSD& newvalue)
-        {
+{
-                eControlType type = controlp->type();
+        LLViewerJoystick::getInstance()->setCameraNeedsUpdate(TRUE);
-                mComment->setText(controlp->getComment());
+        return true;
-                spinner1->setMaxValue(F32_MAX);
+}
-                spinner2->setMaxValue(F32_MAX);
-                spinner3->setMaxValue(F32_MAX);
-                spinner4->setMaxValue(F32_MAX);
-                spinner1->setMinValue(-F32_MAX);
-                spinner2->setMinValue(-F32_MAX);
-                spinner3->setMinValue(-F32_MAX);
-                spinner4->setMinValue(-F32_MAX);
-                if (!spinner1->hasFocus())
-                {
-                        spinner1->setIncrement(0.1f);
-                }
-                if (!spinner2->hasFocus())
-                {
-                        spinner2->setIncrement(0.1f);
-                }
-                if (!spinner3->hasFocus())
-                {
-                        spinner3->setIncrement(0.1f);
-                }
-                if (!spinner4->hasFocus())
-                {
-                        spinner4->setIncrement(0.1f);
-                }
-                LLSD sd = controlp->get();
+static bool handleAudioStreamMusicChanged(const LLSD& newvalue)
-                switch(type)
+{
+        if (gAudiop)
+        {
+                if ( newvalue.asBoolean() )
                {
-                  case TYPE_U32:
+                        if (LLViewerParcelMgr::getInstance()->getAgentParcel()
-                        spinner1->setVisible(TRUE);
+                                && !LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL().empty())
-                        spinner1->setLabel(LLString("value")); // Debug, don't translate
-                        childSetVisible("boolean_combo", FALSE);
-                        if (!spinner1->hasFocus())
-                        {
-                                spinner1->setValue(sd);
-                                spinner1->setMinValue((F32)U32_MIN);
-                                spinner1->setMaxValue((F32)U32_MAX);
-                                spinner1->setIncrement(1.f);
-                                spinner1->setPrecision(0);
-                        }
-                        break;
-                  case TYPE_S32:
-                        spinner1->setVisible(TRUE);
-                        spinner1->setLabel(LLString("value")); // Debug, don't translate
-                        childSetVisible("boolean_combo", FALSE);
-                        if (!spinner1->hasFocus())
-                        {
-                                spinner1->setValue(sd);
-                                spinner1->setMinValue((F32)S32_MIN);
-                                spinner1->setMaxValue((F32)S32_MAX);
-                                spinner1->setIncrement(1.f);
-                                spinner1->setPrecision(0);
-                        }
-                        break;
-                  case TYPE_F32:
-                        spinner1->setVisible(TRUE);
-                        spinner1->setLabel(LLString("value")); // Debug, don't translate
-                        childSetVisible("boolean_combo", FALSE);
-                        if (!spinner1->hasFocus())
                        {
-                                spinner1->setPrecision(3);
+                                // if stream is already playing, don't call this
-                                spinner1->setValue(sd);
+                                // otherwise music will briefly stop
-                        }
+                                if ( !gAudiop->isInternetStreamPlaying() )
-                        break;
-                  case TYPE_BOOLEAN:
-                        childSetVisible("boolean_combo", TRUE);
-                        
-                        if (!childHasFocus("boolean_combo"))
-                        {
-                                if (sd.asBoolean())
                                {
-                                        childSetValue("boolean_combo", LLSD("true"));
+                                        gAudiop->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL().c_str());
                                }
-                                else
-                                {
-                                        childSetValue("boolean_combo", LLSD(""));
-                                }
-                        }
-                        break;
-                  case TYPE_STRING:
-                        childSetVisible("val_text", TRUE);
-                        childSetVisible("boolean_combo", FALSE);
-                        if (!childHasFocus("val_text"))
-                        {
-                                childSetValue("val_text", sd);
-                        }
-                        break;
-                  case TYPE_VEC3:
-                  {
-                        childSetVisible("boolean_combo", FALSE);
-                        LLVector3 v;
-                        v.setValue(sd);
-                        spinner1->setVisible(TRUE);
-                        spinner1->setLabel(LLString("X"));
-                        spinner2->setVisible(TRUE);
-                        spinner2->setLabel(LLString("Y"));
-                        spinner3->setVisible(TRUE);
-                        spinner3->setLabel(LLString("Z"));
-                        if (!spinner1->hasFocus())
-                        {
-                                spinner1->setPrecision(3);
-                                spinner1->setValue(v[VX]);
-                        }
-                        if (!spinner2->hasFocus())
-                        {
-                                spinner2->setPrecision(3);
-                                spinner2->setValue(v[VY]);
-                        }
-                        if (!spinner3->hasFocus())
-                        {
-                                spinner3->setPrecision(3);
-                                spinner3->setValue(v[VZ]);
-                        }
-                        break;
-                  }
-                  case TYPE_VEC3D:
-                  {
-                        childSetVisible("boolean_combo", FALSE);
-                        LLVector3d v;
-                        v.setValue(sd);
-                        spinner1->setVisible(TRUE);
-                        spinner1->setLabel(LLString("X"));
-                        spinner2->setVisible(TRUE);
-                        spinner2->setLabel(LLString("Y"));
-                        spinner3->setVisible(TRUE);
-                        spinner3->setLabel(LLString("Z"));
-                        if (!spinner1->hasFocus())
-                        {
-                                spinner1->setPrecision(3);
-                                spinner1->setValue(v[VX]);
-                        }
-                        if (!spinner2->hasFocus())
-                        {
-                                spinner2->setPrecision(3);
-                                spinner2->setValue(v[VY]);
-                        }
-                        if (!spinner3->hasFocus())
-                        {
-                                spinner3->setPrecision(3);
-                                spinner3->setValue(v[VZ]);
-                        }
-                        break;
-                  }
-                  case TYPE_RECT:
-                  {
-                        childSetVisible("boolean_combo", FALSE);
-                        LLRect r;
-                        r.setValue(sd);
-                        spinner1->setVisible(TRUE);
-                        spinner1->setLabel(LLString("Left"));
-                        spinner2->setVisible(TRUE);
-                        spinner2->setLabel(LLString("Right"));
-                        spinner3->setVisible(TRUE);
-                        spinner3->setLabel(LLString("Bottom"));
-                        spinner4->setVisible(TRUE);
-                        spinner4->setLabel(LLString("Top"));
-                        if (!spinner1->hasFocus())
-                        {
-                                spinner1->setPrecision(0);
-                                spinner1->setValue(r.mLeft);
-                        }
-                        if (!spinner2->hasFocus())
-                        {
-                                spinner2->setPrecision(0);
-                                spinner2->setValue(r.mRight);
-                        }
-                        if (!spinner3->hasFocus())
-                        {
-                                spinner3->setPrecision(0);
-                                spinner3->setValue(r.mBottom);
-                        }
-                        if (!spinner4->hasFocus())
-                        {
-                                spinner4->setPrecision(0);
-                                spinner4->setValue(r.mTop);
                        }
+                }
+                else
+                {
+                        gAudiop->stopInternetStream();
+                }
+        }
+        return true;
+}
-                        spinner1->setMinValue((F32)S32_MIN);
+static bool handleUseOcclusionChanged(const LLSD& newvalue)
-                        spinner1->setMaxValue((F32)S32_MAX);
+{
-                        spinner1->setIncrement(1.f);
+        LLPipeline::sUseOcclusion = (newvalue.asBoolean() && gGLManager.mHasOcclusionQuery 
+                && LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion") && !gUseWireframe) ? 2 : 0;
-                        spinner2->setMinValue((F32)S32_MIN);
+        return true;
-                        spinner2->setMaxValue((F32)S32_MAX);
+}
-                        spinner2->setIncrement(1.f);
-                        spinner3->setMinValue((F32)S32_MIN);
-                        spinner3->setMaxValue((F32)S32_MAX);
-                        spinner3->setIncrement(1.f);
-                        spinner4->setMinValue((F32)S32_MIN);
-                        spinner4->setMaxValue((F32)S32_MAX);
-                        spinner4->setIncrement(1.f);
-                        break;
-                  }
-                  case TYPE_COL4:
-                  {
-                        childSetVisible("boolean_combo", FALSE);
-                        LLColor4 clr;
-                        clr.setValue(sd);
-                        color_swatch->setVisible(TRUE);
-                        // only set if changed so color picker doesn't update
-                        if(clr != LLColor4(color_swatch->getValue()))
-                        {
-                                color_swatch->set(LLColor4(sd), TRUE, FALSE);
-                        }
-                        spinner4->setVisible(TRUE);
-                        spinner4->setLabel(LLString("Alpha"));
-                        if (!spinner4->hasFocus())
-                        {
-                                spinner4->setPrecision(3);
-                                spinner4->setMinValue(0.0);
-                                spinner4->setMaxValue(1.f);
-                                spinner4->setValue(clr.mV[VALPHA]);
-                        }
-                        break;
-                  }
-                  case TYPE_COL3:
-                  {
-                        childSetVisible("boolean_combo", FALSE);
-                        LLColor3 clr;
-                        clr.setValue(sd);
-                        color_swatch->setVisible(TRUE);
-                        color_swatch->setValue(sd);
-                        break;
-                  }
-                  case TYPE_COL4U:
-                  {
-                        childSetVisible("boolean_combo", FALSE);
-                        LLColor4U clr;
-                        clr.setValue(sd);
-                        color_swatch->setVisible(TRUE);
-                        if(LLColor4(clr) != LLColor4(color_swatch->getValue()))
-                        {
-                                color_swatch->set(LLColor4(clr), TRUE, FALSE);
-                        }
-                        spinner4->setVisible(TRUE);
-                        spinner4->setLabel(LLString("Alpha"));
-                        if(!spinner4->hasFocus())
-                        {
-                                spinner4->setPrecision(0);
-                                spinner4->setValue(clr.mV[VALPHA]);
-                        }
-                        spinner4->setMinValue(0);
+static bool handleNumpadControlChanged(const LLSD& newvalue)
-                        spinner4->setMaxValue(255);
+{
-                        spinner4->setIncrement(1.f);
+        if (gKeyboard)
+        {
+                gKeyboard->setNumpadDistinct(static_cast<LLKeyboard::e_numpad_distinct>(newvalue.asInteger()));
+        }
+        return true;
+}
-                        break;
+static bool handleRenderUseVBOChanged(const LLSD& newvalue)
-                  }
+{
-                  default:
+        if (gPipeline.isInit())
-                        mComment->setText(LLString("unknown"));
+        {
-                        break;
+                gPipeline.setUseVBO(newvalue.asBoolean());
-                }
+        }
+        return true;
+}
+static bool handleWLSkyDetailChanged(const LLSD&)
+{
+        if (gSky.mVOWLSkyp.notNull())
+        {
+                gSky.mVOWLSkyp->updateGeometry(gSky.mVOWLSkyp->mDrawable);
+        }
+        return true;
+}
+static bool handleRenderLightingDetailChanged(const LLSD& newvalue)
+{
+        if (gPipeline.isInit())
+        {
+                gPipeline.setLightingDetail(newvalue.asInteger());
+        }
+        return true;
+}
+static bool handleResetVertexBuffersChanged(const LLSD&)
+{
+        if (gPipeline.isInit())
+        {
+                gPipeline.resetVertexBuffers();
        }
+        return true;
+}
+static bool handleRenderDynamicLODChanged(const LLSD& newvalue)
+{
+        LLPipeline::sDynamicLOD = newvalue.asBoolean();
+        return true;
+}
+static bool handleRenderUseFBOChanged(const LLSD& newvalue)
+{
+        LLRenderTarget::sUseFBO = newvalue.asBoolean();
+        if (gPipeline.isInit())
+        {
+                gPipeline.releaseGLBuffers();
+                gPipeline.createGLBuffers();
+        }
+        return true;
+}
+static bool handleRenderUseImpostorsChanged(const LLSD& newvalue)
+{
+        LLVOAvatar::sUseImpostors = FALSE; //newvalue.asBoolean();
+        return true;
+}
+static bool handleRenderUseCleverUIChanged(const LLSD& newvalue)
+{
+        gGL.setClever(newvalue.asBoolean());
+        return true;
+}
+static bool handleRenderResolutionDivisorChanged(const LLSD&)
+{
+        gResizeScreenTexture = TRUE;
+        return true;
+}
+static bool handleDebugViewsChanged(const LLSD& newvalue)
+{
+        LLView::sDebugRects = newvalue.asBoolean();
+        return true;
+}
+static bool handleLogFileChanged(const LLSD& newvalue)
+{
+        std::string log_filename = newvalue.asString();
+        LLFile::remove(log_filename.c_str());
+        LLError::logToFile(log_filename);
+        return true;
+}
+bool handleHideGroupTitleChanged(const LLSD& newvalue)
+{
+        gAgent.setHideGroupTitle(newvalue);
+        return true;
+}
+bool handleEffectColorChanged(const LLSD& newvalue)
+{
+        gAgent.setEffectColor(LLColor4(newvalue));
+        return true;
+}
+bool handleRotateNetMapChanged(const LLSD& newvalue)
+{
+        LLNetMap::setRotateMap(newvalue.asBoolean());
+        return true;
+}
+bool handleVectorizeChanged(const LLSD& newvalue)
+{
+        LLViewerJointMesh::updateVectorize();
+        return true;
+}
+bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
+{
+        if(gVoiceClient)
+        {
+                // Note: Ignore the specific event value, look up the ones we want
+                gVoiceClient->setVoiceEnabled(gSavedSettings.getBOOL("EnableVoiceChat"));
+                gVoiceClient->setUsePTT(gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
+                std::string keyString = gSavedSettings.getString("PushToTalkButton");
+                gVoiceClient->setPTTKey(keyString);
+                gVoiceClient->setPTTIsToggle(gSavedSettings.getBOOL("PushToTalkToggle"));
+                gVoiceClient->setEarLocation(gSavedSettings.getS32("VoiceEarLocation"));
+                std::string serverName = gSavedSettings.getString("VivoxDebugServerName");
+                gVoiceClient->setVivoxDebugServerName(serverName);
+                std::string inputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
+                gVoiceClient->setCaptureDevice(inputDevice);
+                std::string outputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
+                gVoiceClient->setRenderDevice(outputDevice);
+        }
+        return true;
 }
+////////////////////////////////////////////////////////////////////////////
+void settings_setup_listeners()
+{
+        gSavedSettings.getControl("FirstPersonAvatarVisible")->getSignal()->connect(boost::bind(&handleRenderAvatarMouselookChanged, _1));
+        gSavedSettings.getControl("RenderFarClip")->getSignal()->connect(boost::bind(&handleRenderFarClipChanged, _1));
+        gSavedSettings.getControl("RenderTerrainDetail")->getSignal()->connect(boost::bind(&handleTerrainDetailChanged, _1));
+        gSavedSettings.getControl("RenderAvatarVP")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
+        gSavedSettings.getControl("VertexShaderEnable")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
+        gSavedSettings.getControl("RenderDynamicReflections")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
+        gSavedSettings.getControl("RenderGlow")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _1));
+        gSavedSettings.getControl("RenderGlow")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
+        gSavedSettings.getControl("EnableRippleWater")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
+        gSavedSettings.getControl("RenderGlowResolutionPow")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _1));
+        gSavedSettings.getControl("RenderAvatarCloth")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
+        gSavedSettings.getControl("WindLightUseAtmosShaders")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
+        gSavedSettings.getControl("RenderGammaFull")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
+        gSavedSettings.getControl("RenderVolumeLODFactor")->getSignal()->connect(boost::bind(&handleVolumeLODChanged, _1));
+        gSavedSettings.getControl("RenderAvatarLODFactor")->getSignal()->connect(boost::bind(&handleAvatarLODChanged, _1));
+        gSavedSettings.getControl("RenderTerrainLODFactor")->getSignal()->connect(boost::bind(&handleTerrainLODChanged, _1));
+        gSavedSettings.getControl("RenderTreeLODFactor")->getSignal()->connect(boost::bind(&handleTreeLODChanged, _1));
+        gSavedSettings.getControl("RenderFlexTimeFactor")->getSignal()->connect(boost::bind(&handleFlexLODChanged, _1));
+        gSavedSettings.getControl("ThrottleBandwidthKBPS")->getSignal()->connect(boost::bind(&handleBandwidthChanged, _1));
+        gSavedSettings.getControl("RenderGamma")->getSignal()->connect(boost::bind(&handleGammaChanged, _1));
+        gSavedSettings.getControl("RenderFogRatio")->getSignal()->connect(boost::bind(&handleFogRatioChanged, _1));
+        gSavedSettings.getControl("RenderMaxPartCount")->getSignal()->connect(boost::bind(&handleMaxPartCountChanged, _1));
+        gSavedSettings.getControl("RenderDynamicLOD")->getSignal()->connect(boost::bind(&handleRenderDynamicLODChanged, _1));
+        gSavedSettings.getControl("RenderDebugTextureBind")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _1));
+        gSavedSettings.getControl("RenderFastAlpha")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _1));
+        gSavedSettings.getControl("RenderObjectBump")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _1));
+        gSavedSettings.getControl("RenderMaxVBOSize")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _1));
+        gSavedSettings.getControl("RenderUseFBO")->getSignal()->connect(boost::bind(&handleRenderUseFBOChanged, _1));
+        gSavedSettings.getControl("RenderUseImpostors")->getSignal()->connect(boost::bind(&handleRenderUseImpostorsChanged, _1));
+        gSavedSettings.getControl("RenderUseCleverUI")->getSignal()->connect(boost::bind(&handleRenderUseCleverUIChanged, _1));
+        gSavedSettings.getControl("RenderResolutionDivisor")->getSignal()->connect(boost::bind(&handleRenderResolutionDivisorChanged, _1));
+        gSavedSettings.getControl("RenderDeferred")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
+        gSavedSettings.getControl("AvatarCompositeLimit")->getSignal()->connect(boost::bind(&handleCompositeLimitChanged, _1));
+        gSavedSettings.getControl("TextureMemory")->getSignal()->connect(boost::bind(&handleVideoMemoryChanged, _1));
+        gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&handleChatFontSizeChanged, _1));
+        gSavedSettings.getControl("ChatPersistTime")->getSignal()->connect(boost::bind(&handleChatPersistTimeChanged, _1));
+        gSavedSettings.getControl("ConsoleMaxLines")->getSignal()->connect(boost::bind(&handleConsoleMaxLinesChanged, _1));
+        gSavedSettings.getControl("UseOcclusion")->getSignal()->connect(boost::bind(&handleUseOcclusionChanged, _1));
+        gSavedSettings.getControl("AudioLevelMaster")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioLevelSFX")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioLevelUI")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioLevelAmbient")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioLevelMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioLevelMedia")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioLevelVoice")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioLevelDistance")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioLevelDoppler")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioLevelRolloff")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("AudioStreamingMusic")->getSignal()->connect(boost::bind(&handleAudioStreamMusicChanged, _1));
+        gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("MuteMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("MuteMedia")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("MuteVoice")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("MuteAmbient")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("MuteUI")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
+        gSavedSettings.getControl("RenderVBOEnable")->getSignal()->connect(boost::bind(&handleRenderUseVBOChanged, _1));
+        gSavedSettings.getControl("WLSkyDetail")->getSignal()->connect(boost::bind(&handleWLSkyDetailChanged, _1));
+        gSavedSettings.getControl("RenderLightingDetail")->getSignal()->connect(boost::bind(&handleRenderLightingDetailChanged, _1));
+        gSavedSettings.getControl("NumpadControl")->getSignal()->connect(boost::bind(&handleNumpadControlChanged, _1));
+        gSavedSettings.getControl("JoystickAxis0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("JoystickAxis1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("JoystickAxis2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("JoystickAxis3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("JoystickAxis4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("JoystickAxis5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("JoystickAxis6")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisScale0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisScale1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisScale2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisScale3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisScale4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisScale5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisScale6")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisDeadZone0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisDeadZone1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisDeadZone2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisDeadZone3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisDeadZone4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisDeadZone5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("FlycamAxisDeadZone6")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisScale0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisScale1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisScale2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisScale3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisScale4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisScale5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisDeadZone0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisDeadZone1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisDeadZone2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisDeadZone3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisDeadZone4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("AvatarAxisDeadZone5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisScale0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisScale1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisScale2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisScale3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisScale4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisScale5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisDeadZone0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisDeadZone1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisDeadZone2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisDeadZone3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisDeadZone4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+        gSavedSettings.getControl("BuildAxisDeadZone5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
+    gSavedSettings.getControl("DebugViews")->getSignal()->connect(boost::bind(&handleDebugViewsChanged, _1));
+    gSavedSettings.getControl("UserLogFile")->getSignal()->connect(boost::bind(&handleLogFileChanged, _1));
+        gSavedSettings.getControl("RenderHideGroupTitle")->getSignal()->connect(boost::bind(handleHideGroupTitleChanged, _1));
+        gSavedSettings.getControl("EffectColor")->getSignal()->connect(boost::bind(handleEffectColorChanged, _1));
+        gSavedSettings.getControl("MiniMapRotate")->getSignal()->connect(boost::bind(handleRotateNetMapChanged, _1));
+        gSavedSettings.getControl("VectorizePerfTest")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _1));
+        gSavedSettings.getControl("VectorizeEnable")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _1));
+        gSavedSettings.getControl("VectorizeProcessor")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _1));
+        gSavedSettings.getControl("VectorizeSkin")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _1));
+        gSavedSettings.getControl("EnableVoiceChat")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
+        gSavedSettings.getControl("PTTCurrentlyEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
+        gSavedSettings.getControl("PushToTalkButton")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
+        gSavedSettings.getControl("PushToTalkToggle")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
+        gSavedSettings.getControl("VoiceEarLocation")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
+        gSavedSettings.getControl("VivoxDebugServerName")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
+        gSavedSettings.getControl("VoiceInputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
+        gSavedSettings.getControl("VoiceOutputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
+}
diff --git a/linden/indra/newview/llviewercontrol.h b/linden/indra/newview/llviewercontrol.h
index bcea8db..c827f37 100644
--- a/linden/indra/newview/llviewercontrol.h
+++ b/linden/indra/newview/llviewercontrol.h
@@ -32,9 +32,8 @@
 #ifndef LL_LLVIEWERCONTROL_H
 #define LL_LLVIEWERCONTROL_H
+#include <map>
 #include "llcontrol.h"
-#include "llfloater.h"
-#include "lltexteditor.h"
 // Enabled this definition to compile a 'hacked' viewer that
 // allows a hacked godmode to be toggled on and off.
@@ -43,33 +42,12 @@
 extern BOOL gHackGodmode;
 #endif
-class LLFloaterSettingsDebug : public LLFloater
-{
-public:
-        LLFloaterSettingsDebug();
-        virtual ~LLFloaterSettingsDebug();
-        virtual BOOL postBuild();
-        virtual void draw();
-        void updateControl(LLControlBase* control);
-        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;
-        LLTextEditor* mComment;
-};
 // These functions found in llcontroldef.cpp *TODO: clean this up!
 //setting variables are declared in this function
-void declare_settings();
-void fixup_settings();
 void settings_setup_listeners();
+extern std::map<LLString, LLControlGroup*> gSettings;
 // for the graphics settings
 void create_graphics_group(LLControlGroup& group);
@@ -78,9 +56,6 @@ extern LLControlGroup gSavedSettings;
 extern LLControlGroup gSavedPerAccountSettings;
 // Read-only
-extern LLControlGroup gViewerArt;
-// Read-only
 extern LLControlGroup gColors;
 // Saved at end of session
@@ -90,7 +65,4 @@ extern LLControlGroup gCrashSettings;
 extern LLString gLastRunVersion;
 extern LLString gCurrentVersion;
-extern LLString gSettingsFileName;
-extern LLString gPerAccountSettingsFileName;
 #endif // LL_LLVIEWERCONTROL_H
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index 9395b97..b4d6f27 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -75,6 +75,7 @@
 #include "llcubemap.h"
 #include "llviewerregion.h"
 #include "lldrawpoolwater.h"
+#include "lldrawpoolbump.h"
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
 #include "llpostprocess.h"
@@ -82,6 +83,7 @@
 extern LLPointer<LLImageGL> gStartImageGL;
 extern BOOL gDisplaySwapBuffers;
 LLPointer<LLImageGL> gDisconnectedImagep = NULL;
 // used to toggle renderer back on after teleport
@@ -171,18 +173,15 @@ void display_update_camera()
        {
                final_far *= 0.5f;
        }
-        gCamera->setFar(final_far);
+        LLViewerCamera::getInstance()->setFar(final_far);
        gViewerWindow->setup3DRender();
        
        // update all the sky/atmospheric/water settings
-        LLWLParamManager::instance()->update(gCamera);
+        LLWLParamManager::instance()->update(LLViewerCamera::getInstance());
-        LLWaterParamManager::instance()->update(gCamera);
+        LLWaterParamManager::instance()->update(LLViewerCamera::getInstance());
        // Update land visibility too
-        if (gWorldp)
+        LLWorld::getInstance()->setLandFarClip(final_far);
-        {
-                gWorldp->setLandFarClip(final_far);
-        }
 }
@@ -284,7 +283,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
        LLImageGL::updateStats(gFrameTimeSeconds);
        
        LLVOAvatar::sRenderName = gSavedSettings.getS32("RenderName");
-        LLVOAvatar::sRenderGroupTitles = gSavedSettings.getBOOL("RenderGroupTitleAll");
+        LLVOAvatar::sRenderGroupTitles = !gSavedSettings.getBOOL("RenderHideGroupTitleAll");
+        
        gPipeline.mBackfaceCull = TRUE;
        gFrameCount++;
        if (gFocusMgr.getAppHasFocus())
@@ -422,8 +422,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
        //
        //
-        gCamera->setZoomParameters(zoom_factor, subfield);
+        LLViewerCamera::getInstance()->setZoomParameters(zoom_factor, subfield);
-        gCamera->setNear(MIN_NEAR_PLANE);
+        LLViewerCamera::getInstance()->setNear(MIN_NEAR_PLANE);
        //////////////////////////
        //
@@ -497,7 +497,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                stop_glerror();
                                
                // *TODO: merge these two methods
-                gHUDManager->updateEffects();
+                LLHUDManager::getInstance()->updateEffects();
                LLHUDObject::updateAll();
                stop_glerror();
                
@@ -508,9 +508,10 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                
                gFrameStats.start(LLFrameStats::UPDATE_CULL);
                S32 water_clip = 0;
-                if (LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT) > 1)
+                if ((LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT) > 1) &&
+                         gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_WATER))
                {
-                        if (gCamera->cameraUnderWater())
+                        if (LLViewerCamera::getInstance()->cameraUnderWater())
                        {
                                water_clip = -1;
                        }
@@ -525,7 +526,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                LLPipeline::sUseOcclusion = 
                                (!gUseWireframe
-                                && gFeatureManagerp->isFeatureAvailable("UseOcclusion") 
+                                && LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion") 
                                && gSavedSettings.getBOOL("UseOcclusion") 
                                && gGLManager.mHasOcclusionQuery) ? 2 : 0;
                LLPipeline::sFastAlpha = gSavedSettings.getBOOL("RenderFastAlpha");
@@ -539,7 +540,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                }
                static LLCullResult result;
-                gPipeline.updateCull(*gCamera, result, water_clip);
+                gPipeline.updateCull(*LLViewerCamera::getInstance(), result, water_clip);
                stop_glerror();
                BOOL to_texture = !for_snapshot &&
@@ -570,7 +571,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                                
                                glh::matrix4f proj = glh_get_current_projection();
                                glh::matrix4f mod = glh_get_current_modelview();
-                                glViewport(0,0,128,256);
+                                glViewport(0,0,512,512);
+                                LLVOAvatar::updateFreezeCounter() ;
                                LLVOAvatar::updateImpostors();
                                glh_set_current_projection(proj);
                                glh_set_current_modelview(mod);
@@ -585,8 +587,30 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                if (!for_snapshot)
                {
-                        gPipeline.processImagery(*gCamera);
+                        gPipeline.processImagery(*LLViewerCamera::getInstance());
-                        gPipeline.generateWaterReflection(*gCamera);
+                        gPipeline.generateWaterReflection(*LLViewerCamera::getInstance());
+                }
+                //////////////////////////////////////
+                //
+                // Update images, using the image stats generated during object update/culling
+                //
+                // Can put objects onto the retextured list.
+                //
+                // Doing this here gives hardware occlusion queries extra time to complete
+                gFrameStats.start(LLFrameStats::IMAGE_UPDATE);
+                {
+                        LLFastTimer t(LLFastTimer::FTM_IMAGE_UPDATE);
+                        
+                        LLViewerImage::updateClass(LLViewerCamera::getInstance()->getVelocityStat()->getMean(),
+                                                                                LLViewerCamera::getInstance()->getAngularVelocityStat()->getMean());
+                        gBumpImageList.updateImages();  // must be called before gImageList version so that it's textures are thrown out first.
+                        const F32 max_image_decode_time = llmin(0.005f, 0.005f*10.f*gFrameIntervalSeconds); // 50 ms/second decode time (no more than 5ms/frame)
+                        gImageList.updateImages(max_image_decode_time);
+                        stop_glerror();
                }
                ///////////////////////////////////
@@ -599,7 +623,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                //
                {
                        gFrameStats.start(LLFrameStats::STATE_SORT);
-                        gPipeline.stateSort(*gCamera, result);
+                        gPipeline.stateSort(*LLViewerCamera::getInstance(), result);
                        stop_glerror();
                                
                        if (rebuild)
@@ -650,8 +674,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                //                                                              (F32)floater_rect.mRight / (F32)gViewerWindow->getWindowWidth(),
                //                                                              (F32)floater_rect.mBottom / (F32)gViewerWindow->getWindowHeight());
                //              floater_3d_rect.translate(-0.5f, -0.5f);
-                //              glTranslatef(0.f, 0.f, -gCamera->getNear());
+                //              glTranslatef(0.f, 0.f, -LLViewerCamera::getInstance()->getNear());
-                //              glScalef(gCamera->getNear() * gCamera->getAspect() / sinf(gCamera->getView()), gCamera->getNear() / sinf(gCamera->getView()), 1.f);
+                //              glScalef(LLViewerCamera::getInstance()->getNear() * LLViewerCamera::getInstance()->getAspect() / sinf(LLViewerCamera::getInstance()->getView()), LLViewerCamera::getInstance()->getNear() / sinf(LLViewerCamera::getInstance()->getView()), 1.f);
                //              gGL.color4fv(LLColor4::white.mV);
                //              gGL.begin(GL_QUADS);
                //              {
@@ -678,8 +702,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                                && !gRestoreGL)
                {
                        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
-                        LLPipeline::sUnderWaterRender = gCamera->cameraUnderWater() ? TRUE : FALSE;
+                        LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater() ? TRUE : FALSE;
-                        gPipeline.renderGeom(*gCamera, TRUE);
+                        gPipeline.renderGeom(*LLViewerCamera::getInstance(), TRUE);
                        LLPipeline::sUnderWaterRender = FALSE;
                        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
@@ -691,8 +715,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                        }
                        stop_glerror();
                }
-        
-                render_hud_attachments();
                
                if (to_texture)
                {
@@ -735,7 +757,7 @@ void render_hud_attachments()
        if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices(FALSE))
        {
-                LLCamera hud_cam = *gCamera;
+                LLCamera hud_cam = *LLViewerCamera::getInstance();
                LLVector3 origin = hud_cam.getOrigin();
                hud_cam.setOrigin(-1.f,0,0);
                hud_cam.setAxes(LLVector3(1,0,0), LLVector3(0,1,0), LLVector3(0,0,1));
@@ -763,13 +785,13 @@ void render_hud_attachments()
                gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_BUMP);
                gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_SIMPLE);
                gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_VOLUME);
-                gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_GLOW);
                gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_ALPHA);
                
                gPipeline.stateSort(hud_cam, result);
                gPipeline.renderGeom(hud_cam);
+                render_hud_elements();
                //restore type mask
                gPipeline.setRenderTypeMask(mask);
                if (has_ui)
@@ -818,12 +840,12 @@ BOOL setup_hud_matrices(BOOL for_select)
                        //RN: reset viewport to window extents so ortho screen is calculated with proper reference frame
                        gViewerWindow->setupViewport();
                }
-                glh::matrix4f proj = gl_ortho(-0.5f * gCamera->getAspect(), 0.5f * gCamera->getAspect(), -0.5f, 0.5f, 0.f, hud_depth);
+                glh::matrix4f proj = gl_ortho(-0.5f * LLViewerCamera::getInstance()->getAspect(), 0.5f * LLViewerCamera::getInstance()->getAspect(), -0.5f, 0.5f, 0.f, hud_depth);
                proj.element(2,2) = -0.01f;
-                
                // apply camera zoom transform (for high res screenshots)
-                F32 zoom_factor = gCamera->getZoomFactor();
+                F32 zoom_factor = LLViewerCamera::getInstance()->getZoomFactor();
-                S16 sub_region = gCamera->getZoomSubRegion();
+                S16 sub_region = LLViewerCamera::getInstance()->getZoomSubRegion();
                if (zoom_factor > 1.f)
                {
                        float offset = zoom_factor - 1.f;
@@ -831,7 +853,7 @@ BOOL setup_hud_matrices(BOOL for_select)
                        int pos_x = sub_region - (pos_y*llceil(zoom_factor));
                        glh::matrix4f mat;
                        mat.set_scale(glh::vec3f(zoom_factor, zoom_factor, 1.f));
-                        mat.set_translate(glh::vec3f(gCamera->getAspect() * 0.5f * (offset - (F32)pos_x * 2.f), 0.5f * (offset - (F32)pos_y * 2.f), 0.f));
+                        mat.set_translate(glh::vec3f(LLViewerCamera::getInstance()->getAspect() * 0.5f * (offset - (F32)pos_x * 2.f), 0.5f * (offset - (F32)pos_y * 2.f), 0.f));
                        proj *= mat;
                }
@@ -873,6 +895,9 @@ void render_ui_and_swap()
                {
                        gPipeline.renderBloom(gSnapshot);
                }
+                render_hud_elements();
+                render_hud_attachments();
        }
        LLGLSDefault gls_default;
@@ -1049,8 +1074,8 @@ void render_ui_2d()
        //  Menu overlays, HUD, etc
        gViewerWindow->setup2DRender();
-        F32 zoom_factor = gCamera->getZoomFactor();
+        F32 zoom_factor = LLViewerCamera::getInstance()->getZoomFactor();
-        S16 sub_region = gCamera->getZoomSubRegion();
+        S16 sub_region = LLViewerCamera::getInstance()->getZoomSubRegion();
        if (zoom_factor > 1.f)
        {
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index 7cac905..0316c10 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -206,6 +206,16 @@ LLViewerImage::LLViewerImage(const LLUUID& id, BOOL usemipmaps)
        sImageCount++;
 }
+LLViewerImage::LLViewerImage(const LLString& filename, const LLUUID& id, BOOL usemipmaps)
+        : LLImageGL(usemipmaps),
+          mID(id)
+{
+        mLocalFileName = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "textures", filename);
+        init(true);
+        sImageCount++;
+}
 LLViewerImage::LLViewerImage(const U32 width, const U32 height, const U8 components, BOOL usemipmaps)
        : LLImageGL(width, height, components, usemipmaps)
 {
@@ -232,6 +242,8 @@ void LLViewerImage::init(bool firstinit)
 {
        mFullWidth = 0;
        mFullHeight = 0;
+        mOrigWidth = 0;
+        mOrigHeight = 0;
        mNeedsAux = FALSE;
        mTexelsPerImage = 64.f*64.f;
        mMaxVirtualSize = 0.f;
@@ -290,6 +302,8 @@ void LLViewerImage::dump()
                        << " mIsMissingAsset " << (S32)mIsMissingAsset
                        << " mFullWidth " << mFullWidth
                        << " mFullHeight " << mFullHeight
+                        << " mOrigWidth" << mOrigWidth
+                        << " mOrigHeight" << mOrigHeight
                        << llendl;
 }
@@ -359,6 +373,22 @@ BOOL LLViewerImage::createTexture(S32 usename/*= 0*/)
        BOOL res = TRUE;
        if (!gNoRender)
        {
+                // store original size only for locally-sourced images
+                if (!mLocalFileName.empty())
+                {
+                        mOrigWidth = mRawImage->getWidth();
+                        mOrigHeight = mRawImage->getHeight();
+                        // leave black border, do not scale image content
+                        mRawImage->expandToPowerOfTwo(MAX_IMAGE_SIZE, FALSE);
+                }
+                else
+                {
+                        mOrigWidth = mFullWidth;
+                        mOrigHeight = mFullHeight;
+                }
                if (LLImageGL::checkSize(mRawImage->getWidth(), mRawImage->getHeight()))
                {
                        res = LLImageGL::createGLTexture(mRawDiscardLevel, mRawImage, usename);
@@ -592,6 +622,10 @@ F32 LLViewerImage::calcDecodePriority()
                // Don't decode anything we don't need
                priority = -1.0f;
        }
+        else if (mBoostLevel == LLViewerImage::BOOST_UI)
+        {
+                priority = 1.f;
+        }
        else if (pixel_priority <= 0.f && (cur_discard < 0 || mDesiredDiscardLevel < cur_discard))
        {
                // Not on screen but we might want some data
@@ -782,12 +816,11 @@ bool LLViewerImage::updateFetch()
                
                if (!mIsFetching)
                {
-                        if (mRawDiscardLevel < 0)
+                        if (mRawDiscardLevel < 0 || mRawDiscardLevel == INVALID_DISCARD_LEVEL)
                        {
                                // We finished but received no data
                                if (current_discard < 0)
                                {
-                                        llwarns << mID << ": Marking image as missing" << llendl;
                                        setIsMissingAsset();
                                        desired_discard = -1;
                                }
@@ -864,9 +897,23 @@ bool LLViewerImage::updateFetch()
                                desired_discard = llmax(desired_discard, current_discard-2);
                        }
                }
-                if (LLAppViewer::getTextureFetch()->createRequest(getID(),getTargetHost(), decode_priority,
-                                                                                 w, h, c, desired_discard,
+                // bypass texturefetch directly by pulling from LLTextureCache
-                                                                                 needsAux()))
+                bool fetch_request_created = false;
+                if (mLocalFileName.empty())
+                {
+                        fetch_request_created = LLAppViewer::getTextureFetch()->createRequest(getID(), getTargetHost(), decode_priority,
+                                                                                         w, h, c, desired_discard,
+                                                                                         needsAux());
+                }
+                else
+                {
+                        fetch_request_created = LLAppViewer::getTextureFetch()->createRequest(mLocalFileName, getID(),getTargetHost(), decode_priority,
+                                                                                         w, h, c, desired_discard,
+                                                                                         needsAux());
+                }
+                if (fetch_request_created)
                {
                        mHasFetcher = TRUE;
                        mIsFetching = TRUE;
@@ -874,6 +921,7 @@ bool LLViewerImage::updateFetch()
                        mFetchState = LLAppViewer::getTextureFetch()->getFetchState(mID, mDownloadProgress, mRequestedDownloadPriority,
                                                                                                           mFetchPriority, mFetchDeltaTime, mRequestDeltaTime);
                }
                // if createRequest() failed, we're finishing up a request for this UUID,
                // wait for it to complete
        }
@@ -896,6 +944,7 @@ bool LLViewerImage::updateFetch()
 void LLViewerImage::setIsMissingAsset()
 {
+        llwarns << mLocalFileName << " " << mID << ": Marking image as missing" << llendl;
        if (mHasFetcher)
        {
                LLAppViewer::getTextureFetch()->deleteRequest(getID(), true);
diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h
index c90a672..a84cb72 100644
--- a/linden/indra/newview/llviewerimage.h
+++ b/linden/indra/newview/llviewerimage.h
@@ -182,6 +182,7 @@ protected:
        /*virtual*/ ~LLViewerImage();
        
 public:
+        LLViewerImage(const LLString& filename, const LLUUID& id, BOOL usemipmaps = TRUE);
        LLViewerImage(const LLUUID& id, BOOL usemipmaps = TRUE);
        LLViewerImage(const U32 width, const U32 height, const U8 components, BOOL usemipmaps);
        LLViewerImage(const LLImageRaw* raw, BOOL usemipmaps);
@@ -291,6 +292,11 @@ public:
        
        bool doLoadedCallbacks();
+        // returns dimensions of original image for local files (before power of two scaling)
+        // and returns 0 for all asset system images
+        S32 getOriginalWidth() { return mOrigWidth; }
+        S32 getOriginalHeight() { return mOrigHeight; }
 private:
        /*virtual*/ void cleanup(); // Cleanup the LLViewerImage (so we can reinitialize it)
@@ -304,6 +310,10 @@ public:
        S32 mFullWidth;
        S32 mFullHeight;
+        S32 mOrigWidth;
+        S32 mOrigHeight;
+        LLString mLocalFileName;
        // 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
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index faa0afb..88759af 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -86,10 +86,9 @@ LLStat LLViewerImageList::sFormattedMemStat(32, TRUE);
 ///////////////////////////////////////////////////////////////////////////////
 LLViewerImageList::LLViewerImageList() 
-        : LLImageProviderInterface(),
+        : mForceResetTextureStats(FALSE),
-          mForceResetTextureStats(FALSE),
+        mUpdateStats(FALSE),
-          mUpdateStats(FALSE),
+        mMaxResidentTexMem(0)
-          mMaxResidentTexMem(0)
 {
 }
@@ -118,228 +117,42 @@ void LLViewerImageList::doPreloadImages()
        llinfos << "Preloading images..." << llendl;
        
        // Set the "missing asset" image
-        LLViewerImage::sMissingAssetImagep = preloadUIImage("missing_asset.tga" , LLUUID::null, TRUE);
+        LLViewerImage::sMissingAssetImagep = getImageFromFile("missing_asset.tga");
        
        // Set the "white" image
-        LLViewerImage::sWhiteImagep = preloadUIImage("white.tga", LLUUID::null, TRUE);;
+        LLViewerImage::sWhiteImagep = getImageFromFile("white.tga");
-        
+        
-        // Speeds up startup by 4-5 seconds. JC
+        LLUIImageList* image_list = LLUIImageList::getInstance();
-        if (!gPreloadImages) return;
+        image_list->initFromFile(gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "textures", "textures.xml"));
-        LLViewerImage* image;
-        // Images listed here are immediately decoded, before the login screen.
+        // prefetch specific UUIDs
-        // Since this slows down perceived viewer startup time, only include
+        getImage(IMG_SHOT, TRUE);
-        // images here for buttons/checkboxes/etc. that are immediately visible.
+        getImage(IMG_SMOKE_POOF, TRUE);
-        preloadUIImage("button_disabled_32x128.tga", LLUUID::null, FALSE, LLRectf(.125f, 0.5f, .875f, 0.5f ));
+        LLViewerImage* image = getImageFromFile("silhouette.j2c", MIPMAP_YES, IMMEDIATE_YES);
-        preloadUIImage("button_enabled_32x128.tga", LLUUID::null, FALSE, LLRectf(.125f, 0.5f, .875f, 0.5f ));
+        if (image) 
-        preloadUIImage("button_enabled_selected_32x128.tga", LLUUID::null, FALSE, LLRectf(.125f, 0.5f, .875f, 0.5f ));
+        {
-        preloadUIImage("checkbox_disabled_false.tga", LLUUID::null, FALSE);
+                image->setClamp(FALSE, FALSE);  
-        preloadUIImage("checkbox_disabled_true.tga", LLUUID::null, FALSE);
+                mImagePreloads.insert(image);
-        preloadUIImage("checkbox_enabled_false.tga", LLUUID::null, FALSE);
+        }
-        preloadUIImage("checkbox_enabled_true.tga", LLUUID::null, FALSE);
+        image = getImageFromFile("noentrylines.j2c", MIPMAP_YES, IMMEDIATE_YES);
-        preloadUIImage("close_in_blue.tga", LLUUID::null, FALSE);
+        if (image) 
-        preloadUIImage("combobox_arrow.tga", LLUUID::null, FALSE);
+        {
-        preloadUIImage("minimize.tga", LLUUID::null, FALSE);
+                image->setClamp(FALSE, FALSE);  
-        preloadUIImage("minimize_pressed.tga", LLUUID::null, FALSE);
+                mImagePreloads.insert(image);
-        preloadUIImage("radio_active_false.tga", LLUUID::null, FALSE);
+        }
-        preloadUIImage("radio_active_true.tga", LLUUID::null, FALSE);
+        image = getImageFromFile("noentrypasslines.j2c", MIPMAP_YES, IMMEDIATE_YES);
-        preloadUIImage("radio_inactive_false.tga", LLUUID::null, FALSE);
+        if (image) 
-        preloadUIImage("radio_inactive_true.tga", LLUUID::null, FALSE);
+        {
-        preloadUIImage("resize_handle_bottom_right_blue.tga", LLUUID::null, FALSE);
+                image->setClamp(FALSE, FALSE);  
-        preloadUIImage("rounded_square.tga", LLUUID::null, FALSE, LLRectf(.125f, 0.5f, .875f, 0.5f ));
+                mImagePreloads.insert(image);
-        preloadUIImage("rounded_square_soft.tga", LLUUID::null, FALSE, LLRectf(.125f, 0.5f, .875f, 0.5f ));
+        }
-        preloadUIImage("scrollbutton_down_in_blue.tga", LLUUID::null, FALSE);
+        image = getImage(DEFAULT_WATER_NORMAL, MIPMAP_YES, IMMEDIATE_YES);
-        preloadUIImage("scrollbutton_down_out_blue.tga", LLUUID::null, FALSE);
+        if (image) 
-        preloadUIImage("scrollbutton_left_in_blue.tga", LLUUID::null, FALSE);
+        {
-        preloadUIImage("scrollbutton_left_out_blue.tga", LLUUID::null, FALSE);
+                image->setClamp(FALSE, FALSE);  
-        preloadUIImage("scrollbutton_right_in_blue.tga", LLUUID::null, FALSE);
+                mImagePreloads.insert(image);
-        preloadUIImage("scrollbutton_right_out_blue.tga", LLUUID::null, FALSE);
+        }
-        preloadUIImage("scrollbutton_up_in_blue.tga", LLUUID::null, FALSE);
-        preloadUIImage("scrollbutton_up_out_blue.tga", LLUUID::null, FALSE);
-        preloadUIImage("spin_down_in_blue.tga", LLUUID::null, FALSE);
-        preloadUIImage("spin_down_out_blue.tga", LLUUID::null, FALSE);
-        preloadUIImage("spin_up_in_blue.tga", LLUUID::null, FALSE);
-        preloadUIImage("spin_up_out_blue.tga", LLUUID::null, FALSE);
-        preloadUIImage("square_btn_32x128.tga", LLUUID::null, FALSE, LLRectf(.125f, 0.5f, .875f, 0.5f ));
-        preloadUIImage("square_btn_selected_32x128.tga", LLUUID::null, FALSE, LLRectf(.125f, 0.5f, .875f, 0.5f ));
-        preloadUIImage("startup_logo.tga", LLUUID::null, FALSE);                                // -- needed?
-        preloadUIImage("tab_bottom_blue.tga", LLUUID::null, FALSE, LLRectf(0.109375f, 1.f - 0.4375f, 1.f - 0.109375f, 0.4375f));
-        preloadUIImage("tab_bottom_selected_blue.tga", LLUUID::null, FALSE, LLRectf(0.109375f, 1.f - 0.4375f, 1.f - 0.109375f, 0.4375f));
-        preloadUIImage("tab_left.tga", LLUUID::null, FALSE, LLRectf(.125f, 0.5f, .875f, 0.5f ));
-        preloadUIImage("tab_left_selected.tga", LLUUID::null, FALSE, LLRectf(.125f, 0.5f, .875f, 0.5f ));
-        preloadUIImage("tab_top_blue.tga", LLUUID::null, FALSE, LLRectf(0.109375f, 1.f - 0.4375f, 1.f - 0.109375f, 0.4375f));
-        preloadUIImage("tab_top_selected_blue.tga", LLUUID::null, FALSE, LLRectf(0.109375f, 1.f - 0.4375f, 1.f - 0.109375f, 0.4375f));
-        decodeAllImages(2.f); // decode preloaded images
-        
-        // These images are queued for decode during the login sequence, when
-        // we have a progress bar.
-        preloadUIImage("active_voice_tab.tga", LLUUID::null, FALSE);
-        preloadUIImage("button_anim_pause.tga", LLUUID::null, FALSE);
-        preloadUIImage("button_anim_pause_selected.tga", LLUUID::null, FALSE);
-        preloadUIImage("button_anim_play.tga", LLUUID::null, FALSE);
-        preloadUIImage("button_anim_play_selected.tga", LLUUID::null, FALSE);
-        preloadUIImage("button_anim_stop.tga", LLUUID::null, FALSE);
-        preloadUIImage("button_anim_stop_selected.tga", LLUUID::null, FALSE);
-        preloadUIImage("crosshairs.tga", LLUUID::null, FALSE);
-        preloadUIImage("direction_arrow.tga", LLUUID::null, FALSE);
-        preloadUIImage("eyes.tga", LLUUID::null, TRUE);
-        preloadUIImage("foot_shadow.tga", LLUUID::null, TRUE);
-        preloadUIImage("hair.tga", LLUUID::null, TRUE);
-        preloadUIImage("icon_diurnal.tga", LLUUID::null, TRUE);
-        preloadUIImage("icon_for_sale.tga", LLUUID::null, FALSE);
-        preloadUIImage("icon_popular.tga", LLUUID::null, FALSE);
-        preloadUIImage("icon_top_pick.tga", LLUUID::null, FALSE);
-        preloadUIImage("icon_group.tga", LLUUID::null, FALSE);
-        preloadUIImage("icon_lock.tga", LLUUID::null, FALSE);
-        preloadUIImage("img_shot.tga", IMG_SHOT, TRUE);
-        preloadUIImage("img_smoke_poof.tga", IMG_SMOKE_POOF, TRUE);
-        preloadUIImage("inv_folder_animation.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_bodypart.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_callingcard.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_clothing.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_gesture.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_landmark.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_lostandfound.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_notecard.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_object.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_plain_closed.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_script.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_snapshot.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_sound.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_texture.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_folder_trash.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_animation.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_bodypart.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_callingcard_offline.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_callingcard_online.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_eyes.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_gesture.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_gloves.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_hair.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_jacket.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_landmark.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_landmark_visited.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_notecard.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_object.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_object_multi.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_pants.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_script.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_shape.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_shirt.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_shoes.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_skirt.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_snapshot.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_socks.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_sound.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_texture.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_underpants.tga", LLUUID::null, FALSE);
-        preloadUIImage("inv_item_undershirt.tga", LLUUID::null, FALSE);
-        preloadUIImage("lag_status_critical.tga", LLUUID::null, FALSE);
-        preloadUIImage("lag_status_good.tga", LLUUID::null, FALSE);
-        preloadUIImage("lag_status_warning.tga", LLUUID::null, FALSE);
-        preloadUIImage("legend.tga", LLUUID::null, FALSE);
-        preloadUIImage("map_avatar_16.tga", LLUUID::null, FALSE);
-        preloadUIImage("map_avatar_8.tga", LLUUID::null, FALSE);
-        preloadUIImage("map_avatar_you_8.tga", LLUUID::null, FALSE);
-        preloadUIImage("map_event.tga", LLUUID::null, FALSE);
-        preloadUIImage("map_event_mature.tga", LLUUID::null, FALSE);
-        preloadUIImage("map_home.tga", LLUUID::null, FALSE);
-        preloadUIImage("map_infohub.tga", LLUUID::null, FALSE);
-        preloadUIImage("map_telehub.tga", LLUUID::null, FALSE);
-        preloadUIImage("map_track_16.tga", LLUUID::null, FALSE);
-        preloadUIImage("media_icon.tga", LLUUID::null, FALSE);
-        preloadUIImage("music_icon.tga", LLUUID::null, FALSE);
-        image = preloadUIImage("noentrylines.tga", LLUUID::null, TRUE);
-        if (image) image->setClamp(FALSE, FALSE);       
-        image = preloadUIImage("noentrypasslines.tga", LLUUID::null, TRUE);
-        if (image) image->setClamp(FALSE, FALSE);       
-        preloadUIImage("notify_tip_icon.tga", LLUUID::null, FALSE);
-        preloadUIImage("notify_caution_icon.tga", LLUUID::null, FALSE);
-        preloadUIImage("notify_box_icon.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_cone.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_cone_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_cube.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_cube_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_cylinder.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_cylinder_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_grass.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_grass_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_hemi_cone.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_hemi_cone_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_hemi_cylinder.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_hemi_cylinder_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_hemi_sphere.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_hemi_sphere_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_prism.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_prism_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_pyramid.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_pyramid_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_ring.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_ring_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_sphere.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_sphere_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_tetrahedron.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_tetrahedron_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_torus.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_torus_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_tree.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_tree_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_tube.tga", LLUUID::null, FALSE);
-        preloadUIImage("object_tube_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("pixiesmall.tga", LLUUID::null, TRUE);
-        preloadUIImage("script_error.tga", LLUUID::null, TRUE);
-        image = preloadUIImage("silhouette.tga", LLUUID::null, TRUE);
-        if (image) image->setClamp(FALSE, FALSE);       
-        preloadUIImage("status_no_build.tga", LLUUID::null, FALSE);
-        preloadUIImage("status_buy_currency.tga", LLUUID::null, FALSE);
-        preloadUIImage("status_buy_currency_pressed.tga", LLUUID::null, FALSE);
-        preloadUIImage("status_buy_land.tga", LLUUID::null, FALSE);
-        preloadUIImage("status_buy_land_pressed.tga", LLUUID::null, FALSE);
-        preloadUIImage("status_no_fly.tga", LLUUID::null, FALSE);
-        preloadUIImage("status_health.tga", LLUUID::null, FALSE);
-        preloadUIImage("status_no_push.tga", LLUUID::null, FALSE);
-        preloadUIImage("status_no_scripts.tga", LLUUID::null, FALSE);
-        preloadUIImage("tool_dozer.tga", LLUUID::null, FALSE);
-        preloadUIImage("tool_dozer_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("tool_zoom.tga", LLUUID::null, FALSE);
-        preloadUIImage("tool_zoom_active.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn-overlay_volume-panel.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_active-speakers-dot-lvl0.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_active-speakers-dot-lvl1.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_active-speakers-dot-lvl2.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_active-speakers-typing1.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_active-speakers-typing2.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_active-speakers-typing3.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_voice_ptt-off.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_voice_ptt-on.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_voice_ptt-on-lvl1.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_voice_ptt-on-lvl2.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_voice_ptt-on-lvl3.tga", LLUUID::null, FALSE);
-        preloadUIImage("lag_status_good.tga", LLUUID::null, FALSE);
-        preloadUIImage("lag_status_warning.tga", LLUUID::null, FALSE);
-        preloadUIImage("lag_status_critical.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_voice-call-end.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_voice-call-start.tga", LLUUID::null, FALSE);
-        preloadUIImage("mute_icon.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn-overlay_volume-panel.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_slide-groove_dark.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_slide-highlight.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_slide-thumb_dark.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_speaker-muted_dark.tga", LLUUID::null, FALSE);
-        preloadUIImage("icn_speaker_dark.tga", LLUUID::null, FALSE);
-    preloadUIImage("icn_voice-localchat.tga", LLUUID::null, FALSE);
-    preloadUIImage("icn_voice-groupfocus.tga", LLUUID::null, FALSE);
-    preloadUIImage("icn_voice-pvtfocus.tga", LLUUID::null, FALSE);
-        // TODO: Add images for media remote
-        preloadUIImage("icn_chatbar.tga", LLUUID::null, FALSE);
-        preloadUIImage("btn_chatbar.tga", LLUUID::null, FALSE, LLRectf(0.5f, 0.5f, 0.5f, 0.5f));
-        preloadUIImage("btn_chatbar_selected.tga", LLUUID::null, FALSE, LLRectf(0.5f, 0.5f, 0.5f, 0.5f));
-        preloadUIImage("icn_rounded-text-field.tga", LLUUID::null, FALSE);
-        preloadUIImage("flyout_btn_right_selected.tga", LLUUID::null, FALSE, LLRectf(0.125f, 0.5f, 0.2f, 0.5f));
-        preloadUIImage("flyout_btn_right.tga", LLUUID::null, FALSE, LLRectf(0.125f, 0.5f, 0.2f, 0.5f));
-        preloadUIImage("flyout_btn_left_selected.tga", LLUUID::null, FALSE, LLRectf(0.8f, 0.5f, 0.875f, 0.5f));
-        preloadUIImage("flyout_btn_left.tga", LLUUID::null, FALSE, LLRectf(0.8f, 0.5f, 0.875f, 0.5f));
 }
 static std::string get_texture_list_name()
@@ -390,6 +203,9 @@ LLViewerImageList::~LLViewerImageList()
 void LLViewerImageList::shutdown()
 {
+        // clear out preloads
+        mImagePreloads.clear();
        // 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;
@@ -438,9 +254,6 @@ void LLViewerImageList::shutdown()
        mCallbackList.clear();
        mIRCallbackData.clear();
        
-        // Clean up preloaded images
-        mUIImages.clear();
-        
        // Flush all of the references
        mLoadingStreamList.clear();
        mCreateTextureList.clear();
@@ -484,66 +297,14 @@ void LLViewerImageList::restoreGL()
 const LLUUID BAD_IMG_TWO("bea77041-5835-1661-f298-47e2d32b7a70");
 */
-LLImageGL* LLViewerImageList::getImageByID(const LLUUID& image_id, BOOL clamped)
-{
-        LLViewerImage* imagep = getImage(image_id, MIPMAP_FALSE, TRUE);
-        // force a high resolution decode for all UI images (pulled this from LLTextEditor)
-        // this might not make any difference
-        imagep->setBoostLevel(LLViewerImage::BOOST_UI);
-        LLViewerImage::bindTexture(imagep);
-        imagep->setClamp(clamped, clamped);
-        imagep->unbindTexture(0, GL_TEXTURE_2D);
-        
-        return (LLImageGL*)imagep;
-}
-LLUIImage* LLViewerImageList::getUIImageByID(const LLUUID& image_id, BOOL clamped)
-{
-        uuid_ui_image_map_t::iterator found_it = mUIImages.find(image_id);
-        if (found_it != mUIImages.end())
-        {
-                return found_it->second;
-        }
-        
-        // otherwise create new ui image wrapper
-        LLImageGL* image = getImageByID(image_id, clamped);
-        image->dontDiscard();
-        LLPointer<LLUIImage> new_imagep = new LLUIImage(image);
-        mUIImages.insert(std::make_pair(image_id, new_imagep));
-        
-        return new_imagep;
-}
-///////////////////////////////////////////////////////////////////////////////
-LLViewerImage* LLViewerImageList::preloadUIImage(const LLString& filename, const LLUUID &image_set_id, BOOL use_mips, const LLRectf& scale_rect)
-{
-        LLViewerImage* image = getImage(filename, image_set_id, use_mips, TRUE);
-        image->dontDiscard();
-        image->setClamp(TRUE, TRUE);
-        LLUIImage* ui_imagep = new LLUIImage(image);
-        ui_imagep->setScaleRegion(scale_rect);
-        mUIImages.insert(std::make_pair(image->getID(), LLPointer<LLUIImage>(ui_imagep)));
-        return image;
-}
 ///////////////////////////////////////////////////////////////////////////////
-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)
+                                                                                                   LLGLenum primary_format, 
+                                                                                                   const LLUUID& force_id)
 {
        if (gNoRender)
        {
@@ -551,56 +312,48 @@ LLViewerImage* LLViewerImageList::getImageFromFile(const LLString& filename,
                // getImage() will handle that later.
                return getImage(IMG_DEFAULT, TRUE, TRUE);
        }
+        if (filename.empty())
+        {
+                return getImage(IMG_DEFAULT, TRUE, TRUE);
+        }
+        // generate UUID based on hash of filename
+        LLUUID new_id;
+        if (force_id.notNull())
+        {
+                new_id = force_id;
+        }
+        else
+        {
+                new_id.generate(std::string(filename));
+        }
+        LLPointer<LLViewerImage> imagep = hasImage(new_id);
        
-        // Try to load an image from the skins directory.
+        if (imagep.isNull())
-        // Fall back to loading from the VFS if not found.
-        
-        // First verify that the image exists in gViewerArt
-        LLUUID image_id = LLUUID( gViewerArt.getString(filename.c_str()) );
-        if (image_id.isNull())
        {
-                llwarns << "Unable to find image " << filename << " in gViewerArt" << llendl;
+                imagep = new LLViewerImage(filename, new_id, usemipmaps);
-                if (image_set_id.notNull())
+                
+                if (internal_format && primary_format)
                {
-                        // We *know* that missing_asset.tga exists,
+                        imagep->setExplicitFormat(internal_format, primary_format);
-                        // but for paranoia's sake and to avoid infinite recursion, check anyway
-                        image_id = LLUUID(gViewerArt.getString("missing_asset.tga"));
-                        if (image_id.isNull())
-                        {
-                                llerrs << "Missing missing_asset.tga!" << llendl;
-                        }
-                        return getImageFromFile(LLString("missing_asset.tga"), image_set_id,
-                                                                        usemipmaps, level_immediate,
-                                                                        internal_format, primary_format);
                }
-                else
+                addImage(imagep);
+                
+                if (level_immediate)
                {
-                        return (getImage(IMG_DEFAULT, TRUE, TRUE));
+                        imagep->dontDiscard();
+                        imagep->setBoostLevel(LLViewerImage::BOOST_UI);
                }
        }
-        
-        // Now that we have verified that filename exists, load it and assign it to
-        // the filename's UUID, or image_set_id if non null.
-        if (image_set_id.notNull())
-        {
-                image_id = image_set_id;
-        }
-        
-        // Load the image
-        LLViewerImage* imagep = getImageFromUUID(image_id, usemipmaps, level_immediate, 
-                                                                                         internal_format, primary_format, LLHost());
-        
        return imagep;
 }
-LLViewerImage* LLViewerImageList::getImage(const LLUUID &image_id,
-                                                                                   BOOL usemipmaps,
-                                                                                   BOOL level_immediate)
-{
-        return getImageFromUUID(image_id, usemipmaps, level_immediate, 0, 0, LLHost());
-}
-LLViewerImage* LLViewerImageList::getImageFromUUID(const LLUUID &image_id,
+LLViewerImage* LLViewerImageList::getImage(const LLUUID &image_id,
                                                                                                   BOOL usemipmaps,
                                                                                                   BOOL level_immediate,
                                                                                                   LLGLint internal_format,
@@ -700,6 +453,7 @@ void LLViewerImageList::deleteImage(LLViewerImage *image)
                {
                        mCallbackList.erase((LLViewerImage*)image);
                }
                llverify(mUUIDMap.erase(image->getID()) == 1);
                sNumImages--;
                removeImageFromList(image);
@@ -739,20 +493,25 @@ void LLViewerImageList::updateImages(F32 max_time)
                gPipeline.dirtyPoolObjectTextures(mDirtyTextureList);
                mDirtyTextureList.clear();
        }
-        
+        bool didone = false;
        for (image_list_t::iterator iter = mCallbackList.begin();
                iter != mCallbackList.end(); )
        {
+                //trigger loaded callbacks on local textures immediately
                LLViewerImage* image = *iter++;
-                // Do stuff to handle callbacks, update priorities, etc.
+                if (!image->mLocalFileName.empty())
-                bool res = image->doLoadedCallbacks();
+                {
-                if (res)
+                        // Do stuff to handle callbacks, update priorities, etc.
+                        didone = image->doLoadedCallbacks();
+                }
+                else if (!didone)
                {
-                        break; // only actually do one callback per frame
+                        // Do stuff to handle callbacks, update priorities, etc.
+                        didone = image->doLoadedCallbacks();
                }
        }
-        
        if (!gNoRender && !gGLManager.mIsDisabled)
        {
                LLViewerMedia::updateImagesMediaStreams();
@@ -777,7 +536,7 @@ void LLViewerImageList::updateImagesDecodePriorities()
                        mLastUpdateUUID = iter->first;
                        LLPointer<LLViewerImage> imagep = iter->second;
                        ++iter; // safe to incrament now
-                        
                        //
                        // Flush formatted images using a lazy flush
                        //
@@ -1187,6 +946,7 @@ void LLViewerImageList::updateMaxResidentTexMem(S32 mem)
 {
        // Initialize the image pipeline VRAM settings
        S32 cur_mem = gSavedSettings.getS32("TextureMemory");
+        F32 mem_multiplier = gSavedSettings.getF32("RenderTextureMemoryMultiple");
        S32 default_mem = getMaxVideoRamSetting(true); // recommended default
        if (mem == 0)
        {
@@ -1197,6 +957,9 @@ void LLViewerImageList::updateMaxResidentTexMem(S32 mem)
                mem = default_mem;
        }
+        // limit the texture memory to a multiple of the default if we've found some cards to behave poorly otherwise
+        mem = llmin(mem, (S32) (mem_multiplier * (F32) default_mem));
        mem = llclamp(mem, getMinVideoRamSetting(), getMaxVideoRamSetting());
        if (mem != cur_mem)
        {
@@ -1211,8 +974,8 @@ void LLViewerImageList::updateMaxResidentTexMem(S32 mem)
        S32 fb_mem = llmax(VIDEO_CARD_FRAMEBUFFER_MEM, vb_mem/4);
        mMaxResidentTexMem = (vb_mem - fb_mem)<<20;
        
-        //      llinfos << "Graphics Card memory set to " << (VIDEO_CARD_MEM_SIZES[cur_setting]>>20)
+        llinfos << "Total Video Memory set to: " << vb_mem << " MB" << llendl;
-        //                      << " MB" << llendl;
+        llinfos << "Available Texture Memory set to: " << (vb_mem - fb_mem) << " MB" << llendl;
 }
 ///////////////////////////////////////////////////////////////////////////////
@@ -1379,3 +1142,209 @@ S32 LLViewerImageList::calcMaxTextureRAM()
 }
 ///////////////////////////////////////////////////////////////////////////////
+// explicitly cleanup resources, as this is a singleton class with process
+// lifetime so ability to perform std::map operations in destructor is not
+// guaranteed.
+void LLUIImageList::cleanUp()
+{
+        mUIImages.clear();
+}
+LLUIImagePtr LLUIImageList::getUIImageByID(const LLUUID& image_id)
+{
+        // use id as image name
+        LLString image_name = image_id.asString();
+        // look for existing image
+        uuid_ui_image_map_t::iterator found_it = mUIImages.find(image_name);
+        if (found_it != mUIImages.end())
+        {
+                return found_it->second;
+        }
+        return loadUIImageByID(image_id);
+}
+LLUIImagePtr LLUIImageList::getUIImage(const LLString& image_name)
+{
+        // look for existing image
+        uuid_ui_image_map_t::iterator found_it = mUIImages.find(image_name);
+        if (found_it != mUIImages.end())
+        {
+                return found_it->second;
+        }
+        return loadUIImageByName(image_name, image_name);
+}
+LLUIImagePtr LLUIImageList::loadUIImageByName(const LLString& name, const LLString& filename, BOOL use_mips, const LLRect& scale_rect)
+{
+        LLViewerImage* imagep = gImageList.getImageFromFile(filename, MIPMAP_NO, IMMEDIATE_YES);
+        return loadUIImage(imagep, name, use_mips, scale_rect);
+}
+LLUIImagePtr LLUIImageList::loadUIImageByID(const LLUUID& id, BOOL use_mips, const LLRect& scale_rect)
+{
+        LLViewerImage* imagep = gImageList.getImage(id, MIPMAP_NO, IMMEDIATE_YES);
+        return loadUIImage(imagep, id.asString(), use_mips, scale_rect);
+}
+LLUIImagePtr LLUIImageList::loadUIImage(LLViewerImage* imagep, const LLString& name, BOOL use_mips, const LLRect& scale_rect)
+{
+        if (!imagep) return NULL;
+        imagep->setClamp(TRUE, TRUE);
+        LLUIImagePtr new_imagep = new LLUIImage(name, imagep);
+        mUIImages.insert(std::make_pair(name, new_imagep));
+        LLUIImageLoadData* datap = new LLUIImageLoadData;
+        datap->mImageName = name;
+        datap->mImageScaleRegion = scale_rect;
+        imagep->setLoadedCallback(onUIImageLoaded, 0, FALSE, datap);
+        return new_imagep;
+}
+LLUIImagePtr LLUIImageList::preloadUIImage(const LLString& name, const LLString& filename, BOOL use_mips, const LLRect& scale_rect)
+{
+        // look for existing image
+        uuid_ui_image_map_t::iterator found_it = mUIImages.find(name);
+        if (found_it != mUIImages.end())
+        {
+                // image already loaded!
+                llerrs << "UI Image " << name << " already loaded." << llendl;
+        }
+        return loadUIImageByName(name, filename, use_mips, scale_rect);
+}
+//static 
+void LLUIImageList::onUIImageLoaded( BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* user_data )
+{
+        if(!success || !user_data) 
+        {
+                return;
+        }
+        LLString ui_image_name ;
+        LLRect scale_rect ;
+        {
+                LLUIImageLoadData* image_datap = (LLUIImageLoadData*)user_data;
+                ui_image_name = image_datap->mImageName;
+                scale_rect = image_datap->mImageScaleRegion;
+                if(final)
+                {
+                        delete image_datap;
+                }
+        }
+        LLUIImageList* instance = getInstance();
+        uuid_ui_image_map_t::iterator found_it = instance->mUIImages.find(ui_image_name);
+        if (found_it != instance->mUIImages.end())
+        {
+                LLUIImagePtr imagep = found_it->second;
+                // for images grabbed from local files, apply clipping rectangle to restore original dimensions
+                // from power-of-2 gl image
+                if (success && imagep.notNull() && src_vi && !src_vi->mLocalFileName.empty())
+                {
+                        F32 clip_x = (F32)src_vi->getOriginalWidth() / (F32)src_vi->getWidth(0);
+                        F32 clip_y = (F32)src_vi->getOriginalHeight() / (F32)src_vi->getHeight(0);
+                        imagep->setClipRegion(LLRectf(0.f, clip_y, clip_x, 0.f));
+                        if (scale_rect != LLRect::null)
+                        {
+                                imagep->setScaleRegion(
+                                        LLRectf(llclamp((F32)scale_rect.mLeft / (F32)imagep->getWidth(), 0.f, 1.f),
+                                                llclamp((F32)scale_rect.mTop / (F32)imagep->getHeight(), 0.f, 1.f),
+                                                llclamp((F32)scale_rect.mRight / (F32)imagep->getWidth(), 0.f, 1.f),
+                                                llclamp((F32)scale_rect.mBottom / (F32)imagep->getHeight(), 0.f, 1.f)));
+                        }
+                }
+        }
+}
+bool LLUIImageList::initFromFile(const LLString& filename)
+{
+        LLXmlTree xml_tree;
+        if (!xml_tree.parseFile(filename))
+        {
+                llwarns << "Unable to parse UI image list file " << filename << llendl;
+                return false;
+        }
+        LLXmlTreeNode* rootp = xml_tree.getRoot();
+        if (!rootp || !rootp->hasAttribute("version"))
+        {
+                llwarns << "No valid version number in UI image list file " << filename << llendl;
+                return false;
+        }
+        enum
+        {
+                PASS_DECODE_NOW,
+                PASS_DECODE_LATER,
+                NUM_PASSES
+        };
+        for (S32 pass = PASS_DECODE_NOW; pass < NUM_PASSES; pass++)
+        {
+                LLXmlTreeNode* child_nodep = rootp->getFirstChild();
+                while(child_nodep)
+                {
+                        LLString image_name = child_nodep->getName();
+                        LLString file_name = image_name;
+                        LLRect scale_rect;
+                        BOOL use_mip_maps = FALSE;
+                        BOOL preload = FALSE;
+                        child_nodep->getAttributeBOOL("preload", preload);
+                        // load high priority textures on first pass (to kick off decode)
+                        if (preload)
+                        {
+                                if (pass == PASS_DECODE_LATER) 
+                                {
+                                        child_nodep = rootp->getNextChild();
+                                        continue;
+                                }
+                        }
+                        else
+                        {
+                                if (pass == PASS_DECODE_NOW)
+                                {
+                                        child_nodep = rootp->getNextChild();
+                                        continue;
+                                }
+                        }
+                        child_nodep->getAttributeString("file_name", file_name);
+                        child_nodep->getAttributeBOOL("use_mips", use_mip_maps);
+                        LLXmlTreeNode* rect_node = child_nodep->getChildByName("scale_rect");
+                        if (rect_node)
+                        {
+                                rect_node->getAttributeS32("left", scale_rect.mLeft);
+                                rect_node->getAttributeS32("right", scale_rect.mRight);
+                                rect_node->getAttributeS32("bottom", scale_rect.mBottom);
+                                rect_node->getAttributeS32("top", scale_rect.mTop);
+                        }
+                        
+                        preloadUIImage(image_name, file_name, use_mip_maps, scale_rect);
+                        
+                        child_nodep = rootp->getNextChild();
+                }
+                if (pass == PASS_DECODE_NOW && !gSavedSettings.getBOOL("NoPreload"))
+                {
+                        gImageList.decodeAllImages(2.f); // decode preloaded images
+                }
+        }
+        return true;
+}
diff --git a/linden/indra/newview/llviewerimagelist.h b/linden/indra/newview/llviewerimagelist.h
index 8a39405..24d91fa 100644
--- a/linden/indra/newview/llviewerimagelist.h
+++ b/linden/indra/newview/llviewerimagelist.h
@@ -64,7 +64,7 @@ typedef	void (*LLImageCallback)(BOOL success,
                                                                BOOL final,
                                                                void* userdata);
-class LLViewerImageList : public LLImageProviderInterface
+class LLViewerImageList
 {
        LOG_CLASS(LLViewerImageList);
@@ -82,46 +82,32 @@ public:
        LLViewerImageList();
        ~LLViewerImageList();
-        // LLImageProviderInterface
-        LLImageGL* getImageByID(const LLUUID& id, BOOL clamped = TRUE);
-        LLUIImage* getUIImageByID(const LLUUID& id, BOOL clamped = TRUE);
        void init();
        void shutdown();
        void dump();
        void destroyGL(BOOL save_state = TRUE);
        void restoreGL();
-        LLViewerImage * getImage(const LLString& filename,
-                                                         const LLUUID &image_id,
-                                                         BOOL usemipmap = TRUE,
-                                                         BOOL level_immediate = FALSE           // Get the requested level immediately upon creation.
-                                                         );
        LLViewerImage * getImage(const LLUUID &image_id,
-                                                         BOOL usemipmap = TRUE,
+                                                                         BOOL usemipmap = TRUE,
-                                                         BOOL level_immediate = FALSE           // Get the requested level immediately upon creation.
+                                                                         BOOL level_immediate = FALSE,          // Get the requested level immediately upon creation.
-                                                         );
+                                                                         LLGLint internal_format = 0,
+                                                                         LLGLenum primary_format = 0,
+                                                                         LLHost request_from_host = LLHost()
+                                                                         );
        
        LLViewerImage * getImageFromFile(const LLString& filename,
-                                                                         const LLUUID &image_id,
+                                                                         BOOL usemipmap = TRUE,
-                                                                         BOOL usemipmap,
+                                                                         BOOL level_immediate = FALSE,          // Get the requested level immediately upon creation.
-                                                                         BOOL level_immediate,          // Get the requested level immediately upon creation.
+                                                                         LLGLint internal_format = 0,
-                                                                         LLGLint internal_format,
+                                                                         LLGLenum primary_format = 0,
-                                                                         LLGLenum primary_format
+                                                                         const LLUUID& force_id = LLUUID::null
                                                                         );
-        LLViewerImage * getImageFromUUID(const LLUUID &image_id,
-                                                                         BOOL usemipmap,
-                                                                         BOOL level_immediate,          // Get the requested level immediately upon creation.
-                                                                         LLGLint internal_format,
-                                                                         LLGLenum primary_format,
-                                                                         LLHost request_from_host = LLHost()
-                                                                         );
-        
        // Request image from a specific host, used for baked avatar textures.
        // Implemented in header in case someone changes default params above. JC
        LLViewerImage* getImageFromHost(const LLUUID& image_id, LLHost host)
-                { return getImageFromUUID(image_id, TRUE, FALSE, 0, 0, host); }
+                { return getImage(image_id, TRUE, FALSE, 0, 0, host); }
        LLViewerImage *hasImage(const LLUUID &image_id);
        void addImage(LLViewerImage *image);
@@ -154,7 +140,6 @@ public:
        static S32 getMaxVideoRamSetting(bool get_recommended = false);
        
 private:
-        LLViewerImage* preloadUIImage(const LLString& filename, const LLUUID &image_set_id, BOOL use_mips, const LLRectf& scale_rect = LLRectf(0.f, 1.f, 1.f, 0.f));
        void updateImagesDecodePriorities();
        F32  updateImagesCreateTextures(F32 max_time);
        F32  updateImagesFetchTextures(F32 max_time);
@@ -180,6 +165,9 @@ private:
        typedef std::set<LLPointer<LLViewerImage>, LLViewerImage::Compare> image_priority_list_t;       
        image_priority_list_t mImageList;
+        // simply holds on to LLViewerImage references to stop them from being purged too soon
+        std::set<LLPointer<LLViewerImage> > mImagePreloads;
        typedef std::vector<LLPointer<LLViewerImage> > callback_data_t;
        typedef std::set< callback_data_t* > callback_data_list_t;
        callback_data_list_t mIRCallbackData;
@@ -188,9 +176,6 @@ private:
        S32     mMaxResidentTexMem;
        LLFrameTimer mForceDecodeTimer;
        
-        typedef std::map< LLUUID, LLPointer<LLUIImage> > uuid_ui_image_map_t;
-        uuid_ui_image_map_t mUIImages;
 public:
        static U32 sTextureBits;
        static U32 sTexturePackets;
@@ -207,6 +192,36 @@ private:
        static void (*sUUIDCallback)(void**, const LLUUID &);
 };
+class LLUIImageList : public LLImageProviderInterface, public LLSingleton<LLUIImageList>
+{
+public:
+        // LLImageProviderInterface
+        LLUIImagePtr getUIImageByID(const LLUUID& id);
+        LLUIImagePtr getUIImage(const LLString& name);
+        void cleanUp();
+        bool initFromFile(const LLString& filename);
+        LLUIImagePtr preloadUIImage(const LLString& name, const LLString& filename, BOOL use_mips, const LLRect& scale_rect);
+        
+        static void onUIImageLoaded( BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata );
+private:
+        LLUIImagePtr loadUIImageByName(const LLString& name, const LLString& filename, BOOL use_mips = FALSE, const LLRect& scale_rect = LLRect::null);
+        LLUIImagePtr loadUIImageByID(const LLUUID& id, BOOL use_mips = FALSE, const LLRect& scale_rect = LLRect::null);
+        LLUIImagePtr loadUIImage(LLViewerImage* imagep, const LLString& name, BOOL use_mips = FALSE, const LLRect& scale_rect = LLRect::null);
+        struct LLUIImageLoadData
+        {
+                LLString mImageName;
+                LLRect mImageScaleRegion;
+        };
+        typedef std::map< LLString, LLPointer<LLUIImage> > uuid_ui_image_map_t;
+        uuid_ui_image_map_t mUIImages;
+};
 const BOOL GLTEXTURE_TRUE = TRUE;
 const BOOL GLTEXTURE_FALSE = FALSE;
 const BOOL MIPMAP_TRUE = TRUE;
diff --git a/linden/indra/newview/llviewerjoint.cpp b/linden/indra/newview/llviewerjoint.cpp
index 9e243a0..bea90e6 100644
--- a/linden/indra/newview/llviewerjoint.cpp
+++ b/linden/indra/newview/llviewerjoint.cpp
@@ -40,7 +40,7 @@
 #include "llglimmediate.h"
 #include "llmath.h"
 #include "llglheaders.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llvoavatar.h"
 #include "pipeline.h"
diff --git a/linden/indra/newview/llviewerjointmesh.cpp b/linden/indra/newview/llviewerjointmesh.cpp
index 5c73319..b87d564 100644
--- a/linden/indra/newview/llviewerjointmesh.cpp
+++ b/linden/indra/newview/llviewerjointmesh.cpp
@@ -866,13 +866,53 @@ static F64 sUpdateGeometryRunAvgOn[10];
 static U32 sUpdateGeometryRunCount                      = 0 ;
 static U32 sUpdateGeometryCalls                         = 0 ;
 static U32 sUpdateGeometryLastProcessor         = 0 ;
+static BOOL sVectorizePerfTest                          = FALSE;
+static U32 sVectorizeProcessor                          = 0;
+//static
 void (*LLViewerJointMesh::sUpdateGeometryFunc)(LLFace* face, LLPolyMesh* mesh);
-void LLViewerJointMesh::updateGeometry()
+//static
+void LLViewerJointMesh::updateVectorize()
 {
-        extern BOOL gVectorizePerfTest;
+        sVectorizePerfTest = gSavedSettings.getBOOL("VectorizePerfTest");
-        extern U32      gVectorizeProcessor;
+        sVectorizeProcessor = gSavedSettings.getU32("VectorizeProcessor");
+        BOOL vectorizeEnable = gSavedSettings.getBOOL("VectorizeEnable");
+        BOOL vectorizeSkin = gSavedSettings.getBOOL("VectorizeSkin");
+        std::string vp;
+        switch(sVectorizeProcessor)
+        {
+                case 2: vp = "SSE2"; break;                                     // *TODO: replace the magic #s
+                case 1: vp = "SSE"; break;
+                default: vp = "COMPILER DEFAULT"; break;
+        }
+        llinfos << "Vectorization         : " << ( vectorizeEnable ? "ENABLED" : "DISABLED" ) << llendl ;
+        llinfos << "Vector Processor      : " << vp << llendl ;
+        llinfos << "Vectorized Skinning   : " << ( vectorizeSkin ? "ENABLED" : "DISABLED" ) << llendl ;
+        if(vectorizeEnable && vectorizeSkin)
+        {
+                switch(sVectorizeProcessor)
+                {
+                        case 2:
+                                sUpdateGeometryFunc = &updateGeometrySSE2;
+                                break;
+                        case 1:
+                                sUpdateGeometryFunc = &updateGeometrySSE;
+                                break;
+                        default:
+                                sUpdateGeometryFunc = &updateGeometryVectorized;
+                                break;
+                }
+        }
+        else
+        {
+                sUpdateGeometryFunc = &updateGeometryOriginal;
+        }
+}
+void LLViewerJointMesh::updateGeometry()
+{
        if (!(mValid
                  && mMesh
                  && mFace
@@ -883,7 +923,7 @@ void LLViewerJointMesh::updateGeometry()
                return;
        }
-        if (!gVectorizePerfTest)
+        if (!sVectorizePerfTest)
        {
                // Once we've measured performance, just run the specified
                // code version.
@@ -916,13 +956,13 @@ void LLViewerJointMesh::updateGeometry()
                {
                        F64 time_since_app_start = ug_timer.getElapsedSeconds();
                        if(sUpdateGeometryGlobalTime == 0.0 
-                                || sUpdateGeometryLastProcessor != gVectorizeProcessor)
+                                || sUpdateGeometryLastProcessor != sVectorizeProcessor)
                        {
                                sUpdateGeometryGlobalTime               = time_since_app_start;
                                sUpdateGeometryElapsedTime              = 0;
                                sUpdateGeometryCalls                    = 0;
                                sUpdateGeometryRunCount                 = 0;
-                                sUpdateGeometryLastProcessor    = gVectorizeProcessor;
+                                sUpdateGeometryLastProcessor    = sVectorizeProcessor;
                                sUpdateGeometryCallPointer              = false;
                                return;
                        }
@@ -969,7 +1009,7 @@ void LLViewerJointMesh::updateGeometry()
                                F64 perf_boost = ( sUpdateGeometryElapsedTimeOff - sUpdateGeometryElapsedTimeOn ) / sUpdateGeometryElapsedTimeOn;
                                llinfos << "run averages (" << (F64)sUpdateGeometryRunCount
                                        << "/10) vectorize off " << a
-                                        << "% : vectorize type " << gVectorizeProcessor
+                                        << "% : vectorize type " << sVectorizeProcessor
                                        << " " << b
                                        << "% : performance boost " 
                                        << perf_boost * 100.0
@@ -983,7 +1023,6 @@ void LLViewerJointMesh::updateGeometry()
                                        // We have data now on which version is faster.  Switch to that
                                        // code and save the data for next run.
-                                        gVectorizePerfTest = FALSE;
                                        gSavedSettings.setBOOL("VectorizePerfTest", FALSE);
                                        if (perf_boost > 0.0)
diff --git a/linden/indra/newview/llviewerjointmesh.h b/linden/indra/newview/llviewerjointmesh.h
index c02275a..85f8e97 100644
--- a/linden/indra/newview/llviewerjointmesh.h
+++ b/linden/indra/newview/llviewerjointmesh.h
@@ -149,6 +149,9 @@ public:
        /*virtual*/ BOOL isAnimatable() { return FALSE; }
        
+        static void updateVectorize(); // Update globals when settings variables change
+        
+private:
        // Avatar vertex skinning is a significant performance issue on computers
        // with avatar vertex programs turned off (for example, most Macs).  We
        // therefore have custom versions that use SIMD instructions.
diff --git a/linden/indra/newview/llviewerjoystick.cpp b/linden/indra/newview/llviewerjoystick.cpp
index e3db0f2..e9690f8 100644
--- a/linden/indra/newview/llviewerjoystick.cpp
+++ b/linden/indra/newview/llviewerjoystick.cpp
@@ -1,6 +1,6 @@
 /** 
 * @file llviewerjoystick.cpp
- * @brief Joystick functionality.
+ * @brief Joystick / NDOF device functionality.
 *
 * $LicenseInfo:firstyear=2002&license=viewergpl$
 * 
@@ -30,39 +30,701 @@
 */
 #include "llviewerprecompiledheaders.h"
+#include "llviewerjoystick.h"
 #include "llviewercontrol.h"
 #include "llviewerwindow.h"
 #include "llviewercamera.h"
-#include "llviewerjoystick.h"
 #include "llappviewer.h"
 #include "llkeyboard.h"
+#include "lltoolmgr.h"
+#include "llselectmgr.h"
+#include "llviewermenu.h"
+#include "llagent.h"
+#include "llfocusmgr.h"
+// ----------------------------------------------------------------------------
+// Constants
+#define  X_I    1
+#define  Y_I    2
+#define  Z_I    0
+#define RX_I    4
+#define RY_I    5
+#define RZ_I    3
-static LLQuaternion sFlycamRotation;
+// flycam translations in build mode should be reduced
-static LLVector3 sFlycamPosition;
+const F32 BUILDMODE_FLYCAM_T_SCALE = 3.f;
-static F32              sFlycamZoom;
-BOOL  LLViewerJoystick::sOverrideCamera = FALSE;
+F32  LLViewerJoystick::sLastDelta[] = {0,0,0,0,0,0,0};
+F32  LLViewerJoystick::sDelta[] = {0,0,0,0,0,0,0};
-void LLViewerJoystick::updateCamera(BOOL reset)
+// These constants specify the maximum absolute value coming in from the device.
+// HACK ALERT! the value of MAX_JOYSTICK_INPUT_VALUE is not arbitrary as it 
+// should be.  It has to be equal to 3000 because the SpaceNavigator on Windows 
+// refuses to respond to the DirectInput SetProperty call; it always returns 
+// values in the [-3000, 3000] range.
+#define MAX_SPACENAVIGATOR_INPUT  3000.0f
+#define MAX_JOYSTICK_INPUT_VALUE  MAX_SPACENAVIGATOR_INPUT
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::updateEnabled(bool autoenable)
 {
-        static F32 last_delta[] = {0,0,0,0,0,0,0};
+        if (mDriverState == JDS_UNINITIALIZED)
-        static F32 delta[] = { 0,0,0,0,0,0,0 };
+        {
+                gSavedSettings.setBOOL("JoystickEnabled", FALSE );
+        }
+        else
+        {
+                if (isLikeSpaceNavigator() && autoenable)
+                {
+                        gSavedSettings.setBOOL("JoystickEnabled", TRUE );
+                }
+        }
+        if (!gSavedSettings.getBOOL("JoystickEnabled"))
+        {
+                mOverrideCamera = FALSE;
+        }
+}
-        LLWindow* window = gViewerWindow->getWindow();
+void LLViewerJoystick::setOverrideCamera(bool val)
+{
+        if (!gSavedSettings.getBOOL("JoystickEnabled"))
+        {
+                mOverrideCamera = FALSE;
+        }
+        else
+        {
+                mOverrideCamera = val;
+        }
+}
+// -----------------------------------------------------------------------------
+#if LIB_NDOF
+NDOF_HotPlugResult LLViewerJoystick::HotPlugAddCallback(NDOF_Device *dev)
+{
+        NDOF_HotPlugResult res = NDOF_DISCARD_HOTPLUGGED;
+        LLViewerJoystick* joystick(LLViewerJoystick::getInstance());
+        if (joystick->mDriverState == JDS_UNINITIALIZED)
+        {
+        llinfos << "HotPlugAddCallback: will use device:" << llendl;
+                ndof_dump(dev);
+                joystick->mNdofDev = dev;
+        joystick->mDriverState = JDS_INITIALIZED;
+        res = NDOF_KEEP_HOTPLUGGED;
+        }
+        joystick->updateEnabled(true);
+    return res;
+}
+#endif
+// -----------------------------------------------------------------------------
+#if LIB_NDOF
+void LLViewerJoystick::HotPlugRemovalCallback(NDOF_Device *dev)
+{
+        LLViewerJoystick* joystick(LLViewerJoystick::getInstance());
+        if (joystick->mNdofDev == dev)
+        {
+        llinfos << "HotPlugRemovalCallback: joystick->mNdofDev=" 
+                                << joystick->mNdofDev << "; removed device:" << llendl;
+                ndof_dump(dev);
+                joystick->mDriverState = JDS_UNINITIALIZED;
+        }
+        joystick->updateEnabled(true);
+}
+#endif
+// -----------------------------------------------------------------------------
+LLViewerJoystick::LLViewerJoystick()
+:       mDriverState(JDS_UNINITIALIZED),
+        mNdofDev(NULL),
+        mResetFlag(false),
+        mCameraUpdated(true),
+        mOverrideCamera(false)
+{
+        for (int i = 0; i < 6; i++)
+        {
+                mAxes[i] = sDelta[i] = sLastDelta[i] = 0.0f;
+        }
+        
+        memset(mBtn, 0, sizeof(mBtn));
+        // factor in bandwidth? bandwidth = gViewerStats->mKBitStat
+        mPerfScale = 4000.f / gSysCPU.getMhz();
+}
+// -----------------------------------------------------------------------------
+LLViewerJoystick::~LLViewerJoystick()
+{
+        if (mDriverState == JDS_INITIALIZED)
+        {
+                terminate();
+        }
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::init(bool autoenable)
+{
+#if LIB_NDOF
+        static bool libinit = false;
+        mDriverState = JDS_INITIALIZING;
+        if (libinit == false)
+        {
+                // Note: The HotPlug callbacks are not actually getting called on Windows
+                if (ndof_libinit(HotPlugAddCallback, 
+                                                 HotPlugRemovalCallback, 
+                                                 NULL))
+                {
+                        mDriverState = JDS_UNINITIALIZED;
+                }
+                else
+                {
+                        // NB: ndof_libinit succeeds when there's no device
+                        libinit = true;
+                        // allocate memory once for an eventual device
+                        mNdofDev = ndof_create();
+                }
+        }
+        if (libinit)
+        {
+                if (mNdofDev)
+                {
+                        // Different joysticks will return different ranges of raw values.
+                        // Since we want to handle every device in the same uniform way, 
+                        // we initialize the mNdofDev struct and we set the range 
+                        // of values we would like to receive. 
+                        // 
+                        // HACK: On Windows, libndofdev passes our range to DI with a 
+                        // SetProperty call. This works but with one notable exception, the
+                        // SpaceNavigator, who doesn't seem to care about the SetProperty
+                        // call. In theory, we should handle this case inside libndofdev. 
+                        // However, the range we're setting here is arbitrary anyway, 
+                        // so let's just use the SpaceNavigator range for our purposes. 
+                        mNdofDev->axes_min = (long)-MAX_JOYSTICK_INPUT_VALUE;
+                        mNdofDev->axes_max = (long)+MAX_JOYSTICK_INPUT_VALUE;
+                        // libndofdev could be used to return deltas.  Here we choose to
+                        // just have the absolute values instead.
+                        mNdofDev->absolute = 1;
+                        // init & use the first suitable NDOF device found on the USB chain
+                        if (ndof_init_first(mNdofDev, NULL))
+                        {
+                                mDriverState = JDS_UNINITIALIZED;
+                                llwarns << "ndof_init_first FAILED" << llendl;
+                        }
+                        else
+                        {
+                                mDriverState = JDS_INITIALIZED;
+                        }
+                }
+                else
+                {
+                        mDriverState = JDS_UNINITIALIZED;
+                }
+        }
+        updateEnabled(autoenable);
+        
+        llinfos << "ndof: mDriverState=" << mDriverState << "; mNdofDev=" 
+                        << mNdofDev << "; libinit=" << libinit << llendl;
+#endif
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::terminate()
+{
+#if LIB_NDOF
+        ndof_libcleanup();
+        llinfos << "Terminated connection with NDOF device." << llendl;
+#endif
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::updateStatus()
+{
+#if LIB_NDOF
+        ndof_update(mNdofDev);
+        for (int i=0; i<6; i++)
+        {
+                mAxes[i] = (F32) mNdofDev->axes[i] / mNdofDev->axes_max;
+        }
+        for (int i=0; i<16; i++)
+        {
+                mBtn[i] = mNdofDev->buttons[i];
+        }
+        
+#endif
+}
+// -----------------------------------------------------------------------------
+F32 LLViewerJoystick::getJoystickAxis(U32 axis) const
+{
+        if (axis < 6)
+        {
+                return mAxes[axis];
+        }
+        return 0.f;
+}
+// -----------------------------------------------------------------------------
+U32 LLViewerJoystick::getJoystickButton(U32 button) const
+{
+        if (button < 16)
+        {
+                return mBtn[button];
+        }
+        return 0;
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::agentJump()
+{
+    gAgent.moveUp(1);
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::agentSlide(F32 inc)
+{
+        if (inc < 0)
+        {
+                gAgent.moveLeft(1);
+        }
+        else if (inc > 0)
+        {
+                gAgent.moveLeft(-1);
+        }
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::agentPush(F32 inc)
+{
+        if (inc < 0)                            // forward
+        {
+                gAgent.moveAt(1, false);
+        }
+        else if (inc > 0)                       // backward
+        {
+                gAgent.moveAt(-1, false);
+        }
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::agentFly(F32 inc)
+{
+        if (inc < 0)
+        {
+                if (gAgent.getFlying())
+                {
+                        gAgent.moveUp(1);
+                }
+                else
+                {
+                        gAgent.setFlying(true);
+                }
+        }
+        else if (inc > 0)
+        {
+                // crouch
+                gAgent.moveUp(-1);
+        }
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::agentRotate(F32 pitch_inc, F32 yaw_inc)
+{
+        LLQuaternion new_rot;
+        pitch_inc = gAgent.clampPitchToLimits(-pitch_inc);
+        const LLQuaternion qx(pitch_inc, gAgent.getLeftAxis());
+        const LLQuaternion qy(-yaw_inc, gAgent.getReferenceUpVector());
+        new_rot.setQuat(qx * qy);
+        gAgent.rotate(new_rot);
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::resetDeltas(S32 axis[], bool flycam_and_build_mode)
+{
+        for (U32 i = 0; i < 6; i++)
+        {
+                sLastDelta[i] = -mAxes[axis[i]];
+                sDelta[i] = 0.f;
+        }
+        if (flycam_and_build_mode)
+        {
+                sLastDelta[X_I] /= BUILDMODE_FLYCAM_T_SCALE;
+                sLastDelta[Y_I] /= BUILDMODE_FLYCAM_T_SCALE;
+                sLastDelta[Z_I] /= BUILDMODE_FLYCAM_T_SCALE;
+        }
+        sLastDelta[6] = sDelta[6] = 0.f;
+        mResetFlag = false;
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::moveObjects(bool reset)
+{
+        static bool toggle_send_to_sim = false;
+        if (!gFocusMgr.getAppHasFocus() || mDriverState != JDS_INITIALIZED
+                || !gSavedSettings.getBOOL("JoystickEnabled") || !gSavedSettings.getBOOL("JoystickBuildEnabled"))
+        {
+                return;
+        }
+        S32 axis[] = 
+        {
+                gSavedSettings.getS32("JoystickAxis0"),
+                gSavedSettings.getS32("JoystickAxis1"),
+                gSavedSettings.getS32("JoystickAxis2"),
+                gSavedSettings.getS32("JoystickAxis3"),
+                gSavedSettings.getS32("JoystickAxis4"),
+                gSavedSettings.getS32("JoystickAxis5"),
+        };
+        if (reset || mResetFlag)
+        {
+                resetDeltas(axis);
+                return;
+        }
+        F32 axis_scale[] =
+        {
+                gSavedSettings.getF32("BuildAxisScale0"),
+                gSavedSettings.getF32("BuildAxisScale1"),
+                gSavedSettings.getF32("BuildAxisScale2"),
+                gSavedSettings.getF32("BuildAxisScale3"),
+                gSavedSettings.getF32("BuildAxisScale4"),
+                gSavedSettings.getF32("BuildAxisScale5"),
+        };
+        F32 dead_zone[] =
+        {
+                gSavedSettings.getF32("BuildAxisDeadZone0"),
+                gSavedSettings.getF32("BuildAxisDeadZone1"),
+                gSavedSettings.getF32("BuildAxisDeadZone2"),
+                gSavedSettings.getF32("BuildAxisDeadZone3"),
+                gSavedSettings.getF32("BuildAxisDeadZone4"),
+                gSavedSettings.getF32("BuildAxisDeadZone5"),
+        };
+        F32 cur_delta[6];
        F32 time = gFrameIntervalSeconds;
+        // avoid making ridicously big movements if there's a big drop in fps 
+        if (time > .2f)
+        {
+                time = .2f;
+        }
+        // max feather is 32
+        F32 feather = gSavedSettings.getF32("BuildFeathering"); 
+        bool is_zero = true, absolute = gSavedSettings.getBOOL("Cursor3D");
+        
+        for (U32 i = 0; i < 6; i++)
+        {
+                cur_delta[i] = -mAxes[axis[i]];
+                F32 tmp = cur_delta[i];
+                if (absolute)
+                {
+                        cur_delta[i] = cur_delta[i] - sLastDelta[i];
+                }
+                sLastDelta[i] = tmp;
+                is_zero = is_zero && (cur_delta[i] == 0.f);
+                        
+                if (cur_delta[i] > 0)
+                {
+                        cur_delta[i] = llmax(cur_delta[i]-dead_zone[i], 0.f);
+                }
+                else
+                {
+                        cur_delta[i] = llmin(cur_delta[i]+dead_zone[i], 0.f);
+                }
+                cur_delta[i] *= axis_scale[i];
+                
+                if (!absolute)
+                {
+                        cur_delta[i] *= time;
+                }
+                sDelta[i] = sDelta[i] + (cur_delta[i]-sDelta[i])*time*feather;
+        }
+        U32 upd_type = UPD_NONE;
+        LLVector3 v;
+    
+        if (!is_zero)
+        {
+                if (sDelta[0] || sDelta[1] || sDelta[2])
+                {
+                        upd_type |= UPD_POSITION;
+                        v.setVec(sDelta[0], sDelta[1], sDelta[2]);
+                }
+                
+                if (sDelta[3] || sDelta[4] || sDelta[5])
+                {
+                        upd_type |= UPD_ROTATION;
+                }
+                                
+                // the selection update could fail, so we won't send 
+                if (LLSelectMgr::getInstance()->selectionMove(v, sDelta[3],sDelta[4],sDelta[5], upd_type))
+                {
+                        toggle_send_to_sim = true;
+                }
+        }
+        else if (toggle_send_to_sim)
+        {
+                LLSelectMgr::getInstance()->sendSelectionMove();
+                toggle_send_to_sim = false;
+        }
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::moveAvatar(bool reset)
+{
+        if (!gFocusMgr.getAppHasFocus() || mDriverState != JDS_INITIALIZED
+                || !gSavedSettings.getBOOL("JoystickEnabled") || !gSavedSettings.getBOOL("JoystickAvatarEnabled"))
+        {
+                return;
+        }
+        S32 axis[] = 
+        {
+                // [1 0 2 4  3  5]
+                // [Z X Y RZ RX RY]
+                gSavedSettings.getS32("JoystickAxis0"),
+                gSavedSettings.getS32("JoystickAxis1"),
+                gSavedSettings.getS32("JoystickAxis2"),
+                gSavedSettings.getS32("JoystickAxis3"),
+                gSavedSettings.getS32("JoystickAxis4"),
+                gSavedSettings.getS32("JoystickAxis5")
+        };
+        if (reset || mResetFlag)
+        {
+                resetDeltas(axis);
+                if (reset)
+                {
+                        // Note: moving the agent triggers agent camera mode;
+                        //  don't do this every time we set mResetFlag (e.g. because we gained focus)
+                        gAgent.moveAt(0, true);
+                }
+                return;
+        }
+        if (mBtn[1] == 1)
+    {
+                agentJump();
+                return;
+    }
+        F32 axis_scale[] =
+        {
+                gSavedSettings.getF32("AvatarAxisScale0"),
+                gSavedSettings.getF32("AvatarAxisScale1"),
+                gSavedSettings.getF32("AvatarAxisScale2"),
+                gSavedSettings.getF32("AvatarAxisScale3"),
+                gSavedSettings.getF32("AvatarAxisScale4"),
+                gSavedSettings.getF32("AvatarAxisScale5")
+        };
+        F32 dead_zone[] =
+        {
+                gSavedSettings.getF32("AvatarAxisDeadZone0"),
+                gSavedSettings.getF32("AvatarAxisDeadZone1"),
+                gSavedSettings.getF32("AvatarAxisDeadZone2"),
+                gSavedSettings.getF32("AvatarAxisDeadZone3"),
+                gSavedSettings.getF32("AvatarAxisDeadZone4"),
+                gSavedSettings.getF32("AvatarAxisDeadZone5")
+        };
+        // time interval in seconds between this frame and the previous
+        F32 time = gFrameIntervalSeconds;
+        // avoid making ridicously big movements if there's a big drop in fps 
+        if (time > .2f)
+        {
+                time = .2f;
+        }
+        // note: max feather is 32.0
+        F32 feather = gSavedSettings.getF32("AvatarFeathering"); 
+        
+        F32 cur_delta[6];
+        F32 val, dom_mov = 0.f;
+        U32 dom_axis = Z_I;
+#if LIB_NDOF
+    bool absolute = (gSavedSettings.getBOOL("Cursor3D") && mNdofDev->absolute);
+#else
+    bool absolute = false;
+#endif
+        // remove dead zones and determine biggest movement on the joystick 
+        for (U32 i = 0; i < 6; i++)
+        {
+                cur_delta[i] = -mAxes[axis[i]];
+                if (absolute)
+                {
+                        F32 tmp = cur_delta[i];
+                        cur_delta[i] = cur_delta[i] - sLastDelta[i];
+                        sLastDelta[i] = tmp;
+                }
+                if (cur_delta[i] > 0)
+                {
+                        cur_delta[i] = llmax(cur_delta[i]-dead_zone[i], 0.f);
+                }
+                else
+                {
+                        cur_delta[i] = llmin(cur_delta[i]+dead_zone[i], 0.f);
+                }
+                // we don't care about Roll (RZ) and Z is calculated after the loop
+        if (i != Z_I && i != RZ_I)
+                {
+                        // find out the axis with the biggest joystick motion
+                        val = fabs(cur_delta[i]);
+                        if (val > dom_mov)
+                        {
+                                dom_axis = i;
+                                dom_mov = val;
+                        }
+                }
+        }
+        // forward|backward movements overrule the real dominant movement if 
+        // they're bigger than its 20%. This is what you want cos moving forward
+        // is what you do most. We also added a special (even more lenient) case 
+        // for RX|RY to allow walking while pitching n' turning
+        if (fabs(cur_delta[Z_I]) > .2f * dom_mov
+                || ((dom_axis == RX_I || dom_axis == RY_I) 
+                        && fabs(cur_delta[Z_I]) > .05f * dom_mov))
+    {
+                dom_axis = Z_I;
+        }
+        sDelta[X_I] = -cur_delta[X_I] * axis_scale[X_I];
+        sDelta[Y_I] = -cur_delta[Y_I] * axis_scale[Y_I];
+        sDelta[Z_I] = -cur_delta[Z_I] * axis_scale[Z_I];
+        cur_delta[RX_I] *= -axis_scale[RX_I] * mPerfScale;
+        cur_delta[RY_I] *= -axis_scale[RY_I] * mPerfScale;
+                
+        if (!absolute)
+        {
+                cur_delta[RX_I] *= time;
+                cur_delta[RY_I] *= time;
+        }
+        sDelta[RX_I] += (cur_delta[RX_I] - sDelta[RX_I]) * time * feather;
+        sDelta[RY_I] += (cur_delta[RY_I] - sDelta[RY_I]) * time * feather;
+        
+    switch (dom_axis)
+    {
+        case X_I:                                         // move sideways
+                        agentSlide(sDelta[X_I]);
+            break;
+        
+        case Z_I:                                         // forward/back
+                {
+            agentPush(sDelta[Z_I]);
+            
+            if (fabs(sDelta[Y_I])  > .1f)
+                        {
+                                agentFly(sDelta[Y_I]);
+                        }
+                
+                        // too many rotations during walking can be confusing, so apply
+                        // the deadzones one more time (quick & dirty), at 50%|30% power
+                        F32 eff_rx = .3f * dead_zone[RX_I];
+                        F32 eff_ry = .3f * dead_zone[RY_I];
+                
+                        if (sDelta[RX_I] > 0)
+                        {
+                                eff_rx = llmax(sDelta[RX_I] - eff_rx, 0.f);
+                        }
+                        else
+                        {
+                                eff_rx = llmin(sDelta[RX_I] + eff_rx, 0.f);
+                        }
+                        if (sDelta[RY_I] > 0)
+                        {
+                                eff_ry = llmax(sDelta[RY_I] - eff_ry, 0.f);
+                        }
+                        else
+                        {
+                                eff_ry = llmin(sDelta[RY_I] + eff_ry, 0.f);
+                        }
+                        
+                        
+                        if (fabs(eff_rx) > 0.f || fabs(eff_ry) > 0.f)
+                        {
+                                if (gAgent.getFlying())
+                                {
+                                        agentRotate(eff_rx, eff_ry);
+                                }
+                                else
+                                {
+                                        agentRotate(eff_rx, 2.f * eff_ry);
+                                }
+                        }
+            break;
+                }   
+        case Y_I:                                          // up/crouch
+            agentFly(sDelta[Y_I]);
+            break;
+            
+        case RX_I:                                         // pitch
+        case RY_I:                                         // turn
+                        agentRotate(sDelta[RX_I], sDelta[RY_I]);
+            break;
+        // case RZ_I: roll is unused in avatar mode
+    }// switch
+}
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::moveFlycam(bool reset)
+{
+        static LLQuaternion             sFlycamRotation;
+        static LLVector3                sFlycamPosition;
+        static F32                      sFlycamZoom;
+        
+        if (!gFocusMgr.getAppHasFocus() || mDriverState != JDS_INITIALIZED
+                || !gSavedSettings.getBOOL("JoystickEnabled") || !gSavedSettings.getBOOL("JoystickFlycamEnabled"))
+        {
+                return;
+        }
        S32 axis[] = 
        {
-                gSavedSettings.getS32("FlycamAxis0"),
+                gSavedSettings.getS32("JoystickAxis0"),
-                gSavedSettings.getS32("FlycamAxis1"),
+                gSavedSettings.getS32("JoystickAxis1"),
-                gSavedSettings.getS32("FlycamAxis2"),
+                gSavedSettings.getS32("JoystickAxis2"),
-                gSavedSettings.getS32("FlycamAxis3"),
+                gSavedSettings.getS32("JoystickAxis3"),
-                gSavedSettings.getS32("FlycamAxis4"),
+                gSavedSettings.getS32("JoystickAxis4"),
-                gSavedSettings.getS32("FlycamAxis5"),
+                gSavedSettings.getS32("JoystickAxis5"),
-                gSavedSettings.getS32("FlycamAxis6")
+                gSavedSettings.getS32("JoystickAxis6")
        };
+        bool in_build_mode = LLToolMgr::getInstance()->inBuildMode();
+        if (reset || mResetFlag)
+        {
+                sFlycamPosition = LLViewerCamera::getInstance()->getOrigin();
+                sFlycamRotation = LLViewerCamera::getInstance()->getQuaternion();
+                sFlycamZoom = LLViewerCamera::getInstance()->getView();
+                
+                resetDeltas(axis, in_build_mode);
+                return;
+        }
        F32 axis_scale[] =
        {
                gSavedSettings.getF32("FlycamAxisScale0"),
@@ -85,33 +747,37 @@ void LLViewerJoystick::updateCamera(BOOL reset)
                gSavedSettings.getF32("FlycamAxisDeadZone6")
        };
-        if (reset)
+        F32 time = gFrameIntervalSeconds;
-        {
-                sFlycamPosition = gCamera->getOrigin();
-                sFlycamRotation = gCamera->getQuaternion();
-                sFlycamZoom = gCamera->getView();
-                for (U32 i = 0; i < 7; i++)
+        // avoid making ridicously big movements if there's a big drop in fps 
-                {
+        if (time > .2f)
-                        last_delta[i] = -window->getJoystickAxis(axis[i]);
+        {
-                        delta[i] = 0.f;
+                time = .2f;
-                }
-                return;
        }
        F32 cur_delta[7];
        F32 feather = gSavedSettings.getF32("FlycamFeathering");
-        BOOL absolute = gSavedSettings.getBOOL("FlycamAbsolute");
+        bool absolute = gSavedSettings.getBOOL("Cursor3D");
        for (U32 i = 0; i < 7; i++)
        {
-                cur_delta[i] = -window->getJoystickAxis(axis[i]);       
+                cur_delta[i] = -getJoystickAxis(axis[i]);
+                // we need smaller camera movements in build mode
+                if (in_build_mode)
+                {
+                        if (i == X_I || i == Y_I || i == Z_I)
+                        {
+                                cur_delta[i] /= BUILDMODE_FLYCAM_T_SCALE;
+                        }
+                }
                F32 tmp = cur_delta[i];
                if (absolute)
                {
-                        cur_delta[i] = cur_delta[i] - last_delta[i];
+                        cur_delta[i] = cur_delta[i] - sLastDelta[i];
                }
-                last_delta[i] = tmp;
+                sLastDelta[i] = tmp;
                if (cur_delta[i] > 0)
                {
@@ -128,18 +794,15 @@ void LLViewerJoystick::updateCamera(BOOL reset)
                        cur_delta[i] *= time;
                }
-                delta[i] = delta[i] + (cur_delta[i]-delta[i])*time*feather;
+                sDelta[i] = sDelta[i] + (cur_delta[i]-sDelta[i])*time*feather;
        }
        
-        sFlycamPosition += LLVector3(delta) * sFlycamRotation;
+        sFlycamPosition += LLVector3(sDelta) * sFlycamRotation;
-        LLMatrix3 rot_mat(delta[3],
+        LLMatrix3 rot_mat(sDelta[3], sDelta[4], sDelta[5]);
-                                          delta[4],
-                                          delta[5]);
-        
        sFlycamRotation = LLQuaternion(rot_mat)*sFlycamRotation;
-        if (gSavedSettings.getBOOL("FlycamAutoLeveling"))
+        if (gSavedSettings.getBOOL("AutoLeveling"))
        {
                LLMatrix3 level(sFlycamRotation);
@@ -153,123 +816,185 @@ void LLViewerJoystick::updateCamera(BOOL reset)
                level.setRows(x,y,z);
                level.orthogonalize();
                                
-                LLQuaternion quat = LLQuaternion(level);
+                LLQuaternion quat(level);
                sFlycamRotation = nlerp(llmin(feather*time,1.f), sFlycamRotation, quat);
        }
-        if (gSavedSettings.getBOOL("FlycamZoomDirect"))
+        if (gSavedSettings.getBOOL("ZoomDirect"))
        {
-                sFlycamZoom = last_delta[6]*axis_scale[6]+dead_zone[6];
+                sFlycamZoom = sLastDelta[6]*axis_scale[6]+dead_zone[6];
        }
        else
        {
-                sFlycamZoom += delta[6];
+                sFlycamZoom += sDelta[6];
        }
        LLMatrix3 mat(sFlycamRotation);
-        gCamera->setView(sFlycamZoom);
+        LLViewerCamera::getInstance()->setView(sFlycamZoom);
-        gCamera->setOrigin(sFlycamPosition);
+        LLViewerCamera::getInstance()->setOrigin(sFlycamPosition);
-        gCamera->mXAxis = LLVector3(mat.mMatrix[0]);
+        LLViewerCamera::getInstance()->mXAxis = LLVector3(mat.mMatrix[0]);
-        gCamera->mYAxis = LLVector3(mat.mMatrix[1]);
+        LLViewerCamera::getInstance()->mYAxis = LLVector3(mat.mMatrix[1]);
-        gCamera->mZAxis = LLVector3(mat.mMatrix[2]);
+        LLViewerCamera::getInstance()->mZAxis = LLVector3(mat.mMatrix[2]);
 }
+// -----------------------------------------------------------------------------
+bool LLViewerJoystick::toggleFlycam()
+{
+        if (!gSavedSettings.getBOOL("JoystickEnabled") || !gSavedSettings.getBOOL("JoystickFlycamEnabled"))
+        {
+                return false;
+        }
+        mOverrideCamera = !mOverrideCamera;
+        if (mOverrideCamera)
+        {
+                moveFlycam(true);
+        }
+        else if (!LLToolMgr::getInstance()->inBuildMode())
+        {
+                moveAvatar(true);
+        }
+        else 
+        {
+                // we are in build mode, exiting from the flycam mode: since we are 
+                // going to keep the flycam POV for the main camera until the avatar
+                // moves, we need to track this situation.
+                setCameraNeedsUpdate(false);
+                setNeedsReset(true);
+        }
+        return true;
+}
 void LLViewerJoystick::scanJoystick()
 {
-        if (!sOverrideCamera)
+        if (mDriverState != JDS_INITIALIZED || !gSavedSettings.getBOOL("JoystickEnabled"))
        {
-                static U32 joystick_state = 0;
+                return;
-                static U32 button_state = 0;
+        }
-                F32 xval = gViewerWindow->getWindow()->getJoystickAxis(0);
+#if LL_WINDOWS
-                F32 yval = gViewerWindow->getWindow()->getJoystickAxis(1);
+        // On windows, the flycam is updated syncronously with a timer, so there is
+        // no need to update the status of the joystick here.
+        if (!mOverrideCamera)
+#endif
+        updateStatus();
-                if (xval <= -0.5f)
+        static long toggle_flycam = 0;
-                {
-                        if (!(joystick_state & 0x1))
-                        {
-                                gKeyboard->handleTranslatedKeyDown(KEY_PAD_LEFT, 0);
-                                joystick_state |= 0x1;
-                        }
-                }
-                else 
-                {
-                        if (joystick_state & 0x1)
-                        {
-                                gKeyboard->handleTranslatedKeyUp(KEY_PAD_LEFT, 0);
-                                joystick_state &= ~0x1;
-                        }
-                }
-                if (xval >= 0.5f)
-                {
-                        if (!(joystick_state & 0x2))
-                        {
-                                gKeyboard->handleTranslatedKeyDown(KEY_PAD_RIGHT, 0);
-                                joystick_state |= 0x2;
-                        }
-                }
-                else 
-                {
-                        if (joystick_state & 0x2)
-                        {
-                                gKeyboard->handleTranslatedKeyUp(KEY_PAD_RIGHT, 0);
-                                joystick_state &= ~0x2;
-                        }
-                }
-                if (yval <= -0.5f)
-                {
-                        if (!(joystick_state & 0x4))
-                        {
-                                gKeyboard->handleTranslatedKeyDown(KEY_PAD_UP, 0);
-                                joystick_state |= 0x4;
-                        }
-                }
-                else 
-                {
-                        if (joystick_state & 0x4)
-                        {
-                                gKeyboard->handleTranslatedKeyUp(KEY_PAD_UP, 0);
-                                joystick_state &= ~0x4;
-                        }
-                }
-                if (yval >=  0.5f)
-                {
-                        if (!(joystick_state & 0x8))
-                        {
-                                gKeyboard->handleTranslatedKeyDown(KEY_PAD_DOWN, 0);
-                                joystick_state |= 0x8;
-                        }
-                }
-                else 
-                {
-                        if (joystick_state & 0x8)
-                        {
-                                gKeyboard->handleTranslatedKeyUp(KEY_PAD_DOWN, 0);
-                                joystick_state &= ~0x8;
-                        }
-                }
-                for( int i = 0; i < 15; i++ )
+        if (mBtn[0] == 1)
+    {
+                if (mBtn[0] != toggle_flycam)
                {
-                        if ( gViewerWindow->getWindow()->getJoystickButton(i) & 0x80 )
+                        toggle_flycam = toggleFlycam() ? 1 : 0;
-                        {
-                                if (!(button_state & (1<<i)))
-                                {
-                                        gKeyboard->handleTranslatedKeyDown(KEY_BUTTON1+i, 0);
-                                        button_state |= (1<<i);
-                                }
-                        }
-                        else
-                        {
-                                if (button_state & (1<<i))
-                                {
-                                        gKeyboard->handleTranslatedKeyUp(KEY_BUTTON1+i, 0);
-                                        button_state &= ~(1<<i);
-                                }
-                        }
                }
        }
+        else
+        {
+                toggle_flycam = 0;
+        }
+        
+        if (!mOverrideCamera && !LLToolMgr::getInstance()->inBuildMode())
+        {
+                moveAvatar();
+        }
+}
+// -----------------------------------------------------------------------------
+std::string LLViewerJoystick::getDescription()
+{
+        std::string res;
+#if LIB_NDOF
+        if (mDriverState == JDS_INITIALIZED && mNdofDev)
+        {
+                res = ll_safe_string(mNdofDev->product);
+        }
+#endif
+        return res;
+}
+bool LLViewerJoystick::isLikeSpaceNavigator() const
+{
+#if LIB_NDOF    
+        return (isJoystickInitialized() 
+                        && (strncmp(mNdofDev->product, "SpaceNavigator", 14) == 0
+                                || strncmp(mNdofDev->product, "SpaceExplorer", 13) == 0
+                                || strncmp(mNdofDev->product, "SpaceTraveler", 13) == 0
+                                || strncmp(mNdofDev->product, "SpacePilot", 10) == 0));
+#else
+        return false;
+#endif
 }
+// -----------------------------------------------------------------------------
+void LLViewerJoystick::setSNDefaults()
+{
+#if LL_DARWIN 
+#define kPlatformScale  20.f
+#else
+#define kPlatformScale  1.f
+#endif
+        
+        //gViewerWindow->alertXml("CacheWillClear");
+        llinfos << "restoring SpaceNavigator defaults..." << llendl;
+        
+        gSavedSettings.setS32("JoystickAxis0", 1); // z (at)
+        gSavedSettings.setS32("JoystickAxis1", 0); // x (slide)
+        gSavedSettings.setS32("JoystickAxis2", 2); // y (up)
+        gSavedSettings.setS32("JoystickAxis3", 4); // pitch
+        gSavedSettings.setS32("JoystickAxis4", 3); // roll 
+        gSavedSettings.setS32("JoystickAxis5", 5); // yaw
+        gSavedSettings.setS32("JoystickAxis6", -1);
+        
+#if LL_DARWIN
+        // The SpaceNavigator doesn't act as a 3D cursor on OS X. 
+        gSavedSettings.setBOOL("Cursor3D", false);
+#else
+        gSavedSettings.setBOOL("Cursor3D", true);
+#endif
+        gSavedSettings.setBOOL("AutoLeveling", true);
+        gSavedSettings.setBOOL("ZoomDirect", false);
+        
+        gSavedSettings.setF32("AvatarAxisScale0", 1.f);
+        gSavedSettings.setF32("AvatarAxisScale1", 1.f);
+        gSavedSettings.setF32("AvatarAxisScale2", 1.f);
+        gSavedSettings.setF32("AvatarAxisScale4", .1f * kPlatformScale);
+        gSavedSettings.setF32("AvatarAxisScale5", .1f * kPlatformScale);
+        gSavedSettings.setF32("AvatarAxisScale3", 0.f * kPlatformScale);
+        gSavedSettings.setF32("BuildAxisScale1", .3f * kPlatformScale);
+        gSavedSettings.setF32("BuildAxisScale2", .3f * kPlatformScale);
+        gSavedSettings.setF32("BuildAxisScale0", .3f * kPlatformScale);
+        gSavedSettings.setF32("BuildAxisScale4", .3f * kPlatformScale);
+        gSavedSettings.setF32("BuildAxisScale5", .3f * kPlatformScale);
+        gSavedSettings.setF32("BuildAxisScale3", .3f * kPlatformScale);
+        gSavedSettings.setF32("FlycamAxisScale1", 2.f * kPlatformScale);
+        gSavedSettings.setF32("FlycamAxisScale2", 2.f * kPlatformScale);
+        gSavedSettings.setF32("FlycamAxisScale0", 2.1f * kPlatformScale);
+        gSavedSettings.setF32("FlycamAxisScale4", .1f * kPlatformScale);
+        gSavedSettings.setF32("FlycamAxisScale5", .15f * kPlatformScale);
+        gSavedSettings.setF32("FlycamAxisScale3", 0.f * kPlatformScale);
+        gSavedSettings.setF32("FlycamAxisScale6", 0.f * kPlatformScale);
+        
+        gSavedSettings.setF32("AvatarAxisDeadZone0", .1f);
+        gSavedSettings.setF32("AvatarAxisDeadZone1", .1f);
+        gSavedSettings.setF32("AvatarAxisDeadZone2", .1f);
+        gSavedSettings.setF32("AvatarAxisDeadZone3", 1.f);
+        gSavedSettings.setF32("AvatarAxisDeadZone4", .02f);
+        gSavedSettings.setF32("AvatarAxisDeadZone5", .01f);
+        gSavedSettings.setF32("BuildAxisDeadZone0", .01f);
+        gSavedSettings.setF32("BuildAxisDeadZone1", .01f);
+        gSavedSettings.setF32("BuildAxisDeadZone2", .01f);
+        gSavedSettings.setF32("BuildAxisDeadZone3", .01f);
+        gSavedSettings.setF32("BuildAxisDeadZone4", .01f);
+        gSavedSettings.setF32("BuildAxisDeadZone5", .01f);
+        gSavedSettings.setF32("FlycamAxisDeadZone0", .01f);
+        gSavedSettings.setF32("FlycamAxisDeadZone1", .01f);
+        gSavedSettings.setF32("FlycamAxisDeadZone2", .01f);
+        gSavedSettings.setF32("FlycamAxisDeadZone3", .01f);
+        gSavedSettings.setF32("FlycamAxisDeadZone4", .01f);
+        gSavedSettings.setF32("FlycamAxisDeadZone5", .01f);
+        gSavedSettings.setF32("FlycamAxisDeadZone6", 1.f);
+        
+        gSavedSettings.setF32("AvatarFeathering", 6.f);
+        gSavedSettings.setF32("BuildFeathering", 12.f);
+        gSavedSettings.setF32("FlycamFeathering", 5.f);
+}
diff --git a/linden/indra/newview/llviewerjoystick.h b/linden/indra/newview/llviewerjoystick.h
index b4107bb..c7c78f3 100644
--- a/linden/indra/newview/llviewerjoystick.h
+++ b/linden/indra/newview/llviewerjoystick.h
@@ -1,6 +1,6 @@
 /** 
 * @file llviewerjoystick.h
- * @brief Viewer joystick functionality.
+ * @brief Viewer joystick / NDOF device functionality.
 *
 * $LicenseInfo:firstyear=2001&license=viewergpl$
 * 
@@ -32,12 +32,75 @@
 #ifndef LL_LLVIEWERJOYSTICK_H
 #define LL_LLVIEWERJOYSTICK_H
-class LLViewerJoystick
+#include "stdtypes.h"
+#define LIB_NDOF (LL_WINDOWS || LL_DARWIN)
+#if LIB_NDOF
+#include "ndofdev_external.h"
+#else
+#define NDOF_Device     void
+#define NDOF_HotPlugResult S32
+#endif
+typedef enum e_joystick_driver_state
+{
+        JDS_UNINITIALIZED,
+        JDS_INITIALIZED,
+        JDS_INITIALIZING
+} EJoystickDriverState;
+class LLViewerJoystick : public LLSingleton<LLViewerJoystick>
 {
 public:
-        static BOOL sOverrideCamera;
+        LLViewerJoystick();
-        static void scanJoystick();
+        virtual ~LLViewerJoystick();
-        static void updateCamera(BOOL reset = FALSE);
+        
+        void init(bool autoenable);
+        void updateStatus();
+        void scanJoystick();
+        void moveObjects(bool reset = false);
+        void moveAvatar(bool reset = false);
+        void moveFlycam(bool reset = false);
+        F32 getJoystickAxis(U32 axis) const;
+        U32 getJoystickButton(U32 button) const;
+        bool isJoystickInitialized() const {return (mDriverState==JDS_INITIALIZED);}
+        bool isLikeSpaceNavigator() const;
+        void setNeedsReset(bool reset = true) { mResetFlag = reset; }
+        void setCameraNeedsUpdate(bool b)     { mCameraUpdated = b; }
+        bool getCameraNeedsUpdate() const     { return mCameraUpdated; }
+        bool getOverrideCamera() { return mOverrideCamera; }
+        void setOverrideCamera(bool val);
+        bool toggleFlycam();
+        void setSNDefaults();
+        std::string getDescription();
+        
+protected:
+        void updateEnabled(bool autoenable);
+        void terminate();
+        void agentSlide(F32 inc);
+        void agentPush(F32 inc);
+        void agentFly(F32 inc);
+        void agentRotate(F32 pitch_inc, F32 turn_inc);
+    void agentJump();
+        void resetDeltas(S32 axis[], bool flycam_and_build = false);
+#if LIB_NDOF
+        static NDOF_HotPlugResult HotPlugAddCallback(NDOF_Device *dev);
+        static void HotPlugRemovalCallback(NDOF_Device *dev);
+#endif
+        
+private:
+        F32                                             mAxes[6];
+        long                                    mBtn[16];
+        EJoystickDriverState    mDriverState;
+        NDOF_Device                             *mNdofDev;
+        bool                                    mResetFlag;
+        F32                                             mPerfScale;
+        bool                                    mCameraUpdated;
+        bool                                    mOverrideCamera;
+        
+        static F32                              sLastDelta[7];
+        static F32                              sDelta[7];
 };
 #endif
diff --git a/linden/indra/newview/llviewerkeyboard.cpp b/linden/indra/newview/llviewerkeyboard.cpp
index 6fe1052..1c5d870 100644
--- a/linden/indra/newview/llviewerkeyboard.cpp
+++ b/linden/indra/newview/llviewerkeyboard.cpp
@@ -31,6 +31,7 @@
 #include "llviewerprecompiledheaders.h"
+#include "llappviewer.h"
 #include "llviewerkeyboard.h"
 #include "llmath.h"
 #include "llagent.h"
@@ -83,82 +84,102 @@ void agent_push_down( EKeystate s )
        gAgent.moveUp(-1);
 }
-void agent_push_forward( EKeystate s )
+static void agent_handle_doubletap_run(EKeystate s, LLAgent::EDoubleTapRunMode mode)
 {
-        if( KEYSTATE_UP == s  ) return;
+        if (KEYSTATE_UP == s)
-        F32 time = gKeyboard->getCurKeyElapsedTime();
-        S32 frame_count = llround(gKeyboard->getCurKeyElapsedFrameCount());
-        if( time < NUDGE_TIME || frame_count <= NUDGE_FRAMES)
        {
-                gAgent.moveAtNudge(1);
+                // Releasing a walk-key resets the double-tap timer
+                gAgent.mDoubleTapRunTimer.reset();
+                if (gAgent.mDoubleTapRunMode == mode &&
+                    gAgent.getRunning() &&
+                    !gAgent.getAlwaysRun())
+                {
+                        // Turn off temporary running.
+                        gAgent.clearRunning();
+                        gAgent.sendWalkRun(gAgent.getRunning());
+                }
+                gAgent.mDoubleTapRunMode = mode;
        }
-        else
+        else if (gAllowTapTapHoldRun &&
+                 KEYSTATE_DOWN == s &&
+                 gAgent.mDoubleTapRunMode == mode &&
+                 gAgent.mDoubleTapRunTimer.getElapsedTimeF32() < NUDGE_TIME)
        {
-                gAgent.moveAt(1);
+                // Same walk-key was pushed again quickly; this is a double-tap
+                // so engage temporary running.
+                gAgent.setRunning();
+                gAgent.sendWalkRun(gAgent.getRunning());
        }
 }
+static void agent_push_forwardbackward( EKeystate s, S32 direction, LLAgent::EDoubleTapRunMode mode )
-void agent_push_backward( EKeystate s )
 {
-        if( KEYSTATE_UP == s  ) return;
+        agent_handle_doubletap_run(s, mode);
-        S32 frame_count = llround(gKeyboard->getCurKeyElapsedFrameCount());
+        if (KEYSTATE_UP == s) return;
        F32 time = gKeyboard->getCurKeyElapsedTime();
+        S32 frame_count = llround(gKeyboard->getCurKeyElapsedFrameCount());
        if( time < NUDGE_TIME || frame_count <= NUDGE_FRAMES)
        {
-                gAgent.moveAtNudge(-1);
+                gAgent.moveAtNudge(direction);
        }
        else
        {
-                gAgent.moveAt(-1);
+                gAgent.moveAt(direction);
        }
 }
-void agent_slide_left( EKeystate s )
+void agent_push_forward( EKeystate s )
 {
-        if( KEYSTATE_UP == s  ) return;
+        agent_push_forwardbackward(s, 1, LLAgent::DOUBLETAP_FORWARD);
+}
+void agent_push_backward( EKeystate s )
+{
+        agent_push_forwardbackward(s, -1, LLAgent::DOUBLETAP_BACKWARD);
+}
+static void agent_slide_leftright( EKeystate s, S32 direction, LLAgent::EDoubleTapRunMode mode )
+{
+        agent_handle_doubletap_run(s, mode);
+        if( KEYSTATE_UP == s ) return;
        F32 time = gKeyboard->getCurKeyElapsedTime();
        S32 frame_count = llround(gKeyboard->getCurKeyElapsedFrameCount());
        if( time < NUDGE_TIME || frame_count <= NUDGE_FRAMES)
        {
-                gAgent.moveLeftNudge(1);
+                gAgent.moveLeftNudge(direction);
        }
        else
        {
-                gAgent.moveLeft(1);
+                gAgent.moveLeft(direction);
        }
 }
-void agent_slide_right( EKeystate s )
+void agent_slide_left( EKeystate s )
 {
-        if( KEYSTATE_UP == s  ) return;
+        agent_slide_leftright(s, 1, LLAgent::DOUBLETAP_SLIDELEFT);
-        F32 time = gKeyboard->getCurKeyElapsedTime();
+}
-        S32 frame_count = llround(gKeyboard->getCurKeyElapsedFrameCount());
-        if( time < NUDGE_TIME || frame_count <= NUDGE_FRAMES)
-        {
+void agent_slide_right( EKeystate s )
-                gAgent.moveLeftNudge(-1);
+{
-        }
+        agent_slide_leftright(s, -1, LLAgent::DOUBLETAP_SLIDERIGHT);
-        else
-        {
-                gAgent.moveLeft(-1);
-        }
 }
 void agent_turn_left( EKeystate s )
 {
-        if( KEYSTATE_UP == s  ) return;
+        if (LLToolCamera::getInstance()->mouseSteerMode())
-        F32 time = gKeyboard->getCurKeyElapsedTime();
-        if (gToolCamera->mouseSteerMode())
        {
                agent_slide_left(s);
        }
        else
        {
+                if (KEYSTATE_UP == s) return;
+                F32 time = gKeyboard->getCurKeyElapsedTime();
                gAgent.moveYaw( LLFloaterMove::getYawRate( time ) );
        }
 }
@@ -166,14 +187,14 @@ void agent_turn_left( EKeystate s )
 void agent_turn_right( EKeystate s )
 {
-        if( KEYSTATE_UP == s  ) return;
+        if (LLToolCamera::getInstance()->mouseSteerMode())
-        F32 time = gKeyboard->getCurKeyElapsedTime();
-        if (gToolCamera->mouseSteerMode())
        {
                agent_slide_right(s);
        }
        else
        {
+                if (KEYSTATE_UP == s) return;
+                F32 time = gKeyboard->getCurKeyElapsedTime();
                gAgent.moveYaw( -LLFloaterMove::getYawRate( time ) );
        }
 }
@@ -477,6 +498,24 @@ void start_chat( EKeystate s )
        gChatBar->startChat(NULL);
 }
+void start_gesture( EKeystate s )
+{
+        if (KEYSTATE_UP == s &&
+                !(gFocusMgr.getKeyboardFocus() && gFocusMgr.getKeyboardFocus()->acceptsTextInput()))
+        {
+                if (gChatBar->getCurrentChat().empty())
+                {
+                        // No existing chat in chat editor, insert '/'
+                        gChatBar->startChat("/");
+                }
+                else
+                {
+                        // Don't overwrite existing text in chat editor
+                        gChatBar->startChat(NULL);
+                }
+        }
+}
 void bind_keyboard_functions()
 {
        gViewerKeyboard.bindNamedFunction("jump", agent_jump);
@@ -518,6 +557,7 @@ void bind_keyboard_functions()
        gViewerKeyboard.bindNamedFunction("edit_avatar_move_backward", edit_avatar_move_backward);
        gViewerKeyboard.bindNamedFunction("stop_moving", stop_moving);
        gViewerKeyboard.bindNamedFunction("start_chat", start_chat);
+        gViewerKeyboard.bindNamedFunction("start_gesture", start_gesture);
 }
 LLViewerKeyboard::LLViewerKeyboard()
diff --git a/linden/indra/newview/llviewerkeyboard.h b/linden/indra/newview/llviewerkeyboard.h
index 97f0f67..2013125 100644
--- a/linden/indra/newview/llviewerkeyboard.h
+++ b/linden/indra/newview/llviewerkeyboard.h
@@ -55,10 +55,9 @@ typedef enum e_keyboard_mode
 } EKeyboardMode;
-void agent_push_forward( EKeystate s );
-void agent_turn_right( EKeystate s );
 void bind_keyboard_functions();
 class LLViewerKeyboard
 {
 public:
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 0429a3c..f318d07 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -44,9 +44,6 @@
 #include "llmediamanager.h"
 #include "lluuid.h"
-// don't want to include llappviewer.h
-extern std::string gChannelName;
 // Implementation functions not exported into header file
 class LLViewerMediaImpl
        :       public LLMediaObserver
@@ -456,7 +453,7 @@ void LLViewerMedia::initClass()
        // append our magic version number string to the browser user agent id
        std::ostringstream codec;
        codec << "[Second Life ";
-        codec << "(" << gChannelName << ")";
+        codec << "(" << gSavedSettings.getString("VersionChannelName") << ")";
        codec << " - " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD;
        codec << "]";
        init_data->setBrowserUserAgentId( codec.str() );
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index b35abe6..6ee80a6 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -67,7 +67,6 @@
 #include "llagentpilot.h"
 #include "llbox.h"
 #include "llcallingcard.h"
-#include "llcameraview.h"
 #include "llclipboard.h"
 #include "llcompilequeue.h"
 #include "llconsole.h"
@@ -92,6 +91,7 @@
 #include "llfloaterbuycontents.h"
 #include "llfloaterbuycurrency.h"
 #include "llfloaterbuyland.h"
+#include "llfloatercamera.h"
 #include "llfloaterchat.h"
 #include "llfloatercustomize.h"
 #include "llfloaterdaycycle.h"
@@ -106,6 +106,7 @@
 #include "llfloatergroups.h"
 #include "llfloaterhtml.h"
 #include "llfloaterhtmlhelp.h"
+#include "llfloaterhud.h"
 #include "llfloaterinspect.h"
 #include "llfloaterlagmeter.h"
 #include "llfloaterland.h"
@@ -119,7 +120,9 @@
 #include "llfloaterregioninfo.h"
 #include "llfloaterreporter.h"
 #include "llfloaterscriptdebug.h"
+#include "llfloatersettingsdebug.h"
 #include "llfloaterenvsettings.h"
+#include "llfloaterstats.h"
 #include "llfloatertest.h"
 #include "llfloatertools.h"
 #include "llfloaterwater.h"
@@ -170,7 +173,7 @@
 #include "lltoolpie.h"
 #include "lltoolplacer.h"
 #include "lltoolselectland.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "lluploaddialog.h"
 #include "lluserauth.h"
 #include "lluuid.h"
@@ -374,6 +377,11 @@ void toggle_cull_small(void *);
 void toggle_show_xui_names(void *);
 BOOL check_show_xui_names(void *);
+void run_vectorize_perf_test(void *)
+{
+        gSavedSettings.setBOOL("VectorizePerfTest", TRUE);
+}
 // Debug UI
 void handle_web_search_demo(void*);
 void handle_slurl_test(void*);
@@ -457,8 +465,6 @@ void handle_dump_image_list(void*);
 void handle_crash(void*);
 void handle_dump_followcam(void*);
-void handle_toggle_flycam(void*);
-BOOL check_flycam(void*);
 void handle_viewer_enable_message_log(void*);
 void handle_viewer_disable_message_log(void*);
 void handle_send_postcard(void*);
@@ -563,12 +569,12 @@ static LLLandmarkObserver* gLandmarkObserver = NULL;
 LLMenuParcelObserver::LLMenuParcelObserver()
 {
-        gParcelMgr->addObserver(this);
+        LLViewerParcelMgr::getInstance()->addObserver(this);
 }
 LLMenuParcelObserver::~LLMenuParcelObserver()
 {
-        gParcelMgr->removeObserver(this);
+        LLViewerParcelMgr::getInstance()->removeObserver(this);
 }
 void LLMenuParcelObserver::changed()
@@ -660,23 +666,23 @@ void init_menus()
        ///
        /// Pie menus
        ///
-        gPieSelf = gUICtrlFactory->buildPieMenu("menu_pie_self.xml", gMenuHolder);
+        gPieSelf = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_self.xml", gMenuHolder);
        // TomY TODO: what shall we do about these?
        gDetachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach HUD", true);
        gDetachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach", true);
-        gPieAvatar = gUICtrlFactory->buildPieMenu("menu_pie_avatar.xml", gMenuHolder);
+        gPieAvatar = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_avatar.xml", gMenuHolder);
-        gPieObject = gUICtrlFactory->buildPieMenu("menu_pie_object.xml", gMenuHolder);
+        gPieObject = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_object.xml", gMenuHolder);
        gAttachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach HUD");
        gAttachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach");
        gPieRate = gMenuHolder->getChild<LLPieMenu>("Rate Menu");
-        gPieAttachment = gUICtrlFactory->buildPieMenu("menu_pie_attachment.xml", gMenuHolder);
+        gPieAttachment = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_attachment.xml", gMenuHolder);
-        gPieLand = gUICtrlFactory->buildPieMenu("menu_pie_land.xml", gMenuHolder);
+        gPieLand = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_land.xml", gMenuHolder);
        ///
        /// set up the colors
@@ -702,10 +708,13 @@ void init_menus()
        {
                color = gColors.getColor( "MenuNonProductionBgColor" );
        }
-        gMenuBarView = (LLMenuBarGL*)gUICtrlFactory->buildMenu("menu_viewer.xml", gMenuHolder);
+        gMenuBarView = (LLMenuBarGL*)LLUICtrlFactory::getInstance()->buildMenu("menu_viewer.xml", gMenuHolder);
        gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT));
        gMenuBarView->setBackgroundColor( color );
+    gMenuBarView->setItemVisible("Tools", FALSE);
+        gMenuBarView->arrange();
+        
        gMenuHolder->addChild(gMenuBarView);
        
        // menu holder appears on top of menu bar so you can see the menu title
@@ -764,7 +773,7 @@ void init_menus()
        //
        show_debug_menus();
-        gLoginMenuBarView = (LLMenuBarGL*)gUICtrlFactory->buildMenu("menu_login.xml", gMenuHolder);
+        gLoginMenuBarView = (LLMenuBarGL*)LLUICtrlFactory::getInstance()->buildMenu("menu_login.xml", gMenuHolder);
        LLRect menuBarRect = gLoginMenuBarView->getRect();
        gLoginMenuBarView->setRect(LLRect(menuBarRect.mLeft, menuBarRect.mTop, gViewerWindow->getRootView()->getRect().getWidth() - menuBarRect.mLeft,  menuBarRect.mBottom));
@@ -821,14 +830,12 @@ void clear_landmark_menu(LLMenuGL* menu)
        for ( ; it != child_list->end(); ++it)
        {
                LLView* view = *it;
-                if (view->getWidgetType() == WIDGET_TYPE_MENU_ITEM_CALL)
+                LLMenuItemCallGL* menu_item = dynamic_cast<LLMenuItemCallGL*>(view);
+                
+                if (menu_item && menu_item->getMenuCallback() == landmark_menu_action)
                {
-                        LLMenuItemCallGL* menu_item = (LLMenuItemCallGL*)view;
+                        void* user_data = menu_item->getUserData();
-                        if (menu_item->getMenuCallback() == landmark_menu_action)
+                        delete (LLUUID*)user_data;
-                        {
-                                void* user_data = menu_item->getUserData();
-                                delete (LLUUID*)user_data;
-                        }
                }
        }
@@ -1072,9 +1079,6 @@ void init_client_menu(LLMenuGL* menu)
                                                                           &menu_check_control,
                                                                           (void*)"DisableCameraConstraints"));
-        menu->append(new LLMenuItemCheckGL("Joystick Flycam", 
-                &handle_toggle_flycam,NULL,&check_flycam,NULL));
-                
        menu->append(new LLMenuItemCheckGL("Mouse Smoothing",
                                                                                &menu_toggle_control,
                                                                                NULL,
@@ -1088,7 +1092,7 @@ void init_client_menu(LLMenuGL* menu)
                                                                                &menu_check_control,
                                                                                (void*)"ShowConsoleWindow"));
-        if(gQAMode)
+        if(gSavedSettings.getBOOL("QAMode"))
        {
                LLMenuGL* sub = NULL;
                sub = new LLMenuGL("Debugging");
@@ -1174,7 +1178,6 @@ extern BOOL gDebugClicks;
 extern BOOL gDebugWindowProc;
 extern BOOL gDebugTextEditorTips;
 extern BOOL gDebugSelectMgr;
-extern BOOL gVectorizePerfTest;
 void init_debug_ui_menu(LLMenuGL* menu)
 {
@@ -1184,7 +1187,6 @@ void init_debug_ui_menu(LLMenuGL* menu)
        menu->append(new LLMenuItemCallGL( "Dump SelectMgr", &dump_select_mgr));
        menu->append(new LLMenuItemCallGL( "Dump Inventory", &dump_inventory));
        menu->append(new LLMenuItemCallGL( "Dump Focus Holder", &handle_dump_focus, NULL, NULL, 'F', MASK_ALT | MASK_CONTROL));
-        menu->append(new LLMenuItemCallGL( "Dump VolumeMgr",    &dump_volume_mgr, NULL, NULL));
        menu->append(new LLMenuItemCallGL( "Print Selected Object Info",        &print_object_info, NULL, NULL, 'P', MASK_CONTROL|MASK_SHIFT ));
        menu->append(new LLMenuItemCallGL( "Print Agent Info",                  &print_agent_nvpairs, NULL, NULL, 'P', MASK_SHIFT ));
        menu->append(new LLMenuItemCallGL( "Texture Memory Stats",  &output_statistics, NULL, NULL, 'M', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
@@ -1357,6 +1359,9 @@ void init_debug_rendering_menu(LLMenuGL* menu)
        sub_menu->append(new LLMenuItemCheckGL("Texture Priority",      &LLPipeline::toggleRenderDebug, NULL,
                                                                                                        &LLPipeline::toggleRenderDebugControl,
                                                                                                        (void*)LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY));
+        sub_menu->append(new LLMenuItemCheckGL("Avatar Rendering Cost", &LLPipeline::toggleRenderDebug, NULL,
+                                                                                                        &LLPipeline::toggleRenderDebugControl,
+                                                                                                        (void*)LLPipeline::RENDER_DEBUG_SHAME));
        sub_menu->append(new LLMenuItemCheckGL("Texture Area (sqrt(A))",&LLPipeline::toggleRenderDebug, NULL,
                                                                                                        &LLPipeline::toggleRenderDebugControl,
                                                                                                        (void*)LLPipeline::RENDER_DEBUG_TEXTURE_AREA));
@@ -1386,7 +1391,7 @@ void init_debug_rendering_menu(LLMenuGL* menu)
                                                                                   (void*)"ShowDepthBuffer"));
        sub_menu->append(new LLMenuItemToggleGL("Show Select Buffer", &gDebugSelect));
-        sub_menu->append(new LLMenuItemToggleGL("Vectorize Perf Test", &gVectorizePerfTest));
+        sub_menu->append(new LLMenuItemCallGL("Vectorize Perf Test", &run_vectorize_perf_test));
        sub_menu = new LLMenuGL("Render Tests");
@@ -1422,7 +1427,7 @@ void init_debug_rendering_menu(LLMenuGL* menu)
        LLMenuItemCheckGL* item;
        item = new LLMenuItemCheckGL("Object-Object Occlusion", menu_toggle_control, NULL, menu_check_control, (void*)"UseOcclusion", 'O', MASK_CONTROL|MASK_SHIFT);
-        item->setEnabled(gGLManager.mHasOcclusionQuery && gFeatureManagerp->isFeatureAvailable("UseOcclusion"));
+        item->setEnabled(gGLManager.mHasOcclusionQuery && LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion"));
        menu->append(item);
        
        item = new LLMenuItemCheckGL("Fast Alpha", menu_toggle_control, NULL, menu_check_control, (void*)"RenderFastAlpha");
@@ -1485,6 +1490,7 @@ void init_debug_avatar_menu(LLMenuGL* menu)
        menu->appendMenu(sub_menu);
+        menu->append(new LLMenuItemToggleGL("Tap-Tap-Hold To Run", &gAllowTapTapHoldRun));
        menu->append(new LLMenuItemCallGL("Force Params to Default", &LLAgent::clearVisualParams, NULL));
        menu->append(new LLMenuItemCallGL("Reload Vertex Shader", &reload_vertex_shader, NULL));
        menu->append(new LLMenuItemToggleGL("Animation Info", &LLVOAvatar::sShowAnimationDebug));
@@ -1734,7 +1740,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->getSelection()->getFirstRootNode();
+                LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
                if (node && node->mValid && !node->mTouchName.empty())
                {
                        gMenuHolder->childSetText("Object Touch", node->mTouchName);
@@ -1750,7 +1756,7 @@ class LLObjectEnableTouch : public view_listener_t
 void label_touch(LLString& label, void*)
 {
-        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
+        LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
        if (node && node->mValid && !node->mTouchName.empty())
        {
                label.assign(node->mTouchName);
@@ -1802,7 +1808,7 @@ class LLViewCheckBuildMode : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                bool new_value = gToolMgr->inEdit();
+                bool new_value = LLToolMgr::getInstance()->inEdit();
                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                return true;
        }
@@ -1810,13 +1816,21 @@ class LLViewCheckBuildMode : public view_listener_t
 bool toggle_build_mode()
 {
-        if (gToolMgr->inEdit())
+        if (LLToolMgr::getInstance()->inEdit())
        {
                // just reset the view, will pull us out of edit mode
                handle_reset_view();
+                // avoid spurious avatar movements pulling out of edit mode
+                LLViewerJoystick::getInstance()->moveAvatar(true);
        }
        else
        {
+                if (LLViewerJoystick::getInstance()->getOverrideCamera())
+                {
+                        handle_toggle_flycam();
+                }
+                        
                if (gAgent.getFocusOnAvatar() && gSavedSettings.getBOOL("EditCameraMovement") )
                {
                        // zoom in if we're looking at the avatar
@@ -1826,8 +1840,8 @@ bool toggle_build_mode()
                        gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
                }
-                gToolMgr->setCurrentToolset(gBasicToolset);
+                LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
-                gToolMgr->getCurrentToolset()->selectTool( gToolCreate );
+                LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCompCreate::getInstance() );
                // Could be first use
                LLFirstUse::useBuild();
@@ -1844,11 +1858,35 @@ class LLViewBuildMode : public view_listener_t
 };
+class LLViewJoystickFlycam : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_toggle_flycam();
+                return true;
+        }
+};
+class LLViewCheckJoystickFlycam : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_val = LLViewerJoystick::getInstance()->getOverrideCamera();
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_val);
+                return true;
+        }
+};
+void handle_toggle_flycam()
+{
+        LLViewerJoystick::getInstance()->toggleFlycam();
+}
 class LLObjectBuild : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                if (gAgent.getFocusOnAvatar() && !gToolMgr->inEdit() && gSavedSettings.getBOOL("EditCameraMovement") )
+                if (gAgent.getFocusOnAvatar() && !LLToolMgr::getInstance()->inEdit() && gSavedSettings.getBOOL("EditCameraMovement") )
                {
                        // zoom in if we're looking at the avatar
                        gAgent.setFocusOnAvatar(FALSE, ANIMATE);
@@ -1863,8 +1901,8 @@ class LLObjectBuild : public view_listener_t
                        gViewerWindow->moveCursorToCenter();
                }
-                gToolMgr->setCurrentToolset(gBasicToolset);
+                LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
-                gToolMgr->getCurrentToolset()->selectTool( gToolCreate );
+                LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCompCreate::getInstance() );
                // Could be first use
                LLFirstUse::useBuild();
@@ -1876,11 +1914,11 @@ class LLObjectEdit : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                gParcelMgr->deselectLand();
+                LLViewerParcelMgr::getInstance()->deselectLand();
-                if (gAgent.getFocusOnAvatar() && !gToolMgr->inEdit())
+                if (gAgent.getFocusOnAvatar() && !LLToolMgr::getInstance()->inEdit())
                {
-                        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
                        if (selection->getSelectType() == SELECT_TYPE_HUD || !gSavedSettings.getBOOL("EditCameraMovement"))
                        {
@@ -1902,8 +1940,11 @@ class LLObjectEdit : public view_listener_t
                gFloaterTools->open();          /* Flawfinder: ignore */
        
-                gToolMgr->setCurrentToolset(gBasicToolset);
+                LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
-                gFloaterTools->setEditTool( gToolTranslate );
+                gFloaterTools->setEditTool( LLToolCompTranslate::getInstance() );
+                LLViewerJoystick::getInstance()->moveObjects(true);
+                LLViewerJoystick::getInstance()->setNeedsReset(true);
                // Could be first use
                LLFirstUse::useBuild();
@@ -1928,9 +1969,9 @@ class LLLandBuild : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                gParcelMgr->deselectLand();
+                LLViewerParcelMgr::getInstance()->deselectLand();
-                if (gAgent.getFocusOnAvatar() && !gToolMgr->inEdit() && gSavedSettings.getBOOL("EditCameraMovement") )
+                if (gAgent.getFocusOnAvatar() && !LLToolMgr::getInstance()->inEdit() && gSavedSettings.getBOOL("EditCameraMovement") )
                {
                        // zoom in if we're looking at the avatar
                        gAgent.setFocusOnAvatar(FALSE, ANIMATE);
@@ -1947,8 +1988,8 @@ class LLLandBuild : public view_listener_t
                }
-                gToolMgr->setCurrentToolset(gBasicToolset);
+                LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
-                gToolMgr->getCurrentToolset()->selectTool( gToolCreate );
+                LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCompCreate::getInstance() );
                // Could be first use
                LLFirstUse::useBuild();
@@ -1982,7 +2023,7 @@ BOOL enable_land_build(void*)
        if (gAgent.inPrelude()) return FALSE;
        BOOL can_build = FALSE;
-        LLParcel* agent_parcel = gParcelMgr->getAgentParcel();
+        LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (agent_parcel)
        {
                can_build = agent_parcel->getAllowModify();
@@ -1997,7 +2038,7 @@ BOOL enable_object_build(void*)
        if (gAgent.inPrelude()) return FALSE;
        BOOL can_build = FALSE;
-        LLParcel* agent_parcel = gParcelMgr->getAgentParcel();
+        LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (agent_parcel)
        {
                can_build = agent_parcel->getAllowModify();
@@ -2118,7 +2159,7 @@ class LLObjectMute : public view_listener_t
                        // it's an object
                        id = object->getID();
-                        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
+                        LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
                        if (node)
                        {
                                name = node->mName;
@@ -2128,13 +2169,13 @@ class LLObjectMute : public view_listener_t
                }
                
                LLMute mute(id, name, type);
-                if (gMuteListp->isMuted(mute.mID, mute.mName))
+                if (LLMuteList::getInstance()->isMuted(mute.mID, mute.mName))
                {
-                        gMuteListp->remove(mute);
+                        LLMuteList::getInstance()->remove(mute);
                }
                else
                {
-                        gMuteListp->add(mute);
+                        LLMuteList::getInstance()->add(mute);
                        LLFloaterMute::showInstance();
                }
                
@@ -2155,7 +2196,7 @@ bool handle_go_to()
        strings.push_back(val);
        send_generic_message("autopilot", strings);
-        gParcelMgr->deselectLand();
+        LLViewerParcelMgr::getInstance()->deselectLand();
        if (gAgent.getAvatarObject() && !gSavedSettings.getBOOL("AutoPilotLocksCamera"))
        {
@@ -2224,10 +2265,23 @@ class LLAvatarFreeze : public view_listener_t
                if( avatar )
                {
                        LLUUID* avatar_id = new LLUUID( avatar->getID() );
+                        LLString fullname = avatar->getFullname();
-                        gViewerWindow->alertXml("FreezeAvatar",
+                        if (!fullname.empty())
-                                callback_freeze, (void*)avatar_id);
+                        {
-                        
+                                LLString::format_map_t args;
+                                args["[AVATAR_NAME]"] = fullname;
+                                gViewerWindow->alertXml("FreezeAvatarFullname",
+                                                        args,
+                                                        callback_freeze,
+                                                        (void*)avatar_id);
+                        }
+                        else
+                        {
+                                gViewerWindow->alertXml("FreezeAvatar",
+                                                        callback_freeze,
+                                                        (void*)avatar_id);
+                        }
                }
                return true;
        }
@@ -2313,9 +2367,23 @@ class LLAvatarEject : public view_listener_t
                if( avatar )
                {
                        LLUUID* avatar_id = new LLUUID( avatar->getID() );
-                        gViewerWindow->alertXml("EjectAvatar",
+                        LLString fullname = avatar->getFullname();
-                                        callback_eject, (void*)avatar_id);
-                        
+                        if (!fullname.empty())
+                        {
+                                LLString::format_map_t args;
+                                args["[AVATAR_NAME]"] = fullname;
+                                gViewerWindow->alertXml("EjectAvatarFullname",
+                                                        args,
+                                                        callback_eject,
+                                                        (void*)avatar_id);
+                        }
+                        else
+                        {
+                                gViewerWindow->alertXml("EjectAvatar",
+                                                        callback_eject,
+                                                        (void*)avatar_id);
+                        }
                }
                return true;
        }
@@ -2484,9 +2552,9 @@ BOOL enable_buy(void*)
 {
    // In order to buy, there must only be 1 purchaseable object in
    // the selection manger.
-        if(gSelectMgr->getSelection()->getRootObjectCount() != 1) return FALSE;
+        if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 1) return FALSE;
    LLViewerObject* obj = NULL;
-    LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
+    LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
        if(node)
    {
        obj = node->getObject();
@@ -2515,7 +2583,7 @@ class LLObjectEnableBuy : public view_listener_t
 // received by the viewer and cached in the selection manager.
 void handle_buy_object(LLSaleInfo sale_info)
 {
-        if(!gSelectMgr->selectGetAllRootsValid())
+        if(!LLSelectMgr::getInstance()->selectGetAllRootsValid())
        {
                LLNotifyBox::showXml("UnableToBuyWhileDownloading");
                return;
@@ -2523,7 +2591,7 @@ void handle_buy_object(LLSaleInfo sale_info)
        LLUUID owner_id;
        LLString owner_name;
-        BOOL owners_identical = gSelectMgr->selectGetOwner(owner_id, owner_name);
+        BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
        if (!owners_identical)
        {
                LLNotifyBox::showXml("CannotBuyObjectsFromDifferentOwners");
@@ -2531,9 +2599,9 @@ void handle_buy_object(LLSaleInfo sale_info)
        }
        LLPermissions perm;
-        BOOL valid = gSelectMgr->selectGetPermissions(perm);
+        BOOL valid = LLSelectMgr::getInstance()->selectGetPermissions(perm);
        LLAggregatePermissions ag_perm;
-        valid &= gSelectMgr->selectGetAggregatePermissions(ag_perm);
+        valid &= LLSelectMgr::getInstance()->selectGetAggregatePermissions(ag_perm);
        if(!valid || !sale_info.isForSale() || !perm.allowTransferTo(gAgent.getID()))
        {
                LLNotifyBox::showXml("ObjectNotForSale");
@@ -2670,14 +2738,14 @@ void set_god_level(U8 god_level)
        U8 old_god_level = gAgent.getGodLevel();
        gAgent.setGodLevel( god_level );
        gIMMgr->refresh();
-        gParcelMgr->notifyObservers();
+        LLViewerParcelMgr::getInstance()->notifyObservers();
        // Some classifieds change visibility on god mode
        LLFloaterDirectory::requestClassifieds();
        // God mode changes sim visibility
-        gWorldMap->reset();
+        LLWorldMap::getInstance()->reset();
-        gWorldMap->setCurrentLayer(0);
+        LLWorldMap::getInstance()->setCurrentLayer(0);
        // inventory in items may change in god mode
        gObjectList.dirtyAllObjectInventory();
@@ -2943,7 +3011,7 @@ class LLLandSit : public view_listener_t
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
                gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
-                gParcelMgr->deselectLand();
+                LLViewerParcelMgr::getInstance()->deselectLand();
                LLVector3d posGlobal = gLastHitPosGlobal;
                
@@ -3043,7 +3111,7 @@ void create_new_landmark(void*)
                llwarns << "No agent region" << llendl;
                return;
        }
-        LLParcel* agent_parcel = gParcelMgr->getAgentParcel();
+        LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        if (!agent_parcel)
        {
                llwarns << "No agent parcel" << llendl;
@@ -3083,7 +3151,7 @@ void landmark_menu_action(void* userdata)
 void reload_ui(void *)
 {
-        gUICtrlFactory->rebuild();
+        LLUICtrlFactory::getInstance()->rebuild();
 }
 class LLWorldFly : public view_listener_t
@@ -3106,7 +3174,7 @@ void handle_agent_stop_moving(void*)
 void print_packets_lost(void*)
 {
-        gWorldPointer->printPacketsLost();
+        LLWorld::getInstance()->printPacketsLost();
 }
@@ -3155,7 +3223,7 @@ void velocity_interpolate( void* data )
 void update_fov(S32 increments)
 {
-        F32 old_fov = gCamera->getDefaultFOV();
+        F32 old_fov = LLViewerCamera::getInstance()->getDefaultFOV();
        // for each increment, FoV is 20% bigger
        F32 new_fov = old_fov * pow(1.2f, increments);
@@ -3178,8 +3246,8 @@ void update_fov(S32 increments)
                gAgent.sendReliableMessage();
                // force agent to update dirty patches
-                gCamera->setDefaultFOV(new_fov);
+                LLViewerCamera::getInstance()->setDefaultFOV(new_fov);
-                gCamera->setView(new_fov);
+                LLViewerCamera::getInstance()->setView(new_fov);
        }
 }
@@ -3205,7 +3273,7 @@ class LLViewZoomDefault : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                F32 old_fov = gCamera->getView();
+                F32 old_fov = LLViewerCamera::getInstance()->getView();
                // for each increment, FoV is 20% bigger
                F32 new_fov = DEFAULT_FIELD_OF_VIEW;
@@ -3224,8 +3292,8 @@ class LLViewZoomDefault : public view_listener_t
                        gAgent.sendReliableMessage();
                        // force agent to update dirty patches
-                        gCamera->setDefaultFOV(new_fov);
+                        LLViewerCamera::getInstance()->setDefaultFOV(new_fov);
-                        gCamera->setView(new_fov);
+                        LLViewerCamera::getInstance()->setView(new_fov);
                }
                return true;
        }
@@ -3262,17 +3330,6 @@ void handle_show_newest_map(void*)
 // Help menu functions
 //-------------------------------------------------------------------
-class LLHelpMOTD : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLString::format_map_t args;
-                args["[MOTD]"] = gAgent.mMOTD;
-                gViewerWindow->alertXml("MOTD", args, NULL, NULL);
-                return true;
-        }
-};
 //
 // Major mode switching
 //
@@ -3310,9 +3367,15 @@ void reset_view_final( BOOL proceed, void* )
        gAgent.changeCameraToDefault();
        
-        if (LLViewerJoystick::sOverrideCamera)
+        if (LLViewerJoystick::getInstance()->getOverrideCamera())
        {
-                handle_toggle_flycam(NULL);
+                handle_toggle_flycam();
+        }
+        // reset avatar mode from eventual residual motion
+        if (LLToolMgr::getInstance()->inBuildMode())
+        {
+                LLViewerJoystick::getInstance()->moveAvatar(true);
        }
        gAgent.resetView(!gFloaterTools->getVisible());
@@ -3321,7 +3384,7 @@ void reset_view_final( BOOL proceed, void* )
        gViewerWindow->showCursor();
        // Switch back to basic toolset
-        gToolMgr->setCurrentToolset(gBasicToolset);
+        LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
 }
 class LLViewLookAtLastChatter : public view_listener_t
@@ -3394,7 +3457,7 @@ class LLEditEnableDuplicate : public view_listener_t
 void disabled_duplicate(void*)
 {
-        if (gSelectMgr->getSelection()->getFirstObject())
+        if (LLSelectMgr::getInstance()->getSelection()->getFirstObject())
        {
                LLNotifyBox::showXml("CopyFailed");
        }
@@ -3405,32 +3468,32 @@ void handle_duplicate_in_place(void*)
        llinfos << "handle_duplicate_in_place" << llendl;
        LLVector3 offset(0.f, 0.f, 0.f);
-        gSelectMgr->selectDuplicate(offset, TRUE);
+        LLSelectMgr::getInstance()->selectDuplicate(offset, TRUE);
 }
 void handle_repeat_duplicate(void*)
 {
-        gSelectMgr->repeatDuplicate();
+        LLSelectMgr::getInstance()->repeatDuplicate();
 }
 void handle_deed_object_to_group(void*)
 {
        LLUUID group_id;
        
-        gSelectMgr->selectGetGroup(group_id);
+        LLSelectMgr::getInstance()->selectGetGroup(group_id);
-        gSelectMgr->sendOwner(LLUUID::null, group_id, FALSE);
+        LLSelectMgr::getInstance()->sendOwner(LLUUID::null, group_id, FALSE);
-        gViewerStats->incStat(LLViewerStats::ST_RELEASE_COUNT);
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_RELEASE_COUNT);
 }
 BOOL enable_deed_object_to_group(void*)
 {
-        if(gSelectMgr->getSelection()->isEmpty()) return FALSE;
+        if(LLSelectMgr::getInstance()->getSelection()->isEmpty()) return FALSE;
        LLPermissions perm;
        LLUUID group_id;
-        if (gSelectMgr->selectGetGroup(group_id) &&
+        if (LLSelectMgr::getInstance()->selectGetGroup(group_id) &&
                gAgent.hasPowerInGroup(group_id, GP_OBJECT_DEED) &&
-                gSelectMgr->selectGetPermissions(perm) &&
+                LLSelectMgr::getInstance()->selectGetPermissions(perm) &&
                perm.deedToGroup(gAgent.getID(), group_id))
        {
                return TRUE;
@@ -3483,8 +3546,8 @@ void handle_object_owner_permissive(void*)
        if(gAgent.isGodlike())
        {
                // do the objects.
-                gSelectMgr->selectionSetObjectPermissions(PERM_BASE, TRUE, PERM_ALL, TRUE);
+                LLSelectMgr::getInstance()->selectionSetObjectPermissions(PERM_BASE, TRUE, PERM_ALL, TRUE);
-                gSelectMgr->selectionSetObjectPermissions(PERM_OWNER, TRUE, PERM_ALL, TRUE);
+                LLSelectMgr::getInstance()->selectionSetObjectPermissions(PERM_OWNER, TRUE, PERM_ALL, TRUE);
        }
 }
@@ -3493,14 +3556,14 @@ void handle_object_owner_self(void*)
        // only send this if they're a god.
        if(gAgent.isGodlike())
        {
-                gSelectMgr->sendOwner(gAgent.getID(), gAgent.getGroupID(), TRUE);
+                LLSelectMgr::getInstance()->sendOwner(gAgent.getID(), gAgent.getGroupID(), TRUE);
        }
 }
 // Shortcut to set owner permissions to not editable.
 void handle_object_lock(void*)
 {
-        gSelectMgr->selectionSetObjectPermissions(PERM_OWNER, FALSE, PERM_MODIFY);
+        LLSelectMgr::getInstance()->selectionSetObjectPermissions(PERM_OWNER, FALSE, PERM_MODIFY);
 }
 void handle_object_asset_ids(void*)
@@ -3508,23 +3571,23 @@ void handle_object_asset_ids(void*)
        // only send this if they're a god.
        if (gAgent.isGodlike())
        {
-                gSelectMgr->sendGodlikeRequest("objectinfo", "assetids");
+                LLSelectMgr::getInstance()->sendGodlikeRequest("objectinfo", "assetids");
        }
 }
 void handle_force_parcel_owner_to_me(void*)
 {
-        gParcelMgr->sendParcelGodForceOwner( gAgent.getID() );
+        LLViewerParcelMgr::getInstance()->sendParcelGodForceOwner( gAgent.getID() );
 }
 void handle_force_parcel_to_content(void*)
 {
-        gParcelMgr->sendParcelGodForceToContent();
+        LLViewerParcelMgr::getInstance()->sendParcelGodForceToContent();
 }
 void handle_claim_public_land(void*)
 {
-        if (gParcelMgr->getSelectionRegion() != gAgent.getRegion())
+        if (LLViewerParcelMgr::getInstance()->getSelectionRegion() != gAgent.getRegion())
        {
                LLNotifyBox::showXml("ClaimPublicLand");
                return;
@@ -3532,7 +3595,7 @@ void handle_claim_public_land(void*)
        LLVector3d west_south_global;
        LLVector3d east_north_global;
-        gParcelMgr->getSelection(west_south_global, east_north_global);
+        LLViewerParcelMgr::getInstance()->getSelection(west_south_global, east_north_global);
        LLVector3 west_south = gAgent.getPosAgentFromGlobal(west_south_global);
        LLVector3 east_north = gAgent.getPosAgentFromGlobal(east_north_global);
@@ -3565,7 +3628,7 @@ void handle_god_request_havok(void *)
 {
        if (gAgent.isGodlike())
        {
-                gSelectMgr->sendGodlikeRequest("havok", "infoverbose");
+                LLSelectMgr::getInstance()->sendGodlikeRequest("havok", "infoverbose");
        }
 }
@@ -3573,7 +3636,7 @@ void handle_god_request_havok(void *)
 //{
 //      if (gAgent.isGodlike())
 //      {
-//              gSelectMgr->sendGodlikeRequest(GOD_WANTS_FOO);
+//              LLSelectMgr::getInstance()->sendGodlikeRequest(GOD_WANTS_FOO);
 //      }
 //}
@@ -3581,7 +3644,7 @@ void handle_god_request_havok(void *)
 //{
 //      if (gAgent.isGodlike())
 //      {
-//              gSelectMgr->sendGodlikeRequest("terrain", "save");
+//              LLSelectMgr::getInstance()->sendGodlikeRequest("terrain", "save");
 //      }
 //}
@@ -3589,7 +3652,7 @@ void handle_god_request_havok(void *)
 //{
 //      if (gAgent.isGodlike())
 //      {
-//              gSelectMgr->sendGodlikeRequest("terrain", "load");
+//              LLSelectMgr::getInstance()->sendGodlikeRequest("terrain", "load");
 //      }
 //}
@@ -3599,7 +3662,7 @@ void handle_god_request_avatar_geometry(void *)
 {
        if (gAgent.isGodlike())
        {
-                gSelectMgr->sendGodlikeRequest("avatar toggle", NULL);
+                LLSelectMgr::getInstance()->sendGodlikeRequest("avatar toggle", NULL);
        }
 }
@@ -3624,8 +3687,8 @@ void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
        // Check conditions that we can't deal with, building a list of
        // everything that we'll actually be derezzing.
        LLViewerRegion* first_region = NULL;
-        for (LLObjectSelection::valid_root_iterator iter = gSelectMgr->getSelection()->valid_root_begin();
+        for (LLObjectSelection::valid_root_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_root_begin();
-                 iter != gSelectMgr->getSelection()->valid_root_end(); iter++)
+                 iter != LLSelectMgr::getInstance()->getSelection()->valid_root_end(); iter++)
        {
                LLSelectNode* node = *iter;
                LLViewerObject* object = node->getObject();
@@ -3742,7 +3805,7 @@ void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
                                msg->nextBlockFast(_PREHASH_ObjectData);
                                msg->addU32Fast(_PREHASH_ObjectLocalID, object->getLocalID());
                                // VEFFECT: DerezObject
-                                LLHUDEffectSpiral* effectp = (LLHUDEffectSpiral*)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
+                                LLHUDEffectSpiral* effectp = (LLHUDEffectSpiral*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
                                effectp->setPositionGlobal(object->getPositionGlobal());
                                effectp->setColor(LLColor4U(gAgent.getEffectColor()));
                        }
@@ -3767,7 +3830,7 @@ class LLToolsTakeCopy : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                if (gSelectMgr->getSelection()->isEmpty()) return true;
+                if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) return true;
                const LLUUID& category_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_OBJECT);
                derez_objects(DRD_ACQUIRE_TO_AGENT_INVENTORY, category_id);
@@ -3782,9 +3845,9 @@ class LLObjectReturn : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                if (gSelectMgr->getSelection()->isEmpty()) return true;
+                if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) return true;
                
-                mObjectSelection = gSelectMgr->getEditSelection();
+                mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
                gViewerWindow->alertXml("ReturnToOwner",
                        onReturnToOwner,
@@ -3847,7 +3910,7 @@ class LLObjectEnableReturn : public view_listener_t
                                                }
                                        } func;
                                        const bool firstonly = true;
-                                        new_value = gSelectMgr->getSelection()->applyToRootObjects(&func, firstonly);
+                                        new_value = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
                                }
                        }
                }
@@ -3859,7 +3922,7 @@ class LLObjectEnableReturn : public view_listener_t
 void force_take_copy(void*)
 {
-        if (gSelectMgr->getSelection()->isEmpty()) return;
+        if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) return;
        const LLUUID& category_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_OBJECT);
        derez_objects(DRD_FORCE_TO_GOD_INVENTORY, category_id);
 }
@@ -3868,7 +3931,7 @@ 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->getSelection()->isEmpty())
+        if(LLSelectMgr::getInstance()->getSelection()->isEmpty())
        {
                return;
        }
@@ -3877,8 +3940,8 @@ void handle_take()
        BOOL locked_but_takeable_object = FALSE;
        LLUUID category_id;
        
-        for (LLObjectSelection::root_iterator iter = gSelectMgr->getSelection()->root_begin();
+        for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
-                 iter != gSelectMgr->getSelection()->root_end(); iter++)
+                 iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
        {
                LLSelectNode* node = *iter;
                LLViewerObject* object = node->getObject();
@@ -3994,8 +4057,8 @@ BOOL enable_take()
                return FALSE;
        }
-        for (LLObjectSelection::valid_root_iterator iter = gSelectMgr->getSelection()->valid_root_begin();
+        for (LLObjectSelection::valid_root_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_root_begin();
-                 iter != gSelectMgr->getSelection()->valid_root_end(); iter++)
+                 iter != LLSelectMgr::getInstance()->getSelection()->valid_root_end(); iter++)
        {
                LLSelectNode* node = *iter;
                LLViewerObject* object = node->getObject();
@@ -4030,7 +4093,7 @@ class LLToolsBuyOrTake : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                if (gSelectMgr->getSelection()->isEmpty())
+                if (LLSelectMgr::getInstance()->getSelection()->isEmpty())
                {
                        return true;
                }
@@ -4109,8 +4172,8 @@ class LLToolsEnableBuyOrTake : public view_listener_t
 //                FALSE if selection is a 'take'
 BOOL is_selection_buy_not_take()
 {
-        for (LLObjectSelection::root_iterator iter = gSelectMgr->getSelection()->root_begin();
+        for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
-                 iter != gSelectMgr->getSelection()->root_end(); iter++)
+                 iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
        {
                LLSelectNode* node = *iter;
                LLViewerObject* obj = node->getObject();
@@ -4127,8 +4190,8 @@ BOOL is_selection_buy_not_take()
 S32 selection_price()
 {
        S32 total_price = 0;
-        for (LLObjectSelection::root_iterator iter = gSelectMgr->getSelection()->root_begin();
+        for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
-                 iter != gSelectMgr->getSelection()->root_end(); iter++)
+                 iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
        {
                LLSelectNode* node = *iter;
                LLViewerObject* obj = node->getObject();
@@ -4181,10 +4244,10 @@ void handle_buy_currency(void*)
 void handle_buy(void*)
 {
-        if (gSelectMgr->getSelection()->isEmpty()) return;
+        if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) return;
        LLSaleInfo sale_info;
-        BOOL valid = gSelectMgr->selectGetSaleInfo(sale_info);
+        BOOL valid = LLSelectMgr::getInstance()->selectGetSaleInfo(sale_info);
        if (!valid) return;
        if (sale_info.getSaleType() == LLSaleInfo::FS_CONTENTS)
@@ -4208,7 +4271,7 @@ class LLObjectBuy : public view_listener_t
 BOOL sitting_on_selection()
 {
-        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
+        LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
        if (!node)
        {
                return FALSE;
@@ -4251,14 +4314,11 @@ class LLToolsSaveToObjectInventory : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                if(gSelectMgr)
+                LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
+                if(node && (node->mValid) && (!node->mFromTaskID.isNull()))
                {
-                        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
+                        // *TODO: check to see if the fromtaskid object exists.
-                        if(node && (node->mValid) && (!node->mFromTaskID.isNull()))
+                        derez_objects(DRD_SAVE_INTO_TASK_INVENTORY, node->mFromTaskID);
-                        {
-                                // *TODO: check to see if the fromtaskid object exists.
-                                derez_objects(DRD_SAVE_INTO_TASK_INVENTORY, node->mFromTaskID);
-                        }
                }
                return true;
        }
@@ -4271,8 +4331,8 @@ class LLToolsSnapObjectXY : public view_listener_t
        {
                F64 snap_size = (F64)gSavedSettings.getF32("GridResolution");
-                for (LLObjectSelection::root_iterator iter = gSelectMgr->getSelection()->root_begin();
+                for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
-                         iter != gSelectMgr->getSelection()->root_end(); iter++)
+                         iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
                {
                        LLSelectNode* node = *iter;
                        LLViewerObject* obj = node->getObject();
@@ -4306,7 +4366,7 @@ class LLToolsSnapObjectXY : public view_listener_t
                                obj->setPositionGlobal(pos_global, FALSE);
                        }
                }
-                gSelectMgr->sendMultipleUpdate(UPD_POSITION);
+                LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
                return true;
        }
 };
@@ -4330,7 +4390,7 @@ class LLToolsEnableLink : public view_listener_t
                // in component mode, can't link
                if (!gSavedSettings.getBOOL("EditLinkedParts"))
                {
-                        if(gSelectMgr->selectGetAllRootsValid() && gSelectMgr->getSelection()->getRootObjectCount() >= 2)
+                        if(LLSelectMgr::getInstance()->selectGetAllRootsValid() && LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() >= 2)
                        {
                                struct f : public LLSelectedObjectFunctor
                                {
@@ -4340,7 +4400,7 @@ class LLToolsEnableLink : public view_listener_t
                                        }
                                } func;
                                const bool firstonly = true;
-                                new_value = gSelectMgr->getSelection()->applyToRootObjects(&func, firstonly);
+                                new_value = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
                        }
                }
                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
@@ -4352,13 +4412,13 @@ class LLToolsLink : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                if(!gSelectMgr->selectGetAllRootsValid())
+                if(!LLSelectMgr::getInstance()->selectGetAllRootsValid())
                {
                        LLNotifyBox::showXml("UnableToLinkWhileDownloading");
                        return true;
                }
-                S32 object_count = gSelectMgr->getSelection()->getObjectCount();
+                S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
                if (object_count > MAX_CHILDREN_PER_TASK + 1)
                {
                        LLStringBase<char>::format_map_t args;
@@ -4369,19 +4429,19 @@ class LLToolsLink : public view_listener_t
                        return true;
                }
-                if(gSelectMgr->getSelection()->getRootObjectCount() < 2)
+                if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() < 2)
                {
                        gViewerWindow->alertXml("CannotLinkIncompleteSet");
                        return true;
                }
-                if(!gSelectMgr->selectGetRootsModify())
+                if(!LLSelectMgr::getInstance()->selectGetRootsModify())
                {
                        gViewerWindow->alertXml("CannotLinkModify");
                        return true;
                }
                LLUUID owner_id;
                LLString owner_name;
-                if(!gSelectMgr->selectGetOwner(owner_id, owner_name))
+                if(!LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name))
                {
                        // we don't actually care if you're the owner, but novices are
                        // the most likely to be stumped by this one, so offer the
@@ -4389,7 +4449,7 @@ class LLToolsLink : public view_listener_t
                        gViewerWindow->alertXml("CannotLinkDifferentOwners");
                        return true;
                }
-                gSelectMgr->sendLink();
+                LLSelectMgr::getInstance()->sendLink();
                return true;
        }
 };
@@ -4398,9 +4458,9 @@ class LLToolsEnableUnlink : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                bool new_value = gSelectMgr->selectGetAllRootsValid() &&
+                bool new_value = LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
-                        gSelectMgr->getSelection()->getFirstEditableObject() &&
+                        LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
-                        !gSelectMgr->getSelection()->getFirstEditableObject()->isAttachment();
+                        !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment();
                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                return true;
        }
@@ -4410,7 +4470,7 @@ class LLToolsUnlink : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                gSelectMgr->sendDelink();
+                LLSelectMgr::getInstance()->sendDelink();
                return true;
        }
 };
@@ -4433,32 +4493,32 @@ class LLToolsStopAllAnimations : public view_listener_t
 //void handle_hinge(void*)
 //{
-//      gSelectMgr->sendHinge(1);
+//      LLSelectMgr::getInstance()->sendHinge(1);
 //}
 //void handle_ptop(void*)
 //{
-//      gSelectMgr->sendHinge(2);
+//      LLSelectMgr::getInstance()->sendHinge(2);
 //}
 //void handle_lptop(void*)
 //{
-//      gSelectMgr->sendHinge(3);
+//      LLSelectMgr::getInstance()->sendHinge(3);
 //}
 //void handle_wheel(void*)
 //{
-//      gSelectMgr->sendHinge(4);
+//      LLSelectMgr::getInstance()->sendHinge(4);
 //}
 //void handle_dehinge(void*)
 //{
-//      gSelectMgr->sendDehinge();
+//      LLSelectMgr::getInstance()->sendDehinge();
 //}
 //BOOL enable_dehinge(void*)
 //{
-//      LLViewerObject* obj = gSelectMgr->getSelection()->getFirstEditableObject();
+//      LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject();
 //      return obj && !obj->isAttachment();
 //}
@@ -4572,7 +4632,7 @@ class LLObjectEnableDelete : public view_listener_t
                        (!LLAppViewer::instance()->isInProductionGrid()
             && gAgent.isGodlike()) ||
 # endif
-                        (gSelectMgr && gSelectMgr->canDoDelete());
+                        LLSelectMgr::getInstance()->canDoDelete();
 #endif
                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                return true;
@@ -4592,9 +4652,9 @@ class LLObjectDelete : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                if (gSelectMgr)
+                if (LLSelectMgr::getInstance())
                {
-                        gSelectMgr->doDelete();
+                        LLSelectMgr::getInstance()->doDelete();
                }
                // and close any pie/context menus when done
@@ -4609,7 +4669,7 @@ class LLObjectDelete : public view_listener_t
 void handle_force_delete(void*)
 {
-        gSelectMgr->selectForceDelete();
+        LLSelectMgr::getInstance()->selectForceDelete();
 }
 class LLViewEnableLastChatter : public view_listener_t
@@ -4717,7 +4777,7 @@ class LLEditRedo : public view_listener_t
 void print_object_info(void*)
 {
-        gSelectMgr->selectionDump();
+        LLSelectMgr::getInstance()->selectionDump();
 }
 void print_agent_nvpairs(void*)
@@ -4761,6 +4821,8 @@ void show_debug_menus()
                //gMenuBarView->setItemVisible(LLString("DebugOptions"),        visible);
                //gMenuBarView->setItemVisible(LLString(AVI_TOOLS),     visible);
+                gMenuBarView->arrange(); // clean-up positioning 
        };
 }
@@ -4795,7 +4857,7 @@ LLUploadDialog *gExportDialog = NULL;
 void handle_export_selected( void * )
 {
-        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
        if (selection->isEmpty())
        {
                return;
@@ -4829,13 +4891,13 @@ void handle_export_selected( void * )
 BOOL menu_check_build_tool( void* user_data )
 {
        S32 index = (intptr_t) user_data;
-        return gToolMgr->getCurrentToolset()->isToolSelected( index );
+        return LLToolMgr::getInstance()->getCurrentToolset()->isToolSelected( index );
 }
 void handle_reload_settings(void*)
 {
        gSavedSettings.resetToDefaults();
-        gSavedSettings.loadFromFile(gSettingsFileName, TRUE);
+        gSavedSettings.loadFromFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
        llinfos << "Loading colors from colors.xml" << llendl;
        std::string color_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"colors.xml");
@@ -4868,23 +4930,22 @@ class LLWorldAlwaysRun : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
+                // as well as altering the default walk-vs-run state,
+                // we also change the *current* walk-vs-run state.
                if (gAgent.getAlwaysRun())
                {
                        gAgent.clearAlwaysRun();
+                        gAgent.clearRunning();
                }
                else
                {
                        gAgent.setAlwaysRun();
+                        gAgent.setRunning();
                }
-                LLMessageSystem *msg = gMessageSystem;
+                // tell the simulator.
+                gAgent.sendWalkRun(gAgent.getAlwaysRun());
-                msg->newMessageFast(_PREHASH_SetAlwaysRun);
-                msg->nextBlockFast(_PREHASH_AgentData);
-                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                msg->addBOOLFast(_PREHASH_AlwaysRun, gAgent.getAlwaysRun() );
-                gAgent.sendReliableMessage();
                return true;
        }
 };
@@ -4943,7 +5004,7 @@ class LLWorldCreateLandmark : public view_listener_t
                        llwarns << "No agent region" << llendl;
                        return true;
                }
-                LLParcel* agent_parcel = gParcelMgr->getAgentParcel();
+                LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                if (!agent_parcel)
                {
                        llwarns << "No agent parcel" << llendl;
@@ -4978,24 +5039,24 @@ class LLToolsLookAtSelection : public view_listener_t
        {
                const F32 PADDING_FACTOR = 2.f;
                BOOL zoom = (userdata.asString() == "zoom");
-                if (!gSelectMgr->getSelection()->isEmpty())
+                if (!LLSelectMgr::getInstance()->getSelection()->isEmpty())
                {
                        gAgent.setFocusOnAvatar(FALSE, ANIMATE);
-                        LLBBox selection_bbox = gSelectMgr->getBBoxOfSelection();
+                        LLBBox selection_bbox = LLSelectMgr::getInstance()->getBBoxOfSelection();
-                        F32 angle_of_view = llmax(0.1f, gCamera->getAspect() > 1.f ? gCamera->getView() * gCamera->getAspect() : gCamera->getView());
+                        F32 angle_of_view = llmax(0.1f, LLViewerCamera::getInstance()->getAspect() > 1.f ? LLViewerCamera::getInstance()->getView() * LLViewerCamera::getInstance()->getAspect() : LLViewerCamera::getInstance()->getView());
                        F32 distance = selection_bbox.getExtentLocal().magVec() * PADDING_FACTOR / atan(angle_of_view);
-                        LLVector3 obj_to_cam = gCamera->getOrigin() - selection_bbox.getCenterAgent();
+                        LLVector3 obj_to_cam = LLViewerCamera::getInstance()->getOrigin() - selection_bbox.getCenterAgent();
                        obj_to_cam.normVec();
                        if (zoom)
                        {
-                                gAgent.setCameraPosAndFocusGlobal(gSelectMgr->getSelectionCenterGlobal() + LLVector3d(obj_to_cam * distance), gSelectMgr->getSelectionCenterGlobal(), gSelectMgr->getSelection()->getFirstObject()->mID );
+                                gAgent.setCameraPosAndFocusGlobal(LLSelectMgr::getInstance()->getSelectionCenterGlobal() + LLVector3d(obj_to_cam * distance), LLSelectMgr::getInstance()->getSelectionCenterGlobal(), LLSelectMgr::getInstance()->getSelection()->getFirstObject()->mID );
                        }
                        else
                        {
-                                gAgent.setFocusGlobal( gSelectMgr->getSelectionCenterGlobal(), gSelectMgr->getSelection()->getFirstObject()->mID );
+                                gAgent.setFocusGlobal( LLSelectMgr::getInstance()->getSelectionCenterGlobal(), LLSelectMgr::getInstance()->getSelection()->getFirstObject()->mID );
                        }
                }
                return true;
@@ -5091,7 +5152,7 @@ void complete_give_money(S32 option, void* user_data)
 bool handle_give_money_dialog()
 {
-        LLObjectSelectionHandle* handlep = new LLObjectSelectionHandle(gSelectMgr->getSelection());
+        LLObjectSelectionHandle* handlep = new LLObjectSelectionHandle(LLSelectMgr::getInstance()->getSelection());
        if (gAgent.getBusy())
        {
                // warn users of being in busy mode during a transaction
@@ -5167,7 +5228,7 @@ class LLObjectEnableSitOrStand : public view_listener_t
                }
                else
                {
-                        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
+                        LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
                        if (node && node->mValid && !node->mSitName.empty())
                        {
                                label.assign(node->mSitName);
@@ -5190,12 +5251,7 @@ void edit_ui(void*)
 void dump_select_mgr(void*)
 {
-        gSelectMgr->dump();
+        LLSelectMgr::getInstance()->dump();
-}
-void dump_volume_mgr(void*)
-{
-        gVolumeMgr->dump();
 }
 void dump_inventory(void*)
@@ -5207,7 +5263,7 @@ void dump_inventory(void*)
 void handle_force_unlock(void*)
 {
        // First, make it public.
-        gSelectMgr->sendOwner(LLUUID::null, LLUUID::null, TRUE);
+        LLSelectMgr::getInstance()->sendOwner(LLUUID::null, LLUUID::null, TRUE);
        // Second, lie to the viewer and mark it editable and unowned
@@ -5224,7 +5280,7 @@ void handle_force_unlock(void*)
                        return true;
                }
        } func;
-        gSelectMgr->getSelection()->applyToObjects(&func);
+        LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func);
 }
 void handle_dump_followcam(void*)
@@ -5232,21 +5288,6 @@ void handle_dump_followcam(void*)
        LLFollowCamMgr::dump();
 }
-BOOL check_flycam(void*)
-{
-        return LLViewerJoystick::sOverrideCamera;
-}
-void handle_toggle_flycam(void*)
-{
-        LLViewerJoystick::sOverrideCamera = !LLViewerJoystick::sOverrideCamera;
-        if (LLViewerJoystick::sOverrideCamera)
-        {
-                LLViewerJoystick::updateCamera(TRUE);
-                LLFloaterJoystick::show(NULL);
-        }
-}
 void handle_viewer_enable_message_log(void*)
 {
        gMessageSystem->startLogging();
@@ -5304,11 +5345,11 @@ class LLShowFloater : public view_listener_t
                }
                else if (floater_name == "camera controls")
                {
-                        LLFloaterCamera::toggle(NULL);
+                        LLFloaterCamera::toggleInstance();
                }
                else if (floater_name == "movement controls")
                {
-                        LLFloaterMove::show(NULL);
+                        LLFloaterMove::toggleInstance();
                }
                else if (floater_name == "world map")
                {
@@ -5320,7 +5361,7 @@ class LLShowFloater : public view_listener_t
                }
                else if (floater_name == "stat bar")
                {
-                        gDebugView->mStatViewp->setVisible(!gDebugView->mStatViewp->getVisible());
+                        gDebugView->mFloaterStatsp->setVisible(!gDebugView->mFloaterStatsp->getVisible());
                }
                else if (floater_name == "my land")
                {
@@ -5328,21 +5369,21 @@ class LLShowFloater : public view_listener_t
                }
                else if (floater_name == "about land")
                {
-                        if (gParcelMgr->selectionEmpty())
+                        if (LLViewerParcelMgr::getInstance()->selectionEmpty())
                        {
-                                gParcelMgr->selectParcelAt(gAgent.getPositionGlobal());
+                                LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
                        }
                        LLFloaterLand::showInstance();
                }
                else if (floater_name == "buy land")
                {
-                        if (gParcelMgr->selectionEmpty())
+                        if (LLViewerParcelMgr::getInstance()->selectionEmpty())
                        {
-                                gParcelMgr->selectParcelAt(gAgent.getPositionGlobal());
+                                LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
                        }
                        
-                        gParcelMgr->startBuyLand();
+                        LLViewerParcelMgr::getInstance()->startBuyLand();
                }
                else if (floater_name == "about region")
                {
@@ -5360,6 +5401,10 @@ class LLShowFloater : public view_listener_t
                {
                        gViewerHtmlHelp.show();
                }
+                else if (floater_name == "help tutorial")
+                {
+                        LLFloaterHUD::show();
+                }
                else if (floater_name == "complaint reporter")
                {
                        // Prevent menu from appearing in screen shot.
@@ -5375,7 +5420,7 @@ class LLShowFloater : public view_listener_t
                }
                else if (floater_name == "lag meter")
                {
-                        LLFloaterLagMeter::show(NULL);
+                        LLFloaterLagMeter::showInstance();
                }
                else if (floater_name == "bug reporter")
                {
@@ -5428,15 +5473,15 @@ class LLFloaterVisible : public view_listener_t
                }
                else if (floater_name == "camera controls")
                {
-                        new_value = LLFloaterCamera::visible(NULL);
+                        new_value = LLFloaterCamera::instanceVisible();
                }
                else if (floater_name == "movement controls")
                {
-                        new_value = LLFloaterMove::visible(NULL);
+                        new_value = LLFloaterMove::instanceVisible();
                }
                else if (floater_name == "stat bar")
                {
-                        new_value = gDebugView->mStatViewp->getVisible();
+                        new_value = gDebugView->mFloaterStatsp->getVisible();
                }
                else if (floater_name == "active speakers")
                {
@@ -5585,8 +5630,8 @@ void handle_focus(void *)
        gViewerWindow->moveCursorToCenter();
        // Switch to camera toolset
-//      gToolMgr->setCurrentToolset(gCameraToolset);
+//      LLToolMgr::getInstance()->setCurrentToolset(gCameraToolset);
-        gToolMgr->getCurrentToolset()->selectTool( gToolCamera );
+        LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCamera::getInstance() );
 }
 class LLLandEdit : public view_listener_t
@@ -5609,13 +5654,13 @@ class LLLandEdit : public view_listener_t
                }
-                gParcelMgr->selectParcelAt( gLastHitPosGlobal );
+                LLViewerParcelMgr::getInstance()->selectParcelAt( gLastHitPosGlobal );
                gFloaterTools->showMore(TRUE);
                gFloaterView->bringToFront( gFloaterTools );
                // Switch to land edit toolset
-                gToolMgr->getCurrentToolset()->selectTool( gToolParcel );
+                LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolSelectLand::getInstance() );
                return true;
        }
 };
@@ -5624,10 +5669,10 @@ class LLWorldEnableBuyLand : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                bool new_value = gParcelMgr->canAgentBuyParcel(
+                bool new_value = LLViewerParcelMgr::getInstance()->canAgentBuyParcel(
-                                                                gParcelMgr->selectionEmpty()
+                                                                LLViewerParcelMgr::getInstance()->selectionEmpty()
-                                                                        ? gParcelMgr->getAgentParcel()
+                                                                        ? LLViewerParcelMgr::getInstance()->getAgentParcel()
-                                                                        : gParcelMgr->getParcelSelection()->getParcel(),
+                                                                        : LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel(),
                                                                false);
                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                return true;
@@ -5636,8 +5681,8 @@ class LLWorldEnableBuyLand : public view_listener_t
 BOOL enable_buy_land(void*)
 {
-        return gParcelMgr->canAgentBuyParcel(
+        return LLViewerParcelMgr::getInstance()->canAgentBuyParcel(
-                                gParcelMgr->getParcelSelection()->getParcel(), false);
+                                LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel(), false);
 }
@@ -5658,8 +5703,8 @@ void handle_move(void*)
        gViewerWindow->moveCursorToCenter();
-        gToolMgr->setCurrentToolset(gBasicToolset);
+        LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
-        gToolMgr->getCurrentToolset()->selectTool( gToolGrab );
+        LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolGrab::getInstance() );
 }
 class LLObjectAttachToAvatar : public view_listener_t
@@ -5670,7 +5715,7 @@ public:
 private:
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                setObjectSelection(gSelectMgr->getSelection());
+                setObjectSelection(LLSelectMgr::getInstance()->getSelection());
                LLViewerObject* selectedObject = sObjectSelection->getFirstRootObject();
                if (selectedObject)
                {
@@ -5713,7 +5758,7 @@ void near_attach_object(BOOL success, void *user_data)
                        // interpret 0 as "default location"
                        attachment_id = 0;
                }
-                gSelectMgr->sendAttach(attachment_id);
+                LLSelectMgr::getInstance()->sendAttach(attachment_id);
        }               
        LLObjectAttachToAvatar::setObjectSelection(NULL);
 }
@@ -5722,7 +5767,7 @@ void confirm_replace_attachment(S32 option, void* user_data)
 {
        if (option == 0/*YES*/)
        {
-                LLViewerObject* selectedObject = gSelectMgr->getSelection()->getFirstRootObject();
+                LLViewerObject* selectedObject = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject();
                if (selectedObject)
                {
                        const F32 MIN_STOP_DISTANCE = 1.f;      // meters
@@ -5789,7 +5834,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.
-                gSelectMgr->sendDropAttachment();
+                LLSelectMgr::getInstance()->sendDropAttachment();
                return true;
        }
 };
@@ -5892,9 +5937,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->getSelection()->isAttachment())
+                if (LLSelectMgr::getInstance()->getSelection()->isAttachment())
                {
-                        gSelectMgr->sendDetach();
+                        LLSelectMgr::getInstance()->sendDetach();
                }
                return true;
        }
@@ -5922,7 +5967,7 @@ class LLAttachmentEnableDrop : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                LLParcel* parcel = gParcelMgr->getAgentParcel();
+                LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                BOOL can_build   = gAgent.isGodlike() || (parcel && parcel->getAllowModify());
                //Add an inventory observer to only allow dropping the newly attached item
@@ -6011,11 +6056,7 @@ class LLAttachmentEnableDetach : public view_listener_t
 BOOL object_selected_and_point_valid(void *user_data)
 {
        //LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
-        if (gSelectMgr == NULL)
+        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
-        {
-                return FALSE;
-        }
-        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
        for (LLObjectSelection::root_iterator iter = selection->root_begin();
                 iter != selection->root_end(); iter++)
        {
@@ -6048,9 +6089,9 @@ BOOL object_is_wearable()
        {
                return FALSE;
        }
-        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
-        for (LLObjectSelection::valid_root_iterator iter = gSelectMgr->getSelection()->valid_root_begin();
+        for (LLObjectSelection::valid_root_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_root_begin();
-                 iter != gSelectMgr->getSelection()->valid_root_end(); iter++)
+                 iter != LLSelectMgr::getInstance()->getSelection()->valid_root_end(); iter++)
        {
                LLSelectNode* node = *iter;             
                if (node->mPermissions->getOwner() == gAgent.getID())
@@ -6150,7 +6191,7 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
        // Apply until an object fails
        QueueObjects func(q);
        const bool firstonly = true;
-        bool fail = gSelectMgr->getSelection()->applyToObjects(&func, firstonly);
+        bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func, firstonly);
        if(fail)
        {
                if ( !func.scripted )
@@ -6228,8 +6269,8 @@ void handle_set_not_run_selection(void*)
 void handle_selected_texture_info(void*)
 {
-        for (LLObjectSelection::valid_iterator iter = gSelectMgr->getSelection()->valid_begin();
+        for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin();
-                 iter != gSelectMgr->getSelection()->valid_end(); iter++)
+                 iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++)
        {
                LLSelectNode* node = *iter;
                
@@ -6397,14 +6438,14 @@ BOOL menu_check_variable( void* user_data)
 BOOL enable_land_selected( void* )
 {
-        return gParcelMgr && !(gParcelMgr->selectionEmpty());
+        return !(LLViewerParcelMgr::getInstance()->selectionEmpty());
 }
 class LLSomethingSelected : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                bool new_value = !(gSelectMgr->getSelection()->isEmpty());
+                bool new_value = !(LLSelectMgr::getInstance()->getSelection()->isEmpty());
                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                return true;
        }
@@ -6414,7 +6455,7 @@ class LLSomethingSelectedNoHUD : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
                bool new_value = !(selection->isEmpty()) && !(selection->getSelectType() == SELECT_TYPE_HUD);
                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                return true;
@@ -6423,14 +6464,14 @@ class LLSomethingSelectedNoHUD : public view_listener_t
 BOOL enable_more_than_one_selected(void* )
 {
-        return (gSelectMgr->getSelection()->getObjectCount() > 1);
+        return (LLSelectMgr::getInstance()->getSelection()->getObjectCount() > 1);
 }
 class LLEditableSelected : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                bool new_value = (gSelectMgr->getSelection()->getFirstEditableObject() != NULL);
+                bool new_value = (LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() != NULL);
                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                return true;
        }
@@ -6441,7 +6482,7 @@ class LLToolsEnableTakeCopy : public view_listener_t
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
                bool all_valid = false;
-                if (gSelectMgr)
+                if (LLSelectMgr::getInstance())
                {
                        all_valid = true;
 #ifndef HACKED_GODLIKE_VIEWER
@@ -6458,7 +6499,7 @@ class LLToolsEnableTakeCopy : public view_listener_t
                                        }
                                } func;
                                const bool firstonly = true;
-                                bool any_invalid = gSelectMgr->getSelection()->applyToRootObjects(&func, firstonly);
+                                bool any_invalid = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
                                all_valid = !any_invalid;
                        }
 #endif // HACKED_GODLIKE_VIEWER
@@ -6471,7 +6512,7 @@ class LLToolsEnableTakeCopy : public view_listener_t
 BOOL enable_selection_you_own_all(void*)
 {
-        if (gSelectMgr)
+        if (LLSelectMgr::getInstance())
        {
                struct f : public LLSelectedObjectFunctor
                {
@@ -6481,7 +6522,7 @@ BOOL enable_selection_you_own_all(void*)
                        }
                } func;
                const bool firstonly = true;
-                bool no_perms = gSelectMgr->getSelection()->applyToRootObjects(&func, firstonly);
+                bool no_perms = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
                if (no_perms)
                {
                        return FALSE;
@@ -6492,7 +6533,7 @@ BOOL enable_selection_you_own_all(void*)
 BOOL enable_selection_you_own_one(void*)
 {
-        if (gSelectMgr)
+        if (LLSelectMgr::getInstance())
        {
                struct f : public LLSelectedObjectFunctor
                {
@@ -6502,7 +6543,7 @@ BOOL enable_selection_you_own_one(void*)
                        }
                } func;
                const bool firstonly = true;
-                bool any_perms = gSelectMgr->getSelection()->applyToRootObjects(&func, firstonly);
+                bool any_perms = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
                if (!any_perms)
                {
                        return FALSE;
@@ -6537,40 +6578,37 @@ bool LLHasAsset::operator()(LLInventoryCategory* cat,
 BOOL enable_save_into_inventory(void*)
 {
-        if(gSelectMgr)
+        // *TODO: clean this up
+        // find the last root
+        LLSelectNode* last_node = NULL;
+        for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
+                 iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
        {
-                // *TODO: clean this up
+                last_node = *iter;
-                // find the last root
+        }
-                LLSelectNode* last_node = NULL;
-                for (LLObjectSelection::root_iterator iter = gSelectMgr->getSelection()->root_begin();
-                         iter != gSelectMgr->getSelection()->root_end(); iter++)
-                {
-                        last_node = *iter;
-                }
 #ifdef HACKED_GODLIKE_VIEWER
-                return TRUE;
+        return TRUE;
 #else
 # ifdef TOGGLE_HACKED_GODLIKE_VIEWER
-                if (!LLAppViewer::instance()->isInProductionGrid()
+        if (!LLAppViewer::instance()->isInProductionGrid()
-            && gAgent.isGodlike())
+        && gAgent.isGodlike())
-                {
+        {
-                        return TRUE;
+                return TRUE;
-                }
+        }
 # endif
-                // check all pre-req's for save into inventory.
+        // check all pre-req's for save into inventory.
-                if(last_node && last_node->mValid && !last_node->mItemID.isNull()
+        if(last_node && last_node->mValid && !last_node->mItemID.isNull()
-                   && (last_node->mPermissions->getOwner() == gAgent.getID())
+           && (last_node->mPermissions->getOwner() == gAgent.getID())
-                   && (gInventory.getItem(last_node->mItemID) != NULL))
+           && (gInventory.getItem(last_node->mItemID) != NULL))
+        {
+                LLViewerObject* obj = last_node->getObject();
+                if( obj && !obj->isAttachment() )
                {
-                        LLViewerObject* obj = last_node->getObject();
+                        return TRUE;
-                        if( obj && !obj->isAttachment() )
-                        {
-                                return TRUE;
-                        }
                }
-#endif
        }
+#endif
        return FALSE;
 }
@@ -6586,17 +6624,14 @@ class LLToolsEnableSaveToInventory : public view_listener_t
 BOOL enable_save_into_task_inventory(void*)
 {
-        if(gSelectMgr)
+        LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
+        if(node && (node->mValid) && (!node->mFromTaskID.isNull()))
        {
-                LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
+                // *TODO: check to see if the fromtaskid object exists.
-                if(node && (node->mValid) && (!node->mFromTaskID.isNull()))
+                LLViewerObject* obj = node->getObject();
+                if( obj && !obj->isAttachment() )
                {
-                        // *TODO: check to see if the fromtaskid object exists.
+                        return TRUE;
-                        LLViewerObject* obj = node->getObject();
-                        if( obj && !obj->isAttachment() )
-                        {
-                                return TRUE;
-                        }
                }
        }
        return FALSE;
@@ -6620,7 +6655,7 @@ BOOL enable_not_thirdperson(void*)
 BOOL enable_export_selected(void *)
 {
-        if (gSelectMgr->getSelection()->isEmpty())
+        if (LLSelectMgr::getInstance()->getSelection()->isEmpty())
        {
                return FALSE;
        }
@@ -6651,7 +6686,7 @@ class LLToolsEnableToolNotPie : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                bool new_value = ( gToolMgr->getBaseTool() != gToolPie );
+                bool new_value = ( LLToolMgr::getInstance()->getBaseTool() != LLToolPie::getInstance() );
                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                return true;
        }
@@ -6819,11 +6854,11 @@ class LLToolsEditLinkedParts : public view_listener_t
                BOOL select_individuals = gSavedSettings.getBOOL("EditLinkedParts");
                if (select_individuals)
                {
-                        gSelectMgr->demoteSelectionToIndividuals();
+                        LLSelectMgr::getInstance()->demoteSelectionToIndividuals();
                }
                else
                {
-                        gSelectMgr->promoteSelectionToRoot();
+                        LLSelectMgr::getInstance()->promoteSelectionToRoot();
                }
                return true;
        }
@@ -7043,17 +7078,17 @@ class LLToolsUseSelectionForGrid : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                gSelectMgr->clearGridObjects();
+                LLSelectMgr::getInstance()->clearGridObjects();
                struct f : public LLSelectedObjectFunctor
                {
                        virtual bool apply(LLViewerObject* objectp)
                        {
-                                gSelectMgr->addGridObject(objectp);
+                                LLSelectMgr::getInstance()->addGridObject(objectp);
                                return true;
                        }
                } func;
-                gSelectMgr->getSelection()->applyToRootObjects(&func);
+                LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func);
-                gSelectMgr->setGridMode(GRID_MODE_REF_OBJECT);
+                LLSelectMgr::getInstance()->setGridMode(GRID_MODE_REF_OBJECT);
                if (gFloaterTools)
                {
                        gFloaterTools->mComboGridMode->setCurrentByIndex((S32)GRID_MODE_REF_OBJECT);
@@ -7131,7 +7166,7 @@ void handle_save_to_xml(void*)
        if (picker.getSaveFile(LLFilePicker::FFSAVE_XML, default_name.c_str()))
        {
                LLString filename = picker.getFirstFile();
-                gUICtrlFactory->saveToXML(frontmost, filename);
+                LLUICtrlFactory::getInstance()->saveToXML(frontmost, filename);
        }
 }
@@ -7142,15 +7177,19 @@ void handle_load_from_xml(void*)
        {
                LLString filename = picker.getFirstFile();
                LLFloater* floater = new LLFloater("sample_floater");
-                gUICtrlFactory->buildFloater(floater, filename);
+                LLUICtrlFactory::getInstance()->buildFloater(floater, filename);
        }
 }
 void handle_slurl_test(void*)
 {
-        bool open_app_slurls = true;
+        const bool open_links_externally = false;
-        bool open_links_externally = false;
+        const bool open_app_slurls = true;
-        LLFloaterHtml::getInstance()->show("http://secondlife.com/app/search/slurls.html", "SLURL Test", open_app_slurls, open_links_externally);
+        LLFloaterHtml::getInstance()->show(
+                "http://secondlife.com/app/search/slurls.html",
+                "SLURL Test", 
+                open_links_externally, 
+                open_app_slurls);
 }
 void handle_rebake_textures(void*)
@@ -7510,15 +7549,6 @@ class LLWorldChat : public view_listener_t
        }
 };
-class LLWorldStartGesture : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                handle_slash_key(NULL);
-                return true;
-        }
-};
 class LLToolsSelectTool : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -7526,23 +7556,23 @@ class LLToolsSelectTool : public view_listener_t
                LLString tool_name = userdata.asString();
                if (tool_name == "focus")
                {
-                        gToolMgr->getCurrentToolset()->selectToolByIndex(1);
+                        LLToolMgr::getInstance()->getCurrentToolset()->selectToolByIndex(1);
                }
                else if (tool_name == "move")
                {
-                        gToolMgr->getCurrentToolset()->selectToolByIndex(2);
+                        LLToolMgr::getInstance()->getCurrentToolset()->selectToolByIndex(2);
                }
                else if (tool_name == "edit")
                {
-                        gToolMgr->getCurrentToolset()->selectToolByIndex(3);
+                        LLToolMgr::getInstance()->getCurrentToolset()->selectToolByIndex(3);
                }
                else if (tool_name == "create")
                {
-                        gToolMgr->getCurrentToolset()->selectToolByIndex(4);
+                        LLToolMgr::getInstance()->getCurrentToolset()->selectToolByIndex(4);
                }
                else if (tool_name == "land")
                {
-                        gToolMgr->getCurrentToolset()->selectToolByIndex(5);
+                        LLToolMgr::getInstance()->getCurrentToolset()->selectToolByIndex(5);
                }
                return true;
        }
@@ -7706,6 +7736,7 @@ void initialize_menus()
        // View menu
        addMenu(new LLViewMouselook(), "View.Mouselook");
        addMenu(new LLViewBuildMode(), "View.BuildMode");
+        addMenu(new LLViewJoystickFlycam(), "View.JoystickFlycam");
        addMenu(new LLViewResetView(), "View.ResetView");
        addMenu(new LLViewLookAtLastChatter(), "View.LookAtLastChatter");
        addMenu(new LLViewShowHoverTips(), "View.ShowHoverTips");
@@ -7724,6 +7755,7 @@ void initialize_menus()
        addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
        addMenu(new LLViewCheckBuildMode(), "View.CheckBuildMode");
+        addMenu(new LLViewCheckJoystickFlycam(), "View.CheckJoystickFlycam");
        addMenu(new LLViewCheckShowHoverTips(), "View.CheckShowHoverTips");
        addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
        addMenu(new LLViewCheckBeaconEnabled(), "View.CheckBeaconEnabled");
@@ -7732,7 +7764,6 @@ void initialize_menus()
        // World menu
        addMenu(new LLWorldChat(), "World.Chat");
-        addMenu(new LLWorldStartGesture(), "World.StartGesture");
        addMenu(new LLWorldAlwaysRun(), "World.AlwaysRun");
        addMenu(new LLWorldFly(), "World.Fly");
        addMenu(new LLWorldCreateLandmark(), "World.CreateLandmark");
@@ -7785,7 +7816,6 @@ void initialize_menus()
        addMenu(new LLToolsVisibleTakeObject(), "Tools.VisibleTakeObject");*/
        // Help menu
-        addMenu(new LLHelpMOTD(), "Help.MOTD");
        // most items use the ShowFloater method
        // Self pie menu
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index 5565c7f..384c1cc 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -102,6 +102,7 @@ void handle_sit_down(void*);
 bool toggle_build_mode();
 void handle_object_build(void*);
 void handle_save_snapshot(void *);
+void handle_toggle_flycam();
 bool handle_sit_or_stand();
 bool handle_give_money_dialog();
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index a4c55f7..ab77b53 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -46,7 +46,7 @@
 #include "llstatusbar.h"
 #include "llviewercontrol.h"    // gSavedSettings
 #include "llviewerimagelist.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewermenu.h"       // gMenuHolder
 #include "llviewerregion.h"
 #include "llviewerstats.h"
@@ -86,7 +86,7 @@ class LLFileEnableUpload : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                bool new_value = gStatusBar && gGlobalEconomy && (gStatusBar->getBalance() >= gGlobalEconomy->getPriceUpload());
+                bool new_value = gStatusBar && LLGlobalEconomy::Singleton::getInstance() && (gStatusBar->getBalance() >= LLGlobalEconomy::Singleton::getInstance()->getPriceUpload());
                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                return true;
        }
@@ -218,7 +218,7 @@ class LLFileUploadImage : public view_listener_t
                if (filename)
                {
                        LLFloaterImagePreview* floaterp = new LLFloaterImagePreview(filename);
-                        gUICtrlFactory->buildFloater(floaterp, "floater_image_preview.xml");
+                        LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_image_preview.xml");
                }
                return TRUE;
        }
@@ -232,7 +232,7 @@ class LLFileUploadSound : public view_listener_t
                if (filename)
                {
                        LLFloaterNameDesc* floaterp = new LLFloaterNameDesc(filename);
-                        gUICtrlFactory->buildFloater(floaterp, "floater_sound_preview.xml");
+                        LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_sound_preview.xml");
                }
                return true;
        }
@@ -246,7 +246,7 @@ class LLFileUploadAnim : public view_listener_t
                if (filename)
                {
                        LLFloaterAnimPreview* floaterp = new LLFloaterAnimPreview(filename);
-                        gUICtrlFactory->buildFloater(floaterp, "floater_animation_preview.xml");
+                        LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_animation_preview.xml");
                }
                return true;
        }
@@ -414,15 +414,6 @@ class LLFileTakeSnapshotToDisk : public view_listener_t
        }
 };
-class LLFileSaveMovie : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLViewerWindow::saveMovieNumbered(NULL);
-                return true;
-        }
-};
 class LLFileSetWindowSize : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -450,7 +441,7 @@ void handle_upload(void* data)
        if (filename)
        {
                LLFloaterNameDesc* floaterp = new LLFloaterNameDesc(filename);
-                gUICtrlFactory->buildFloater(floaterp, "floater_name_description.xml");
+                LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_name_description.xml");
        }
 }
@@ -808,7 +799,7 @@ void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
                {
                        // Charge the user for the upload.
                        LLViewerRegion* region = gAgent.getRegion();
-                        S32 upload_cost = gGlobalEconomy->getPriceUpload();
+                        S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
                        if(!(can_afford_transaction(upload_cost)))
                        {
@@ -920,17 +911,17 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
        
        if( LLAssetType::AT_SOUND == asset_type )
        {
-                gViewerStats->incStat(LLViewerStats::ST_UPLOAD_SOUND_COUNT );
+                LLViewerStats::getInstance()->incStat(LLViewerStats::ST_UPLOAD_SOUND_COUNT );
        }
        else
        if( LLAssetType::AT_TEXTURE == asset_type )
        {
-                gViewerStats->incStat(LLViewerStats::ST_UPLOAD_TEXTURE_COUNT );
+                LLViewerStats::getInstance()->incStat(LLViewerStats::ST_UPLOAD_TEXTURE_COUNT );
        }
        else
        if( LLAssetType::AT_ANIMATION == asset_type)
        {
-                gViewerStats->incStat(LLViewerStats::ST_UPLOAD_ANIM_COUNT );
+                LLViewerStats::getInstance()->incStat(LLViewerStats::ST_UPLOAD_ANIM_COUNT );
        }
        if(LLInventoryType::IT_NONE == inv_type)
@@ -985,7 +976,7 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
                        LLAssetType::AT_TEXTURE == asset_type ||
                        LLAssetType::AT_ANIMATION == asset_type)
                {
-                        S32 upload_cost = gGlobalEconomy->getPriceUpload();
+                        S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
                        S32 balance = gStatusBar->getBalance();
                        if (balance < upload_cost)
                        {
@@ -1033,7 +1024,6 @@ void init_menu_file()
        (new LLFileSaveTexture())->registerListener(gMenuHolder, "File.SaveTexture");
        (new LLFileTakeSnapshot())->registerListener(gMenuHolder, "File.TakeSnapshot");
        (new LLFileTakeSnapshotToDisk())->registerListener(gMenuHolder, "File.TakeSnapshotToDisk");
-        (new LLFileSaveMovie())->registerListener(gMenuHolder, "File.SaveMovie");
        (new LLFileSetWindowSize())->registerListener(gMenuHolder, "File.SetWindowSize");
        (new LLFileQuit())->registerListener(gMenuHolder, "File.Quit");
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 37bd350..592ef39 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -36,7 +36,6 @@
 #include <deque>
 #include "audioengine.h" 
-#include "audiosettings.h"
 #include "indra_constants.h"
 #include "lscript_byteformat.h"
 #include "mean_collision_data.h"
@@ -68,6 +67,7 @@
 #include "llagent.h"
 #include "llcallingcard.h"
 #include "llconsole.h"
+#include "llvieweraudio.h"
 #include "llviewercontrol.h"
 #include "lldrawpool.h"
 #include "llfirstuse.h"
@@ -81,6 +81,7 @@
 #include "llfloaterregioninfo.h"
 #include "llfloaterlandholdings.h"
 #include "llfloatermap.h"
+#include "llurldispatcher.h"
 #include "llfloatermute.h"
 #include "llfloaterpostcard.h"
 #include "llfloaterpreference.h"
@@ -284,8 +285,7 @@ void process_logout_reply(LLMessageSystem* msg, void**)
 void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 {
-        if(!gWorldp) return;
+        LLViewerRegion *regionp = LLWorld::getInstance()->getRegion(mesgsys->getSender());
-        LLViewerRegion *regionp = gWorldp->getRegion(mesgsys->getSender());
        if (!regionp || gNoRender)
        {
@@ -912,10 +912,10 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
        }
        LLMute mute(blocked_id, from_name, type);
-        if (gMuteListp->add(mute))
+        if (LLMuteList::getInstance()->add(mute))
        {
                LLFloaterMute::showInstance();
-                gFloaterMute->selectMute(blocked_id);
+                LLFloaterMute::getInstance()->selectMute(blocked_id);
        }
        // purge the message queue of any previously queued inventory offers from the same source.
@@ -1100,7 +1100,7 @@ void inventory_offer_callback(S32 button, void* user_data)
                log_message = "You decline " + info->mDesc + " from " + info->mFromName + ".";
                chat.mText = log_message;
-                if( gMuteListp->isMuted(info->mFromID ) && ! gMuteListp->isLinden(info->mFromName) )  // muting for SL-42269
+                if( LLMuteList::getInstance()->isMuted(info->mFromID ) && ! LLMuteList::getInstance()->isLinden(info->mFromName) )  // muting for SL-42269
                {
                        chat.mMuted = TRUE;
                }
@@ -1159,7 +1159,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
        }
        
        //If muted, don't even go through the messaging stuff.  Just curtail the offer here.
-        if (gMuteListp->isMuted(info->mFromID, info->mFromName))
+        if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName))
        {
                inventory_offer_callback(IOR_MUTE, info);
                return;
@@ -1351,13 +1351,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
        time_t timestamp = (time_t)t;
        BOOL is_busy = gAgent.getBusy();
-        BOOL is_muted = gMuteListp->isMuted(from_id, name, LLMute::flagTextChat);
+        BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat);
-        BOOL is_linden = gMuteListp->isLinden(name);
+        BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
        BOOL is_owned_by_me = FALSE;
        
        chat.mMuted = is_muted && !is_linden;
        chat.mFromID = from_id;
        chat.mFromName = name;
+        chat.mSourceType = (from_id.isNull() || !strcmp(name, SYSTEM_FROM)) ? CHAT_SOURCE_SYSTEM : CHAT_SOURCE_AGENT;
        LLViewerObject *source = gObjectList.findObject(session_id); //Session ID is probably the wrong thing.
        if (source)
@@ -1448,7 +1449,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                }
                else if (from_id.isNull())
                {
-                        // Messages from "Second Life" don't go to IM history
+                        // Messages from "Second Life" ID don't go to IM history
+                        // messages which should be routed to IM window come from a user ID with name=SYSTEM_NAME
                        snprintf(buffer, sizeof(buffer), "%s: %s", name, message);              /* Flawfinder: ignore */
                        chat.mText = buffer;
                        LLFloaterChat::addChat(chat, FALSE, FALSE);
@@ -2099,7 +2101,7 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
        if(!source_name.empty())
        {
                if (gAgent.getBusy() 
-                        || gMuteListp->isMuted(source_id, source_name, LLMute::flagTextChat))
+                        || LLMuteList::getInstance()->isMuted(source_id, source_name, LLMute::flagTextChat))
                {
                        // automatically decline offer
                        callingcard_offer_callback(1, (void*)offerdata);
@@ -2169,20 +2171,15 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
        BOOL is_self = (from_id == gAgent.getID());
        BOOL is_busy = gAgent.getBusy();
-        // Apparently you can receive chat before app is fully initialized, hence
-        // gMuteListp can be null. JC
        BOOL is_muted = FALSE;
        BOOL is_linden = FALSE;
-        if (gMuteListp)
+        is_muted = LLMuteList::getInstance()->isMuted(
-        {
+                from_id,
-                is_muted = gMuteListp->isMuted(
+                from_name,
-                        from_id,
+                LLMute::flagTextChat) 
-                        from_name,
+                || LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagTextChat);
-                        LLMute::flagTextChat) 
+        is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT &&
-                        || gMuteListp->isMuted(owner_id, LLMute::flagTextChat);
+                LLMuteList::getInstance()->isLinden(from_name);
-                is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT &&
-                        gMuteListp->isLinden(from_name);
-        }
        BOOL is_audible = (CHAT_AUDIBLE_FULLY == chat.mAudible);
        chatter = gObjectList.findObject(from_id);
@@ -2200,7 +2197,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                        //We set the particles to be owned by the object's owner, 
                        //just in case they should be muted by the mute list
                        psc->setOwnerUUID(owner_id);
-                        gWorldPointer->mPartSim.addPartSource(psc);
+                        LLViewerPartSim::getInstance()->addPartSource(psc);
                }
                // record last audible utterance
@@ -2242,7 +2239,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                // Look for the start of typing so we can put "..." in the bubbles.
                if (CHAT_TYPE_START == chat.mChatType)
                {
-                        gLocalSpeakerMgr->setSpeakerTyping(from_id, TRUE);
+                        LLLocalSpeakerMgr::getInstance()->setSpeakerTyping(from_id, TRUE);
                        // Might not have the avatar constructed yet, eg on login.
                        if (chatter && chatter->isAvatar())
@@ -2253,7 +2250,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                }
                else if (CHAT_TYPE_STOP == chat.mChatType)
                {
-                        gLocalSpeakerMgr->setSpeakerTyping(from_id, FALSE);
+                        LLLocalSpeakerMgr::getInstance()->setSpeakerTyping(from_id, FALSE);
                        // Might not have the avatar constructed yet, eg on login.
                        if (chatter && chatter->isAvatar())
@@ -2266,7 +2263,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                // We have a real utterance now, so can stop showing "..." and proceed.
                if (chatter && chatter->isAvatar())
                {
-                        gLocalSpeakerMgr->setSpeakerTyping(from_id, FALSE);
+                        LLLocalSpeakerMgr::getInstance()->setSpeakerTyping(from_id, FALSE);
                        ((LLVOAvatar*)chatter)->stopTyping();
                        if (!is_muted && !is_busy)
@@ -2558,10 +2555,10 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
        // Do teleport effect for where you're leaving
        // VEFFECT: TeleportStart
-        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
+        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
        effectp->setPositionGlobal(gAgent.getPositionGlobal());
        effectp->setColor(LLColor4U(gAgent.getEffectColor()));
-        gHUDManager->sendEffects();
+        LLHUDManager::getInstance()->sendEffects();
        U32 location_id;
        U32 sim_ip;
@@ -2597,8 +2594,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
        // Viewer trusts the simulator.
        gMessageSystem->enableCircuit(sim_host, TRUE);
-        if(!gWorldp) return;
+        LLViewerRegion* regionp =  LLWorld::getInstance()->addRegion(region_handle, sim_host);
-        LLViewerRegion* regionp =  gWorldp->addRegion(region_handle, sim_host);
 /*
        // send camera update to new region
@@ -2642,11 +2638,11 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
        // Now do teleport effect for where you're going.
        // VEFFECT: TeleportEnd
-        effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
+        effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
        effectp->setPositionGlobal(gAgent.getPositionGlobal());
        effectp->setColor(LLColor4U(gAgent.getEffectColor()));
-        gHUDManager->sendEffects();
+        LLHUDManager::getInstance()->sendEffects();
 //      gTeleportDisplay = TRUE;
 //      gTeleportDisplayTimer.reset();
@@ -2712,8 +2708,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
        F32 x, y;
        from_region_handle(region_handle, &x, &y);
-        if(!gWorldp) return;
+        LLViewerRegion* regionp = LLWorld::getInstance()->getRegionFromHandle(region_handle);
-        LLViewerRegion* regionp = gWorldp->getRegionFromHandle(region_handle);
        if (!regionp)
        {
                if (gAgent.getRegion())
@@ -2833,13 +2828,8 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
                avatarp->mFootPlane.clearVec();
        }
        
-        // reset always run status
+        // send walk-vs-run status
-        msg->newMessageFast(_PREHASH_SetAlwaysRun);
+        gAgent.sendWalkRun(gAgent.getRunning() || gAgent.getAlwaysRun());
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        msg->addBOOLFast(_PREHASH_AlwaysRun, gAgent.getAlwaysRun());
-        gAgent.sendReliableMessage();
        if (LLFloaterReleaseMsg::checkVersion(version_channel_char))
        {
@@ -2874,8 +2864,7 @@ void process_crossed_region(LLMessageSystem* msg, void**)
        send_complete_agent_movement(sim_host);
-        if(!gWorldp) return;
+        LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host);
-        LLViewerRegion* regionp = gWorldp->addRegion(region_handle, sim_host);
        regionp->setSeedCapability(std::string(seedCap));
 }
@@ -2904,6 +2893,12 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
                return;
        }
+        // no region to send update to
+        if(gAgent.getRegion() == NULL)
+        {
+                return;
+        }
        const F32 TRANSLATE_THRESHOLD = 0.01f;
        // NOTA BENE: This is (intentionally?) using the small angle sine approximation to test for rotation
@@ -2944,7 +2939,7 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
        U8              flag_change = 0;
        cam_center_chg = last_camera_pos_agent - camera_pos_agent;
-        cam_rot_chg = last_camera_at - gCamera->getAtAxis();
+        cam_rot_chg = last_camera_at - LLViewerCamera::getInstance()->getAtAxis();
        // If a modifier key is held down, turn off
        // LBUTTON and ML_LBUTTON so that using the camera (alt-key) doesn't
@@ -3052,9 +3047,9 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 //              }
                
                msg->addVector3Fast(_PREHASH_CameraCenter, camera_pos_agent);
-                msg->addVector3Fast(_PREHASH_CameraAtAxis, gCamera->getAtAxis());
+                msg->addVector3Fast(_PREHASH_CameraAtAxis, LLViewerCamera::getInstance()->getAtAxis());
-                msg->addVector3Fast(_PREHASH_CameraLeftAxis, gCamera->getLeftAxis());
+                msg->addVector3Fast(_PREHASH_CameraLeftAxis, LLViewerCamera::getInstance()->getLeftAxis());
-                msg->addVector3Fast(_PREHASH_CameraUpAxis, gCamera->getUpAxis());
+                msg->addVector3Fast(_PREHASH_CameraUpAxis, LLViewerCamera::getInstance()->getUpAxis());
                msg->addF32Fast(_PREHASH_Far, gAgent.mDrawDistance);
                
                msg->addU32Fast(_PREHASH_ControlFlags, control_flags);
@@ -3089,9 +3084,9 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
                last_head_rot = head_rotation;
                last_render_state = render_state;
                last_camera_pos_agent = camera_pos_agent;
-                last_camera_at = gCamera->getAtAxis();
+                last_camera_at = LLViewerCamera::getInstance()->getAtAxis();
-                last_camera_left = gCamera->getLeftAxis();
+                last_camera_left = LLViewerCamera::getInstance()->getLeftAxis();
-                last_camera_up = gCamera->getUpAxis();
+                last_camera_up = LLViewerCamera::getInstance()->getUpAxis();
                last_control_flags = control_flags;
                last_flags = flags;
        }
@@ -3205,7 +3200,7 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
                        //llinfos << "Kill message for local " << local_id << llendl;
                }
-                gSelectMgr->removeObjectFromSelections(id);
+                LLSelectMgr::getInstance()->removeObjectFromSelections(id);
                // ...don't kill the avatar
                if (!(id == gAgentID))
@@ -3259,8 +3254,7 @@ void process_time_synch(LLMessageSystem *mesgsys, void **user_data)
        mesgsys->getVector3Fast(_PREHASH_TimeInfo, _PREHASH_SunDirection, sun_direction);
        mesgsys->getVector3Fast(_PREHASH_TimeInfo, _PREHASH_SunAngVelocity, sun_ang_velocity);
-        if(!gWorldp) return;
+        LLWorld::getInstance()->setSpaceTimeUSec(space_time_usec);
-        gWorldp->setSpaceTimeUSec(space_time_usec);
        //lldebugs << "time_synch() - " << sun_direction << ", " << sun_ang_velocity
        //               << ", " << phase << llendl;
@@ -3276,8 +3270,6 @@ void process_time_synch(LLMessageSystem *mesgsys, void **user_data)
 void process_sound_trigger(LLMessageSystem *msg, void **)
 {
        if (!gAudiop) return;
-        if (!gParcelMgr) return;
-        if (!gMuteListp) return;
        U64             region_handle = 0;
        F32             gain = 0;
@@ -3303,17 +3295,17 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
        // Don't play a trigger sound if you can't hear it due
        // to parcel "local audio only" settings.
-        if (!gParcelMgr->canHearSound(pos_global)) return;
+        if (!LLViewerParcelMgr::getInstance()->canHearSound(pos_global)) return;
        // Don't play sounds triggered by someone you muted.
-        if (gMuteListp->isMuted(owner_id, LLMute::flagObjectSounds)) return;
+        if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
        
        // Don't play sounds from an object you muted
-        if (gMuteListp->isMuted(object_id)) return;
+        if (LLMuteList::getInstance()->isMuted(object_id)) return;
        // Don't play sounds from an object whose parent you muted
        if (parent_id.notNull()
-                && gMuteListp->isMuted(parent_id))
+                && LLMuteList::getInstance()->isMuted(parent_id))
        {
                return;
        }
@@ -3340,8 +3332,8 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
        LLViewerObject *objectp = gObjectList.findObject(object_id);
        if (!objectp) return;
-        if (gMuteListp->isMuted(object_id)) return;
+        if (LLMuteList::getInstance()->isMuted(object_id)) return;
-        if (gMuteListp->isMuted(owner_id, LLMute::flagObjectSounds)) return;
+        if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
        
        LLAudioSource *sourcep = objectp->getAudioSource(owner_id);
        if (!sourcep) return;
@@ -3377,9 +3369,9 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
                return;
        }
        
-        if (gMuteListp->isMuted(object_id)) return;
+        if (LLMuteList::getInstance()->isMuted(object_id)) return;
        
-        if (gMuteListp->isMuted(owner_id, LLMute::flagObjectSounds)) return;
+        if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
        objectp->setAttachedSound(sound_id, owner_id, gain, flags);
 }
@@ -3430,73 +3422,91 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
                switch (stat_id)
                {
                case LL_SIM_STAT_TIME_DILATION:
-                        gViewerStats->mSimTimeDilation.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimTimeDilation.addValue(stat_value);
                        break;
                case LL_SIM_STAT_FPS:
-                        gViewerStats->mSimFPS.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimFPS.addValue(stat_value);
                        break;
                case LL_SIM_STAT_PHYSFPS:
-                        gViewerStats->mSimPhysicsFPS.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimPhysicsFPS.addValue(stat_value);
                        break;
                case LL_SIM_STAT_AGENTUPS:
-                        gViewerStats->mSimAgentUPS.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimAgentUPS.addValue(stat_value);
                        break;
                case LL_SIM_STAT_FRAMEMS:
-                        gViewerStats->mSimFrameMsec.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimFrameMsec.addValue(stat_value);
                        break;
                case LL_SIM_STAT_NETMS:
-                        gViewerStats->mSimNetMsec.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimNetMsec.addValue(stat_value);
                        break;
                case LL_SIM_STAT_SIMOTHERMS:
-                        gViewerStats->mSimSimOtherMsec.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimSimOtherMsec.addValue(stat_value);
                        break;
                case LL_SIM_STAT_SIMPHYSICSMS:
-                        gViewerStats->mSimSimPhysicsMsec.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimSimPhysicsMsec.addValue(stat_value);
                        break;
                case LL_SIM_STAT_AGENTMS:
-                        gViewerStats->mSimAgentMsec.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimAgentMsec.addValue(stat_value);
                        break;
                case LL_SIM_STAT_IMAGESMS:
-                        gViewerStats->mSimImagesMsec.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimImagesMsec.addValue(stat_value);
                        break;
                case LL_SIM_STAT_SCRIPTMS:
-                        gViewerStats->mSimScriptMsec.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimScriptMsec.addValue(stat_value);
                        break;
                case LL_SIM_STAT_NUMTASKS:
-                        gViewerStats->mSimObjects.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimObjects.addValue(stat_value);
                        break;
                case LL_SIM_STAT_NUMTASKSACTIVE:
-                        gViewerStats->mSimActiveObjects.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimActiveObjects.addValue(stat_value);
                        break;
                case LL_SIM_STAT_NUMAGENTMAIN:
-                        gViewerStats->mSimMainAgents.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimMainAgents.addValue(stat_value);
                        break;
                case LL_SIM_STAT_NUMAGENTCHILD:
-                        gViewerStats->mSimChildAgents.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimChildAgents.addValue(stat_value);
                        break;
                case LL_SIM_STAT_NUMSCRIPTSACTIVE:
-                        gViewerStats->mSimActiveScripts.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimActiveScripts.addValue(stat_value);
                        break;
                case LL_SIM_STAT_LSLIPS:
-                        gViewerStats->mSimLSLIPS.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimLSLIPS.addValue(stat_value);
                        break;
                case LL_SIM_STAT_INPPS:
-                        gViewerStats->mSimInPPS.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimInPPS.addValue(stat_value);
                        break;
                case LL_SIM_STAT_OUTPPS:
-                        gViewerStats->mSimOutPPS.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimOutPPS.addValue(stat_value);
                        break;
                case LL_SIM_STAT_PENDING_DOWNLOADS:
-                        gViewerStats->mSimPendingDownloads.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimPendingDownloads.addValue(stat_value);
                        break;
                case LL_SIM_STAT_PENDING_UPLOADS:
-                        gViewerStats->mSimPendingUploads.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimPendingUploads.addValue(stat_value);
                        break;
                case LL_SIM_STAT_PENDING_LOCAL_UPLOADS:
-                        gViewerStats->mSimPendingLocalUploads.addValue(stat_value);
+                        LLViewerStats::getInstance()->mSimPendingLocalUploads.addValue(stat_value);
                        break;
                case LL_SIM_STAT_TOTAL_UNACKED_BYTES:
-                        gViewerStats->mSimTotalUnackedBytes.addValue(stat_value / 1024.f);
+                        LLViewerStats::getInstance()->mSimTotalUnackedBytes.addValue(stat_value / 1024.f);
+                        break;
+                case LL_SIM_STAT_PHYSICS_PINNED_TASKS:
+                        LLViewerStats::getInstance()->mPhysicsPinnedTasks.addValue(stat_value);
+                        break;
+                case LL_SIM_STAT_PHYSICS_LOD_TASKS:
+                        LLViewerStats::getInstance()->mPhysicsLODTasks.addValue(stat_value);
+                        break;
+                case LL_SIM_STAT_SIMPHYSICSSTEPMS:
+                        LLViewerStats::getInstance()->mSimSimPhysicsStepMsec.addValue(stat_value);
+                        break;
+                case LL_SIM_STAT_SIMPHYSICSSHAPEMS:
+                        LLViewerStats::getInstance()->mSimSimPhysicsShapeUpdateMsec.addValue(stat_value);
+                        break;
+                case LL_SIM_STAT_SIMPHYSICSOTHERMS:
+                        LLViewerStats::getInstance()->mSimSimPhysicsOtherMsec.addValue(stat_value);
+                        break;
+                case LL_SIM_STAT_SIMPHYSICSMEMORY:
+                        LLViewerStats::getInstance()->mPhysicsMemoryAllocated.addValue(stat_value);
                        break;
                default:
 //                      llwarns << "Unknown stat id" << stat_id << llendl;
@@ -3506,7 +3516,7 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
        /*
        msg->getF32Fast(_PREHASH_Statistics, _PREHASH_PhysicsTimeDilation, time_dilation);
-        gViewerStats->mSimTDStat.addValue(time_dilation);
+        LLViewerStats::getInstance()->mSimTDStat.addValue(time_dilation);
        // Process information
        //      {       CpuUsage                        F32                             }
@@ -3521,9 +3531,9 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
        msg->getF32Fast(_PREHASH_Statistics, _PREHASH_SimMemTotal, sim_mem_total);
        msg->getF32Fast(_PREHASH_Statistics, _PREHASH_SimMemRSS, sim_mem_rss);
        msg->getF32Fast(_PREHASH_Statistics, _PREHASH_ProcessUptime, process_uptime);
-        gViewerStats->mSimCPUUsageStat.addValue(cpu_usage);
+        LLViewerStats::getInstance()->mSimCPUUsageStat.addValue(cpu_usage);
-        gViewerStats->mSimMemTotalStat.addValue(sim_mem_total);
+        LLViewerStats::getInstance()->mSimMemTotalStat.addValue(sim_mem_total);
-        gViewerStats->mSimMemRSSStat.addValue(sim_mem_rss);
+        LLViewerStats::getInstance()->mSimMemRSSStat.addValue(sim_mem_rss);
        */
        //
@@ -3951,7 +3961,7 @@ void process_time_dilation(LLMessageSystem *msg, void **user_data)
        // get the pointer to the right region
        U32 ip = msg->getSenderIP();
        U32 port = msg->getSenderPort();
-        LLViewerRegion *regionp = gWorldp->getRegion(ip, port);
+        LLViewerRegion *regionp = LLWorld::getInstance()->getRegion(ip, port);
        if (regionp)
        {
                regionp->setTimeDilation(time_dilation);
@@ -4051,7 +4061,7 @@ void process_alert_core(const std::string& message, BOOL modal)
        // HACK -- handle callbacks for specific alerts
        if ( message == "You died and have been teleported to your home location")
        {
-                gViewerStats->incStat(LLViewerStats::ST_KILLED_COUNT);
+                LLViewerStats::getInstance()->incStat(LLViewerStats::ST_KILLED_COUNT);
        }
        else if( message == "Home position set." )
        {
@@ -4059,7 +4069,7 @@ void process_alert_core(const std::string& message, BOOL modal)
                LLString snap_filename = gDirUtilp->getLindenUserDir();
                snap_filename += gDirUtilp->getDirDelimiter();
                snap_filename += SCREEN_HOME_FILENAME;
-                gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidth(), gViewerWindow->getWindowHeight(), FALSE, FALSE);
+                gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, FALSE);
        }
        const std::string ALERT_PREFIX("ALERT: ");
@@ -4239,9 +4249,9 @@ void process_frozen_message(LLMessageSystem *msgsystem, void **user_data)
 // do some extra stuff once we get our economy data
 void process_economy_data(LLMessageSystem *msg, void** /*user_data*/)
 {
-        LLGlobalEconomy::processEconomyData(msg, (void**)gGlobalEconomy);
+        LLGlobalEconomy::processEconomyData(msg, LLGlobalEconomy::Singleton::getInstance());
-        S32 upload_cost = gGlobalEconomy->getPriceUpload();
+        S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
        LLFloaterImagePreview::setUploadAmount(upload_cost);
        gMenuHolder->childSetLabelArg("Upload Image", "[COST]", llformat("%d", upload_cost));
@@ -4415,7 +4425,7 @@ void script_question_cb(S32 option, void* user_data)
        if ( option == 2 ) // mute
        {
-                gMuteListp->add(LLMute(cbdata->mItemID, cbdata->mObjectName, LLMute::OBJECT));
+                LLMuteList::getInstance()->add(LLMute(cbdata->mItemID, cbdata->mObjectName, LLMute::OBJECT));
                // purge the message queue of any previously queued requests from the same source. DEV-4879
                class OfferMatcher : public LLNotifyBoxView::Matcher
@@ -4455,7 +4465,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
        msg->getS32Fast(_PREHASH_Data, _PREHASH_Questions, questions );
        // don't display permission requests if this object is muted - JS.
-        if (gMuteListp->isMuted(taskid)) return;
+        if (LLMuteList::getInstance()->isMuted(taskid)) return;
        // throttle excessive requests from any specific user's scripts
        LLString throttle_owner_name = owner_name;
@@ -5085,7 +5095,7 @@ void callback_load_url_name(const LLUUID& id, const char* first, const char* las
                        }
                        // For legacy name-only mutes.
-                        if (gMuteListp->isMuted(LLUUID::null, owner_name))
+                        if (LLMuteList::getInstance()->isMuted(LLUUID::null, owner_name))
                        {
                                delete infop;
                                infop = NULL;
@@ -5119,10 +5129,8 @@ void process_load_url(LLMessageSystem* msg, void**)
        // URL is safety checked in load_url above
        // Check if object or owner is muted
-        if (gMuteListp &&
+        if (LLMuteList::getInstance()->isMuted(infop->mObjectID, infop->mObjectName) ||
-            (gMuteListp->isMuted(infop->mObjectID, infop->mObjectName) ||
+            LLMuteList::getInstance()->isMuted(infop->mOwnerID))
-             gMuteListp->isMuted(infop->mOwnerID))
-            )
        {
                llinfos<<"Ignoring load_url from muted object/owner."<<llendl;
                delete infop;
@@ -5184,8 +5192,11 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
        msg->getVector3("Data", "SimPosition", pos);
        msg->getVector3("Data", "LookAt", look_at);
-        gFloaterWorldMap->trackURL(sim_name, (U32)pos.mV[VX], (U32)pos.mV[VY], (U32)pos.mV[VZ]);
+        // gFloaterWorldMap->trackURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]);
-        LLFloaterWorldMap::show(NULL, TRUE);
+        // LLFloaterWorldMap::show(NULL, TRUE);
+        LLURLDispatcher::dispatch(LLURLDispatcher::buildSLURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]), FALSE);
+        
 }
 void process_covenant_reply(LLMessageSystem* msg, void**)
@@ -5323,10 +5334,7 @@ void onCovenantLoadComplete(LLVFS *vfs,
        }
        else
        {
-                if( gViewerStats )
+                LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                {
-                        gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                }
                
                if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
                    LL_ERR_FILE_EMPTY == status)
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index bca7415..d6e92c2 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -114,10 +114,5 @@ LLGridData gGridInfo[GRID_INFO_COUNT] =
 // Use this to figure out which domain name and login URI to use.
 EGridInfo gGridChoice = GRID_INFO_NONE;
-char gGridName[MAX_STRING];             /* Flawfinder: ignore */
+LLString gGridName;             /* Flawfinder: ignore */
-F32 gPacketDropPercentage = 0.f;
-F32 gInBandwidth = 0.f;
-F32 gOutBandwidth = 0.f;
 unsigned char gMACAddress[MAC_ADDRESS_BYTES];           /* Flawfinder: ignore */
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 87678f6..176ce43 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -55,7 +55,7 @@ enum EGridInfo
        GRID_INFO_VAAK,
        GRID_INFO_YAMI,
        GRID_INFO_LOCAL,
-        GRID_INFO_OTHER, // IP address set via -user or other command line option
+        GRID_INFO_OTHER, // IP address set via command line option
        GRID_INFO_COUNT
 };
@@ -68,12 +68,9 @@ struct LLGridData
        const char* mHelperURI;
 };
-extern F32 gPacketDropPercentage;
-extern F32 gInBandwidth;
-extern F32 gOutBandwidth;
 extern EGridInfo gGridChoice;
 extern LLGridData gGridInfo[];
-extern char gGridName[MAX_STRING];              /* Flawfinder: ignore */
+extern LLString gGridName;              /* Flawfinder: ignore */
 const S32 MAC_ADDRESS_BYTES = 6;
 extern unsigned char gMACAddress[MAC_ADDRESS_BYTES];            /* Flawfinder: ignore */
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 55210ad..057e2d9 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -67,7 +67,7 @@
 #include "llfollowcam.h"
 #include "llnetmap.h"
 #include "llselectmgr.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "lltooldraganddrop.h"
 #include "llviewercamera.h"
 #include "llviewerimagelist.h"
@@ -202,7 +202,7 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
 {
        llassert(mRegionp);
-        LLPrimitive::init(pcode);
+        LLPrimitive::init_primitive(pcode);
        // CP: added 12/2/2005 - this was being initialised to 0, not the current frame time
        mLastInterpUpdateSecs = LLFrameTimer::getElapsedSeconds();
@@ -549,9 +549,9 @@ void LLViewerObject::removeChild(LLViewerObject *childp)
        
        if (childp->isSelected())
        {
-                gSelectMgr->deselectObjectAndFamily(childp);
+                LLSelectMgr::getInstance()->deselectObjectAndFamily(childp);
                BOOL add_to_end = TRUE;
-                gSelectMgr->selectObjectAndFamily(childp, add_to_end);
+                LLSelectMgr::getInstance()->selectObjectAndFamily(childp, add_to_end);
        }
 }
@@ -686,7 +686,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
        // Coordinates of objects on simulators are region-local.
        U64 region_handle;
        mesgsys->getU64Fast(_PREHASH_RegionData, _PREHASH_RegionHandle, region_handle);
-        mRegionp = gWorldPointer->getRegionFromHandle(region_handle);
+        mRegionp = LLWorld::getInstance()->getRegionFromHandle(region_handle);
        if (!mRegionp)
        {
                U32 x, y;
@@ -711,9 +711,9 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
        U16 valswizzle[4];
 #endif
        U16     *val;
-        const F32 size = gWorldPointer->getRegionWidthInMeters();       
+        const F32 size = LLWorld::getInstance()->getRegionWidthInMeters();      
-        const F32 MAX_HEIGHT = gWorldPointer->getRegionMaxHeight();
+        const F32 MAX_HEIGHT = LLWorld::getInstance()->getRegionMaxHeight();
-        const F32 MIN_HEIGHT = gWorldPointer->getRegionMinHeight();
+        const F32 MIN_HEIGHT = LLWorld::getInstance()->getRegionMinHeight();
        S32 length;
        S32     count;
        S32 this_update_precision = 32;         // in bits
@@ -723,6 +723,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
        LLVector3 new_vel;
        LLVector3 new_acc;
        LLVector3 new_angv;
+        LLVector3 old_angv = getAngularVelocity();
        LLQuaternion new_rot;
        LLVector3 new_scale = getScale();
@@ -1857,7 +1858,8 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                }
        }
-        if (new_rot != mLastRot)
+        if (new_rot != mLastRot
+                || new_angv != old_angv)
        {
                mLastRot = new_rot;
                setChanged(ROTATED | SILHOUETTE);
@@ -1920,7 +1922,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
        if (needs_refresh)
        {
-                gSelectMgr->updateSelectionCenter();
+                LLSelectMgr::getInstance()->updateSelectionCenter();
                dialog_refresh_all();
        } 
@@ -1974,7 +1976,7 @@ BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                F32 dt_raw = (F32)(time - mLastInterpUpdateSecs);
                F32 dt = mTimeDilation * dt_raw;
-                if (!mUserSelected && !mJointInfo)
+                if (!mJointInfo)
                {
                        applyAngularVelocity(dt);
                }
@@ -2060,9 +2062,9 @@ BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                else
                {
                        // linear motion
-                        // HAVOK_TIMESTEP is used below to correct for the fact that the velocity in object
+                        // PHYSICS_TIMESTEP is used below to correct for the fact that the velocity in object
                        // updates represents the average velocity of the last timestep, rather than the final velocity.
-                        // the time dilation above should guarrantee that dt is never less than HAVOK_TIMESTEP, theoretically
+                        // the time dilation above should guarantee that dt is never less than PHYSICS_TIMESTEP, theoretically
                        // 
                        // There is a problem here if dt is negative. . .
@@ -2074,7 +2076,7 @@ BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                        
                        if (!(accel.isExactlyZero() && vel.isExactlyZero()))
                        {
-                                LLVector3 pos   = (vel + (0.5f * (dt-HAVOK_TIMESTEP)) * accel) * dt;    
+                                LLVector3 pos   = (vel + (0.5f * (dt-PHYSICS_TIMESTEP)) * accel) * dt;  
                        
                                // region local  
                                setPositionRegion(pos + getPositionRegion());
@@ -2180,7 +2182,7 @@ void LLViewerObject::doUpdateInventory(
                // make sure that the serial number does not match.
                deleteInventoryItem(item_id);
                LLPermissions perm(item->getPermissions());
-                LLPermissions* obj_perm = gSelectMgr->findObjectPermissions(this);
+                LLPermissions* obj_perm = LLSelectMgr::getInstance()->findObjectPermissions(this);
                bool is_atomic = ((S32)LLAssetType::AT_OBJECT == item->getType()) ? false : true;
                if(obj_perm)
                {
@@ -2717,19 +2719,19 @@ void LLViewerObject::setPixelAreaAndAngle(LLAgent &agent)
        if (range < 0.001f || isHUDAttachment())                // range == zero
        {
                mAppAngle = 180.f;
-                mPixelArea = (F32)gCamera->getScreenPixelArea();
+                mPixelArea = (F32)LLViewerCamera::getInstance()->getScreenPixelArea();
        }
        else
        {
                mAppAngle = (F32) atan2( max_scale, range) * RAD_TO_DEG;
-                F32 pixels_per_meter = gCamera->getPixelMeterRatio() / range;
+                F32 pixels_per_meter = LLViewerCamera::getInstance()->getPixelMeterRatio() / range;
                mPixelArea = (pixels_per_meter * max_scale) * (pixels_per_meter * mid_scale);
-                if (mPixelArea > gCamera->getScreenPixelArea())
+                if (mPixelArea > LLViewerCamera::getInstance()->getScreenPixelArea())
                {
                        mAppAngle = 180.f;
-                        mPixelArea = (F32)gCamera->getScreenPixelArea();
+                        mPixelArea = (F32)LLViewerCamera::getInstance()->getScreenPixelArea();
                }
        }
 }
@@ -3526,36 +3528,21 @@ void LLViewerObject::sendRotationUpdate() const
        gMessageSystem->sendReliable( regionp->getHost() );
 }
-// formerly send_object_position_global
+/* Obsolete, we use MultipleObjectUpdate instead
-void LLViewerObject::sendPositionUpdate() const
+//// formerly send_object_position_global
-{
+//void LLViewerObject::sendPositionUpdate() const
-        gMessageSystem->newMessageFast(_PREHASH_ObjectPosition);
+//{
-        gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+//      gMessageSystem->newMessageFast(_PREHASH_ObjectPosition);
-        gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+//      gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-        gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+//      gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-        gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
+//      gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID,      mLocalID );
+//      gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-        gMessageSystem->addVector3Fast(_PREHASH_Position, getPositionRegion());
+//      gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID,      mLocalID );
-        LLViewerRegion* regionp = getRegion();
+//      gMessageSystem->addVector3Fast(_PREHASH_Position, getPositionRegion());
-        gMessageSystem->sendReliable(regionp->getHost());
+//      LLViewerRegion* regionp = getRegion();
-}
+//      gMessageSystem->sendReliable(regionp->getHost());
+//}
+*/
-//formerly send_object_scale
-void LLViewerObject::sendScaleUpdate()
-{
-        gMessageSystem->newMessageFast(_PREHASH_ObjectScale);
-        gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-        gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-        gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-        gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID,      mLocalID );
-        gMessageSystem->addVector3Fast(_PREHASH_Scale,  (getScale()));
-        LLViewerRegion *regionp = getRegion();
-        gMessageSystem->sendReliable(regionp->getHost() );
-}
 //formerly send_object_shape(LLViewerObject *object)
 void LLViewerObject::sendShapeUpdate()
@@ -4100,7 +4087,7 @@ void LLViewerObject::unpackParticleSource(const S32 block_num, const LLUUID& own
        {
                LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::unpackPSS(this, NULL, block_num);
                //If the owner is muted, don't create the system
-                if(gMuteListp->isMuted(owner_id, LLMute::flagParticles)) return;
+                if(LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagParticles)) return;
                // We need to be able to deal with a particle source that hasn't changed, but still got an update!
                if (pss)
@@ -4108,7 +4095,7 @@ void LLViewerObject::unpackParticleSource(const S32 block_num, const LLUUID& own
 //                      llinfos << "Making particle system with owner " << owner_id << llendl;
                        pss->setOwnerUUID(owner_id);
                        mPartSourcep = pss;
-                        gWorldPointer->mPartSim.addPartSource(pss);
+                        LLViewerPartSim::getInstance()->addPartSource(pss);
                }
        }
        if (mPartSourcep)
@@ -4118,8 +4105,7 @@ void LLViewerObject::unpackParticleSource(const S32 block_num, const LLUUID& own
                        LLViewerImage* image;
                        if (mPartSourcep->mPartSysData.mPartImageID == LLUUID::null)
                        {
-                                LLUUID id(gViewerArt.getString("pixiesmall.tga"));
+                                image = gImageList.getImageFromFile("pixiesmall.j2c");
-                                image = gImageList.getImage(id);
                        }
                        else
                        {
@@ -4149,14 +4135,14 @@ void LLViewerObject::unpackParticleSource(LLDataPacker &dp, const LLUUID& owner_
        {
                LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::unpackPSS(this, NULL, dp);
                //If the owner is muted, don't create the system
-                if(gMuteListp->isMuted(owner_id, LLMute::flagParticles)) return;
+                if(LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagParticles)) return;
                // We need to be able to deal with a particle source that hasn't changed, but still got an update!
                if (pss)
                {
 //                      llinfos << "Making particle system with owner " << owner_id << llendl;
                        pss->setOwnerUUID(owner_id);
                        mPartSourcep = pss;
-                        gWorldPointer->mPartSim.addPartSource(pss);
+                        LLViewerPartSim::getInstance()->addPartSource(pss);
                }
        }
        if (mPartSourcep)
@@ -4166,8 +4152,7 @@ void LLViewerObject::unpackParticleSource(LLDataPacker &dp, const LLUUID& owner_
                        LLViewerImage* image;
                        if (mPartSourcep->mPartSysData.mPartImageID == LLUUID::null)
                        {
-                                LLUUID id(gViewerArt.getString("pixiesmall.tga"));
+                                image = gImageList.getImageFromFile("pixiesmall.j2c");
-                                image = gImageList.getImage(id);
                        }
                        else
                        {
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index 329ef6a..316e8db 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -268,7 +268,6 @@ public:
        void setPositionAgent(const LLVector3 &pos_agent, BOOL damped = FALSE);
        void setPositionParent(const LLVector3 &pos_parent, BOOL damped = FALSE);
        void setPositionAbsoluteGlobal( const LLVector3d &pos_global, BOOL damped = FALSE );
-        void sendPositionUpdate() const;
        virtual const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const             { return xform->getWorldMatrix(); }
@@ -303,7 +302,6 @@ public:
        void sendTEUpdate() const;                      // Sends packed representation of all texture entry information
        
        virtual void setScale(const LLVector3 &scale, BOOL damped = FALSE);
-        void sendScaleUpdate();
        void sendShapeUpdate();
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 612baf1..9b1548f 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -235,11 +235,11 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
                && update_type != OUT_TERSE_IMPROVED 
                && objectp->mCreateSelected)
        {
-                if ( gToolMgr->getCurrentTool() != gToolPie )
+                if ( LLToolMgr::getInstance()->getCurrentTool() != LLToolPie::getInstance() )
                {
                        //llinfos << "DEBUG selecting " << objectp->mID << " " 
                        //              << objectp->mLocalID << llendl;
-                        gSelectMgr->selectObjectAndFamily(objectp);
+                        LLSelectMgr::getInstance()->selectObjectAndFamily(objectp);
                        dialog_refresh_all();
                }
@@ -302,7 +302,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
        U64 region_handle;
        mesgsys->getU64Fast(_PREHASH_RegionData, _PREHASH_RegionHandle, region_handle);
-        LLViewerRegion *regionp = gWorldPointer->getRegionFromHandle(region_handle);
+        LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(region_handle);
        if (!regionp)
        {
@@ -585,7 +585,7 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
                        return true;
                }
        } func;
-        gSelectMgr->getSelection()->applyToRootObjects(&func);
+        LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func);
        // Iterate through some of the objects and lazy update their texture priorities
        for (i = mCurLazyUpdateIndex; i < max_value; i++)
@@ -710,7 +710,7 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
        // don't factor frames that were paused into the stats
        if (! mWasPaused)
        {
-                gViewerStats->updateFrameStats(time_diff);
+                LLViewerStats::getInstance()->updateFrameStats(time_diff);
        }
        /*
@@ -996,7 +996,7 @@ void LLViewerObjectList::shiftObjects(const LLVector3 &offset)
        }
        gPipeline.shiftObjects(offset);
-        gWorldp->shiftRegions(offset);
+        LLWorld::getInstance()->shiftRegions(offset);
 }
 void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
@@ -1023,7 +1023,7 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
                const LLVector3& scale = objectp->getScale();
                const LLVector3d pos = objectp->getPositionGlobal();
                const F64 water_height = F64( objectp->getRegion()->getWaterHeight() );
-                // gWorldPointer->getWaterHeight();
+                // LLWorld::getInstance()->getWaterHeight();
                F32 approx_radius = (scale.mV[VX] + scale.mV[VY]) * 0.5f * 0.5f * 1.3f;  // 1.3 is a fudge
@@ -1097,8 +1097,8 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce
                std::vector<LLDrawable*> pick_drawables;
-                for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
+                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
                {
                        LLViewerRegion* region = *iter;
                        for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
@@ -1491,12 +1491,12 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port)
        if (orphans_found && objectp->isSelected())
        {
-                LLSelectNode* nodep = gSelectMgr->getSelection()->findNode(objectp);
+                LLSelectNode* nodep = LLSelectMgr::getInstance()->getSelection()->findNode(objectp);
                if (nodep && !nodep->mIndividualSelection)
                {
                        // rebuild selection with orphans
-                        gSelectMgr->deselectObjectAndFamily(objectp);
+                        LLSelectMgr::getInstance()->deselectObjectAndFamily(objectp);
-                        gSelectMgr->selectObjectAndFamily(objectp);
+                        LLSelectMgr::getInstance()->selectObjectAndFamily(objectp);
                }
        }
 }
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index 9180fb2..187a553 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -295,7 +295,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg
                        }
                        else
                        {
-                                LLParcel *parcel = gParcelMgr->getAgentParcel();
+                                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                                play(parcel);
                        }
                }
@@ -311,7 +311,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg
        {
                if(! LLViewerMedia::hasMedia())
                {
-                        LLParcel *parcel = gParcelMgr->getAgentParcel();
+                        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                        play(parcel);
                }
                seek(time);
@@ -346,7 +346,7 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
                msg->getS32("DataBlockExtended", "MediaHeight", media_height);
        }
-        LLParcel *parcel = gParcelMgr->getAgentParcel();
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
        BOOL same = FALSE;
        if (parcel)
        {
diff --git a/linden/indra/newview/llviewerparcelmediaautoplay.cpp b/linden/indra/newview/llviewerparcelmediaautoplay.cpp
index 854ba24..3b50060 100644
--- a/linden/indra/newview/llviewerparcelmediaautoplay.cpp
+++ b/linden/indra/newview/llviewerparcelmediaautoplay.cpp
@@ -84,10 +84,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick()
        LLUUID this_media_texture_id;
        S32 this_parcel_id = 0;
-        if (gParcelMgr)
+        this_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-        {
-                this_parcel = gParcelMgr->getAgentParcel();
-        }
        if (this_parcel)
        {
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index ddc67d0..b151802 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -74,7 +74,6 @@ const F32 PARCEL_COLLISION_DRAW_SECS = 1.f;
 // Globals
-LLViewerParcelMgr *gParcelMgr = NULL;
 U8* LLViewerParcelMgr::sPackedOverlay = NULL;
@@ -139,11 +138,8 @@ LLViewerParcelMgr::LLViewerParcelMgr()
        mCollisionSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)];
        resetSegments(mCollisionSegments);
-        mBlockedImageID.set(gViewerArt.getString("noentrylines.tga"));
+        mBlockedImage = gImageList.getImageFromFile("noentrylines.j2c");
-        sBlockedImage = gImageList.getImage(mBlockedImageID, TRUE, TRUE);
+        mPassImage = gImageList.getImageFromFile("noentrypasslines.j2c");
-        mPassImageID.set(gViewerArt.getString("noentrypasslines.tga"));
-        sPassImage = gImageList.getImage(mPassImageID, TRUE, TRUE);
        S32 overlay_size = mParcelsPerEdge * mParcelsPerEdge / PARCEL_OVERLAY_CHUNKS;
        sPackedOverlay = new U8[overlay_size];
@@ -217,9 +213,7 @@ void LLViewerParcelMgr::dump()
 LLViewerRegion* LLViewerParcelMgr::getSelectionRegion()
 {
-        if (!gWorldp) return NULL;
+        return LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
-        return gWorldp->getRegionFromPosGlobal( mWestSouth );
 }
@@ -436,11 +430,6 @@ LLParcelSelectionHandle LLViewerParcelMgr::selectParcelInRectangle()
 void LLViewerParcelMgr::selectCollisionParcel()
 {
-        if (!gWorldp)
-        {
-                return;
-        }
        // BUG: Claim to be in the agent's region
        mWestSouth = gAgent.getRegion()->getOriginGlobal();
        mEastNorth = mWestSouth;
@@ -483,11 +472,6 @@ void LLViewerParcelMgr::selectCollisionParcel()
 LLParcelSelectionHandle LLViewerParcelMgr::selectLand(const LLVector3d &corner1, const LLVector3d &corner2,
                                                                   BOOL snap_selection)
 {
-        if (!gWorldp)
-        {
-                return NULL;
-        }
        sanitize_corners( corner1, corner2, mWestSouth, mEastNorth );
        // ...x isn't more than one meter away
@@ -515,8 +499,8 @@ LLParcelSelectionHandle LLViewerParcelMgr::selectLand(const LLVector3d &corner1,
        east_north_region_check.mdV[VX] -= 0.5;
        east_north_region_check.mdV[VY] -= 0.5;
-        LLViewerRegion *region = gWorldp->getRegionFromPosGlobal(mWestSouth);
+        LLViewerRegion *region = LLWorld::getInstance()->getRegionFromPosGlobal(mWestSouth);
-        LLViewerRegion *region_other = gWorldp->getRegionFromPosGlobal( east_north_region_check );
+        LLViewerRegion *region_other = LLWorld::getInstance()->getRegionFromPosGlobal( east_north_region_check );
        if(!region)
        {
@@ -689,8 +673,7 @@ F32 LLViewerParcelMgr::agentDrawDistance() const
 BOOL LLViewerParcelMgr::isOwnedAt(const LLVector3d& pos_global) const
 {
-        if (!gWorldp) return FALSE;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( pos_global );
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal( pos_global );
        if (!region) return FALSE;
        LLViewerParcelOverlay* overlay = region->getParcelOverlay();
@@ -703,8 +686,7 @@ BOOL LLViewerParcelMgr::isOwnedAt(const LLVector3d& pos_global) const
 BOOL LLViewerParcelMgr::isOwnedSelfAt(const LLVector3d& pos_global) const
 {
-        if (!gWorldp) return FALSE;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( pos_global );
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal( pos_global );
        if (!region) return FALSE;
        LLViewerParcelOverlay* overlay = region->getParcelOverlay();
@@ -717,8 +699,7 @@ BOOL LLViewerParcelMgr::isOwnedSelfAt(const LLVector3d& pos_global) const
 BOOL LLViewerParcelMgr::isOwnedOtherAt(const LLVector3d& pos_global) const
 {
-        if (!gWorldp) return FALSE;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( pos_global );
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal( pos_global );
        if (!region) return FALSE;
        LLViewerParcelOverlay* overlay = region->getParcelOverlay();
@@ -731,8 +712,7 @@ BOOL LLViewerParcelMgr::isOwnedOtherAt(const LLVector3d& pos_global) const
 BOOL LLViewerParcelMgr::isSoundLocal(const LLVector3d& pos_global) const
 {
-        if (!gWorldp) return FALSE;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( pos_global );
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal( pos_global );
        if (!region) return FALSE;
        LLViewerParcelOverlay* overlay = region->getParcelOverlay();
@@ -754,12 +734,12 @@ BOOL LLViewerParcelMgr::canHearSound(const LLVector3d &pos_global) const
        }
        else
        {
-                if (gParcelMgr->getAgentParcel()->getSoundLocal())
+                if (LLViewerParcelMgr::getInstance()->getAgentParcel()->getSoundLocal())
                {
                        // Not in same parcel, and agent parcel only has local sound
                        return FALSE;
                }
-                else if (gParcelMgr->isSoundLocal(pos_global))
+                else if (LLViewerParcelMgr::getInstance()->isSoundLocal(pos_global))
                {
                        // Not in same parcel, and target parcel only has local sound
                        return FALSE;
@@ -775,8 +755,7 @@ BOOL LLViewerParcelMgr::canHearSound(const LLVector3d &pos_global) const
 BOOL LLViewerParcelMgr::inAgentParcel(const LLVector3d &pos_global) const
 {
-        if (!gWorldp) return FALSE;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal(pos_global);
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal(pos_global);
        if (region != gAgent.getRegion())
        {
                // Can't be in the agent parcel if you're not in the same region.
@@ -833,8 +812,7 @@ void LLViewerParcelMgr::render()
        {
                // Rendering is done in agent-coordinates, so need to supply
                // an appropriate offset to the render code.
-                if (!gWorldp) return;
+                LLViewerRegion* regionp = LLWorld::getInstance()->getRegionFromPosGlobal(mWestSouth);
-                LLViewerRegion* regionp = gWorldp->getRegionFromPosGlobal(mWestSouth);
                if (!regionp) return;
                renderHighlightSegments(mHighlightSegments, regionp);
@@ -866,8 +844,7 @@ void LLViewerParcelMgr::sendParcelAccessListRequest(U32 flags)
                return;
        }
-        if(!gWorldp) return;
+        LLViewerRegion *region = LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
-        LLViewerRegion *region = gWorldp->getRegionFromPosGlobal( mWestSouth );
        if (!region) return;
        LLMessageSystem *msg = gMessageSystem;
@@ -902,8 +879,7 @@ void LLViewerParcelMgr::sendParcelDwellRequest()
                return;
        }
-        if(!gWorldp) return;
+        LLViewerRegion *region = LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
-        LLViewerRegion *region = gWorldp->getRegionFromPosGlobal( mWestSouth );
        if (!region) return;
        LLMessageSystem *msg = gMessageSystem;
@@ -935,8 +911,7 @@ void LLViewerParcelMgr::sendParcelGodForceOwner(const LLUUID& owner_id)
        east_north_region_check.mdV[VX] -= 0.5;
        east_north_region_check.mdV[VY] -= 0.5;
-        if(!gWorldp) return;
+        LLViewerRegion *region = LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
-        LLViewerRegion *region = gWorldp->getRegionFromPosGlobal( mWestSouth );
        if (!region)
        {
                // TODO: Add a force owner version of this alert.
@@ -945,7 +920,7 @@ void LLViewerParcelMgr::sendParcelGodForceOwner(const LLUUID& owner_id)
        }
        // BUG: Make work for cross-region selections
-        LLViewerRegion *region2 = gWorldp->getRegionFromPosGlobal( east_north_region_check );
+        LLViewerRegion *region2 = LLWorld::getInstance()->getRegionFromPosGlobal( east_north_region_check );
        if (region != region2)
        {
                gViewerWindow->alertXml("CannotSetLandOwnerMultipleRegions");
@@ -992,8 +967,7 @@ void LLViewerParcelMgr::sendParcelGodForceToContent()
                gViewerWindow->alertXml("CannotContentifyNothingSelected");
                return;
        }
-        if(!gWorldp) return;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal( mWestSouth );
        if (!region)
        {
                gViewerWindow->alertXml("CannotContentifyNoRegion");
@@ -1018,8 +992,7 @@ void LLViewerParcelMgr::sendParcelRelease()
                return;
        }
-        if(!gWorldp) return;
+        LLViewerRegion *region = LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
-        LLViewerRegion *region = gWorldp->getRegionFromPosGlobal( mWestSouth );
        if (!region)
        {
                gViewerWindow->alertXml("CannotReleaseLandNoRegion");
@@ -1081,8 +1054,7 @@ LLViewerParcelMgr::ParcelBuyInfo* LLViewerParcelMgr::setupParcelBuy(
                return NULL;
        }
-        if(!gWorldp) return NULL;
+        LLViewerRegion *region = LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
-        LLViewerRegion *region = gWorldp->getRegionFromPosGlobal( mWestSouth );
        if (!region)
        {
                gViewerWindow->alertXml("CannotBuyLandNoRegion");
@@ -1099,7 +1071,7 @@ LLViewerParcelMgr::ParcelBuyInfo* LLViewerParcelMgr::setupParcelBuy(
                east_north_region_check.mdV[VX] -= 0.5;
                east_north_region_check.mdV[VY] -= 0.5;
-                LLViewerRegion *region2 = gWorldp->getRegionFromPosGlobal( east_north_region_check );
+                LLViewerRegion *region2 = LLWorld::getInstance()->getRegionFromPosGlobal( east_north_region_check );
                if (region != region2)
                {
@@ -1192,8 +1164,7 @@ void LLViewerParcelMgr::sendParcelDeed(const LLUUID& group_id)
                gViewerWindow->alertXml("CannotDeedLandNoGroup");
                return;
        }
-        if(!gWorldp) return;
+        LLViewerRegion *region = LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
-        LLViewerRegion *region = gWorldp->getRegionFromPosGlobal( mWestSouth );
        if (!region)
        {
                gViewerWindow->alertXml("CannotDeedLandNoRegion");
@@ -1231,7 +1202,7 @@ void LLViewerParcelMgr::makeLandmarkAtSelection()
        global_center *= 0.5f;
        LLViewerRegion* region;
-        region = gWorldp->getRegionFromPosGlobal(global_center);
+        region = LLWorld::getInstance()->getRegionFromPosGlobal(global_center);
        LLVector3 west_south_bottom_region = region->getPosRegionFromGlobal( mWestSouth );
        LLVector3 east_north_top_region = region->getPosRegionFromGlobal( mEastNorth );
@@ -1260,11 +1231,8 @@ const LLString& LLViewerParcelMgr::getAgentParcelName() const
 void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_agent_region)
 {
        if(!parcel) return;
-        if(!gWorldp) return;
-        //llinfos << "passed parcel: " << parcel->getName() << llendl;
-        LLViewerRegion* region = use_agent_region ?
+        LLViewerRegion *region = use_agent_region ? gAgent.getRegion() : LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
-                gAgent.getRegion() : gWorldp->getRegionFromPosGlobal( mWestSouth );
        if (!region) return;
        //llinfos << "found region: " << region->getName() << llendl;
@@ -1302,8 +1270,7 @@ void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_ag
 void LLViewerParcelMgr::requestHoverParcelProperties(const LLVector3d& pos)
 {
-        if(!gWorldp) return;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( pos );
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal( pos );
        if (!region)
        {
                return;
@@ -1356,7 +1323,7 @@ void LLViewerParcelMgr::processParcelOverlay(LLMessageSystem *msg, void **user)
                return;
        }
-        S32 parcels_per_edge = gParcelMgr->mParcelsPerEdge;
+        S32 parcels_per_edge = LLViewerParcelMgr::getInstance()->mParcelsPerEdge;
        S32 expected_size = parcels_per_edge * parcels_per_edge / PARCEL_OVERLAY_CHUNKS;
        if (packed_overlay_size != expected_size)
        {
@@ -1374,7 +1341,7 @@ void LLViewerParcelMgr::processParcelOverlay(LLMessageSystem *msg, void **user)
                        expected_size);
        LLHost host = msg->getSender();
-        LLViewerRegion *region = gWorldp->getRegion(host);
+        LLViewerRegion *region = LLWorld::getInstance()->getRegion(host);
        if (region)
        {
                region->mParcelOverlay->uncompressLandOverlay( sequence_id, sPackedOverlay );
@@ -1434,31 +1401,31 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
        if (sequence_id == SELECTED_PARCEL_SEQ_ID)
        {
                // ...selected parcels report this sequence id
-                gParcelMgr->mRequestResult = PARCEL_RESULT_SUCCESS;
+                LLViewerParcelMgr::getInstance()->mRequestResult = PARCEL_RESULT_SUCCESS;
-                parcel = gParcelMgr->mCurrentParcel;
+                parcel = LLViewerParcelMgr::getInstance()->mCurrentParcel;
        }
        else if (sequence_id == HOVERED_PARCEL_SEQ_ID)
        {
-                gParcelMgr->mHoverRequestResult = PARCEL_RESULT_SUCCESS;
+                LLViewerParcelMgr::getInstance()->mHoverRequestResult = PARCEL_RESULT_SUCCESS;
-                parcel = gParcelMgr->mHoverParcel;
+                parcel = LLViewerParcelMgr::getInstance()->mHoverParcel;
        }
        else if (sequence_id == COLLISION_NOT_IN_GROUP_PARCEL_SEQ_ID ||
                         sequence_id == COLLISION_NOT_ON_LIST_PARCEL_SEQ_ID ||
                         sequence_id == COLLISION_BANNED_PARCEL_SEQ_ID)
        {
-                gParcelMgr->mHoverRequestResult = PARCEL_RESULT_SUCCESS;
+                LLViewerParcelMgr::getInstance()->mHoverRequestResult = PARCEL_RESULT_SUCCESS;
-                parcel = gParcelMgr->mCollisionParcel;
+                parcel = LLViewerParcelMgr::getInstance()->mCollisionParcel;
        }
-        else if (sequence_id == 0 || sequence_id > gParcelMgr->mAgentParcelSequenceID)
+        else if (sequence_id == 0 || sequence_id > LLViewerParcelMgr::getInstance()->mAgentParcelSequenceID)
        {
                // new agent parcel
-                gParcelMgr->mAgentParcelSequenceID = sequence_id;
+                LLViewerParcelMgr::getInstance()->mAgentParcelSequenceID = sequence_id;
-                parcel = gParcelMgr->mAgentParcel;
+                parcel = LLViewerParcelMgr::getInstance()->mAgentParcel;
        }
        else
        {
                llinfos << "out of order agent parcel sequence id " << sequence_id
-                        << " last good " << gParcelMgr->mAgentParcelSequenceID
+                        << " last good " << LLViewerParcelMgr::getInstance()->mAgentParcelSequenceID
                        << llendl;
                return;
        }
@@ -1529,15 +1496,15 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                parcel->setRegionDenyAgeUnverifiedOverride(region_deny_age_unverified_override);
                parcel->unpackMessage(msg);
-                if (parcel == gParcelMgr->mAgentParcel)
+                if (parcel == LLViewerParcelMgr::getInstance()->mAgentParcel)
                {
-                        S32 bitmap_size =       gParcelMgr->mParcelsPerEdge
+                        S32 bitmap_size =       LLViewerParcelMgr::getInstance()->mParcelsPerEdge
-                                                                * gParcelMgr->mParcelsPerEdge
+                                                                * LLViewerParcelMgr::getInstance()->mParcelsPerEdge
                                                                / 8;
                        U8* bitmap = new U8[ bitmap_size ];
                        msg->getBinaryDataFast(_PREHASH_ParcelData, _PREHASH_Bitmap, bitmap, bitmap_size);
-                        gParcelMgr->writeAgentParcelFromBitmap(bitmap);
+                        LLViewerParcelMgr::getInstance()->writeAgentParcelFromBitmap(bitmap);
                        delete[] bitmap;
                }
        }
@@ -1546,80 +1513,79 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
        if (sequence_id == SELECTED_PARCEL_SEQ_ID)
        {
                // Update selected counts
-                gParcelMgr->mCurrentParcelSelection->mSelectedSelfCount = self_count;
+                LLViewerParcelMgr::getInstance()->mCurrentParcelSelection->mSelectedSelfCount = self_count;
-                gParcelMgr->mCurrentParcelSelection->mSelectedOtherCount = other_count;
+                LLViewerParcelMgr::getInstance()->mCurrentParcelSelection->mSelectedOtherCount = other_count;
-                gParcelMgr->mCurrentParcelSelection->mSelectedPublicCount = public_count;
+                LLViewerParcelMgr::getInstance()->mCurrentParcelSelection->mSelectedPublicCount = public_count;
-                gParcelMgr->mCurrentParcelSelection->mSelectedMultipleOwners =
+                LLViewerParcelMgr::getInstance()->mCurrentParcelSelection->mSelectedMultipleOwners =
                                                        (request_result == PARCEL_RESULT_MULTIPLE);
                // Select the whole parcel
-                if(!gWorldp) return;
+                LLViewerRegion* region = LLWorld::getInstance()->getRegion( msg->getSender() );
-                LLViewerRegion* region = gWorldp->getRegion( msg->getSender() );
                if (region)
                {
                        if (!snap_selection)
                        {
                                // don't muck with the westsouth and eastnorth.
                                // just highlight it
-                                LLVector3 west_south = region->getPosRegionFromGlobal(gParcelMgr->mWestSouth);
+                                LLVector3 west_south = region->getPosRegionFromGlobal(LLViewerParcelMgr::getInstance()->mWestSouth);
-                                LLVector3 east_north = region->getPosRegionFromGlobal(gParcelMgr->mEastNorth);
+                                LLVector3 east_north = region->getPosRegionFromGlobal(LLViewerParcelMgr::getInstance()->mEastNorth);
-                                gParcelMgr->resetSegments(gParcelMgr->mHighlightSegments);
+                                LLViewerParcelMgr::getInstance()->resetSegments(LLViewerParcelMgr::getInstance()->mHighlightSegments);
-                                gParcelMgr->writeHighlightSegments(
+                                LLViewerParcelMgr::getInstance()->writeHighlightSegments(
                                                                west_south.mV[VX],
                                                                west_south.mV[VY],
                                                                east_north.mV[VX],
                                                                east_north.mV[VY] );
-                                gParcelMgr->mCurrentParcelSelection->mWholeParcelSelected = FALSE;
+                                LLViewerParcelMgr::getInstance()->mCurrentParcelSelection->mWholeParcelSelected = FALSE;
                        }
                        else if (0 == local_id)
                        {
                                // this is public land, just highlight the selection
-                                gParcelMgr->mWestSouth = region->getPosGlobalFromRegion( aabb_min );
+                                LLViewerParcelMgr::getInstance()->mWestSouth = region->getPosGlobalFromRegion( aabb_min );
-                                gParcelMgr->mEastNorth = region->getPosGlobalFromRegion( aabb_max );
+                                LLViewerParcelMgr::getInstance()->mEastNorth = region->getPosGlobalFromRegion( aabb_max );
-                                gParcelMgr->resetSegments(gParcelMgr->mHighlightSegments);
+                                LLViewerParcelMgr::getInstance()->resetSegments(LLViewerParcelMgr::getInstance()->mHighlightSegments);
-                                gParcelMgr->writeHighlightSegments(
+                                LLViewerParcelMgr::getInstance()->writeHighlightSegments(
                                                                aabb_min.mV[VX],
                                                                aabb_min.mV[VY],
                                                                aabb_max.mV[VX],
                                                                aabb_max.mV[VY] );
-                                gParcelMgr->mCurrentParcelSelection->mWholeParcelSelected = TRUE;
+                                LLViewerParcelMgr::getInstance()->mCurrentParcelSelection->mWholeParcelSelected = TRUE;
                        }
                        else
                        {
-                                gParcelMgr->mWestSouth = region->getPosGlobalFromRegion( aabb_min );
+                                LLViewerParcelMgr::getInstance()->mWestSouth = region->getPosGlobalFromRegion( aabb_min );
-                                gParcelMgr->mEastNorth = region->getPosGlobalFromRegion( aabb_max );
+                                LLViewerParcelMgr::getInstance()->mEastNorth = region->getPosGlobalFromRegion( aabb_max );
                                // Owned land, highlight the boundaries
-                                S32 bitmap_size =       gParcelMgr->mParcelsPerEdge
+                                S32 bitmap_size =       LLViewerParcelMgr::getInstance()->mParcelsPerEdge
-                                                                        * gParcelMgr->mParcelsPerEdge
+                                                                        * LLViewerParcelMgr::getInstance()->mParcelsPerEdge
                                                                        / 8;
                                U8* bitmap = new U8[ bitmap_size ];
                                msg->getBinaryDataFast(_PREHASH_ParcelData, _PREHASH_Bitmap, bitmap, bitmap_size);
-                                gParcelMgr->resetSegments(gParcelMgr->mHighlightSegments);
+                                LLViewerParcelMgr::getInstance()->resetSegments(LLViewerParcelMgr::getInstance()->mHighlightSegments);
-                                gParcelMgr->writeSegmentsFromBitmap( bitmap, gParcelMgr->mHighlightSegments );
+                                LLViewerParcelMgr::getInstance()->writeSegmentsFromBitmap( bitmap, LLViewerParcelMgr::getInstance()->mHighlightSegments );
                                delete[] bitmap;
                                bitmap = NULL;
-                                gParcelMgr->mCurrentParcelSelection->mWholeParcelSelected = TRUE;
+                                LLViewerParcelMgr::getInstance()->mCurrentParcelSelection->mWholeParcelSelected = TRUE;
                        }
                        // Request access list information for this land
-                        gParcelMgr->sendParcelAccessListRequest(AL_ACCESS | AL_BAN);
+                        LLViewerParcelMgr::getInstance()->sendParcelAccessListRequest(AL_ACCESS | AL_BAN);
                        // Request dwell for this land, if it's not public land.
-                        gParcelMgr->mSelectedDwell = 0.f;
+                        LLViewerParcelMgr::getInstance()->mSelectedDwell = 0.f;
                        if (0 != local_id)
                        {
-                                gParcelMgr->sendParcelDwellRequest();
+                                LLViewerParcelMgr::getInstance()->sendParcelDwellRequest();
                        }
-                        gParcelMgr->mSelected = TRUE;
+                        LLViewerParcelMgr::getInstance()->mSelected = TRUE;
-                        gParcelMgr->notifyObservers();
+                        LLViewerParcelMgr::getInstance()->notifyObservers();
                }
        }
        else if (sequence_id == COLLISION_NOT_IN_GROUP_PARCEL_SEQ_ID ||
@@ -1627,32 +1593,32 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                         sequence_id == COLLISION_BANNED_PARCEL_SEQ_ID)
        {
                // We're about to collide with this parcel
-                gParcelMgr->mRenderCollision = TRUE;
+                LLViewerParcelMgr::getInstance()->mRenderCollision = TRUE;
-                gParcelMgr->mCollisionTimer.reset();
+                LLViewerParcelMgr::getInstance()->mCollisionTimer.reset();
                // Differentiate this parcel if we are banned from it.
                if (sequence_id == COLLISION_BANNED_PARCEL_SEQ_ID)
                {
-                        gParcelMgr->mCollisionBanned = BA_BANNED;
+                        LLViewerParcelMgr::getInstance()->mCollisionBanned = BA_BANNED;
                }
                else if (sequence_id == COLLISION_NOT_IN_GROUP_PARCEL_SEQ_ID)
                {
-                        gParcelMgr->mCollisionBanned = BA_NOT_IN_GROUP;
+                        LLViewerParcelMgr::getInstance()->mCollisionBanned = BA_NOT_IN_GROUP;
                }
                else 
                {
-                        gParcelMgr->mCollisionBanned = BA_NOT_ON_LIST;
+                        LLViewerParcelMgr::getInstance()->mCollisionBanned = BA_NOT_ON_LIST;
                }
-                S32 bitmap_size =       gParcelMgr->mParcelsPerEdge
+                S32 bitmap_size =       LLViewerParcelMgr::getInstance()->mParcelsPerEdge
-                                                        * gParcelMgr->mParcelsPerEdge
+                                                        * LLViewerParcelMgr::getInstance()->mParcelsPerEdge
                                                        / 8;
                U8* bitmap = new U8[ bitmap_size ];
                msg->getBinaryDataFast(_PREHASH_ParcelData, _PREHASH_Bitmap, bitmap, bitmap_size);
-                gParcelMgr->resetSegments(gParcelMgr->mCollisionSegments);
+                LLViewerParcelMgr::getInstance()->resetSegments(LLViewerParcelMgr::getInstance()->mCollisionSegments);
-                gParcelMgr->writeSegmentsFromBitmap( bitmap, gParcelMgr->mCollisionSegments );
+                LLViewerParcelMgr::getInstance()->writeSegmentsFromBitmap( bitmap, LLViewerParcelMgr::getInstance()->mCollisionSegments );
                delete[] bitmap;
                bitmap = NULL;
@@ -1660,16 +1626,16 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
        }
        else if (sequence_id == HOVERED_PARCEL_SEQ_ID)
        {
-                LLViewerRegion *region = gWorldp->getRegion( msg->getSender() );
+                LLViewerRegion *region = LLWorld::getInstance()->getRegion( msg->getSender() );
                if (region)
                {
-                        gParcelMgr->mHoverWestSouth = region->getPosGlobalFromRegion( aabb_min );
+                        LLViewerParcelMgr::getInstance()->mHoverWestSouth = region->getPosGlobalFromRegion( aabb_min );
-                        gParcelMgr->mHoverEastNorth = region->getPosGlobalFromRegion( aabb_max );
+                        LLViewerParcelMgr::getInstance()->mHoverEastNorth = region->getPosGlobalFromRegion( aabb_max );
                }
                else
                {
-                        gParcelMgr->mHoverWestSouth.clearVec();
+                        LLViewerParcelMgr::getInstance()->mHoverWestSouth.clearVec();
-                        gParcelMgr->mHoverEastNorth.clearVec();
+                        LLViewerParcelMgr::getInstance()->mHoverEastNorth.clearVec();
                }
        }
        else
@@ -1724,15 +1690,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 void optionally_start_music(const LLString& music_url)
 {
-        if (gSavedSettings.getWarning("FirstStreamingMusic"))
+        if (gSavedSettings.getBOOL("AudioStreamingMusic"))
-        {
-                std::string* newstring = new std::string(music_url);
-                gViewerWindow->alertXml("ParcelCanPlayMusic",
-                        callback_start_music,
-                        (void*)newstring);
-        }
-        else if (gSavedSettings.getBOOL("AudioStreamingMusic"))
        {
                // Make the user click the start button on the overlay bar. JC
                //              llinfos << "Starting parcel music " << music_url << llendl;
@@ -1746,31 +1704,6 @@ void optionally_start_music(const LLString& music_url)
        }
 }
-void callback_start_music(S32 option, void* data)
-{
-        std::string* music_url = (std::string*)data;
-        if (0 == option)
-        {
-                gSavedSettings.setBOOL("AudioStreamingMusic", TRUE);
-                llinfos << "Starting first parcel music " << music_url << llendl;
-                if ( gOverlayBar && gOverlayBar->musicPlaying())
-                {
-                        gAudiop->startInternetStream(music_url->c_str());
-                }
-        }
-        else
-        {
-                gSavedSettings.setBOOL("AudioStreamingMusic", FALSE);
-        }
-        gSavedSettings.setWarning("FirstStreamingMusic", FALSE);
-        delete music_url;
-        music_url = NULL;
-}
 // static
 void LLViewerParcelMgr::processParcelAccessListReply(LLMessageSystem *msg, void **user)
 {
@@ -1784,7 +1717,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->mCurrentParcel;
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->mCurrentParcel;
        if (!parcel) return;
        if (parcel_id != parcel->getLocalID())
@@ -1807,7 +1740,7 @@ void LLViewerParcelMgr::processParcelAccessListReply(LLMessageSystem *msg, void
                parcel->unpackAccessEntries(msg, &(parcel->mRenterList) );
        }*/
-        gParcelMgr->notifyObservers();
+        LLViewerParcelMgr::getInstance()->notifyObservers();
 }
@@ -1826,10 +1759,10 @@ void LLViewerParcelMgr::processParcelDwellReply(LLMessageSystem* msg, void**)
        F32 dwell;
        msg->getF32("Data", "Dwell", dwell);
-        if (local_id == gParcelMgr->mCurrentParcel->getLocalID())
+        if (local_id == LLViewerParcelMgr::getInstance()->mCurrentParcel->getLocalID())
        {
-                gParcelMgr->mSelectedDwell = dwell;
+                LLViewerParcelMgr::getInstance()->mSelectedDwell = dwell;
-                gParcelMgr->notifyObservers();
+                LLViewerParcelMgr::getInstance()->notifyObservers();
        }
 }
@@ -1845,8 +1778,7 @@ void LLViewerParcelMgr::sendParcelAccessListUpdate(U32 which)
                return;
        }
-        if(!gWorldp) return;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal( mWestSouth );
        if (!region) return;
        LLMessageSystem* msg = gMessageSystem;
@@ -1995,13 +1927,13 @@ void LLViewerParcelMgr::deedAlertCB(S32 option, void*)
 {
        if (option == 0)
        {
-                LLParcel* parcel = gParcelMgr->getParcelSelection()->getParcel();
+                LLParcel* parcel = LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel();
                LLUUID group_id;
                if(parcel)
                {
                        group_id = parcel->getGroupID();
                }
-                gParcelMgr->sendParcelDeed(group_id);
+                LLViewerParcelMgr::getInstance()->sendParcelDeed(group_id);
        }
 }
@@ -2034,8 +1966,7 @@ void LLViewerParcelMgr::startReleaseLand()
        }
        LLVector3d parcel_center = (mWestSouth + mEastNorth) / 2.0;
-        if(!gWorldp) return;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal(parcel_center);
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal(parcel_center);
        if (!region)
        {
                gViewerWindow->alertXml("CannotReleaseLandRegionNotFound");
@@ -2139,8 +2070,7 @@ void LLViewerParcelMgr::callbackDivideLand(S32 option, void* data)
        LLViewerParcelMgr* self = (LLViewerParcelMgr*)data;
        LLVector3d parcel_center = (self->mWestSouth + self->mEastNorth) / 2.0;
-        if(!gWorldp) return;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal(parcel_center);
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal(parcel_center);
        if (!region)
        {
                gViewerWindow->alertXml("CannotDivideLandNoRegion");
@@ -2198,8 +2128,7 @@ void LLViewerParcelMgr::callbackJoinLand(S32 option, void* data)
        LLViewerParcelMgr* self = (LLViewerParcelMgr*)data;
        LLVector3d parcel_center = (self->mWestSouth + self->mEastNorth) / 2.0;
-        if(!gWorldp) return;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal(parcel_center);
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal(parcel_center);
        if (!region)
        {
                gViewerWindow->alertXml("CannotJoinLandNoRegion");
@@ -2247,8 +2176,7 @@ void LLViewerParcelMgr::startDeedLandToGroup()
        }
        LLVector3d parcel_center = (mWestSouth + mEastNorth) / 2.0;
-        if(!gWorldp) return;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal(parcel_center);
-        LLViewerRegion* region = gWorldp->getRegionFromPosGlobal(parcel_center);
        if (!region)
        {
                gViewerWindow->alertXml("CannotDeedLandNoRegion");
@@ -2273,8 +2201,8 @@ void LLViewerParcelMgr::startDeedLandToGroup()
 }
 void LLViewerParcelMgr::reclaimParcel()
 {
-        LLParcel* parcel = gParcelMgr->getParcelSelection()->getParcel();
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel();
-        LLViewerRegion* regionp = gParcelMgr->getSelectionRegion();
+        LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion();
        if(parcel && parcel->getOwnerID().notNull()
           && (parcel->getOwnerID() != gAgent.getID())
           && regionp && (regionp->getOwner() == gAgent.getID()))
@@ -2296,7 +2224,7 @@ void LLViewerParcelMgr::releaseAlertCB(S32 option, void *)
        if (option == 0)
        {
                // Send the release message, not a force
-                gParcelMgr->sendParcelRelease();
+                LLViewerParcelMgr::getInstance()->sendParcelRelease();
        }
 }
@@ -2399,8 +2327,6 @@ void sanitize_corners(const LLVector3d &corner1,
 void LLViewerParcelMgr::cleanupGlobals()
 {
-        delete gParcelMgr;
-        gParcelMgr = NULL;
        LLParcelSelection::sNullSelection = NULL;
 }
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h
index 5847343..319bbc6 100644
--- a/linden/indra/newview/llviewerparcelmgr.h
+++ b/linden/indra/newview/llviewerparcelmgr.h
@@ -37,6 +37,7 @@
 #include "llframetimer.h"
 #include "llmemory.h"
 #include "llparcelselection.h"
+#include "llui.h"
 class LLUUID;
 class LLMessageSystem;
@@ -73,8 +74,7 @@ public:
        virtual void changed() = 0;
 };
+class LLViewerParcelMgr : public LLSingleton<LLViewerParcelMgr>
-class LLViewerParcelMgr
 {
 public:
@@ -325,15 +325,14 @@ private:
        BOOL                                            mRenderSelection;
        S32                                                     mCollisionBanned;     
        LLFrameTimer                            mCollisionTimer;
-        LLUUID                                          mBlockedImageID;
+        LLImageGL*                                      mBlockedImage;
-        LLUUID                                          mPassImageID;
+        LLImageGL*                                      mPassImage;
        // Media
        S32                                             mMediaParcelId;
        U64                                             mMediaRegionId;
 };
-extern LLViewerParcelMgr *gParcelMgr;
 void sanitize_corners(const LLVector3d &corner1, const LLVector3d &corner2,
                                                LLVector3d &west_south_bottom, LLVector3d &east_north_top);
diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp
index 281b644..ad34b6a 100644
--- a/linden/indra/newview/llviewerparceloverlay.cpp
+++ b/linden/indra/newview/llviewerparceloverlay.cpp
@@ -58,7 +58,6 @@ LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_
        mDirty( FALSE ),
        mTimeSinceLastUpdate(),
        mOverlayTextureIdx(-1),
-        mLineImageID( gViewerArt.getString("propertyline.tga") ),
        mVertexCount(0),
        mVertexArray(NULL),
        mColorArray(NULL)
@@ -750,20 +749,15 @@ S32 LLViewerParcelOverlay::renderPropertyLines	()
        LLGLSNoTexture gls_no_texture;
        LLGLDepthTest mDepthTest(GL_TRUE);
-        // JC - This doesn't work.
-        //gGLSUITextureDepth.set();
-        //LLViewerImage* image = gImageList.getImage( mLineImageID );
-        //image->bindTexture();
        // Find camera height off the ground (not from zero)
        F32 ground_height_at_camera = land.resolveHeightGlobal( gAgent.getCameraPositionGlobal() );
-        F32 camera_z = gCamera->getOrigin().mV[VZ];
+        F32 camera_z = LLViewerCamera::getInstance()->getOrigin().mV[VZ];
        F32 camera_height = camera_z - ground_height_at_camera;
        camera_height = llclamp(camera_height, 0.f, 100.f);
        // Pull lines toward camera by 1 cm per meter off the ground.
-        const LLVector3& CAMERA_AT = gCamera->getAtAxis();
+        const LLVector3& CAMERA_AT = LLViewerCamera::getInstance()->getAtAxis();
        F32 pull_toward_camera_scale = 0.01f * camera_height;
        LLVector3 pull_toward_camera = CAMERA_AT;
        pull_toward_camera *= -pull_toward_camera_scale;
@@ -791,7 +785,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines	()
        // Set up a cull plane 2 * PARCEL_GRID_STEP_METERS behind
        // the camera.  The cull plane normal is the camera's at axis.
-        LLVector3 cull_plane_point = gCamera->getAtAxis();
+        LLVector3 cull_plane_point = LLViewerCamera::getInstance()->getAtAxis();
        cull_plane_point *= -2.f * PARCEL_GRID_STEP_METERS;
        cull_plane_point += camera_region;
diff --git a/linden/indra/newview/llviewerparceloverlay.h b/linden/indra/newview/llviewerparceloverlay.h
index 40e488f..8d1d3d2 100644
--- a/linden/indra/newview/llviewerparceloverlay.h
+++ b/linden/indra/newview/llviewerparceloverlay.h
@@ -111,7 +111,6 @@ private:
        LLFrameTimer    mTimeSinceLastUpdate;
        S32                             mOverlayTextureIdx;
        
-        LLUUID                  mLineImageID;
        S32                             mVertexCount;
        F32*                    mVertexArray;
        U8*                             mColorArray;
diff --git a/linden/indra/newview/llviewerpartsim.cpp b/linden/indra/newview/llviewerpartsim.cpp
index 267f0c8..1788a7c 100644
--- a/linden/indra/newview/llviewerpartsim.cpp
+++ b/linden/indra/newview/llviewerpartsim.cpp
@@ -70,7 +70,7 @@ U32 LLViewerPart::sNextPartID = 1;
 F32 calc_desired_size(LLVector3 pos, LLVector2 scale)
 {
-        F32 desired_size = (pos-gCamera->getOrigin()).magVec();
+        F32 desired_size = (pos-LLViewerCamera::getInstance()->getOrigin()).magVec();
        desired_size /= 4;
        return llclamp(desired_size, scale.magVec()*0.5f, PART_SIM_BOX_SIDE*2);
 }
@@ -121,7 +121,7 @@ LLViewerPartGroup::LLViewerPartGroup(const LLVector3 &center_agent, const F32 bo
        mVOPartGroupp = NULL;
        mUniformParticles = TRUE;
-        mRegionp = gWorldPointer->getRegionFromPosAgent(center_agent);
+        mRegionp = LLWorld::getInstance()->getRegionFromPosAgent(center_agent);
        llassert_always(center_agent.isFinite());
        
        if (!mRegionp)
@@ -243,7 +243,7 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
        S32 i;
        F32 dt;
        
-        LLVector3 gravity(0.f, 0.f, -9.8f);
+        LLVector3 gravity(0.f, 0.f, GRAVITY);
        LLViewerRegion *regionp = getRegion();
        S32 end = (S32) mParticles.size();
@@ -371,7 +371,7 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
                        if (!posInGroup(part.mPosAgent, desired_size))
                        {
                                // Transfer particles between groups
-                                gWorldPointer->mPartSim.put(&part);
+                                LLViewerPartSim::getInstance()->put(&part);
                                end--;
                                LLPointer<LLViewerPart>::swap(mParticles[i], mParticles[end]);
                                // be sure to process the particle we just swapped-in
@@ -445,7 +445,7 @@ LLViewerPartSim::LLViewerPartSim()
 }
-LLViewerPartSim::~LLViewerPartSim()
+void LLViewerPartSim::destroyClass()
 {
        LLMemType mt(LLMemType::MTYPE_PARTICLES);
        S32 i;
diff --git a/linden/indra/newview/llviewerpartsim.h b/linden/indra/newview/llviewerpartsim.h
index 42d3fd7..cea7024 100644
--- a/linden/indra/newview/llviewerpartsim.h
+++ b/linden/indra/newview/llviewerpartsim.h
@@ -35,12 +35,11 @@
 #include "lldarrayptr.h"
 #include "llframetimer.h"
 #include "llmemory.h"
 #include "llpartdata.h"
+#include "llviewerpartsource.h"
 class LLViewerImage;
 class LLViewerPart;
-class LLViewerPartSource;
 class LLViewerRegion;
 class LLViewerImage;
 class LLVOPartGroup;
@@ -126,11 +125,12 @@ protected:
        LLViewerRegion *mRegionp;
 };
-class LLViewerPartSim
+class LLViewerPartSim : public LLSingleton<LLViewerPartSim>
 {
 public:
        LLViewerPartSim();
-        virtual ~LLViewerPartSim();
+        virtual ~LLViewerPartSim(){}
+        void destroyClass();
        typedef std::vector<LLViewerPartGroup *> group_list_t;
        typedef std::vector<LLPointer<LLViewerPartSource> > source_list_t;
diff --git a/linden/indra/newview/llviewerpartsource.cpp b/linden/indra/newview/llviewerpartsource.cpp
index 0f30edf..040d108 100644
--- a/linden/indra/newview/llviewerpartsource.cpp
+++ b/linden/indra/newview/llviewerpartsource.cpp
@@ -98,9 +98,7 @@ LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp)
        llassert(source_objp);
        mSourceObjectp = source_objp;
        mPosAgent = mSourceObjectp->getPositionAgent();
-        LLUUID id;
+        mImagep = gImageList.getImageFromFile("pixiesmall.j2c");
-        id.set( gViewerArt.getString("pixiesmall.tga") );
-        mImagep = gImageList.getImage(id);
        mImagep->bind();
        mImagep->setClamp(TRUE, TRUE);
 }
@@ -123,7 +121,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
        F32 old_update_time = mLastUpdateTime;
        mLastUpdateTime += dt;
-        F32 ref_rate_travelspeed = llmin(gWorldPointer->mPartSim.getRefRate(), 1.f);
+        F32 ref_rate_travelspeed = llmin(LLViewerPartSim::getInstance()->getRefRate(), 1.f);
        
        F32 dt_update = mLastUpdateTime - mLastPartTime;
@@ -213,7 +211,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
                        mRotation.setQuat(0, 0, 0);
                }
                
-                if (gWorldPointer->mPartSim.aboveParticleLimit())
+                if (LLViewerPartSim::getInstance()->aboveParticleLimit())
                {
                        // Don't bother doing any more updates if we're above the particle limit,
                        // just give up.
@@ -235,7 +233,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
                                    (mPartSysData.mPartData.mStartScale[1]
                                     + mPartSysData.mPartData.mEndScale[1])/2));
                
-                F32 pixel_meter_ratio = gCamera->getPixelMeterRatio();
+                F32 pixel_meter_ratio = LLViewerCamera::getInstance()->getPixelMeterRatio();
                // Maximum distance at which spawned particles will be viewable
                F32 max_dist = max_short_side * pixel_meter_ratio; 
@@ -250,7 +248,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
                }
                // Distance from camera
-                F32 dist = (mPosAgent - gCamera->getOrigin()).magVec();
+                F32 dist = (mPosAgent - LLViewerCamera::getInstance()->getOrigin()).magVec();
                // Particle size vs distance vs maxage throttling
@@ -267,14 +265,14 @@ void LLViewerPartSourceScript::update(const F32 dt)
                }
                
                if(mDelay)
-                {
+                {                       
                        limited_rate = llmax(limited_rate, 0.01f * mDelay--) ;
                }
                S32 i;
                for (i = 0; i < mPartSysData.mBurstPartCount; i++)
                {
-                        if (ll_frand() < llmax(1.0f - gWorldPointer->mPartSim.getBurstRate(), limited_rate))
+                        if (ll_frand() < llmax(1.0f - LLViewerPartSim::getInstance()->getBurstRate(), limited_rate))
                        {
                                // Limit particle generation
                                continue;
@@ -385,7 +383,7 @@ void LLViewerPartSourceScript::update(const F32 dt)
                                mPartSysData.mBurstRadius = 0; 
                        }
-                        gWorldPointer->mPartSim.addPart(part);
+                        LLViewerPartSim::getInstance()->addPart(part);
                }
                mLastPartTime = mLastUpdateTime;
@@ -528,9 +526,7 @@ void LLViewerPartSourceSpiral::update(const F32 dt)
        LLMemType mt(LLMemType::MTYPE_PARTICLES);
        if (!mImagep)
        {
-                LLUUID id;
+                mImagep = gImageList.getImageFromFile("pixiesmall.j2c");
-                id.set( gViewerArt.getString("pixiesmall.tga") );
-                mImagep = gImageList.getImage(id);
        }
        const F32 RATE = 0.025f;
@@ -544,7 +540,7 @@ void LLViewerPartSourceSpiral::update(const F32 dt)
        if (dt_update > RATE)
        {
                mLastPartTime = mLastUpdateTime;
-                if (!gWorldPointer->mPartSim.shouldAddPart())
+                if (!LLViewerPartSim::getInstance()->shouldAddPart())
                {
                        // Particle simulation says we have too many particles, skip all this
                        return;
@@ -567,7 +563,7 @@ void LLViewerPartSourceSpiral::update(const F32 dt)
                part->mScale.mV[1] = 0.25f;
                part->mParameter = ll_frand(F_TWO_PI);
-                gWorldPointer->mPartSim.addPart(part);
+                LLViewerPartSim::getInstance()->addPart(part);
        }
 }
@@ -691,7 +687,7 @@ void LLViewerPartSourceBeam::update(const F32 dt)
        if (dt_update > RATE)
        {
                mLastPartTime = mLastUpdateTime;
-                if (!gWorldPointer->mPartSim.shouldAddPart())
+                if (!LLViewerPartSim::getInstance()->shouldAddPart())
                {
                        // Particle simulation says we have too many particles, skip all this
                        return;
@@ -699,9 +695,7 @@ void LLViewerPartSourceBeam::update(const F32 dt)
                if (!mImagep)
                {
-                        LLUUID id;
+                        mImagep = gImageList.getImageFromFile("pixiesmall.j2c");
-                        id.set( gViewerArt.getString("pixiesmall.tga") );
-                        mImagep = gImageList.getImage(id);
                }
                LLPointer<LLViewerPart> part = new LLViewerPart();
@@ -724,7 +718,7 @@ void LLViewerPartSourceBeam::update(const F32 dt)
                part->mPosAgent = mPosAgent;
                part->mVelocity = mTargetPosAgent - mPosAgent;
-                gWorldPointer->mPartSim.addPart(part);
+                LLViewerPartSim::getInstance()->addPart(part);
        }
 }
@@ -787,9 +781,7 @@ void LLViewerPartSourceChat::update(const F32 dt)
        LLMemType mt(LLMemType::MTYPE_PARTICLES);
        if (!mImagep)
        {
-                LLUUID id;
+                mImagep = gImageList.getImageFromFile("pixiesmall.j2c");
-                id.set( gViewerArt.getString("pixiesmall.tga") );
-                mImagep = gImageList.getImage(id);
        }
@@ -813,7 +805,7 @@ void LLViewerPartSourceChat::update(const F32 dt)
        if (dt_update > RATE)
        {
                mLastPartTime = mLastUpdateTime;
-                if (!gWorldPointer->mPartSim.shouldAddPart())
+                if (!LLViewerPartSim::getInstance()->shouldAddPart())
                {
                        // Particle simulation says we have too many particles, skip all this
                        return;
@@ -836,7 +828,7 @@ void LLViewerPartSourceChat::update(const F32 dt)
                part->mScale.mV[1] = 0.25f;
                part->mParameter = ll_frand(F_TWO_PI);
-                gWorldPointer->mPartSim.addPart(part);
+                LLViewerPartSim::getInstance()->addPart(part);
        }
 }
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 1cc6d42..e8ed85f 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -179,7 +179,7 @@ LLViewerRegion::~LLViewerRegion()
        // This should be reference counted...
        disconnectAllNeighbors();
        mCloudLayer.destroy();
-        gWorldPointer->mPartSim.cleanupRegion(this);
+        LLViewerPartSim::getInstance()->cleanupRegion(this);
        gObjectList.killObjects(this);
@@ -626,7 +626,7 @@ F32 LLViewerRegion::getCompositionXY(const S32 x, const S32 y) const
                if (y >= 256)
                {
                        LLVector3d center = getCenterGlobal() + LLVector3d(256.f, 256.f, 0.f);
-                        LLViewerRegion *regionp = gWorldPointer->getRegionFromPosGlobal(center);
+                        LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromPosGlobal(center);
                        if (regionp)
                        {
                                // OK, we need to do some hackery here - different simulators no longer use
@@ -653,7 +653,7 @@ F32 LLViewerRegion::getCompositionXY(const S32 x, const S32 y) const
                else
                {
                        LLVector3d center = getCenterGlobal() + LLVector3d(256.f, 0, 0.f);
-                        LLViewerRegion *regionp = gWorldPointer->getRegionFromPosGlobal(center);
+                        LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromPosGlobal(center);
                        if (regionp)
                        {
                                // OK, we need to do some hackery here - different simulators no longer use
@@ -681,7 +681,7 @@ F32 LLViewerRegion::getCompositionXY(const S32 x, const S32 y) const
        else if (y >= 256)
        {
                LLVector3d center = getCenterGlobal() + LLVector3d(0.f, 256.f, 0.f);
-                LLViewerRegion *regionp = gWorldPointer->getRegionFromPosGlobal(center);
+                LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromPosGlobal(center);
                if (regionp)
                {
                        // OK, we need to do some hackery here - different simulators no longer use
@@ -868,9 +868,8 @@ public:
                const LLSD& context,
                const LLSD& input) const
        {
-                if(!gWorldp) return;
                LLHost host(input["sender"].asString());
-                LLViewerRegion* region = gWorldp->getRegion(host);
+                LLViewerRegion* region = LLWorld::getInstance()->getRegion(host);
                if( !region )
                {
                        return;
@@ -950,6 +949,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
 {
        //llinfos << "CoarseLocationUpdate" << llendl;
        mMapAvatars.reset();
+        mMapAvatarIDs.reset(); // only matters in a rare case but it's good to be safe.
        U8 x_pos = 0;
        U8 y_pos = 0;
@@ -1382,7 +1382,6 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
        capabilityNames.append("MapLayer");
        capabilityNames.append("MapLayerGod");
        capabilityNames.append("NewFileAgentInventory");
-        capabilityNames.append("ParcelGodReserveForNewbie");
        capabilityNames.append("ParcelPropertiesUpdate");
        capabilityNames.append("ParcelVoiceInfoRequest");
        capabilityNames.append("ProvisionVoiceAccountRequest");
diff --git a/linden/indra/newview/llviewerstats.cpp b/linden/indra/newview/llviewerstats.cpp
index dabc971..9f10bbf 100644
--- a/linden/indra/newview/llviewerstats.cpp
+++ b/linden/indra/newview/llviewerstats.cpp
@@ -59,7 +59,6 @@
        #include "lllcd.h"
 #endif
-LLViewerStats *gViewerStats = NULL;
 class StatAttributes
 {
@@ -223,17 +222,17 @@ LLViewerStats::~LLViewerStats()
 void LLViewerStats::resetStats()
 {
-        gViewerStats->mKBitStat.reset();
+        LLViewerStats::getInstance()->mKBitStat.reset();
-        gViewerStats->mLayersKBitStat.reset();
+        LLViewerStats::getInstance()->mLayersKBitStat.reset();
-        gViewerStats->mObjectKBitStat.reset();
+        LLViewerStats::getInstance()->mObjectKBitStat.reset();
-        gViewerStats->mTextureKBitStat.reset();
+        LLViewerStats::getInstance()->mTextureKBitStat.reset();
-        gViewerStats->mVFSPendingOperations.reset();
+        LLViewerStats::getInstance()->mVFSPendingOperations.reset();
-        gViewerStats->mAssetKBitStat.reset();
+        LLViewerStats::getInstance()->mAssetKBitStat.reset();
-        gViewerStats->mPacketsInStat.reset();
+        LLViewerStats::getInstance()->mPacketsInStat.reset();
-        gViewerStats->mPacketsLostStat.reset();
+        LLViewerStats::getInstance()->mPacketsLostStat.reset();
-        gViewerStats->mPacketsOutStat.reset();
+        LLViewerStats::getInstance()->mPacketsOutStat.reset();
-        gViewerStats->mFPSStat.reset();
+        LLViewerStats::getInstance()->mFPSStat.reset();
-        gViewerStats->mTexturePacketsStat.reset();
+        LLViewerStats::getInstance()->mTexturePacketsStat.reset();
 }
@@ -511,54 +510,54 @@ void update_statistics(U32 frame_count)
        {
                if (gAgent.getCameraMode() == CAMERA_MODE_MOUSELOOK)
                {
-                        gViewerStats->incStat(LLViewerStats::ST_MOUSELOOK_SECONDS, gFrameIntervalSeconds);
+                        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_MOUSELOOK_SECONDS, gFrameIntervalSeconds);
                }
                else if (gAgent.getCameraMode() == CAMERA_MODE_CUSTOMIZE_AVATAR)
                {
-                        gViewerStats->incStat(LLViewerStats::ST_AVATAR_EDIT_SECONDS, gFrameIntervalSeconds);
+                        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_AVATAR_EDIT_SECONDS, gFrameIntervalSeconds);
                }
                else if (gFloaterTools && gFloaterTools->getVisible())
                {
-                        gViewerStats->incStat(LLViewerStats::ST_TOOLBOX_SECONDS, gFrameIntervalSeconds);
+                        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_TOOLBOX_SECONDS, gFrameIntervalSeconds);
                }
        }
-        gViewerStats->setStat(LLViewerStats::ST_ENABLE_VBO, (F64)gSavedSettings.getBOOL("RenderVBOEnable"));
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_ENABLE_VBO, (F64)gSavedSettings.getBOOL("RenderVBOEnable"));
-        gViewerStats->setStat(LLViewerStats::ST_LIGHTING_DETAIL, (F64)gSavedSettings.getS32("RenderLightingDetail"));
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_LIGHTING_DETAIL, (F64)gSavedSettings.getS32("RenderLightingDetail"));
-        gViewerStats->setStat(LLViewerStats::ST_DRAW_DIST, (F64)gSavedSettings.getF32("RenderFarClip"));
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_DRAW_DIST, (F64)gSavedSettings.getF32("RenderFarClip"));
-        gViewerStats->setStat(LLViewerStats::ST_CHAT_BUBBLES, (F64)gSavedSettings.getBOOL("UseChatBubbles"));
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_CHAT_BUBBLES, (F64)gSavedSettings.getBOOL("UseChatBubbles"));
 #if 0 // 1.9.2
-        gViewerStats->setStat(LLViewerStats::ST_SHADER_OBJECTS, (F64)gSavedSettings.getS32("VertexShaderLevelObject"));
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_SHADER_OBJECTS, (F64)gSavedSettings.getS32("VertexShaderLevelObject"));
-        gViewerStats->setStat(LLViewerStats::ST_SHADER_AVATAR, (F64)gSavedSettings.getBOOL("VertexShaderLevelAvatar"));
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_SHADER_AVATAR, (F64)gSavedSettings.getBOOL("VertexShaderLevelAvatar"));
-        gViewerStats->setStat(LLViewerStats::ST_SHADER_ENVIRONMENT, (F64)gSavedSettings.getBOOL("VertexShaderLevelEnvironment"));
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_SHADER_ENVIRONMENT, (F64)gSavedSettings.getBOOL("VertexShaderLevelEnvironment"));
 #endif
-        gViewerStats->setStat(LLViewerStats::ST_FRAME_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_FRAME));
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_FRAME_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_FRAME));
        F64 idle_secs = gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_IDLE);
        F64 network_secs = gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_NETWORK);
-        gViewerStats->setStat(LLViewerStats::ST_UPDATE_SECS, idle_secs - network_secs);
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_UPDATE_SECS, idle_secs - network_secs);
-        gViewerStats->setStat(LLViewerStats::ST_NETWORK_SECS, network_secs);
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_NETWORK_SECS, network_secs);
-        gViewerStats->setStat(LLViewerStats::ST_IMAGE_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_IMAGE_UPDATE));
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_IMAGE_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_IMAGE_UPDATE));
-        gViewerStats->setStat(LLViewerStats::ST_REBUILD_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_STATESORT ));
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_REBUILD_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_STATESORT ));
-        gViewerStats->setStat(LLViewerStats::ST_RENDER_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_RENDER_GEOMETRY));
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_RENDER_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_RENDER_GEOMETRY));
                
        LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(gAgent.getRegion()->getHost());
        if (cdp)
        {
-                gViewerStats->mSimPingStat.addValue(cdp->getPingDelay());
+                LLViewerStats::getInstance()->mSimPingStat.addValue(cdp->getPingDelay());
                gAvgSimPing = ((gAvgSimPing * (F32)gSimPingCount) + (F32)(cdp->getPingDelay())) / ((F32)gSimPingCount + 1);
                gSimPingCount++;
        }
        else
        {
-                gViewerStats->mSimPingStat.addValue(10000);
+                LLViewerStats::getInstance()->mSimPingStat.addValue(10000);
        }
-        gViewerStats->mFPSStat.addValue(1);
+        LLViewerStats::getInstance()->mFPSStat.addValue(1);
        F32 layer_bits = (F32)(gVLManager.getLandBits() + gVLManager.getWindBits() + gVLManager.getCloudBits());
-        gViewerStats->mLayersKBitStat.addValue(layer_bits/1024.f);
+        LLViewerStats::getInstance()->mLayersKBitStat.addValue(layer_bits/1024.f);
-        gViewerStats->mObjectKBitStat.addValue(gObjectBits/1024.f);
+        LLViewerStats::getInstance()->mObjectKBitStat.addValue(gObjectBits/1024.f);
-        gViewerStats->mTextureKBitStat.addValue(LLViewerImageList::sTextureBits/1024.f);
+        LLViewerStats::getInstance()->mTextureKBitStat.addValue(LLViewerImageList::sTextureBits/1024.f);
-        gViewerStats->mVFSPendingOperations.addValue(LLVFile::getVFSThread()->getPending());
+        LLViewerStats::getInstance()->mVFSPendingOperations.addValue(LLVFile::getVFSThread()->getPending());
-        gViewerStats->mAssetKBitStat.addValue(gTransferManager.getTransferBitsIn(LLTCT_ASSET)/1024.f);
+        LLViewerStats::getInstance()->mAssetKBitStat.addValue(gTransferManager.getTransferBitsIn(LLTCT_ASSET)/1024.f);
        gTransferManager.resetTransferBitsIn(LLTCT_ASSET);
        static S32 tex_bits_idle_count = 0;
@@ -573,7 +572,7 @@ void update_statistics(U32 frame_count)
                gDebugTimers[0].unpause();
        }
        
-        gViewerStats->mTexturePacketsStat.addValue(LLViewerImageList::sTexturePackets);
+        LLViewerStats::getInstance()->mTexturePacketsStat.addValue(LLViewerImageList::sTexturePackets);
        {
                static F32 visible_avatar_frames = 0.f;
@@ -584,10 +583,10 @@ void update_statistics(U32 frame_count)
                        visible_avatar_frames = 1.f;
                        avg_visible_avatars = (avg_visible_avatars * (F32)(visible_avatar_frames - 1.f) + visible_avatars) / visible_avatar_frames;
                }
-                gViewerStats->setStat(LLViewerStats::ST_VISIBLE_AVATARS, (F64)avg_visible_avatars);
+                LLViewerStats::getInstance()->setStat(LLViewerStats::ST_VISIBLE_AVATARS, (F64)avg_visible_avatars);
        }
-        gWorldp->updateNetStats();
+        LLWorld::getInstance()->updateNetStats();
-        gWorldp->requestCacheMisses();
+        LLWorld::getInstance()->requestCacheMisses();
        
        // Reset all of these values.
        gVLManager.resetBitCounts();
@@ -599,9 +598,9 @@ void update_statistics(U32 frame_count)
 #if LL_WINDOWS && LL_LCD_COMPILE
        bool LCDenabled = gLcdScreen->Enabled();
-        gViewerStats->setStat(LLViewerStats::ST_LOGITECH_LCD, LCDenabled);
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_LOGITECH_LCD, LCDenabled);
 #else
-        gViewerStats->setStat(LLViewerStats::ST_LOGITECH_LCD, false);
+        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_LOGITECH_LCD, false);
 #endif
 }
@@ -704,11 +703,11 @@ void send_stats()
        std::string gpu_desc = llformat(
                "%-6s Class %d ",
                gGLManager.mGLVendorShort.substr(0,6).c_str(),
-                (S32)gFeatureManagerp->getGPUClass())
+                (S32)LLFeatureManager::getInstance()->getGPUClass())
-                + gFeatureManagerp->getGPUString();
+                + LLFeatureManager::getInstance()->getGPUString();
        system["gpu"] = gpu_desc;
-        system["gpu_class"] = (S32)gFeatureManagerp->getGPUClass();
+        system["gpu_class"] = (S32)LLFeatureManager::getInstance()->getGPUClass();
        system["gpu_vendor"] = gGLManager.mGLVendorShort;
        system["gpu_version"] = gGLManager.mDriverVersionVendorString;
@@ -754,7 +753,7 @@ void send_stats()
        misc["int_1"] = LLFloaterDirectory::sOldSearchCount; // Steve: 1.18.6
        misc["int_2"] = LLFloaterDirectory::sNewSearchCount; // Steve: 1.18.6
        
-        gViewerStats->addToMessage(body);
+        LLViewerStats::getInstance()->addToMessage(body);
        LLHTTPClient::post(url, body, new ViewerStatsResponder());
 }
diff --git a/linden/indra/newview/llviewerstats.h b/linden/indra/newview/llviewerstats.h
index 7d3698c..a0b80f2 100644
--- a/linden/indra/newview/llviewerstats.h
+++ b/linden/indra/newview/llviewerstats.h
@@ -34,7 +34,7 @@
 #include "llstat.h"
-class LLViewerStats
+class LLViewerStats : public LLSingleton<LLViewerStats>
 {
 public:
        LLStat mKBitStat;
@@ -69,6 +69,11 @@ public:
        LLStat mSimNetMsec;
        LLStat mSimSimOtherMsec;
        LLStat mSimSimPhysicsMsec;
+        LLStat mSimSimPhysicsStepMsec;
+        LLStat mSimSimPhysicsShapeUpdateMsec;
+        LLStat mSimSimPhysicsOtherMsec;
        LLStat mSimAgentMsec;
        LLStat mSimImagesMsec;
        LLStat mSimScriptMsec;
@@ -86,6 +91,9 @@ public:
        LLStat mSimPendingLocalUploads;
        LLStat mSimTotalUnackedBytes;
+        LLStat mPhysicsPinnedTasks;
+        LLStat mPhysicsLODTasks;
+        LLStat mPhysicsMemoryAllocated;
        /*
        LLStat mSimCPUUsageStat;
        LLStat mSimMemTotalStat;
@@ -185,8 +193,6 @@ private:
        F64 mLastTimeDiff;  // used for time stat updates
 };
-extern LLViewerStats *gViewerStats;
 static const F32 SEND_STATS_PERIOD = 300.0f;
 // The following are from (older?) statistics code found in appviewer.
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 15085ac..60ec187 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -54,13 +54,15 @@
 #include "llviewerimagelist.h"
 #include "llviewerwindow.h"
 #include "llviewerinventory.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llnotecard.h"
 #include "llmemorystream.h"
 #include "llmenugl.h"
 #include "llappviewer.h" // for gPacificDaylightTime
+static LLRegisterWidget<LLViewerTextEditor> r("text_editor");
 ///----------------------------------------------------------------------------
 /// Class LLEmbeddedNotecardOpener
 ///----------------------------------------------------------------------------
@@ -424,15 +426,15 @@ void LLEmbeddedItems::bindEmbeddedChars( LLFontGL* font ) const
                        break;
                  case LLAssetType::AT_NOTECARD:                img_name = "inv_item_notecard.tga";     break;
                  case LLAssetType::AT_LSL_TEXT:                img_name = "inv_item_script.tga";       break;
-                  case LLAssetType::AT_BODYPART:                img_name = "inv_item_bodypart.tga";     break;
+                  case LLAssetType::AT_BODYPART:                img_name = "inv_item_skin.tga"; break;
                  case LLAssetType::AT_ANIMATION:               img_name = "inv_item_animation.tga";break;
                  case LLAssetType::AT_GESTURE:                 img_name = "inv_item_gesture.tga";      break;
                  default: llassert(0); continue;
                }
-                LLViewerImage* image = gImageList.getImage(LLUUID(gViewerArt.getString(img_name)), MIPMAP_FALSE, TRUE);
+                LLUIImagePtr image = LLUI::getUIImage(img_name);
-                font->addEmbeddedChar( wch, image, item->getName() );
+                font->addEmbeddedChar( wch, image->getImage(), item->getName() );
        }
 }
@@ -575,7 +577,8 @@ LLViewerTextEditor::LLViewerTextEditor(const LLString& name,
        // *TODO: Add right click menus for SLURLs
        // Build the right click menu
        // make the popup menu available
-        //LLMenuGL* menu = gUICtrlFactory->buildMenu("menu_slurl.xml", this);
+        //LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_slurl.xml", this);
        //if (!menu)
        //{
        //      menu = new LLMenuGL("");
@@ -694,7 +697,7 @@ BOOL LLViewerTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
                                S32 screen_x;
                                S32 screen_y;
                                localPointToScreen(x, y, &screen_x, &screen_y );
-                                gToolDragAndDrop->setDragStart( screen_x, screen_y );
+                                LLToolDragAndDrop::getInstance()->setDragStart( screen_x, screen_y );
                                start_select = FALSE;
                        }
@@ -779,108 +782,105 @@ BOOL LLViewerTextEditor::handleHover(S32 x, S32 y, MASK mask)
                // leave hover segment active during drag and drop
                mHoverSegment = NULL;
        }
-        if( getVisible() )
+        if(hasMouseCapture() )
        {
-                if(hasMouseCapture() )
+                if( mIsSelecting ) 
                {
-                        if( mIsSelecting ) 
+                        if (x != mLastSelectionX || y != mLastSelectionY)
                        {
-                                if (x != mLastSelectionX || y != mLastSelectionY)
+                                mLastSelectionX = x;
-                                {
+                                mLastSelectionY = y;
-                                        mLastSelectionX = x;
+                        }
-                                        mLastSelectionY = y;
-                                }
-                                if( y > getTextRect().mTop )
-                                {
-                                        mScrollbar->setDocPos( mScrollbar->getDocPos() - 1 );
-                                }
-                                else
-                                if( y < getTextRect().mBottom )
-                                {
-                                        mScrollbar->setDocPos( mScrollbar->getDocPos() + 1 );
-                                }
-                                setCursorAtLocalPos( x, y, TRUE );
+                        if( y > getTextRect().mTop )
-                                mSelectionEnd = mCursorPos;
+                        {
-                                
+                                mScrollbar->setDocPos( mScrollbar->getDocPos() - 1 );
-                                updateScrollFromCursor();
-                                getWindow()->setCursor(UI_CURSOR_IBEAM);
                        }
-                        else if( mDragItem )
+                        else
+                        if( y < getTextRect().mBottom )
                        {
-                                S32 screen_x;
+                                mScrollbar->setDocPos( mScrollbar->getDocPos() + 1 );
-                                S32 screen_y;
-                                localPointToScreen(x, y, &screen_x, &screen_y );
-                                if( gToolDragAndDrop->isOverThreshold( screen_x, screen_y ) )
-                                {
-                                        gToolDragAndDrop->beginDrag(
-                                                LLAssetType::lookupDragAndDropType( mDragItem->getType() ),
-                                                mDragItem->getUUID(),
-                                                LLToolDragAndDrop::SOURCE_NOTECARD,
-                                                getSourceID(), mObjectID);
-                                        return gToolDragAndDrop->handleHover( x, y, mask );
-                                }
-                                getWindow()->setCursor(UI_CURSOR_HAND);
                        }
-                        lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (active)" << llendl;               
+                        setCursorAtLocalPos( x, y, TRUE );
-                        handled = TRUE;
+                        mSelectionEnd = mCursorPos;
-                }
+                        
+                        updateScrollFromCursor();
-                if( !handled )
+                        getWindow()->setCursor(UI_CURSOR_IBEAM);
-                {
-                        // Pass to children
-                        handled = LLView::childrenHandleHover(x, y, mask) != NULL;
-                }
-                if( handled )
-                {
-                        // Delay cursor flashing
-                        resetKeystrokeTimer();
                }
-        
+                else if( mDragItem )
-                // Opaque
-                if( !handled && mTakesNonScrollClicks)
                {
-                        // Check to see if we're over an HTML-style link
+                        S32 screen_x;
-                        if( !mSegments.empty() )
+                        S32 screen_y;
+                        localPointToScreen(x, y, &screen_x, &screen_y );
+                        if( LLToolDragAndDrop::getInstance()->isOverThreshold( screen_x, screen_y ) )
                        {
-                                const LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
+                                LLToolDragAndDrop::getInstance()->beginDrag(
-                                if( cur_segment )
+                                        LLAssetType::lookupDragAndDropType( mDragItem->getType() ),
-                                {
+                                        mDragItem->getUUID(),
-                                        if(cur_segment->getStyle().isLink())
+                                        LLToolDragAndDrop::SOURCE_NOTECARD,
-                                        {
+                                        getSourceID(), mObjectID);
-                                                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over link, inactive)" << llendl;          
-                                                getWindow()->setCursor(UI_CURSOR_HAND);
+                                return LLToolDragAndDrop::getInstance()->handleHover( x, y, mask );
-                                                handled = TRUE;
-                                        }
-                                        else
-                                        if(cur_segment->getStyle().getIsEmbeddedItem())
-                                        {
-                                                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over embedded item, inactive)" << llendl;         
-                                                getWindow()->setCursor(UI_CURSOR_HAND);
-                                                //getWindow()->setCursor(UI_CURSOR_ARROW);
-                                                handled = TRUE;
-                                        }
-                                        mHoverSegment = cur_segment;
-                                }
                        }
+                        getWindow()->setCursor(UI_CURSOR_HAND);
+                }
-                        if( !handled )
+                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (active)" << llendl;               
+                handled = TRUE;
+        }
+        if( !handled )
+        {
+                // Pass to children
+                handled = LLView::childrenHandleHover(x, y, mask) != NULL;
+        }
+        if( handled )
+        {
+                // Delay cursor flashing
+                resetKeystrokeTimer();
+        }
+        // Opaque
+        if( !handled && mTakesNonScrollClicks)
+        {
+                // Check to see if we're over an HTML-style link
+                if( !mSegments.empty() )
+                {
+                        const LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
+                        if( cur_segment )
                        {
-                                lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (inactive)" << llendl;             
+                                if(cur_segment->getStyle().isLink())
-                                if (!mScrollbar->getVisible() || x < getRect().getWidth() - SCROLLBAR_SIZE)
                                {
-                                        getWindow()->setCursor(UI_CURSOR_IBEAM);
+                                        lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over link, inactive)" << llendl;          
+                                        getWindow()->setCursor(UI_CURSOR_HAND);
+                                        handled = TRUE;
                                }
                                else
+                                if(cur_segment->getStyle().getIsEmbeddedItem())
                                {
-                                        getWindow()->setCursor(UI_CURSOR_ARROW);
+                                        lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over embedded item, inactive)" << llendl;         
+                                        getWindow()->setCursor(UI_CURSOR_HAND);
+                                        //getWindow()->setCursor(UI_CURSOR_ARROW);
+                                        handled = TRUE;
                                }
-                                handled = TRUE;
+                                mHoverSegment = cur_segment;
+                        }
+                }
+                if( !handled )
+                {
+                        lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (inactive)" << llendl;             
+                        if (!mScrollbar->getVisible() || x < getRect().getWidth() - SCROLLBAR_SIZE)
+                        {
+                                getWindow()->setCursor(UI_CURSOR_IBEAM);
                        }
+                        else
+                        {
+                                getWindow()->setCursor(UI_CURSOR_ARROW);
+                        }
+                        handled = TRUE;
                }
        }
@@ -962,8 +962,6 @@ BOOL LLViewerTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
 BOOL LLViewerTextEditor::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
        BOOL handled = childrenHandleRightMouseDown(x, y, mask) != NULL;
        // *TODO: Add right click menus for SLURLs
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index 9b9bd2f..347180b 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -126,14 +126,13 @@ private:
        LLPointer<class LLEmbeddedNotecardOpener> mInventoryCallback;
        // *TODO: Add right click menus for SLURLs
-        //LLHandle<LLView> mPopupMenuHandle;
+        //LLViewHandle mPopupMenuHandle;
        //
        // Inner classes
        //
        class LLTextCmdInsertEmbeddedItem;
 };
 #endif  // LL_VIEWERTEXTEDITOR_H
diff --git a/linden/indra/newview/llviewerthrottle.cpp b/linden/indra/newview/llviewerthrottle.cpp
index 75357ba..ceff856 100644
--- a/linden/indra/newview/llviewerthrottle.cpp
+++ b/linden/indra/newview/llviewerthrottle.cpp
@@ -307,7 +307,7 @@ void LLViewerThrottle::updateDynamicThrottle()
        }
        mUpdateTimer.reset();
-        if (gViewerStats->mPacketsLostPercentStat.getMean() > TIGHTEN_THROTTLE_THRESHOLD)
+        if (LLViewerStats::getInstance()->mPacketsLostPercentStat.getMean() > TIGHTEN_THROTTLE_THRESHOLD)
        {
                if (mThrottleFrac <= MIN_FRACTIONAL || mCurrentBandwidth / 1024.0f <= MIN_BANDWIDTH)
                {
@@ -320,7 +320,7 @@ void LLViewerThrottle::updateDynamicThrottle()
                mCurrent.sendToSim();
                llinfos << "Tightening network throttle to " << mCurrentBandwidth << llendl;
        }
-        else if (gViewerStats->mPacketsLostPercentStat.getMean() <= EASE_THROTTLE_THRESHOLD)
+        else if (LLViewerStats::getInstance()->mPacketsLostPercentStat.getMean() <= EASE_THROTTLE_THRESHOLD)
        {
                if (mThrottleFrac >= MAX_FRACTIONAL || mCurrentBandwidth / 1024.0f >= MAX_BANDWIDTH)
                {
diff --git a/linden/indra/newview/llvieweruictrlfactory.cpp b/linden/indra/newview/llvieweruictrlfactory.cpp
deleted file mode 100644
index 3a4df1c..0000000
--- a/linden/indra/newview/llvieweruictrlfactory.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/** 
- * @file llvieweruictrlfactory.cpp
- * @brief factory class for creating UI controls
- *
- * $LicenseInfo:firstyear=2003&license=viewergpl$
- * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-#include "llviewerprecompiledheaders.h"
-#include <fstream>
-#include <boost/tokenizer.hpp>
-#include "v4color.h"
-#include "llvieweruictrlfactory.h"
-#include "llcolorswatch.h"
-#include "llinventoryview.h"
-#include "llviewertexteditor.h"
-#include "lltexturectrl.h"
-#include "llnameeditor.h"
-#include "llnamelistctrl.h"
-#include "llwebbrowserctrl.h"
-#include "lljoystickbutton.h"
-#include "llmediaremotectrl.h"
-#include "v4color.h"
-#include <boost/tokenizer.hpp>
-LLUICtrlFactory* gUICtrlFactory = NULL;
-//-----------------------------------------------------------------------------
-// LLUICtrlFactory()
-//-----------------------------------------------------------------------------
-LLViewerUICtrlFactory::LLViewerUICtrlFactory()
-:       LLUICtrlFactory()
-{
-        // Register controls
-        LLUICtrlCreator<LLColorSwatchCtrl>::registerCreator(LL_COLOR_SWATCH_CTRL_TAG, this);
-        LLUICtrlCreator<LLViewerTextEditor>::registerCreator(LL_TEXT_EDITOR_TAG, this);
-        LLUICtrlCreator<LLTextureCtrl>::registerCreator(LL_TEXTURE_CTRL_TAG, this);
-        LLUICtrlCreator<LLNameListCtrl>::registerCreator(LL_NAME_LIST_CTRL_TAG, this);
-        LLUICtrlCreator<LLNameEditor>::registerCreator(LL_NAME_EDITOR_TAG, this);
-        LLUICtrlCreator<LLInventoryPanel>::registerCreator(LL_INVENTORY_PANEL_TAG, this);
-        LLUICtrlCreator<LLWebBrowserCtrl>::registerCreator(LL_WEB_BROWSER_CTRL_TAG, this);
-        LLUICtrlCreator<LLJoystickAgentSlide>::registerCreator(LL_JOYSTICK_SLIDE, this);
-        LLUICtrlCreator<LLJoystickAgentTurn>::registerCreator(LL_JOYSTICK_TURN, this);
-        LLUICtrlCreator<LLMediaRemoteCtrl>::registerCreator(LL_MEDIA_REMOTE_CTRL_TAG, this);
-}
-//-----------------------------------------------------------------------------
-// ~LLUICtrlFactory()
-//-----------------------------------------------------------------------------
-LLViewerUICtrlFactory::~LLViewerUICtrlFactory()
-{
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-LLColorSwatchCtrl*      LLViewerUICtrlFactory::getColorSwatchByName(LLPanel* panelp, const LLString& name)      
-{ 
-        return panelp->getChild<LLColorSwatchCtrl>(name); 
-}
-LLNameListCtrl*         LLViewerUICtrlFactory::getNameListByName(LLPanel* panelp, const LLString& name)         
-{ 
-        return panelp->getChild<LLNameListCtrl>(name); 
-}
-LLTextureCtrl*          LLViewerUICtrlFactory::getTexturePickerByName(LLPanel* panelp, const LLString& name)
-{
-        return panelp->getChild<LLTextureCtrl>(name); 
-}
-LLWebBrowserCtrl*       LLViewerUICtrlFactory::getWebBrowserByName(LLPanel* panelp, const LLString& name)
-{
-        return panelp->getChild<LLWebBrowserCtrl>(name); 
-}
-LLViewerTextEditor* LLViewerUICtrlFactory::getViewerTextEditorByName(LLPanel* panelp, const LLString& name)             
-{ 
-        return panelp->getChild<LLViewerTextEditor>(name); 
-}
-LLNameEditor* LLViewerUICtrlFactory::getNameEditorByName(LLPanel* panelp, const LLString& name)         
-{ 
-        return panelp->getChild<LLNameEditor>(name); 
-}
-LLMediaRemoteCtrl* LLViewerUICtrlFactory::getMediaRemoteByName(LLPanel* panelp, const LLString& name)           
-{ 
-        return panelp->getChild<LLMediaRemoteCtrl>(name); 
-}
-LLJoystickAgentTurn* LLViewerUICtrlFactory::getJoystickAgentTurnByName(LLPanel* panelp, const LLString& name)           
-{ 
-        return panelp->getChild<LLJoystickAgentTurn>(name); 
-}
-LLJoystickAgentSlide* LLViewerUICtrlFactory::getJoystickAgentSlideByName(LLPanel* panelp, const LLString& name)         
-{ 
-        return panelp->getChild<LLJoystickAgentSlide>(name); 
-}
diff --git a/linden/indra/newview/llvieweruictrlfactory.h b/linden/indra/newview/llvieweruictrlfactory.h
deleted file mode 100644
index abfb701..0000000
--- a/linden/indra/newview/llvieweruictrlfactory.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/** 
- * @file llvieweruictrlfactory.h
- * @brief factory class for creating UI controls
- *
- * $LicenseInfo:firstyear=2003&license=viewergpl$
- * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-#ifndef LL_LLVIEWERUICTRLFACTORY_H
-#define LL_LLVIEWERUICTRLFACTORY_H
-#include "lluictrlfactory.h"
-class LLControlGroup;
-class LLColorSwatchCtrl;
-class LLInventoryPanel;
-class LLNameListCtrl;
-class LLNameEditor;
-class LLTextureCtrl;
-class LLWebBrowserCtrl;
-class LLViewerTextEditor;
-class LLMediaRemoteCtrl;
-class LLJoystickAgentTurn;
-class LLJoystickAgentSlide;
-class LLViewerUICtrlFactory : public LLUICtrlFactory
-{
-public:
-        LLViewerUICtrlFactory();
-        // do not call!  needs to be public so run-time can clean up the singleton
-        virtual ~LLViewerUICtrlFactory();
-        // specific typed getters
-        static LLColorSwatchCtrl*       getColorSwatchByName(LLPanel* panelp, const LLString& name);
-        static LLNameListCtrl*          getNameListByName(LLPanel* panelp, const LLString& name);
-        static LLTextureCtrl*           getTexturePickerByName(LLPanel* panelp, const LLString& name);
-        static LLWebBrowserCtrl*        getWebBrowserByName(LLPanel* panelp, const LLString& name);
-        static LLViewerTextEditor*      getViewerTextEditorByName(      LLPanel* panelp, const LLString& name);
-        static LLNameEditor*            getNameEditorByName(LLPanel* panelp, const LLString& name);
-        static LLMediaRemoteCtrl*   getMediaRemoteByName(LLPanel* panelp, const LLString& name);
-        static LLJoystickAgentTurn* getJoystickAgentTurnByName(LLPanel* panelp, const LLString& name);
-        static LLJoystickAgentSlide* getJoystickAgentSlideByName(LLPanel* panelp, const LLString& name);
-};
-extern LLUICtrlFactory* gUICtrlFactory;
-#endif //LL_LLVIEWERUICTRLFACTORY_H
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index a82b162..a14a3b3 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -32,6 +32,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llpanellogin.h"
+#include "llviewerkeyboard.h"
 #include "llviewerwindow.h"
 // system library includes
@@ -76,7 +77,6 @@
 #include "llagent.h"
 #include "llalertdialog.h"
 #include "llbox.h"
-#include "llcameraview.h"
 #include "llchatbar.h"
 #include "llconsole.h"
 #include "llviewercontrol.h"
@@ -95,6 +95,7 @@
 #include "llfloateractivespeakers.h"
 #include "llfloaterbuildoptions.h"
 #include "llfloaterbuyland.h"
+#include "llfloatercamera.h"
 #include "llfloaterchat.h"
 #include "llfloaterchatterbox.h"
 #include "llfloatercustomize.h"
@@ -102,7 +103,6 @@
 #include "llfloaterland.h"
 #include "llfloaterinspect.h"
 #include "llfloatermap.h"
-#include "llfloatermute.h"
 #include "llfloaternamedesc.h"
 #include "llfloaterpreference.h"
 #include "llfloatersnapshot.h"
@@ -132,7 +132,7 @@
 #include "llresmgr.h"
 #include "llrootview.h"
 #include "llselectmgr.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llstartup.h"
 #include "llstatusbar.h"
 #include "llstatview.h"
@@ -155,10 +155,9 @@
 #include "lltoolmorph.h"
 #include "lltoolpie.h"
 #include "lltoolplacer.h"
-#include "lltoolselect.h"
 #include "lltoolselectland.h"
 #include "lltoolview.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "lluploaddialog.h"
 #include "llurldispatcher.h"            // SLURL from other app instance
 #include "llvieweraudio.h"
@@ -177,12 +176,12 @@
 #include "llvovolume.h"
 #include "llworld.h"
 #include "llworldmapview.h"
-#include "moviemaker.h"
 #include "pipeline.h"
 #include "llappviewer.h"
 #include "llurlsimstring.h"
 #include "llviewerdisplay.h"
 #include "llspatialpartition.h"
+#include "llviewerjoystick.h"
 #if LL_WINDOWS
 #include "llwindebug.h"
@@ -241,11 +240,6 @@ BOOL			gPickTransparent = TRUE;
 BOOL                    gDebugFastUIRender = FALSE;
-BOOL                    gbCapturing = FALSE;
-#if !LL_SOLARIS
-MovieMaker              gMovieMaker;
-#endif
 // HUD display lines in lower right
 BOOL                            gDisplayWindInfo = FALSE;
 BOOL                            gDisplayCameraPos = FALSE;
@@ -268,7 +262,6 @@ const S32 PICK_DIAMETER = 2 * PICK_HALF_WIDTH+1;
 const F32 MIN_DISPLAY_SCALE = 0.85f;
 const S32 CONSOLE_BOTTOM_PAD = 40;
 #ifdef SABINRIG
 /// ALL RIG STUFF
 bool rigControl = false;
@@ -486,7 +479,7 @@ public:
                        camera_center_text = llformat("CameraCenter %f %f %f",
                                                                                  (F32)(tvector.mdV[VX]), (F32)(tvector.mdV[VY]), (F32)(tvector.mdV[VZ]));
-                        tvector = LLVector4(gCamera->getAtAxis());
+                        tvector = LLVector4(LLViewerCamera::getInstance()->getAtAxis());
                        camera_view_text = llformat("CameraAtAxis    %f %f %f",
                                                                                (F32)(tvector.mdV[VX]), (F32)(tvector.mdV[VY]), (F32)(tvector.mdV[VZ]));
                
@@ -520,9 +513,16 @@ public:
                }
                if (gDisplayFOV)
                {
-                        addText(xpos, ypos, llformat("FOV: %2.1f deg", RAD_TO_DEG * gCamera->getView()));
+                        addText(xpos, ypos, llformat("FOV: %2.1f deg", RAD_TO_DEG * LLViewerCamera::getInstance()->getView()));
                        ypos += y_inc;
                }
+                
+                if (LLViewerJoystick::getInstance()->getOverrideCamera())
+                {
+                        addText(xpos + 200, ypos, llformat("Flycam"));
+                        ypos += y_inc;
+                }
+                
                if (gSavedSettings.getBOOL("DebugShowRenderInfo"))
                {
                        if (gPipeline.getUseVertexShaders() == 0)
@@ -698,13 +698,10 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
                gHoverView->cancelHover();
        }
-        if (gToolMgr)
+        // Don't let the user move the mouse out of the window until mouse up.
+        if( LLToolMgr::getInstance()->getCurrentTool()->clipMouseWhenDown() )
        {
-                // Don't let the user move the mouse out of the window until mouse up.
+                mWindow->setMouseClipping(TRUE);
-                if( gToolMgr->getCurrentTool()->clipMouseWhenDown() )
-                {
-                        mWindow->setMouseClipping(TRUE);
-                }
        }
        LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
@@ -756,16 +753,13 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
                return FALSE;
        }
-        if (gToolMgr)
+        if(LLToolMgr::getInstance()->getCurrentTool()->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
-                        // This is necessary to force clicks in the world to cause edit
+                // cause a commit to update their value.  JC
-                        // boxes that might have keyboard focus to relinquish it, and hence
+                gFocusMgr.setKeyboardFocus(NULL);
-                        // cause a commit to update their value.  JC
+                return TRUE;
-                        gFocusMgr.setKeyboardFocus(NULL);
-                        return TRUE;
-                }
        }
        return FALSE;
@@ -842,12 +836,9 @@ BOOL LLViewerWindow::handleDoubleClick(LLWindow *window,  LLCoordGL pos, MASK ma
                return TRUE;
        }
-        if (gToolMgr)
+        if(LLToolMgr::getInstance()->getCurrentTool()->handleDoubleClick( x, y, mask ) )
        {
-                if(gToolMgr->getCurrentTool()->handleDoubleClick( x, y, mask ) )
+                return TRUE;
-                {
-                        return TRUE;
-                }
        }
        // if we got this far and nothing handled a double click, pass a normal mouse down
@@ -886,15 +877,11 @@ BOOL LLViewerWindow::handleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask)
        mWindow->releaseMouse();
-        LLTool *tool = NULL;
+        LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
-        if (gToolMgr)
-        {
-                tool = gToolMgr->getCurrentTool();
-                if( tool->clipMouseWhenDown() )
+        if( tool->clipMouseWhenDown() )
-                {
+        {
-                        mWindow->setMouseClipping(FALSE);
+                mWindow->setMouseClipping(FALSE);
-                }
        }
        LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
@@ -986,13 +973,10 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
                gHoverView->cancelHover();
        }
-        if (gToolMgr)
+        // Don't let the user move the mouse out of the window until mouse up.
+        if( LLToolMgr::getInstance()->getCurrentTool()->clipMouseWhenDown() )
        {
-                // Don't let the user move the mouse out of the window until mouse up.
+                mWindow->setMouseClipping(TRUE);
-                if( gToolMgr->getCurrentTool()->clipMouseWhenDown() )
-                {
-                        mWindow->setMouseClipping(TRUE);
-                }
        }
        LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
@@ -1036,26 +1020,23 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
                llinfos << "Right Mouse Down not handled by view" << llendl;
        }
-        if (gToolMgr)
+        if(LLToolMgr::getInstance()->getCurrentTool()->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
-                        // This is necessary to force clicks in the world to cause edit
+                // cause a commit to update their value.  JC
-                        // boxes that might have keyboard focus to relinquish it, and hence
+                gFocusMgr.setKeyboardFocus(NULL);
-                        // cause a commit to update their value.  JC
+                return TRUE;
-                        gFocusMgr.setKeyboardFocus(NULL);
-                        return TRUE;
-                }
        }
        // *HACK: this should be rolled into the composite tool logic, not
        // hardcoded at the top level.
-        if (gToolPie && (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgent.getCameraMode()) )
+        if (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgent.getCameraMode())
        {
                // If the current tool didn't process the click, we should show
                // the pie menu.  This can be done by passing the event to the pie
                // menu tool.
-                gToolPie->handleRightMouseDown(x, y, mask);
+                LLToolPie::getInstance()->handleRightMouseDown(x, y, mask);
                // show_context_menu( x, y, mask );
        }
@@ -1095,15 +1076,11 @@ BOOL LLViewerWindow::handleRightMouseUp(LLWindow *window,  LLCoordGL pos, MASK m
        mWindow->releaseMouse();
-        LLTool *tool = NULL;
+        LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
-        if (gToolMgr)
-        {
-                tool = gToolMgr->getCurrentTool();
-                if( tool->clipMouseWhenDown() )
+        if( tool->clipMouseWhenDown() )
-                {
+        {
-                        mWindow->setMouseClipping(FALSE);
+                mWindow->setMouseClipping(FALSE);
-                }
        }
        LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
@@ -1252,10 +1229,7 @@ void LLViewerWindow::handleFocus(LLWindow *window)
        LLModalDialog::onAppFocusGained();
        gAgent.onAppFocusGained();
-        if (gToolMgr)
+        LLToolMgr::getInstance()->onAppFocusGained();
-        {
-                gToolMgr->onAppFocusGained();
-        }
        gShowTextEditCursor = TRUE;
@@ -1275,10 +1249,7 @@ void LLViewerWindow::handleFocusLost(LLWindow *window)
 {
        gFocusMgr.setAppHasFocus(FALSE);
        //LLModalDialog::onAppFocusLost();
-        if( gToolMgr )
+        LLToolMgr::getInstance()->onAppFocusLost();
-        {
-                gToolMgr->onAppFocusLost();
-        }
        gFocusMgr.setMouseCapture( NULL );
        if (gMenuBarView)
@@ -1340,6 +1311,7 @@ BOOL LLViewerWindow::handleTranslatedKeyUp(KEY key,  MASK mask)
 void LLViewerWindow::handleScanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level)
 {
+        LLViewerJoystick::getInstance()->setCameraNeedsUpdate(true);
        return gViewerKeyboard.scanKey(key, key_down, key_up, key_level);
 }
@@ -1402,6 +1374,12 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated)
        return TRUE;
 }
+BOOL LLViewerWindow::handleActivateApp(LLWindow *window, BOOL activating)
+{
+        LLViewerJoystick::getInstance()->setNeedsReset(true);
+        return FALSE;
+}
 void LLViewerWindow::handleMenuSelect(LLWindow *window,  S32 menu_item)
 {
@@ -1434,9 +1412,9 @@ BOOL LLViewerWindow::handlePaint(LLWindow *window,  S32 x,  S32 y, S32 width,  S
                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(),
+                                LLViewerStats::getInstance()->mFPSStat.getMeanPerSec(),
-                                gViewerStats->mSimPhysicsFPS.getPrev(0),
+                                LLViewerStats::getInstance()->mSimPhysicsFPS.getPrev(0),
-                                gViewerStats->mSimTimeDilation.getPrev(0));
+                                LLViewerStats::getInstance()->mSimTimeDilation.getPrev(0));
                len = strlen(temp_str);         /* Flawfinder: ignore */
                TextOutA(hdc, 0, 0, temp_str, len); 
@@ -1488,6 +1466,26 @@ void LLViewerWindow::handleDataCopy(LLWindow *window, S32 data_type, void *data)
        }
 }
+BOOL LLViewerWindow::handleTimerEvent(LLWindow *window)
+{
+        if (LLViewerJoystick::getInstance()->getOverrideCamera())
+        {
+                LLViewerJoystick::getInstance()->updateStatus();
+                return TRUE;
+        }
+        return FALSE;
+}
+BOOL LLViewerWindow::handleDeviceChange(LLWindow *window)
+{
+        // give a chance to use a joystick after startup (hot-plugging)
+        if (!LLViewerJoystick::getInstance()->isJoystickInitialized() )
+        {
+                LLViewerJoystick::getInstance()->init(true);
+                return TRUE;
+        }
+        return FALSE;
+}
 //
 // Classes
@@ -1528,7 +1526,8 @@ LLViewerWindow::LLViewerWindow(
                gNoRender,
                gSavedSettings.getBOOL("DisableVerticalSync"),
                !gNoRender,
-                ignore_pixel_depth);
+                ignore_pixel_depth,
+                gSavedSettings.getU32("RenderFSAASamples"));
 #if LL_WINDOWS
        if (!LLWinDebug::setupExceptionHandler())
        {
@@ -1572,21 +1571,21 @@ LLViewerWindow::LLViewerWindow(
        //
        llinfos << "Loading feature tables." << llendl;
-        gFeatureManagerp->init();
+        LLFeatureManager::getInstance()->init();
        // Initialize OpenGL Renderer
-        if (!gFeatureManagerp->isFeatureAvailable("RenderVBOEnable") ||
+        if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
                !gGLManager.mHasVertexBufferObject)
        {
                gSavedSettings.setBOOL("RenderVBOEnable", FALSE);
        }
        LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable"));
-        if (gFeatureManagerp->isSafe()
+        if (LLFeatureManager::getInstance()->isSafe()
-                || (gSavedSettings.getS32("LastFeatureVersion") != gFeatureManagerp->getVersion())
+                || (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion())
                || (gSavedSettings.getBOOL("ProbeHardwareOnStartup")))
        {
-                gFeatureManagerp->applyRecommendedSettings();
+                LLFeatureManager::getInstance()->applyRecommendedSettings();
                gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE);
        }
@@ -1594,7 +1593,7 @@ LLViewerWindow::LLViewerWindow(
        if (gSavedSettings.getBOOL("RenderInitError"))
        {
                mInitAlert = "DisplaySettingsNoShaders";
-                gFeatureManagerp->setGraphicsLevel(0, false);
+                LLFeatureManager::getInstance()->setGraphicsLevel(0, false);
                gSavedSettings.setU32("RenderQualityPerformance", 0);           
                
        }
@@ -1617,9 +1616,6 @@ LLViewerWindow::LLViewerWindow(
                initFonts();
        }
-        // Init Resource Manager
-        gResMgr = new LLResMgr();
        // Make avatar head look forward at start
        mCurrentMousePoint.mX = getWindowWidth() / 2;
        mCurrentMousePoint.mY = getWindowHeight() / 2;
@@ -1790,6 +1786,19 @@ void adjust_rect_top_left(const LLString& control, const LLRect& window)
        }
 }
+void adjust_rect_top_center(const LLString& control, const LLRect& window)
+{
+        LLRect r = gSavedSettings.getRect(control);
+        if (r.mLeft == 0 && r.mBottom == 0)
+        {
+                r.setLeftTopAndSize( window.getWidth()/2 - r.getWidth()/2,
+                        window.getHeight(),
+                        r.getWidth(),
+                        r.getHeight() );
+                gSavedSettings.setRect(control, r);
+        }
+}
 void adjust_rect_top_right(const LLString& control, const LLRect& window)
 {
        LLRect r = gSavedSettings.getRect(control);
@@ -1808,9 +1817,11 @@ void adjust_rect_bottom_center(const LLString& control, const LLRect& window)
        LLRect r = gSavedSettings.getRect(control);
        if (r.mLeft == 0 && r.mBottom == 0)
        {
+                // *TODO: Adjust based on XUI XML
+                const S32 TOOLBAR_HEIGHT = 64;
                r.setOriginAndSize(
                        window.getWidth()/2 - r.getWidth()/2,
-                        0,
+                        TOOLBAR_HEIGHT,
                        r.getWidth(),
                        r.getHeight());
                gSavedSettings.setRect(control, r);
@@ -1844,24 +1855,24 @@ void LLViewerWindow::adjustRectanglesForFirstUse(const LLRect& window)
 {
        LLRect r;
-        adjust_rect_bottom_center("FloaterMoveRect", window);
+        adjust_rect_bottom_center("FloaterMoveRect2", window);
-        adjust_rect_bottom_center("FloaterCameraRect", window);
+        adjust_rect_top_center("FloaterCameraRect3", window);
        adjust_rect_top_left("FloaterCustomizeAppearanceRect", window);
        adjust_rect_top_left("FloaterLandRect5", window);
+        adjust_rect_top_left("FloaterHUDRect", window);
        adjust_rect_top_left("FloaterFindRect2", window);
-        adjust_rect_top_left("FloaterGestureRect", window);
+        adjust_rect_top_left("FloaterGestureRect2", window);
        adjust_rect_top_right("FloaterMiniMapRect", window);
        
        adjust_rect_top_right("FloaterLagMeter", window);
-        adjust_rect_top_right("FloaterLagMeter", window);
        adjust_rect_top_left("FloaterBuildOptionsRect", window);
        // bottom-right
@@ -1921,7 +1932,7 @@ void LLViewerWindow::initWorldUI()
                mRootView->addChild(gMorphView);
                gMorphView->setVisible(FALSE);
-                gFloaterMute = LLFloaterMute::getInstance();
+                // *Note: this is where gFloaterMute used to be initialized.
                LLWorldMapView::initClass();
@@ -1981,15 +1992,12 @@ LLViewerWindow::~LLViewerWindow()
        // Automatically deleted as children of mRootView.  Fix the globals.
        gFloaterTools = NULL;
        gStatusBar = NULL;
-        gFloaterCamera = NULL;
        gIMMgr = NULL;
        gHoverView = NULL;
        gFloaterView            = NULL;
        gMorphView                      = NULL;
-        gFloaterMute = NULL;
        gFloaterMap     = NULL;
        gHUDView = NULL;
@@ -1997,9 +2005,6 @@ LLViewerWindow::~LLViewerWindow()
        delete mToolTip;
        mToolTip = NULL;
-        delete gResMgr;
-        gResMgr = NULL;
        
        //--------------------------------------------------------
        // Shutdown GL cleanly.  Order is very important here.
@@ -2028,11 +2033,8 @@ LLViewerWindow::~LLViewerWindow()
        delete[] mPickBuffer;
        mPickBuffer = NULL;
-        if (gSelectMgr)
+        llinfos << "Cleaning up select manager" << llendl;
-        {
+        LLSelectMgr::getInstance()->cleanup();
-                llinfos << "Cleaning up select manager" << llendl;
-                gSelectMgr->cleanup();
-        }
        LLVertexBuffer::cleanupClass();
@@ -2106,17 +2108,17 @@ void LLViewerWindow::reshape(S32 width, S32 height)
                glViewport(0, 0, width, height );
-                if (height > 0 && gCamera)
+                if (height > 0)
                { 
-                        gCamera->setViewHeightInPixels( height );
+                        LLViewerCamera::getInstance()->setViewHeightInPixels( height );
                        if (mWindow->getFullscreen())
                        {
                                // force to 4:3 aspect for odd resolutions
-                                gCamera->setAspect( getDisplayAspectRatio() );
+                                LLViewerCamera::getInstance()->setAspect( getDisplayAspectRatio() );
                        }
                        else
                        {
-                                gCamera->setAspect( width / (F32) height);
+                                LLViewerCamera::getInstance()->setAspect( width / (F32) height);
                        }
                }
@@ -2173,8 +2175,8 @@ void LLViewerWindow::reshape(S32 width, S32 height)
                        }
                }
-                gViewerStats->setStat(LLViewerStats::ST_WINDOW_WIDTH, (F64)width);
+                LLViewerStats::getInstance()->setStat(LLViewerStats::ST_WINDOW_WIDTH, (F64)width);
-                gViewerStats->setStat(LLViewerStats::ST_WINDOW_HEIGHT, (F64)height);
+                LLViewerStats::getInstance()->setStat(LLViewerStats::ST_WINDOW_HEIGHT, (F64)height);
                gResizeScreenTexture = TRUE;
        }
 }
@@ -2285,7 +2287,7 @@ void LLViewerWindow::draw()
                glLoadIdentity();
                microsecondsToTimecodeString(gFrameTime,text);
-                const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF );
+                const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
                font->renderUTF8(text, 0,
                                                llround((getWindowWidth()/2)-100.f),
                                                llround((getWindowHeight()-60.f)),
@@ -2302,30 +2304,24 @@ void LLViewerWindow::draw()
                glScalef(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f);
                LLVector2 old_scale_factor = LLUI::sGLScaleFactor;
-                if (gCamera)
+                // apply camera zoom transform (for high res screenshots)
+                F32 zoom_factor = LLViewerCamera::getInstance()->getZoomFactor();
+                S16 sub_region = LLViewerCamera::getInstance()->getZoomSubRegion();
+                if (zoom_factor > 1.f)
                {
-                        // apply camera zoom transform (for high res screenshots)
+                        //decompose subregion number to x and y values
-                        F32 zoom_factor = gCamera->getZoomFactor();
+                        int pos_y = sub_region / llceil(zoom_factor);
-                        S16 sub_region = gCamera->getZoomSubRegion();
+                        int pos_x = sub_region - (pos_y*llceil(zoom_factor));
-                        if (zoom_factor > 1.f)
+                        // offset for this tile
-                        {
+                        glTranslatef((F32)gViewerWindow->getWindowWidth() * -(F32)pos_x, 
-                                //decompose subregion number to x and y values
+                                                (F32)gViewerWindow->getWindowHeight() * -(F32)pos_y, 
-                                int pos_y = sub_region / llceil(zoom_factor);
+                                                0.f);
-                                int pos_x = sub_region - (pos_y*llceil(zoom_factor));
+                        glScalef(zoom_factor, zoom_factor, 1.f);
-                                // offset for this tile
+                        LLUI::sGLScaleFactor *= zoom_factor;
-                                glTranslatef((F32)gViewerWindow->getWindowWidth() * -(F32)pos_x, 
-                                                        (F32)gViewerWindow->getWindowHeight() * -(F32)pos_y, 
-                                                        0.f);
-                                glScalef(zoom_factor, zoom_factor, 1.f);
-                                LLUI::sGLScaleFactor *= zoom_factor;
-                        }
                }
-                if (gToolMgr)
+                // Draw tool specific overlay on world
-                {
+                LLToolMgr::getInstance()->getCurrentTool()->draw();
-                        // Draw tool specific overlay on world
-                        gToolMgr->getCurrentTool()->draw();
-                }
                if( gAgent.cameraMouselook() )
                {
@@ -2401,7 +2397,9 @@ void LLViewerWindow::draw()
 // Takes a single keydown event, usually when UI is visible
 BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
 {
-        if (gFocusMgr.getKeyboardFocus() && !(mask &     (MASK_CONTROL | MASK_ALT)))
+        if (gFocusMgr.getKeyboardFocus() 
+                && !(mask & (MASK_CONTROL | MASK_ALT))
+                && !gFocusMgr.getKeystrokesOnly())
        {
                // We have keyboard focus, and it's not an accelerator
@@ -2415,7 +2413,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
        // HACK look for UI editing keys
        if (LLView::sEditingUI)
        {
-                if (LLFloaterEditUI::handleKeyEditUI(key, mask))
+                if (LLFloaterEditUI::processKeystroke(key, mask))
                {
                        return TRUE;
                }
@@ -2547,12 +2545,9 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
                }
        }
-        if (gToolMgr)
+        if( LLToolMgr::getInstance()->getCurrentTool()->handleKey(key, mask) )
        {
-                if( gToolMgr->getCurrentTool()->handleKey(key, mask) )
+                return TRUE;
-                {
-                        return TRUE;
-                }
        }
        // Try for a new-format gesture
@@ -2570,14 +2565,14 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
        // Topmost view gets a chance before the hierarchy
        // *FIX: get rid of this?
-        LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
+        //LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
-        if (top_ctrl)
+        //if (top_ctrl)
-        {
+        //{
-                if( top_ctrl->handleKey( key, mask, TRUE ) )
+        //      if( top_ctrl->handleKey( key, mask, TRUE ) )
-                {
+        //      {
-                        return TRUE;
+        //              return TRUE;
-                }
+        //      }
-        }
+        //}
        // give floaters first chance to handle TAB key
        // so frontmost floater gets focus
@@ -2651,12 +2646,12 @@ BOOL LLViewerWindow::handleUnicodeChar(llwchar uni_char, MASK mask)
                        return TRUE;
                }
-                // Topmost view gets a chance before the hierarchy
+                //// Topmost view gets a chance before the hierarchy
-                LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
+                //LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
-                if (top_ctrl && top_ctrl->handleUnicodeChar( uni_char, FALSE ) )
+                //if (top_ctrl && top_ctrl->handleUnicodeChar( uni_char, FALSE ) )
-                {
+                //{
-                        return TRUE;
+                //      return TRUE;
-                }
+                //}
                return TRUE;
        }
@@ -2713,11 +2708,8 @@ void LLViewerWindow::handleScrollWheel(S32 clicks)
                llinfos << "Scroll Wheel not handled by view" << llendl;
        }
-        if (gWorldPointer)
+        // Zoom the camera in and out behavior
-        {
+        gAgent.handleScrollWheel(clicks);
-                // Zoom the camera in and out behavior
-                gAgent.handleScrollWheel(clicks);
-        }
        return;
 }
@@ -2904,9 +2896,9 @@ BOOL LLViewerWindow::handlePerFrameHover()
        // *NOTE: sometimes tools handle the mouse as a captor, so this
        // logic is a little confusing
        LLTool *tool = NULL;
-        if (gToolMgr && gHoverView && gCamera)
+        if (gHoverView)
        {
-                tool = gToolMgr->getCurrentTool();
+                tool = LLToolMgr::getInstance()->getCurrentTool();
                if(!handled && tool)
                {
@@ -2926,8 +2918,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->getBaseTool() == gToolPie) &&
+                        (LLToolMgr::getInstance()->getBaseTool() == LLToolPie::getInstance()) &&
-                        (gToolMgr->getCurrentTool() != gToolPie);
+                        (LLToolMgr::getInstance()->getCurrentTool() != LLToolPie::getInstance());
        }
@@ -2978,19 +2970,19 @@ BOOL LLViewerWindow::handlePerFrameHover()
                }
        }               
        
-        if (tool && tool != gToolNull  && tool != gToolInspect && tool != gToolDragAndDrop && !gSavedSettings.getBOOL("FreezeTime"))
+        if (tool && tool != gToolNull  && tool != LLToolCompInspect::getInstance() && tool != LLToolDragAndDrop::getInstance() && !gSavedSettings.getBOOL("FreezeTime"))
        { 
                LLMouseHandler *captor = gFocusMgr.getMouseCapture();
                // With the null, inspect, or drag and drop tool, don't muck
                // with visibility.
                if (gFloaterTools->isMinimized() ||
-                        (tool != gToolPie                                               // not default tool
+                        (tool != LLToolPie::getInstance()                                               // not default tool
-                        && tool != gToolGun                                             // not coming out of mouselook
+                        && tool != LLToolCompGun::getInstance()                                 // not coming out of mouselook
-                        && !mSuppressToolbox                                    // not override in third person
+                        && !mSuppressToolbox                                                                    // not override in third person
-                        && gToolMgr->getCurrentToolset() != gFaceEditToolset    // not special mode
+                        && LLToolMgr::getInstance()->getCurrentToolset() != gFaceEditToolset    // not special mode
-                        && gToolMgr->getCurrentToolset() != gMouselookToolset
+                        && LLToolMgr::getInstance()->getCurrentToolset() != gMouselookToolset
-                        && (!captor || captor->isView())) // not dragging
+                        && (!captor || captor->isView()))                                               // not dragging
                        )
                {
                        // Force floater tools to be visible (unless minimized)
@@ -3049,7 +3041,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
                // snap floaters to top of chat bar/button strip
                LLView* chatbar_and_buttons = gOverlayBar->getChild<LLView>("chatbar_and_buttons", TRUE);
-                // find top of chatbar and strate buttons, if either are visible
+                // find top of chatbar and state buttons, if either are visible
                if (chatbar_and_buttons && !chatbar_and_buttons->getLocalBoundingRect().isNull())
                {
                        // convert top/left corner of chatbar/buttons container to gFloaterView-relative coordinates
@@ -3088,9 +3080,9 @@ BOOL LLViewerWindow::handlePerFrameHover()
        mLastMousePoint = mCurrentMousePoint;
        // last ditch force of edit menu to selection manager
-        if (LLEditMenuHandler::gEditMenuHandler == NULL && gSelectMgr && gSelectMgr->getSelection()->getObjectCount())
+        if (LLEditMenuHandler::gEditMenuHandler == NULL && LLSelectMgr::getInstance()->getSelection()->getObjectCount())
        {
-                LLEditMenuHandler::gEditMenuHandler = gSelectMgr;
+                LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
        }
        if (gFloaterView->getCycleMode())
@@ -3119,20 +3111,23 @@ BOOL LLViewerWindow::handlePerFrameHover()
                gFloaterView->syncFloaterTabOrder();
        }
-        if (gSavedSettings.getBOOL("ChatBarStealsFocus") && gChatBar && gFocusMgr.getKeyboardFocus() == NULL && gChatBar->getVisible())
+        if (gSavedSettings.getBOOL("ChatBarStealsFocus") 
+                && gChatBar 
+                && gFocusMgr.getKeyboardFocus() == NULL 
+                && gChatBar->isInVisibleChain())
        {
                gChatBar->startChat(NULL);
        }
        // cleanup unused selections when no modal dialogs are open
-        if (gParcelMgr && LLModalDialog::activeCount() == 0)
+        if (LLModalDialog::activeCount() == 0)
        {
-                gParcelMgr->deselectUnused();
+                LLViewerParcelMgr::getInstance()->deselectUnused();
        }
-        if (gSelectMgr && LLModalDialog::activeCount() == 0)
+        if (LLModalDialog::activeCount() == 0)
        {
-                gSelectMgr->deselectUnused();
+                LLSelectMgr::getInstance()->deselectUnused();
        }
        return handled;
@@ -3179,12 +3174,12 @@ void LLViewerWindow::saveLastMouse(const LLCoordGL &point)
 //  render_hud_elements:        FALSE, FALSE, FALSE
 void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls, BOOL for_hud )
 {
-        LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+        LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
        if (!for_hud && !for_gl_pick)
        {
                // Call this once and only once
-                gSelectMgr->updateSilhouettes();
+                LLSelectMgr::getInstance()->updateSilhouettes();
        }
        
        // Draw fence around land selections
@@ -3192,18 +3187,18 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
        {
                if (pick_parcel_walls)
                {
-                        gParcelMgr->renderParcelCollision();
+                        LLViewerParcelMgr::getInstance()->renderParcelCollision();
                }
        }
        else if (( for_hud && selection->getSelectType() == SELECT_TYPE_HUD) ||
                         (!for_hud && selection->getSelectType() != SELECT_TYPE_HUD))
        {               
-                gSelectMgr->renderSilhouettes(for_hud);
+                LLSelectMgr::getInstance()->renderSilhouettes(for_hud);
                
                stop_glerror();
                // setup HUD render
-                if (selection->getSelectType() == SELECT_TYPE_HUD && gSelectMgr->getSelection()->getObjectCount())
+                if (selection->getSelectType() == SELECT_TYPE_HUD && LLSelectMgr::getInstance()->getSelection()->getObjectCount())
                {
                        LLBBox hud_bbox = gAgent.getAvatarObject()->getHUDBBox();
@@ -3212,7 +3207,7 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                        glPushMatrix();
                        glLoadIdentity();
                        F32 depth = llmax(1.f, hud_bbox.getExtentLocal().mV[VX] * 1.1f);
-                        glOrtho(-0.5f * gCamera->getAspect(), 0.5f * gCamera->getAspect(), -0.5f, 0.5f, 0.f, depth);
+                        glOrtho(-0.5f * LLViewerCamera::getInstance()->getAspect(), 0.5f * LLViewerCamera::getInstance()->getAspect(), -0.5f, 0.5f, 0.f, depth);
                        
                        glMatrixMode(GL_MODELVIEW);
                        glPushMatrix();
@@ -3222,7 +3217,7 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                }
                // Render light for editing
-                if (LLSelectMgr::sRenderLightRadius && gToolMgr->inEdit())
+                if (LLSelectMgr::sRenderLightRadius && LLToolMgr::getInstance()->inEdit())
                {
                        LLImageGL::unbindTexture(0);
                        LLGLEnable gls_blend(GL_BLEND);
@@ -3268,7 +3263,7 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                                        return true;
                                }
                        } func;
-                        gSelectMgr->getSelection()->applyToObjects(&func);
+                        LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func);
                        
                        glPopMatrix();
                }                               
@@ -3277,7 +3272,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();
+                LLTool* tool = LLToolMgr::getInstance()->getCurrentTool();
                if (tool)
                {
                        if(tool->isAlwaysRendered())
@@ -3286,15 +3281,15 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                        }
                        else
                        {
-                                if( !gSelectMgr->getSelection()->isEmpty() )
+                                if( !LLSelectMgr::getInstance()->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("EditLinkedParts");
-                                        for (LLObjectSelection::iterator iter = gSelectMgr->getSelection()->begin();
+                                        for (LLObjectSelection::iterator iter = LLSelectMgr::getInstance()->getSelection()->begin();
-                                                 iter != gSelectMgr->getSelection()->end(); iter++)
+                                                 iter != LLSelectMgr::getInstance()->getSelection()->end(); iter++)
                                        {
                                                LLSelectNode* nodep = *iter;
                                                LLViewerObject* object = nodep->getObject();
@@ -3310,17 +3305,17 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                                        BOOL draw_handles = TRUE;
-                                        if (tool == gToolTranslate && (!moveable_object_selected || !all_selected_objects_move))
+                                        if (tool == LLToolCompTranslate::getInstance() && (!moveable_object_selected || !all_selected_objects_move))
                                        {
                                                draw_handles = FALSE;
                                        }
-                                        if (tool == gToolRotate && (!moveable_object_selected || !all_selected_objects_move))
+                                        if (tool == LLToolCompRotate::getInstance() && (!moveable_object_selected || !all_selected_objects_move))
                                        {
                                                draw_handles = FALSE;
                                        }
-                                        if ( !all_selected_objects_modify && tool == gToolStretch )
+                                        if ( !all_selected_objects_modify && tool == LLToolCompScale::getInstance() )
                                        {
                                                draw_handles = FALSE;
                                        }
@@ -3424,13 +3419,13 @@ void LLViewerWindow::hitObjectOrLandGlobalAsync(S32 x, S32 y_from_bot, MASK mask
        gLastHitParcelWall = FALSE;
        LLCamera pick_camera;
-        pick_camera.setOrigin(gCamera->getOrigin());
+        pick_camera.setOrigin(LLViewerCamera::getInstance()->getOrigin());
-        pick_camera.setOriginAndLookAt(gCamera->getOrigin(),
+        pick_camera.setOriginAndLookAt(LLViewerCamera::getInstance()->getOrigin(),
-                                                                   gCamera->getUpAxis(),
+                                                                   LLViewerCamera::getInstance()->getUpAxis(),
-                                                                   gCamera->getOrigin() + mouseDirectionGlobal(x, y_from_bot));
+                                                                   LLViewerCamera::getInstance()->getOrigin() + mouseDirectionGlobal(x, y_from_bot));
        pick_camera.setView(0.5f*DEG_TO_RAD);
-        pick_camera.setNear(gCamera->getNear());
+        pick_camera.setNear(LLViewerCamera::getInstance()->getNear());
-        pick_camera.setFar(gCamera->getFar());
+        pick_camera.setFar(LLViewerCamera::getInstance()->getFar());
        pick_camera.setAspect(1.f);
        // save our drawing state
@@ -3447,8 +3442,7 @@ void LLViewerWindow::hitObjectOrLandGlobalAsync(S32 x, S32 y_from_bot, MASK mask
        // build perspective transform and picking viewport
        // Perform pick on a PICK_DIAMETER x PICK_DIAMETER pixel region around cursor point.
        // Don't limit the select distance for this pick.
-        // make viewport big enough to handle antialiased frame buffers
+        LLViewerCamera::getInstance()->setPerspective(FOR_SELECTION, scaled_x - (PICK_HALF_WIDTH + 2), scaled_y - (PICK_HALF_WIDTH + 2), PICK_DIAMETER + 4, PICK_DIAMETER + 4, FALSE);
-        gCamera->setPerspective(FOR_SELECTION, scaled_x - (PICK_HALF_WIDTH + 2), scaled_y - (PICK_HALF_WIDTH + 2), PICK_DIAMETER + 4, PICK_DIAMETER + 4, FALSE);
        // make viewport big enough to handle antialiased frame buffers
        gGLViewport[0] = scaled_x - (PICK_HALF_WIDTH + 2);
        gGLViewport[1] = scaled_y - (PICK_HALF_WIDTH + 2);
@@ -3519,13 +3513,13 @@ void LLViewerWindow::hitUIElementAsync(S32 x, S32 y_from_bot, MASK mask, void (*
        gLastHitUIElement = 0;
        LLCamera pick_camera;
-        pick_camera.setOrigin(gCamera->getOrigin());
+        pick_camera.setOrigin(LLViewerCamera::getInstance()->getOrigin());
-        pick_camera.setOriginAndLookAt(gCamera->getOrigin(),
+        pick_camera.setOriginAndLookAt(LLViewerCamera::getInstance()->getOrigin(),
-                                                                   gCamera->getUpAxis(),
+                                                                   LLViewerCamera::getInstance()->getUpAxis(),
-                                                                   gCamera->getOrigin() + mouseDirectionGlobal(x, y_from_bot));
+                                                                   LLViewerCamera::getInstance()->getOrigin() + mouseDirectionGlobal(x, y_from_bot));
        pick_camera.setView(0.5f*DEG_TO_RAD);
-        pick_camera.setNear(gCamera->getNear());
+        pick_camera.setNear(LLViewerCamera::getInstance()->getNear());
-        pick_camera.setFar(gCamera->getFar());
+        pick_camera.setFar(LLViewerCamera::getInstance()->getFar());
        pick_camera.setAspect(1.f);
        // save our drawing state
@@ -3755,7 +3749,7 @@ LLViewerObject* LLViewerWindow::getObjectUnderCursor(const F32 depth)
        S32 y = getCurrentMouseY();
        
        LLVector3               mouse_direction_global = mouseDirectionGlobal(x,y);
-        LLVector3               camera_pos_global = gCamera->getOrigin();
+        LLVector3               camera_pos_global = LLViewerCamera::getInstance()->getOrigin();
        LLVector3               pick_end = camera_pos_global + mouse_direction_global * depth;
        LLVector3               collision_point;
        return gPipeline.pickObject(camera_pos_global, pick_end, collision_point);
@@ -3841,7 +3835,7 @@ void LLViewerWindow::analyzeHit(
                                U8 uv_pick_buffer[UV_PICK_WIDTH * UV_PICK_WIDTH * 4];
                                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);
+                                LLViewerCamera::getInstance()->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);
@@ -3875,7 +3869,7 @@ void LLViewerWindow::analyzeHit(
 LLVector3 LLViewerWindow::mouseDirectionGlobal(const S32 x, const S32 y) const
 {
        // find vertical field of view
-        F32                     fov = gCamera->getView();
+        F32                     fov = LLViewerCamera::getInstance()->getView();
        // find screen resolution
        S32                     height = getWindowHeight();
@@ -3889,9 +3883,9 @@ LLVector3 LLViewerWindow::mouseDirectionGlobal(const S32 x, const S32 y) const
        F32                     click_y = y - height / 2.f;
        // compute mouse vector
-        LLVector3       mouse_vector =  distance * gCamera->getAtAxis()
+        LLVector3       mouse_vector =  distance * LLViewerCamera::getInstance()->getAtAxis()
-                                                                - click_x * gCamera->getLeftAxis()
+                                                                - click_x * LLViewerCamera::getInstance()->getLeftAxis()
-                                                                + click_y * gCamera->getUpAxis();
+                                                                + click_y * LLViewerCamera::getInstance()->getUpAxis();
        mouse_vector.normVec();
@@ -3904,8 +3898,8 @@ LLVector3 LLViewerWindow::mouseDirectionGlobal(const S32 x, const S32 y) const
 LLVector3 LLViewerWindow::mouseDirectionCamera(const S32 x, const S32 y) const
 {
        // find vertical field of view
-        F32                     fov_height = gCamera->getView();
+        F32                     fov_height = LLViewerCamera::getInstance()->getView();
-        F32                     fov_width = fov_height * gCamera->getAspect();
+        F32                     fov_width = fov_height * LLViewerCamera::getInstance()->getAspect();
        // find screen resolution
        S32                     height = getWindowHeight();
@@ -3982,7 +3976,7 @@ BOOL LLViewerWindow::mousePointOnLandGlobal(const S32 x, const S32 y, LLVector3d
                mouse_direction_global_d.setVec(mouse_direction_global * mouse_dir_scale);
                probe_point_global = camera_pos_global + mouse_direction_global_d;
-                regionp = gWorldPointer->resolveRegionGlobal(probe_point_region, probe_point_global);
+                regionp = LLWorld::getInstance()->resolveRegionGlobal(probe_point_region, probe_point_global);
                if (!regionp)
                {
@@ -4029,7 +4023,7 @@ BOOL LLViewerWindow::mousePointOnLandGlobal(const S32 x, const S32 y, LLVector3d
                        mouse_direction_global_d.setVec(mouse_direction_global * mouse_dir_scale);
                        probe_point_global = camera_pos_global + mouse_direction_global_d;
-                        regionp = gWorldPointer->resolveRegionGlobal(probe_point_region, probe_point_global);
+                        regionp = LLWorld::getInstance()->resolveRegionGlobal(probe_point_region, probe_point_global);
                        if (!regionp)
                        {
@@ -4179,108 +4173,6 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageRaw *raw, const LLString& extensio
        return success;
 }
-void LLViewerWindow::saveMovieNumbered(void*)
-{
-        if (!gbCapturing)
-        {
-                // Get a directory if this is the first time.
-                if (strlen(sSnapshotDir) == 0)          /* Flawfinder: ignore */
-                {
-                        LLString proposed_name( sMovieBaseName );
-#if LL_DARWIN
-                        proposed_name.append( ".mov" );
-#else
-                        proposed_name.append( ".avi" );
-#endif
-                        // pick a directory in which to save
-                        LLFilePicker &picker = LLFilePicker::instance();
-                        if (!picker.getSaveFile(LLFilePicker::FFSAVE_AVI, proposed_name.c_str()))
-                        {
-                                // Clicked cancel
-                                return;
-                        }
-                        // Copy the directory + file name
-                        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);         /* Flawfinder: ignore */
-                        S32 index = length;
-                        // Back up over ".bmp"
-                        index -= 4;
-                        if (index >= 0 && directory[index] == '.')
-                        {
-                                directory[index] = '\0';
-                        }
-                        else
-                        {
-                                index = length;
-                        }
-                        // Find trailing backslash
-                        while (index >= 0 && directory[index] != gDirUtilp->getDirDelimiter()[0])
-                        {
-                                index--;
-                        }
-                        // If we found one, truncate the string there
-                        if (index >= 0)
-                        {
-                                if (index + 1 <= length)
-                                {
-                                        strncpy(LLViewerWindow::sMovieBaseName, directory + index + 1, LL_MAX_PATH -1);         /* Flawfinder: ignore */
-                                        LLViewerWindow::sMovieBaseName[LL_MAX_PATH -1] = '\0';
-                                }
-                                index++;
-                                directory[index] = '\0';
-                                strncpy(LLViewerWindow::sSnapshotDir, directory, LL_MAX_PATH -1);               /* Flawfinder: ignore */
-                                LLViewerWindow::sSnapshotDir[LL_MAX_PATH -1] = '\0';
-                        }
-                }
-                // Look for an unused file name
-                LLString filepath;
-                S32 i = 1;
-                S32 err = 0;
-                do
-                {
-                        char extension[100];            /* Flawfinder: ignore */
-#if LL_DARWIN
-                        snprintf( extension, sizeof(extension), "_%.3d.mov", i );               /* Flawfinder: ignore */
-#else
-                        snprintf( extension, sizeof(extension), "_%.3d.avi", i );               /* Flawfinder: ignore */
-#endif
-                        filepath.assign( sSnapshotDir );
-                        filepath.append( sMovieBaseName );
-                        filepath.append( extension );
-                        struct stat stat_info;
-                        err = gViewerWindow->mWindow->stat( filepath.c_str(), &stat_info );
-                        i++;
-                }
-                while( -1 != err );  // search until the file is not found (i.e., stat() gives an error).
-                S32 x = gViewerWindow->getWindowWidth();
-                S32 y = gViewerWindow->getWindowHeight();
-                gbCapturing = TRUE;
-#if !LL_SOLARIS
-                gMovieMaker.StartCapture((char *)filepath.c_str(), x, y);
-#endif
-        }
-        else
-        {
-#if !LL_SOLARIS
-                gMovieMaker.EndCapture();
-#endif
-                gbCapturing = FALSE;
-        }
-}
 static S32 BORDERHEIGHT = 0;
 static S32 BORDERWIDTH = 0;
@@ -4348,16 +4240,147 @@ void LLViewerWindow::playSnapshotAnimAndSound()
        send_sound_trigger(LLUUID(gSavedSettings.getString("UISndSnapshot")), 1.0f);
 }
+BOOL LLViewerWindow::thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 preview_height, BOOL show_ui, BOOL do_rebuild, ESnapshotType type)
+{
+        if ((!raw) || preview_width < 10 || preview_height < 10)
+        {
+                return FALSE;
+        }
+        if(gResizeScreenTexture) //the window is resizing
+        {
+                return FALSE ;
+        }
+        setCursor(UI_CURSOR_WAIT);
+        // Hide all the UI widgets first and draw a frame
+        BOOL prev_draw_ui = gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI);
+        if ( prev_draw_ui != show_ui)
+        {
+                LLPipeline::toggleRenderDebugFeature((void*)LLPipeline::RENDER_DEBUG_FEATURE_UI);
+        }
+        BOOL hide_hud = !gSavedSettings.getBOOL("RenderHUDInSnapshot") && LLPipeline::sShowHUDAttachments;
+        if (hide_hud)
+        {
+                LLPipeline::sShowHUDAttachments = FALSE;
+        }
+        S32 render_name = gSavedSettings.getS32("RenderName");
+        gSavedSettings.setS32("RenderName", 0);
+        LLVOAvatar::updateFreezeCounter(1) ; //pause avatar updating for one frame
+        
+        S32 w = preview_width ;
+        S32 h = preview_height ;        
+        LLVector2 display_scale = mDisplayScale ;
+        mDisplayScale.setVec((F32)w / mWindowRect.getWidth(), (F32)h / mWindowRect.getHeight()) ;
+        LLRect window_rect = mWindowRect;
+        mWindowRect.set(0, h, w, 0);
+        
+        gDisplaySwapBuffers = FALSE;    
+        glClearColor(0.f, 0.f, 0.f, 0.f);
+        glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+        setup3DRender();
+        setupViewport();
+        LLFontGL::setFontDisplay(FALSE) ;
+        LLHUDText::setDisplayText(FALSE) ;
+        if (type == SNAPSHOT_TYPE_OBJECT_ID)
+        {
+                gPickTransparent = FALSE;
+                gObjectList.renderObjectsForSelect(*LLViewerCamera::getInstance(), FALSE, FALSE);
+        }
+        else
+        {
+                display(do_rebuild, 1.0f, 0, TRUE);
+                render_ui_and_swap();
+        }
+        S32 glformat, gltype, glpixel_length ;
+        if(SNAPSHOT_TYPE_DEPTH == type)
+        {
+                glpixel_length = 4 ;
+                glformat = GL_DEPTH_COMPONENT ; 
+                gltype = GL_FLOAT ;
+        }
+        else
+        {
+                glpixel_length = 3 ;
+                glformat = GL_RGB ;
+                gltype = GL_UNSIGNED_BYTE ;
+        }
+        raw->resize(w, h, glpixel_length);      
+        glReadPixels(0, 0, w, h, glformat, gltype, raw->getData());
+        if(SNAPSHOT_TYPE_DEPTH == type)
+        {
+                LLViewerCamera* camerap = LLViewerCamera::getInstance();
+                F32 depth_conversion_factor_1 = (camerap->getFar() + camerap->getNear()) / (2.f * camerap->getFar() * camerap->getNear());
+                F32 depth_conversion_factor_2 = (camerap->getFar() - camerap->getNear()) / (2.f * camerap->getFar() * camerap->getNear());
+                //calculate the depth 
+                for (S32 y = 0 ; y < h ; y++)
+                {
+                        for(S32 x = 0 ; x < w ; x++)
+                        {
+                                S32 i = (w * y + x) << 2 ;
+                                
+                                F32 depth_float_i = *(F32*)(raw->getData() + i);
+                                
+                                F32 linear_depth_float = 1.f / (depth_conversion_factor_1 - (depth_float_i * depth_conversion_factor_2));
+                                U8 depth_byte = F32_to_U8(linear_depth_float, camerap->getNear(), camerap->getFar());
+                                *(raw->getData() + i + 0) = depth_byte;
+                                *(raw->getData() + i + 1) = depth_byte;
+                                *(raw->getData() + i + 2) = depth_byte;
+                                *(raw->getData() + i + 3) = 255;
+                        }
+                }               
+        }
+        LLFontGL::setFontDisplay(TRUE) ;
+        LLHUDText::setDisplayText(TRUE) ;
+        mDisplayScale.setVec(display_scale) ;
+        mWindowRect = window_rect;      
+        setup3DRender();
+        setupViewport();
+        gDisplaySwapBuffers = FALSE;
+        // POST SNAPSHOT
+        if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
+        {
+                LLPipeline::toggleRenderDebugFeature((void*)LLPipeline::RENDER_DEBUG_FEATURE_UI);
+        }
+        if (hide_hud)
+        {
+                LLPipeline::sShowHUDAttachments = TRUE;
+        }
+        setCursor(UI_CURSOR_ARROW);
+        if (do_rebuild)
+        {
+                // If we had to do a rebuild, that means that the lists of drawables to be rendered
+                // was empty before we started.
+                // Need to reset these, otherwise we call state sort on it again when render gets called the next time
+                // and we stand a good chance of crashing on rebuild because the render drawable arrays have multiple copies of
+                // objects on them.
+                gPipeline.resetDrawOrders();
+        }
+        
+        gSavedSettings.setS32("RenderName", render_name);       
+        
+        return TRUE;
+}
 // Saves the image from the screen to the specified filename and path.
 BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, 
                                                                 BOOL keep_window_aspect, BOOL is_texture, BOOL show_ui, BOOL do_rebuild, ESnapshotType type, S32 max_size)
 {
-        //F32 image_aspect_ratio = ((F32)image_width) / ((F32)image_height);
+        if (!raw)
-        //F32 window_aspect_ratio = ((F32)getWindowWidth()) / ((F32)getWindowHeight());
-        if ((!gWorldPointer) ||
-                (!raw))
        {
                return FALSE;
        }
@@ -4388,43 +4411,22 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
        // from window
        S32 snapshot_width = mWindowRect.getWidth();
        S32 snapshot_height =  mWindowRect.getHeight();
-        F32 scale_factor = 1.0f ;
-        if (keep_window_aspect || is_texture) //map the entire window to snapshot
-        {
-        }
-        else //scale or crop
-        {
-                if(snapshot_width > image_width) //crop
-                {
-                        snapshot_width = image_width ;
-                }
-                if(snapshot_height > image_height)//crop
-                {
-                        snapshot_height = image_height ;
-                }
-                //if (image_aspect_ratio > window_aspect_ratio)
-                //{
-                //      snapshot_height  = llround((F32)snapshot_width / image_aspect_ratio);
-                //}
-                //else if (image_aspect_ratio < window_aspect_ratio)
-                //{
-                //      snapshot_width = llround((F32)snapshot_height  * image_aspect_ratio);
-                //}
-        }
-        LLRenderTarget target;
-        
-        scale_factor = llmax(1.f, (F32)image_width / snapshot_width, (F32)image_height / snapshot_height); 
-        
        // SNAPSHOT
        S32 window_width = mWindowRect.getWidth();
-        S32 window_height = mWindowRect.getHeight();
+        S32 window_height = mWindowRect.getHeight();    
-        
        LLRect window_rect = mWindowRect;
        BOOL use_fbo = FALSE;
-        
+        F32 scale_factor = 1.0f ;
+        if(!keep_window_aspect) //image cropping
+        {               
+                F32 ratio = llmin( (F32)window_width / image_width , (F32)window_height / image_height) ;
+                snapshot_width = (S32)(ratio * image_width) ;
+                snapshot_height = (S32)(ratio * image_height) ;
+                scale_factor = llmax(1.0f, 1.0f / ratio) ;      
+        }
+        LLRenderTarget target;
        if (gGLManager.mHasFramebufferObject && 
                (image_width > window_width ||
                image_height > window_height) &&
@@ -4445,9 +4447,14 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                        window_height = snapshot_height;
                        scale_factor = 1.f;
                        mWindowRect.set(0, 0, snapshot_width, snapshot_height);
-                        target.bindTarget();
+                        target.bindTarget();                    
+                }
-                        
+                else //tiling
+                {
+                        F32 ratio = llmin( (F32)window_width / image_width , (F32)window_height / image_height) ;
+                        snapshot_width = (S32)(ratio * image_width) ;
+                        snapshot_height = (S32)(ratio * image_height) ;
+                        scale_factor = llmax(1.0f, 1.0f / ratio) ;      
                }
        }
        
@@ -4479,8 +4486,8 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
        S32 output_buffer_offset_y = 0;
-        F32 depth_conversion_factor_1 = (gCamera->getFar() + gCamera->getNear()) / (2.f * gCamera->getFar() * gCamera->getNear());
+        F32 depth_conversion_factor_1 = (LLViewerCamera::getInstance()->getFar() + LLViewerCamera::getInstance()->getNear()) / (2.f * LLViewerCamera::getInstance()->getFar() * LLViewerCamera::getInstance()->getNear());
-        F32 depth_conversion_factor_2 = (gCamera->getFar() - gCamera->getNear()) / (2.f * gCamera->getFar() * gCamera->getNear());
+        F32 depth_conversion_factor_2 = (LLViewerCamera::getInstance()->getFar() - LLViewerCamera::getInstance()->getNear()) / (2.f * LLViewerCamera::getInstance()->getFar() * LLViewerCamera::getInstance()->getNear());
        for (int subimage_y = 0; subimage_y < scale_factor; ++subimage_y)
        {
@@ -4498,12 +4505,12 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                                glClearColor(0.f, 0.f, 0.f, 0.f);
                                glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-                                gCamera->setZoomParameters(scale_factor, subimage_x+(subimage_y*llceil(scale_factor)));
+                                LLViewerCamera::getInstance()->setZoomParameters(scale_factor, subimage_x+(subimage_y*llceil(scale_factor)));
                                setup3DRender();
                                setupViewport();
                                BOOL first_time_through = (subimage_x + subimage_y == 0);
                                gPickTransparent = FALSE;
-                                gObjectList.renderObjectsForSelect(*gCamera, FALSE, !first_time_through);
+                                gObjectList.renderObjectsForSelect(*LLViewerCamera::getInstance(), FALSE, !first_time_through);
                        }
                        else
                        {
@@ -4555,7 +4562,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                                                F32 depth_float = *(F32*)(raw->getData() + i);
                                        
                                                F32 linear_depth_float = 1.f / (depth_conversion_factor_1 - (depth_float * depth_conversion_factor_2));
-                                                U8 depth_byte = F32_to_U8(linear_depth_float, gCamera->getNear(), gCamera->getFar());
+                                                U8 depth_byte = F32_to_U8(linear_depth_float, LLViewerCamera::getInstance()->getNear(), LLViewerCamera::getInstance()->getFar());
                                                *(raw->getData() + i + 0) = depth_byte;
                                                *(raw->getData() + i + 1) = depth_byte;
                                                *(raw->getData() + i + 2) = depth_byte;
@@ -4643,7 +4650,7 @@ void LLViewerWindow::drawMouselookInstructions()
 {
        // Draw instructions for mouselook ("Press ESC to leave Mouselook" in a box at the top of the screen.)
        const char* instructions = "Press ESC to leave Mouselook.";
-        const LLFontGL* font = gResMgr->getRes( LLFONT_SANSSERIF );
+        const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
        const S32 INSTRUCTIONS_PAD = 5;
        LLRect instructions_rect;
@@ -4747,7 +4754,7 @@ void LLViewerWindow::setupViewport(S32 x_offset, S32 y_offset)
 void LLViewerWindow::setup3DRender()
 {
-        gCamera->setPerspective(NOT_FOR_SELECTION, 0, 0,  mWindowRect.getWidth(), mWindowRect.getHeight(), FALSE, gCamera->getNear(), MAX_FAR_CLIP*2.f);
+        LLViewerCamera::getInstance()->setPerspective(NOT_FOR_SELECTION, 0, 0,  mWindowRect.getWidth(), mWindowRect.getHeight(), FALSE, LLViewerCamera::getInstance()->getNear(), MAX_FAR_CLIP*2.f);
 }
 void LLViewerWindow::setup2DRender()
@@ -5064,6 +5071,8 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
                return TRUE;    // a lie..., because we'll get to it later
        }
+        U32 fsaa = gSavedSettings.getU32("RenderFSAASamples");
+        U32 old_fsaa = mWindow->getFSAASamples();
        // going from windowed to windowed
        if (!old_fullscreen && !fullscreen)
        {
@@ -5072,7 +5081,11 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
                {
                        mWindow->setSize(size);
                }
-                return TRUE;
+                if (fsaa == old_fsaa)
+                {
+                        return TRUE;
+                }
        }
        // Close floaters that don't handle settings change
@@ -5098,10 +5111,13 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
                gSavedSettings.setS32("WindowY", old_pos.mY);
        }
        
+        mWindow->setFSAASamples(fsaa);
        result_first_try = mWindow->switchContext(fullscreen, size, disable_vsync);
        if (!result_first_try)
        {
                // try to switch back
+                mWindow->setFSAASamples(old_fsaa);
                result_second_try = mWindow->switchContext(old_fullscreen, old_size, disable_vsync);
                if (!result_second_try)
@@ -5378,7 +5394,7 @@ LLBottomPanel::LLBottomPanel(const LLRect &rect) :
        mFactoryMap["toolbar"] = LLCallbackMap(createToolBar, NULL);
        mFactoryMap["overlay"] = LLCallbackMap(createOverlayBar, NULL);
        mFactoryMap["hud"] = LLCallbackMap(createHUD, NULL);
-        gUICtrlFactory->buildPanel(this, "panel_bars.xml", &getFactoryMap());
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_bars.xml", &getFactoryMap());
        
        setOrigin(rect.mLeft, rect.mBottom);
        reshape(rect.getWidth(), rect.getHeight());
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index 3122d8c..a9f941c 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -97,6 +97,7 @@ public:
        /*virtual*/ void handleFocus(LLWindow *window);
        /*virtual*/ void handleFocusLost(LLWindow *window);
        /*virtual*/ BOOL handleActivate(LLWindow *window, BOOL activated);
+        /*virtual*/ BOOL handleActivateApp(LLWindow *window, BOOL activating);
        /*virtual*/ void handleMenuSelect(LLWindow *window,  S32 menu_item);
        /*virtual*/ BOOL handlePaint(LLWindow *window,  S32 x,  S32 y,  S32 width,  S32 height);
        /*virtual*/ void handleScrollWheel(LLWindow *window,  S32 clicks);
@@ -104,6 +105,9 @@ public:
        /*virtual*/ void handleWindowBlock(LLWindow *window);
        /*virtual*/ void handleWindowUnblock(LLWindow *window);
        /*virtual*/ void handleDataCopy(LLWindow *window, S32 data_type, void *data);
+        /*virtual*/ BOOL handleTimerEvent(LLWindow *window);
+        /*virtual*/ BOOL handleDeviceChange(LLWindow *window);
        //
@@ -207,9 +211,6 @@ public:
        static void             loadUserImage(void **cb_data, const LLUUID &uuid);
-        // Save snapshot like Snapshot 1, 2, 3, etc.
-        static void             saveMovieNumbered(void*);
        static void             movieSize(S32 new_width, S32 new_height);
        typedef enum e_snapshot_type
@@ -222,6 +223,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 is_texture = FALSE,
                                                                BOOL show_ui = TRUE, BOOL do_rebuild = FALSE, ESnapshotType type = SNAPSHOT_TYPE_COLOR, S32 max_size = MAX_IMAGE_SIZE );
+        BOOL            thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 preview_height, BOOL show_ui, BOOL do_rebuild, ESnapshotType type) ;
        BOOL                saveImageNumbered(LLImageRaw *raw, const LLString& extension = LLString());
        void                    playSnapshotAnimAndSound();
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index 904c2b9..b60b07e 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -32,6 +32,8 @@
 #include "llviewerprecompiledheaders.h"
 #include "llvlcomposition.h"
+#include "imageids.h"
 #include "llerror.h"
 #include "v3math.h"
 #include "llsurface.h"
@@ -69,22 +71,10 @@ LLVLComposition::LLVLComposition(LLSurface *surfacep, const U32 width, const F32
        mSurfacep = surfacep;
        // Load Terrain Textures - Original ones
-        LLUUID id;
+        setDetailTextureID(0, TERRAIN_DIRT_DETAIL);
-        // Dirt
+        setDetailTextureID(1, TERRAIN_GRASS_DETAIL);
-        id.set( gViewerArt.getString("terrain_dirt_detail.tga") );
+        setDetailTextureID(2, TERRAIN_MOUNTAIN_DETAIL);
-        setDetailTextureID(0, id);
+        setDetailTextureID(3, TERRAIN_ROCK_DETAIL);
-        // Grass
-        id.set( gViewerArt.getString("terrain_grass_detail.tga") );
-        setDetailTextureID(1, id);
-        // Rock mountain
-        id.set( gViewerArt.getString("terrain_mountain_detail.tga") );
-        setDetailTextureID(2, id);
-        // Rock face
-        id.set( gViewerArt.getString("terrain_rock_detail.tga") );
-        setDetailTextureID(3, id);
        // Initialize the texture matrix to defaults.
        for (S32 i = 0; i < CORNER_COUNT; ++i)
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 957ea5c..7989704 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -138,6 +138,7 @@ LLVOAvatarSkeletonInfo* LLVOAvatar::sSkeletonInfo = NULL;
 LLVOAvatarInfo*                 LLVOAvatar::sAvatarInfo = NULL;
 BOOL gDebugAvatarRotation = FALSE;
+S32 LLVOAvatar::sFreezeCounter = 0 ;
 //extern BOOL gVelocityInterpolate;
@@ -283,7 +284,7 @@ BOOL LLVOAvatar::sShowFootPlane = FALSE;
 BOOL LLVOAvatar::sShowCollisionVolumes = FALSE;
 BOOL LLVOAvatar::sVisibleInFirstPerson = FALSE;
 F32 LLVOAvatar::sLODFactor = 1.f;
-BOOL LLVOAvatar::sUseImpostors = TRUE;
+BOOL LLVOAvatar::sUseImpostors = FALSE;
 BOOL LLVOAvatar::sJointDebug = FALSE;
 S32 LLVOAvatar::sCurJoint = 0;
@@ -663,6 +664,7 @@ LLVOAvatar::LLVOAvatar(
        mNameAway(FALSE),
        mNameBusy(FALSE),
        mNameMute(FALSE),
+        mRenderGroupTitles(sRenderGroupTitles),
        mNameAppearance(FALSE),
        mLastRegionHandle(0),
        mRegionCrossingCount(0),
@@ -692,7 +694,7 @@ LLVOAvatar::LLVOAvatar(
        
        // mVoiceVisualizer is created by the hud effects manager and uses the HUD Effects pipeline
        bool needsSendToSim = false; // currently, this HUD effect doesn't need to pack and unpack data to do its job
-        mVoiceVisualizer = ( LLVoiceVisualizer *)gHUDManager->createViewerEffect( LLHUDObject::LL_HUD_EFFECT_VOICE_VISUALIZER, needsSendToSim );
+        mVoiceVisualizer = ( LLVoiceVisualizer *)LLHUDManager::getInstance()->createViewerEffect( LLHUDObject::LL_HUD_EFFECT_VOICE_VISUALIZER, needsSendToSim );
        lldebugs << "LLVOAvatar Constructor (0x" << this << ") id:" << mID << llendl;
@@ -755,8 +757,7 @@ LLVOAvatar::LLVOAvatar(
        mRippleTimeLast = 0.f;
-        mShadowImageID = LLUUID( gViewerArt.getString("foot_shadow.tga"));
+        mShadowImagep = gImageList.getImageFromFile("foot_shadow.j2c");
-        mShadowImagep = gImageList.getImage(mShadowImageID);
        mShadowImagep->bind();
        mShadowImagep->setClamp(TRUE, TRUE);
        
@@ -1726,7 +1727,7 @@ BOOL LLVOAvatar::buildSkeleton(LLVOAvatarSkeletonInfo *info)
                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();
+                F32 aspect = LLViewerCamera::getInstance()->getAspect();
                LLVector3 scale(1.f, aspect, 1.f);
                mScreenp->setScale(scale);
                mScreenp->setWorldPosition(LLVector3::zero);
@@ -2377,7 +2378,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 {
        LLMemType mt(LLMemType::MTYPE_AVATAR);
        LLFastTimer t(LLFastTimer::FTM_AVATAR_UPDATE);
-        
        if (isDead())
        {
                llinfos << "Warning!  Idle on dead avatar" << llendl;
@@ -2570,7 +2571,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                        if (visibleAttachment && attached_object && !attached_object->isDead() && attachment->getValid())
                        {
                                // if selecting any attachments, update all of them as non-damped
-                                if (gSelectMgr->getSelection()->getObjectCount() && gSelectMgr->getSelection()->isAttachment())
+                                if (LLSelectMgr::getInstance()->getSelection()->getObjectCount() && LLSelectMgr::getInstance()->getSelection()->isAttachment())
                                {
                                        gPipeline.updateMoveNormalAsync(attached_object->mDrawable);
                                }
@@ -2605,7 +2606,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                        F32 old_angle = mImpostorAngle.mV[i];
                        F32 angle_diff = fabsf(cur_angle-old_angle);
                
-                        if (angle_diff > 3.14159f/16.f)
+                        if (angle_diff > 3.14159f/512.f*distance)
                        {
                                mNeedsImpostorUpdate = TRUE;
                        }
@@ -2792,6 +2793,12 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                        mVisibleChat = visible_chat;
                        new_name = TRUE;
                }
+                
+                if (sRenderGroupTitles != mRenderGroupTitles)
+                {
+                        mRenderGroupTitles = sRenderGroupTitles;
+                        new_name = TRUE;
+                }
                // First Calculate Alpha
                // If alpha > 0, create mNameText if necessary, otherwise delete it
@@ -2840,11 +2847,11 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                                mNameText->setUsePixelSize(TRUE);
                                LLVector3 pixel_right_vec;
                                LLVector3 pixel_up_vec;
-                                gCamera->getPixelVectors(root_pos_last, pixel_up_vec, pixel_right_vec);
+                                LLViewerCamera::getInstance()->getPixelVectors(root_pos_last, pixel_up_vec, pixel_right_vec);
-                                LLVector3 camera_to_av = root_pos_last - gCamera->getOrigin();
+                                LLVector3 camera_to_av = root_pos_last - LLViewerCamera::getInstance()->getOrigin();
                                camera_to_av.normVec();
                                LLVector3 local_camera_at = camera_to_av * ~root_rot;
-                                LLVector3 local_camera_up = camera_to_av % gCamera->getLeftAxis();
+                                LLVector3 local_camera_up = camera_to_av % LLViewerCamera::getInstance()->getLeftAxis();
                                local_camera_up.normVec();
                                local_camera_up = local_camera_up * ~root_rot;
                        
@@ -2868,7 +2875,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                LLNameValue *title = getNVPair("Title");
                LLNameValue* firstname = getNVPair("FirstName");
                LLNameValue* lastname = getNVPair("LastName");
-                
                if (mNameText.notNull() && firstname && lastname)
                {
                        BOOL is_away = mSignaledAnimations.find(ANIM_AGENT_AWAY)  != mSignaledAnimations.end();
@@ -2881,7 +2888,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                        }
                        else
                        {
-                                is_muted = gMuteListp->isMuted(getID());
+                                is_muted = LLMuteList::getInstance()->isMuted(getID());
                        }
                        if (mNameString.empty() ||
@@ -3062,6 +3069,8 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                sNumVisibleChatBubbles--;
        }
+        shame();
        //--------------------------------------------------------------------
        // draw tractor beam when editing objects
        //--------------------------------------------------------------------
@@ -3078,7 +3087,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
        else if (!mBeam || mBeam->isDead())
        {
                // VEFFECT: Tractor Beam
-                mBeam = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM);
+                mBeam = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM);
                mBeam->setColor(LLColor4U(gAgent.getEffectColor()));
                mBeam->setSourceObject(this);
                mBeamTimer.reset();
@@ -3086,7 +3095,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
        if (!mBeam.isNull())
        {
-                LLObjectSelectionHandle selection = gSelectMgr->getSelection();
+                LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
                if (gAgent.mPointAt.notNull())
                {
@@ -3103,7 +3112,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                else
                {
                        mBeam->setTargetObject(NULL);
-                        LLTool *tool = gToolMgr->getCurrentTool();
+                        LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
                        if (tool->isEditing())
                        {
                                if (tool->getEditingObject())
@@ -3159,9 +3168,10 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 {
        LLMemType mt(LLMemType::MTYPE_AVATAR);
        // update screen joint size
        if (mScreenp)
        {
-                F32 aspect = gCamera->getAspect();
+                F32 aspect = LLViewerCamera::getInstance()->getAspect();
                LLVector3 scale(1.f, aspect, 1.f);
                mScreenp->setScale(scale);
                mScreenp->updateWorldMatrixChildren();
@@ -3228,10 +3238,15 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
        // the rest should only be done occasionally for far away avatars
        //--------------------------------------------------------------------
-        if (!mIsSelf && sUseImpostors && !mNeedsAnimUpdate)
+        if (!mIsSelf && sUseImpostors && !mNeedsAnimUpdate && !sFreezeCounter)
        {
                F32 impostor_area = 256.f*512.f*(8.125f - LLVOAvatar::sLODFactor*8.f);
-                if (visible && mPixelArea <= impostor_area)
+                if (LLMuteList::getInstance()->isMuted(getID()))
+                {
+                        mUpdatePeriod = 16;
+                        visible = (LLDrawable::getCurrentFrame()+mID.mData[0])%mUpdatePeriod == 0 ? TRUE : FALSE;
+                }
+                else if (visible && mPixelArea <= impostor_area)
                {
                        mUpdatePeriod = llclamp((S32) sqrtf(impostor_area*4.f/mPixelArea), 2, 8);
@@ -3337,7 +3352,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
                resolveHeightGlobal(root_pos, ground_under_pelvis, normal);
                F32 foot_to_ground = (F32) (root_pos.mdV[VZ] - mPelvisToFoot - ground_under_pelvis.mdV[VZ]);
-                BOOL in_air = ( (!gWorldPointer->getRegionFromPosGlobal(ground_under_pelvis)) || 
+                BOOL in_air = ( (!LLWorld::getInstance()->getRegionFromPosGlobal(ground_under_pelvis)) || 
                                foot_to_ground > FOOT_GROUND_COLLISION_TOLERANCE);
                if (in_air && !mInAir)
@@ -3398,11 +3413,11 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
                                // make sure fwdDir stays in same general direction as primdir
                                if (gAgent.getFlying())
                                {
-                                        fwdDir = gCamera->getAtAxis();
+                                        fwdDir = LLViewerCamera::getInstance()->getAtAxis();
                                }
                                else
                                {
-                                        LLVector3 at_axis = gCamera->getAtAxis();
+                                        LLVector3 at_axis = LLViewerCamera::getInstance()->getAtAxis();
                                        LLVector3 up_vector = gAgent.getReferenceUpVector();
                                        at_axis -= up_vector * (at_axis * up_vector);
                                        at_axis.normVec();
@@ -3618,8 +3633,8 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
                        LLVector3d foot_pos_global = gAgent.getPosGlobalFromAgent(foot_pos_agent);
-                        if (gParcelMgr && gParcelMgr->canHearSound(foot_pos_global)
+                        if (LLViewerParcelMgr::getInstance()->canHearSound(foot_pos_global)
-                                && gMuteListp && !gMuteListp->isMuted(getID(), LLMute::flagObjectSounds))
+                                && !LLMuteList::getInstance()->isMuted(getID(), LLMute::flagObjectSounds))
                        {
                                gAudiop->triggerSound(step_sound_id, getID(), gain, foot_pos_global);
                        }
@@ -3678,7 +3693,7 @@ void LLVOAvatar::updateHeadOffset()
        // since we only care about Z, just grab one of the eyes
        LLVector3 midEyePt = mEyeLeftp->getWorldPosition();
        midEyePt -= mDrawable.notNull() ? mDrawable->getWorldPosition() : mRoot.getWorldPosition();
-        midEyePt.mV[VZ] = llmax(-mPelvisToFoot + gCamera->getNear(), midEyePt.mV[VZ]);
+        midEyePt.mV[VZ] = llmax(-mPelvisToFoot + LLViewerCamera::getInstance()->getNear(), midEyePt.mV[VZ]);
        if (mDrawable.notNull())
        {
@@ -3713,7 +3728,7 @@ void LLVOAvatar::updateVisibility()
        else
        {
                // calculate avatar distance wrt head
-                mDrawable->updateDistance(*gCamera);
+                mDrawable->updateDistance(*LLViewerCamera::getInstance());
                
                if (!mDrawable->getSpatialGroup() || mDrawable->getSpatialGroup()->isVisible())
                {
@@ -3767,15 +3782,15 @@ void LLVOAvatar::updateVisibility()
                                llinfos << "Avatar not in frustum" << llendl;
                        }*/
-                        /*if (gCamera->sphereInFrustum(sel_pos_agent, 2.0f))
+                        /*if (LLViewerCamera::getInstance()->sphereInFrustum(sel_pos_agent, 2.0f))
                        {
                                llinfos << "Sel pos visible" << llendl;
                        }
-                        if (gCamera->sphereInFrustum(wrist_right_pos_agent, 0.2f))
+                        if (LLViewerCamera::getInstance()->sphereInFrustum(wrist_right_pos_agent, 0.2f))
                        {
                                llinfos << "Wrist pos visible" << llendl;
                        }
-                        if (gCamera->sphereInFrustum(getPositionAgent(), getMaxScale()*2.f))
+                        if (LLViewerCamera::getInstance()->sphereInFrustum(getPositionAgent(), getMaxScale()*2.f))
                        {
                                llinfos << "Agent visible" << llendl;
                        }*/
@@ -3841,16 +3856,16 @@ BOOL LLVOAvatar::needsRenderBeam()
        {
                return FALSE;
        }
-        LLTool *tool = gToolMgr->getCurrentTool();
+        LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
-        BOOL is_touching_or_grabbing = (tool == gToolGrab && gToolGrab->isEditing());
+        BOOL is_touching_or_grabbing = (tool == LLToolGrab::getInstance() && LLToolGrab::getInstance()->isEditing());
-        if (gToolGrab->getEditingObject() && 
+        if (LLToolGrab::getInstance()->getEditingObject() && 
-                gToolGrab->getEditingObject()->isAttachment())
+                LLToolGrab::getInstance()->getEditingObject()->isAttachment())
        {
                // don't render selection beam on hud objects
                is_touching_or_grabbing = FALSE;
        }
-        return is_touching_or_grabbing || (mState & AGENT_STATE_EDITING && gSelectMgr->shouldShowSelection());
+        return is_touching_or_grabbing || (mState & AGENT_STATE_EDITING && LLSelectMgr::getInstance()->shouldShowSelection());
 }
 //-----------------------------------------------------------------------------
@@ -3890,7 +3905,7 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass)
                        {
                                mEyeLashLOD.updateGeometry();
                                mHeadLOD.updateGeometry();
-                                mHairLOD.updateGeometry();
+                                mHairLOD.updateGeometry();                              
                        }
                        mNeedsSkin = FALSE;
                        
@@ -4112,8 +4127,13 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color)
        }
        LLVector3 pos(getRenderPosition()+mImpostorOffset);
-        LLVector3 left = gCamera->getLeftAxis()*mImpostorDim.mV[0];
+        LLVector3 at = (pos - LLViewerCamera::getInstance()->getOrigin());
-        LLVector3 up = gCamera->getUpAxis()*mImpostorDim.mV[1];
+        at.normVec();
+        LLVector3 left = LLViewerCamera::getInstance()->getUpAxis() % at;
+        LLVector3 up = at%left;
+        left *= mImpostorDim.mV[0];
+        up *= mImpostorDim.mV[1];
        LLGLEnable test(GL_ALPHA_TEST);
        glAlphaFunc(GL_GREATER, 0.f);
@@ -4432,7 +4452,7 @@ void LLVOAvatar::resolveHeightAgent(const LLVector3 &in_pos_agent, LLVector3 &ou
 void LLVOAvatar::resolveRayCollisionAgent(const LLVector3d start_pt, const LLVector3d end_pt, LLVector3d &out_pos, LLVector3 &out_norm)
 {
        LLViewerObject *obj;
-        gWorldPointer->resolveStepHeightGlobal(this, start_pt, end_pt, out_pos, out_norm, &obj);
+        LLWorld::getInstance()->resolveStepHeightGlobal(this, start_pt, end_pt, out_pos, out_norm, &obj);
 }
@@ -4442,7 +4462,7 @@ void LLVOAvatar::resolveHeightGlobal(const LLVector3d &inPos, LLVector3d &outPos
        LLVector3d p0 = inPos + zVec;
        LLVector3d p1 = inPos - zVec;
        LLViewerObject *obj;
-        gWorldPointer->resolveStepHeightGlobal(this, p0, p1, outPos, outNorm, &obj);
+        LLWorld::getInstance()->resolveStepHeightGlobal(this, p0, p1, outPos, outNorm, &obj);
        if (!obj)
        {
                mStepOnLand = TRUE;
@@ -4593,8 +4613,8 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
                        if (gAudiop)
                        {
                                LLVector3d char_pos_global = gAgent.getPosGlobalFromAgent(getCharacterPosition());
-                                if (gParcelMgr && gParcelMgr->canHearSound(char_pos_global)
+                                if (LLViewerParcelMgr::getInstance()->canHearSound(char_pos_global)
-                                        && gMuteListp && !gMuteListp->isMuted(getID(), LLMute::flagObjectSounds))
+                                    && !LLMuteList::getInstance()->isMuted(getID(), LLMute::flagObjectSounds))
                                {
                                        // RN: uncomment this to play on typing sound at fixed volume once sound engine is fixed
                                        // to support both spatialized and non-spatialized instances of the same sound
@@ -4878,7 +4898,7 @@ void LLVOAvatar::getGround(const LLVector3 &in_pos_agent, LLVector3 &out_pos_age
        p1_global = gAgent.getPosGlobalFromAgent(in_pos_agent) - z_vec;
        LLViewerObject *obj;
        LLVector3d out_pos_global;
-        gWorldPointer->resolveStepHeightGlobal(this, p0_global, p1_global, out_pos_global, outNorm, &obj);
+        LLWorld::getInstance()->resolveStepHeightGlobal(this, p0_global, p1_global, out_pos_global, outNorm, &obj);
        out_pos_agent = gAgent.getPosAgentFromGlobal(out_pos_global);
 }
@@ -5614,7 +5634,7 @@ void LLVOAvatar::setPixelAreaAndAngle(LLAgent &agent)
        LLVector3 center = (ext[1] + ext[0]) * 0.5f;
        LLVector3 size = (ext[1]-ext[0])*0.5f;
-        mPixelArea = LLPipeline::calcPixelArea(center, size, *gCamera);
+        mPixelArea = LLPipeline::calcPixelArea(center, size, *LLViewerCamera::getInstance());
        F32 range = mDrawable->mDistanceWRTCamera;
@@ -5643,6 +5663,8 @@ BOOL LLVOAvatar::updateJointLODs()
        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);
+        F32 area_scale = 0.16f;
        {
                if (mIsSelf)
                {
@@ -5652,7 +5674,7 @@ BOOL LLVOAvatar::updateJointLODs()
                        }
                        else
                        {
-                                mAdjustedPixelArea = mPixelArea;
+                                mAdjustedPixelArea = mPixelArea*area_scale;
                        }
                }
                else if (mIsDummy)
@@ -5662,7 +5684,7 @@ BOOL LLVOAvatar::updateJointLODs()
                else
                {
                        // reported avatar pixel area is dependent on avatar render load, based on number of visible avatars
-                        mAdjustedPixelArea = (F32)mPixelArea * lod_factor * lod_factor * avatar_num_factor * avatar_num_factor;
+                        mAdjustedPixelArea = (F32)mPixelArea * area_scale * lod_factor * lod_factor * avatar_num_factor * avatar_num_factor;
                }
                // now select meshes to render based on adjusted pixel area
@@ -5749,7 +5771,7 @@ void LLVOAvatar::updateShadowFaces()
                return;
        }
-        LLSprite sprite(mShadowImageID);
+        LLSprite sprite(mShadowImagep.notNull() ? mShadowImagep->getID() : LLUUID::null);
        sprite.setFollow(FALSE);
        const F32 cos_angle = gSky.getSunDirection().mV[2];
        F32 cos_elev = sqrt(1 - cos_angle * cos_angle);
@@ -5987,8 +6009,8 @@ BOOL LLVOAvatar::attachObject(LLViewerObject *viewer_object)
        if (viewer_object->isSelected())
        {
-                gSelectMgr->updateSelectionCenter();
+                LLSelectMgr::getInstance()->updateSelectionCenter();
-                gSelectMgr->updatePointAt();
+                LLSelectMgr::getInstance()->updatePointAt();
        }
        if (mIsSelf)
@@ -6295,6 +6317,22 @@ void LLVOAvatar::onLocalTextureLoaded( BOOL success, LLViewerImage *src_vi, LLIm
                        self->updateMeshTextures();
                }
        }
+        else if (final)
+        {
+                LLVOAvatar *self = (LLVOAvatar *)gObjectList.findObject(data->mAvatarID);
+                LLVOAvatar::ELocTexIndex idx = data->mIndex;
+                // Failed: asset is missing
+                if( self &&
+                        (!self->mLocalTextureBaked[ idx ]) &&
+                        (self->mLocalTexture[ idx ].notNull()) &&
+                        (self->mLocalTexture[ idx ]->getID() == src_id))
+                {
+                        self->mLocalTextureDiscard[idx] = 0; // we check that it's missing later
+                        self->requestLayerSetUpdate( idx );
+                        self->updateMeshTextures();
+                }
+                
+        }
        if( final || !success )
        {
@@ -6459,7 +6497,7 @@ void LLVOAvatar::forceBakeAllTextures(bool slam_for_debug)
                        BOOL set_by_user = TRUE;
                        invalidateComposite(layer_set, set_by_user);
-                        gViewerStats->incStat(LLViewerStats::ST_TEX_REBAKES);
+                        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_TEX_REBAKES);
                }
                else
                {
@@ -6497,7 +6535,7 @@ void LLVOAvatar::processRebakeAvatarTextures(LLMessageSystem* msg, void**)
                                BOOL set_by_user = TRUE;
                                self->invalidateComposite(layer_set, set_by_user);
                                found = TRUE;
-                                gViewerStats->incStat(LLViewerStats::ST_TEX_REBAKES);
+                                LLViewerStats::getInstance()->incStat(LLViewerStats::ST_TEX_REBAKES);
                        }
                }
        }
@@ -7346,7 +7384,10 @@ void LLVOAvatar::clearChat()
 S32 LLVOAvatar::getLocalDiscardLevel( S32 index )
 {
-        if (index >= 0 && mLocalTexture[index].notNull() && mLocalTexture[index]->getID() != IMG_DEFAULT_AVATAR)
+        if (index >= 0
+                && mLocalTexture[index].notNull()
+                && (mLocalTexture[index]->getID() != IMG_DEFAULT_AVATAR)
+                && !mLocalTexture[index]->isMissingAsset())
        {
                return mLocalTexture[index]->getDiscardLevel();
        }
@@ -9351,13 +9392,13 @@ void LLVOAvatar::updateRegion(LLViewerRegion *regionp)
                        {
                                ++mRegionCrossingCount;
                                F64 delta = (F64)mRegionCrossingTimer.getElapsedTimeF32();
-                                F64 avg = (mRegionCrossingCount == 1) ? 0 : gViewerStats->getStat(LLViewerStats::ST_CROSSING_AVG);
+                                F64 avg = (mRegionCrossingCount == 1) ? 0 : LLViewerStats::getInstance()->getStat(LLViewerStats::ST_CROSSING_AVG);
                                F64 delta_avg = (delta + avg*(mRegionCrossingCount-1)) / mRegionCrossingCount;
-                                gViewerStats->setStat(LLViewerStats::ST_CROSSING_AVG, delta_avg);
+                                LLViewerStats::getInstance()->setStat(LLViewerStats::ST_CROSSING_AVG, delta_avg);
-                                F64 max = (mRegionCrossingCount == 1) ? 0 : gViewerStats->getStat(LLViewerStats::ST_CROSSING_MAX);
+                                F64 max = (mRegionCrossingCount == 1) ? 0 : LLViewerStats::getInstance()->getStat(LLViewerStats::ST_CROSSING_MAX);
                                max = llmax(delta, max);
-                                gViewerStats->setStat(LLViewerStats::ST_CROSSING_MAX, max);
+                                LLViewerStats::getInstance()->setStat(LLViewerStats::ST_CROSSING_MAX, max);
                        }
                        mLastRegionHandle = regionp->getHandle();
                }
@@ -9433,6 +9474,23 @@ LLHost LLVOAvatar::getObjectHost() const
        }
 }
+//static
+void LLVOAvatar::updateFreezeCounter(S32 counter)
+{
+        if(counter)
+        {
+                sFreezeCounter = counter ;
+        }
+        else if(sFreezeCounter > 0)
+        {
+                sFreezeCounter-- ;
+        }
+        else
+        {
+                sFreezeCounter = 0 ;
+        }
+}
 BOOL LLVOAvatar::updateLOD()
 {
        BOOL res = updateJointLODs();
@@ -9486,7 +9544,7 @@ BOOL LLVOAvatar::isImpostor() const
 BOOL LLVOAvatar::needsImpostorUpdate() const
 {
-        return mNeedsImpostorUpdate;
+        return mNeedsImpostorUpdate ;
 }
 const LLVector3& LLVOAvatar::getImpostorOffset() const
@@ -9515,10 +9573,145 @@ void LLVOAvatar::getImpostorValues(LLVector3* extents, LLVector3& angle, F32& di
        extents[0] = ext[0];
        extents[1] = ext[1];
-        LLVector3 at = gCamera->getOrigin()-(getRenderPosition()+mImpostorOffset);
+        LLVector3 at = LLViewerCamera::getInstance()->getOrigin()-(getRenderPosition()+mImpostorOffset);
        distance = at.normVec();
-        angle.mV[0] = acosf(at.mV[0]);
+        F32 da = 1.f - (at*LLViewerCamera::getInstance()->getAtAxis());
-        angle.mV[1] = acosf(at.mV[1]);
+        angle.mV[0] = LLViewerCamera::getInstance()->getYaw()*da;
-        angle.mV[2] = acosf(at.mV[2]);
+        angle.mV[1] = LLViewerCamera::getInstance()->getPitch()*da;
+        angle.mV[2] = da;
+}
+U32 calc_shame(LLVOVolume* volume, std::set<LLUUID> &textures)
+{
+        if (!volume)
+        {
+                return 0;
+        }
+        U32 shame = 0;
+        U32 invisi = 0;
+        U32 shiny = 0;
+        U32 glow = 0;
+        U32 alpha = 0;
+        U32 flexi = 0;
+        U32 animtex = 0;
+        U32 particles = 0;
+        U32 scale = 0;
+        U32 bump = 0;
+        U32 planar = 0;
+        
+        if (volume->isFlexible())
+        {
+                flexi = 1;
+        }
+        if (volume->isParticleSource())
+        {
+                particles = 1;
+        }
+        const LLVector3& sc = volume->getScale();
+        scale += (U32) sc.mV[0] + (U32) sc.mV[1] + (U32) sc.mV[2];
+        LLDrawable* drawablep = volume->mDrawable;
+        if (volume->isSculpted())
+        {
+                LLSculptParams *sculpt_params = (LLSculptParams *) volume->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+                LLUUID sculpt_id = sculpt_params->getSculptTexture();
+                textures.insert(sculpt_id);
+        }
+        for (S32 i = 0; i < drawablep->getNumFaces(); ++i)
+        {
+                LLFace* face = drawablep->getFace(i);
+                const LLTextureEntry* te = face->getTextureEntry();
+                LLViewerImage* img = face->getTexture();
+                textures.insert(img->getID());
+                if (face->getPoolType() == LLDrawPool::POOL_ALPHA)
+                {
+                        alpha++;
+                }
+                else if (img->getPrimaryFormat() == GL_ALPHA)
+                {
+                        invisi = 1;
+                }
+                if (te)
+                {
+                        if (te->getBumpmap())
+                        {
+                                bump = 1;
+                        }
+                        if (te->getShiny())
+                        {
+                                shiny = 1;
+                        }
+                        if (te->getGlow() > 0.f)
+                        {
+                                glow = 1;
+                        }
+                        if (face->mTextureMatrix != NULL)
+                        {
+                                animtex++;
+                        }
+                        if (te->getTexGen())
+                        {
+                                planar++;
+                        }
+                }
+        }
+        shame += invisi + shiny + glow + alpha*4 + flexi*8 + animtex*4 + particles*16+bump*4+scale+planar;
+        for (U32 i = 0; i < drawablep->getChildCount(); ++i)
+        {
+                shame += calc_shame(drawablep->getChild(i)->getVOVolume(), textures);
+        }
+        return shame;
+}
+void LLVOAvatar::shame()
+{
+        if (!gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_SHAME))
+        {
+                return;
+        }
+        U32 shame = 1;
+        std::set<LLUUID> textures;
+        attachment_map_t::const_iterator iter;
+        for (iter = mAttachmentPoints.begin(); 
+                iter != mAttachmentPoints.end();
+                ++iter)
+        {
+                LLViewerJointAttachment* attachment = iter->second;
+                LLViewerObject* object = attachment->getObject();
+                if (object && !object->isHUDAttachment())
+                {
+                        LLDrawable* drawable = object->mDrawable;
+                        if (drawable)
+                        {
+                                shame += 10;
+                                LLVOVolume* volume = drawable->getVOVolume();
+                                if (volume)
+                                {
+                                        shame += calc_shame(volume, textures);
+                                }
+                        }
+                }
+        }       
+        shame += textures.size() * 5;
+        setDebugText(llformat("%d", shame));
+        F32 green = 1.f-llclamp(((F32) shame-1024.f)/1024.f, 0.f, 1.f);
+        F32 red = llmin((F32) shame/1024.f, 1.f);
+        mText->setColor(LLColor4(red,green,0,1));
 }
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 2033fda..bc68cf4 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -694,7 +694,6 @@ public:
        //--------------------------------------------------------------------
        // texture ids and pointers
        //--------------------------------------------------------------------
-        LLUUID                  mShadowImageID;
        LLPointer<LLViewerImage> mShadowImagep;
        LLUUID                  mLastHeadBakedID;
@@ -909,6 +908,8 @@ protected:
        BOOL      mNameMute;
        BOOL      mNameAppearance;
        BOOL      mVisibleChat;
+        BOOL      mRenderGroupTitles;
        LLString  mDebugText;
        U64               mLastRegionHandle;
@@ -982,6 +983,7 @@ protected:
        LLHost                  getObjectHost() const;
        S32                             getLocalDiscardLevel( S32 index);
        
+        void                    shame();  //generate shame metric
 //Ventrella
        //-----------------------------------------------------------------------------------------------
        // the Voice Visualizer is responsible for detecting the user's voice signal, and when the
@@ -991,7 +993,11 @@ protected:
        LLVoiceVisualizer * mVoiceVisualizer;
        int                                     mCurrentGesticulationLevel;
 //End Ventrella
-        
+private:
+        static  S32 sFreezeCounter ;
+public:
+        static void updateFreezeCounter(S32 counter = 0 ) ;
 };
 #endif // LL_VO_AVATAR_H
diff --git a/linden/indra/newview/llvoclouds.cpp b/linden/indra/newview/llvoclouds.cpp
index 6ca8ac0..f50468d 100644
--- a/linden/indra/newview/llvoclouds.cpp
+++ b/linden/indra/newview/llvoclouds.cpp
@@ -133,7 +133,7 @@ BOOL LLVOClouds::updateGeometry(LLDrawable *drawable)
                drawable->setNumFacesFast(num_faces, NULL, getTEImage(0));
        }
-        mDepth = (getPositionAgent()-gCamera->getOrigin())*gCamera->getAtAxis();
+        mDepth = (getPositionAgent()-LLViewerCamera::getInstance()->getOrigin())*LLViewerCamera::getInstance()->getAtAxis();
        S32 face_indx = 0;
        for ( ; face_indx < num_faces; face_indx++)
@@ -224,7 +224,7 @@ void LLVOClouds::getGeometry(S32 te,
        LLVector3 vtx[4];
-        at = gCamera->getAtAxis();
+        at = LLViewerCamera::getInstance()->getAtAxis();
        right = at % LLVector3(0.f, 0.f, 1.f);
        right.normVec();
        up = right % at;
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index f9b4bc0..a0e98ce 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -176,7 +176,8 @@ void LLVOGrass::initClass()
                        static LLStdStringHandle texture_name_string = LLXmlTree::addAttributeString("texture_name");
                        success &= grass_def->getFastAttributeString(texture_name_string, textureName);
-                        newGrass->mTextureID.set( gViewerArt.getString(textureName) );
+                        LLViewerImage* grass_image = gImageList.getImageFromFile(textureName);
+                        newGrass->mTextureID = grass_image->getID();
                }
                static LLStdStringHandle blade_sizex_string = LLXmlTree::addAttributeString("blade_size_x");
@@ -330,7 +331,7 @@ void LLVOGrass::setPixelAreaAndAngle(LLAgent &agent)
        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 = LLViewerCamera::getInstance()->getViewHeightInPixels() / (tan(LLViewerCamera::getInstance()->getView()) * range);
        // 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;
@@ -430,7 +431,7 @@ void LLVOGrass::plantBlades()
        face->setTEOffset(0);
        face->mCenterLocal = mPosition + mRegionp->getOriginAgent();
        
-        mDepth = (face->mCenterLocal - gCamera->getOrigin())*gCamera->getAtAxis();
+        mDepth = (face->mCenterLocal - LLViewerCamera::getInstance()->getOrigin())*LLViewerCamera::getInstance()->getAtAxis();
        mDrawable->setPosition(face->mCenterLocal);
        mDrawable->movePartition();
        LLPipeline::sCompiles++;
diff --git a/linden/indra/newview/llvoground.cpp b/linden/indra/newview/llvoground.cpp
index a985c44..32622ec 100644
--- a/linden/indra/newview/llvoground.cpp
+++ b/linden/indra/newview/llvoground.cpp
@@ -122,13 +122,13 @@ BOOL LLVOGround::updateGeometry(LLDrawable *drawable)
        //
        //
        //
-        LLVector3 at_dir = gCamera->getAtAxis();
+        LLVector3 at_dir = LLViewerCamera::getInstance()->getAtAxis();
        at_dir.mV[VZ] = 0.f;
        if (at_dir.normVec() < 0.01)
        {
                // We really don't care, as we're not looking anywhere near the horizon.
        }
-        LLVector3 left_dir = gCamera->getLeftAxis();
+        LLVector3 left_dir = LLViewerCamera::getInstance()->getLeftAxis();
        left_dir.mV[VZ] = 0.f;
        left_dir.normVec();
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index f0dafef..738eeac 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -678,31 +678,6 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
 ///////////////////////////////////////////////////////////////////////////////////////////////
-class LLVoiceClientPrefsListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                // Note: Ignore the specific event value, look up the ones we want
-                gVoiceClient->setVoiceEnabled(gSavedSettings.getBOOL("EnableVoiceChat"));
-                gVoiceClient->setUsePTT(gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
-                std::string keyString = gSavedSettings.getString("PushToTalkButton");
-                gVoiceClient->setPTTKey(keyString);
-                gVoiceClient->setPTTIsToggle(gSavedSettings.getBOOL("PushToTalkToggle"));
-                gVoiceClient->setEarLocation(gSavedSettings.getS32("VoiceEarLocation"));
-                std::string serverName = gSavedSettings.getString("VivoxDebugServerName");
-                gVoiceClient->setVivoxDebugServerName(serverName);
-                std::string inputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
-                gVoiceClient->setCaptureDevice(inputDevice);
-                std::string outputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
-                gVoiceClient->setRenderDevice(outputDevice);
-                return true;
-        }
-};
-static LLVoiceClientPrefsListener voice_prefs_listener;
 class LLVoiceClientMuteListObserver : public LLMuteListObserver
 {
        /* virtual */ void onChange()  { gVoiceClient->muteListChanged();}
@@ -859,16 +834,6 @@ LLVoiceClient::LLVoiceClient()
        std::string renderDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
        setRenderDevice(renderDevice);
        
-        // Set up our listener to get updates on all prefs values we care about.
-        gSavedSettings.getControl("EnableVoiceChat")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("PTTCurrentlyEnabled")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("PushToTalkButton")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("PushToTalkToggle")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("VoiceEarLocation")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("VivoxDebugServerName")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("VoiceInputAudioDevice")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("VoiceOutputAudioDevice")->addListener(&voice_prefs_listener);
        mTuningMode = false;
        mTuningEnergy = 0.0f;
        mTuningMicVolume = 0;
@@ -1239,12 +1204,7 @@ void LLVoiceClient::stateMachine()
        // Check for parcel boundary crossing
        {
                LLViewerRegion *region = gAgent.getRegion();
-                LLParcel *parcel = NULL;
+                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-                if(gParcelMgr)
-                {
-                        parcel = gParcelMgr->getAgentParcel();
-                }                       
                
                if(region && parcel)
                {
@@ -1281,7 +1241,7 @@ void LLVoiceClient::stateMachine()
                break;
                
                case stateStart:
-                        if(gDisableVoice)
+                        if(gSavedSettings.getBOOL("CmdLineDisableVoice"))
                        {
                                // Voice is locked out, we must not launch the vivox daemon.
                                setState(stateJail);
@@ -1661,9 +1621,9 @@ void LLVoiceClient::stateMachine()
                        notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_LOGGED_IN);
                        // Set up the mute list observer if it hasn't been set up already.
-                        if((!sMuteListListener_listening) && (gMuteListp))
+                        if((!sMuteListListener_listening))
                        {
-                                gMuteListp->addObserver(&mutelist_listener);
+                                LLMuteList::getInstance()->addObserver(&mutelist_listener);
                                sMuteListListener_listening = true;
                        }
@@ -3103,7 +3063,7 @@ void LLVoiceClient::updateMuteState(participantState *p)
 {
        if(p->mAvatarIDValid)
        {
-                bool isMuted = gMuteListp->isMuted(p->mAvatarID, LLMute::flagVoiceChat);
+                bool isMuted = LLMuteList::getInstance()->isMuted(p->mAvatarID, LLMute::flagVoiceChat);
                if(p->mOnMuteList != isMuted)
                {
                        p->mOnMuteList = isMuted;
@@ -3644,7 +3604,7 @@ void LLVoiceClient::setVoiceEnabled(bool enabled)
 bool LLVoiceClient::voiceEnabled()
 {
-        return gSavedSettings.getBOOL("EnableVoiceChat") && !gDisableVoice;
+        return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice");
 }
 void LLVoiceClient::setUsePTT(bool usePTT)
diff --git a/linden/indra/newview/llvoiceremotectrl.cpp b/linden/indra/newview/llvoiceremotectrl.cpp
index f4adc8f..3779ffd 100644
--- a/linden/indra/newview/llvoiceremotectrl.cpp
+++ b/linden/indra/newview/llvoiceremotectrl.cpp
@@ -35,7 +35,7 @@
 #include "llagent.h"
 #include "llui.h"
 #include "llbutton.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 #include "llvoiceclient.h"
 #include "llimpanel.h"
@@ -51,11 +51,11 @@ LLVoiceRemoteCtrl::LLVoiceRemoteCtrl (const LLString& name) : LLPanel(name)
        if (gSavedSettings.getBOOL("ShowVoiceChannelPopup"))
        {
-                gUICtrlFactory->buildPanel(this, "panel_voice_remote_expanded.xml");
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_voice_remote_expanded.xml");
        }
        else
        {
-                gUICtrlFactory->buildPanel(this, "panel_voice_remote.xml");
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_voice_remote.xml");
        }
        setFocusRoot(TRUE);
@@ -67,23 +67,23 @@ LLVoiceRemoteCtrl::~LLVoiceRemoteCtrl()
 BOOL LLVoiceRemoteCtrl::postBuild()
 {
-        mTalkBtn = LLUICtrlFactory::getButtonByName(this, "push_to_talk");
+        mTalkBtn = getChild<LLButton>("push_to_talk");
        mTalkBtn->setClickedCallback(onBtnTalkClicked);
        mTalkBtn->setHeldDownCallback(onBtnTalkHeld);
        mTalkBtn->setMouseUpCallback(onBtnTalkReleased);
-        mTalkLockBtn = LLUICtrlFactory::getButtonByName(this, "ptt_lock");
+        mTalkLockBtn = getChild<LLButton>("ptt_lock");
        mTalkLockBtn->setClickedCallback(onBtnLock);
        mTalkLockBtn->setCallbackUserData(this);
-        mSpeakersBtn = LLUICtrlFactory::getButtonByName(this, "speakers_btn");
+        mSpeakersBtn = getChild<LLButton>("speakers_btn");
        mSpeakersBtn->setClickedCallback(onClickSpeakers);
        mSpeakersBtn->setCallbackUserData(this);
        childSetAction("show_channel", onClickPopupBtn, this);
        childSetAction("end_call_btn", onClickEndCall, this);
-        LLTextBox* text = LLUICtrlFactory::getTextBoxByName(this, "channel_label");
+        LLTextBox* text = getChild<LLTextBox>("channel_label");
        if (text)
        {
                text->setUseEllipses(TRUE);
@@ -116,14 +116,14 @@ void LLVoiceRemoteCtrl::draw()
        mSpeakersBtn->setToggleState(LLFloaterActiveSpeakers::instanceVisible(LLSD()));
        mTalkLockBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
-        LLUUID talk_blip_image_id;
+        LLString talk_blip_image;
        if (gVoiceClient->getIsSpeaking(gAgent.getID()))
        {
                F32 voice_power = gVoiceClient->getCurrentPower(gAgent.getID());
                if (voice_power > LLVoiceClient::OVERDRIVEN_POWER_LEVEL)
                {
-                        talk_blip_image_id = LLUUID(gViewerArt.getString("icn_voice_ptt-on-lvl3.tga"));
+                        talk_blip_image = "icn_voice_ptt-on-lvl3.tga";
                }
                else
                {
@@ -133,26 +133,26 @@ void LLVoiceRemoteCtrl::draw()
                        switch(icon_image_idx)
                        {
                        case 0:
-                                talk_blip_image_id = LLUUID(gViewerArt.getString("icn_voice_ptt-on.tga"));
+                                talk_blip_image = "icn_voice_ptt-on.tga";
                                break;
                        case 1:
-                                talk_blip_image_id = LLUUID(gViewerArt.getString("icn_voice_ptt-on-lvl1.tga"));
+                                talk_blip_image = "icn_voice_ptt-on-lvl1.tga";
                                break;
                        case 2:
-                                talk_blip_image_id = LLUUID(gViewerArt.getString("icn_voice_ptt-on-lvl2.tga"));
+                                talk_blip_image = "icn_voice_ptt-on-lvl2.tga";
                                break;
                        }
                }
        }
        else
        {
-                talk_blip_image_id = LLUUID(gViewerArt.getString("icn_voice_ptt-off.tga"));
+                talk_blip_image = "icn_voice_ptt-off.tga";
        }
-        LLIconCtrl* icon = LLUICtrlFactory::getIconByName(this, "voice_volume");
+        LLIconCtrl* icon = getChild<LLIconCtrl>("voice_volume");
        if (icon)
        {
-                icon->setImage(talk_blip_image_id);
+                icon->setImage(talk_blip_image);
        }
        LLFloater* voice_floater = LLFloaterChatterBox::getInstance()->getCurrentVoiceFloater();
@@ -173,13 +173,13 @@ void LLVoiceRemoteCtrl::draw()
        if (current_channel)
        {
-                LLIconCtrl* voice_channel_icon = LLUICtrlFactory::getIconByName(this, "voice_channel_icon");
+                LLIconCtrl* voice_channel_icon = getChild<LLIconCtrl>("voice_channel_icon");
                if (voice_channel_icon && voice_floater)
                {
-                        voice_channel_icon->setImage(LLUUID(gViewerArt.getString(voice_floater->getUIString("voice_icon"))));
+                        voice_channel_icon->setImage(voice_floater->getUIString("voice_icon"));
                }
-                LLButton* voice_channel_bg = LLUICtrlFactory::getButtonByName(this, "voice_channel_bg");
+                LLButton* voice_channel_bg = getChild<LLButton>("voice_channel_bg");
                if (voice_channel_bg)
                {
                        LLColor4 bg_color;
@@ -199,7 +199,7 @@ void LLVoiceRemoteCtrl::draw()
                }
        }
-        LLButton* expand_button = LLUICtrlFactory::getButtonByName(this, "show_channel");
+        LLButton* expand_button = getChild<LLButton>("show_channel");
        if (expand_button)
        {
                if (expand_button->getToggleState())
@@ -257,11 +257,11 @@ void LLVoiceRemoteCtrl::onClickPopupBtn(void* user_data)
        remotep->deleteAllChildren();
        if (gSavedSettings.getBOOL("ShowVoiceChannelPopup"))
        {
-                gUICtrlFactory->buildPanel(remotep, "panel_voice_remote_expanded.xml");
+                LLUICtrlFactory::getInstance()->buildPanel(remotep, "panel_voice_remote_expanded.xml");
        }
        else
        {
-                gUICtrlFactory->buildPanel(remotep, "panel_voice_remote.xml");
+                LLUICtrlFactory::getInstance()->buildPanel(remotep, "panel_voice_remote.xml");
        }
        gOverlayBar->layoutButtons();
 }
diff --git a/linden/indra/newview/llvoicevisualizer.cpp b/linden/indra/newview/llvoicevisualizer.cpp
index 0046ae0..8c0d0ab 100644
--- a/linden/indra/newview/llvoicevisualizer.cpp
+++ b/linden/indra/newview/llvoicevisualizer.cpp
@@ -98,21 +98,21 @@ LLVoiceVisualizer::LLVoiceVisualizer( const U8 type )
        
        mTimer.reset();
        
-        LLUUID sound_level_img[] = 
+        const char* sound_level_img[] = 
        {
-                LLUUID(gSavedSettings.getString("VoiceImageLevel0")),
+                "041ee5a0-cb6a-9ac5-6e49-41e9320507d5.j2c",
-                LLUUID(gSavedSettings.getString("VoiceImageLevel1")),
+                "29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
-                LLUUID(gSavedSettings.getString("VoiceImageLevel2")),
+                "29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
-                LLUUID(gSavedSettings.getString("VoiceImageLevel3")),
+                "29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
-                LLUUID(gSavedSettings.getString("VoiceImageLevel4")),
+                "29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
-                LLUUID(gSavedSettings.getString("VoiceImageLevel5")),                                                                                                                   
+                "29de489d-0491-fb00-7dab-f9e686d31e83.j2c",                                                                                                                     
-                LLUUID(gSavedSettings.getString("VoiceImageLevel6"))
+                "29de489d-0491-fb00-7dab-f9e686d31e83.j2c"
        };
        for (int i=0; i<NUM_VOICE_SYMBOL_WAVES; i++)
        {
                mSoundSymbol.mWaveFadeOutStartTime      [i] = mCurrentTime;
-                mSoundSymbol.mTexture                           [i] = gImageList.getImageByID(sound_level_img[i]);
+                mSoundSymbol.mTexture                           [i] = gImageList.getImageFromFile(sound_level_img[i], FALSE, TRUE);
                mSoundSymbol.mWaveActive                        [i] = false;
                mSoundSymbol.mWaveOpacity                       [i] = 1.0f;
                mSoundSymbol.mWaveExpansion                     [i] = 1.0f;
@@ -203,8 +203,8 @@ void LLVoiceVisualizer::render()
                //-------------------------------------------------------------
                // create coordinates of the geometry for the dot
                //-------------------------------------------------------------
-                LLVector3 l     = gCamera->getLeftAxis() * DOT_SIZE;
+                LLVector3 l     = LLViewerCamera::getInstance()->getLeftAxis() * DOT_SIZE;
-                LLVector3 u     = gCamera->getUpAxis()   * DOT_SIZE;
+                LLVector3 u     = LLViewerCamera::getInstance()->getUpAxis()   * DOT_SIZE;
                LLVector3 bottomLeft    = mSoundSymbol.mPosition + l - u;
                LLVector3 bottomRight   = mSoundSymbol.mPosition - l - u;
@@ -330,8 +330,8 @@ void LLVoiceVisualizer::render()
                                F32 width       = i * WAVE_WIDTH_SCALE  * mSoundSymbol.mWaveExpansion[i];
                                F32 height      = i * WAVE_HEIGHT_SCALE * mSoundSymbol.mWaveExpansion[i];
-                                LLVector3 l     = gCamera->getLeftAxis() * width;
+                                LLVector3 l     = LLViewerCamera::getInstance()->getLeftAxis() * width;
-                                LLVector3 u     = gCamera->getUpAxis()   * height;
+                                LLVector3 u     = LLViewerCamera::getInstance()->getUpAxis()   * height;
                                LLVector3 bottomLeft    = mSoundSymbol.mPosition + l - u;
                                LLVector3 bottomRight   = mSoundSymbol.mPosition - l - u;
diff --git a/linden/indra/newview/llvopartgroup.cpp b/linden/indra/newview/llvopartgroup.cpp
index 79255ca..7d1fec4 100644
--- a/linden/indra/newview/llvopartgroup.cpp
+++ b/linden/indra/newview/llvopartgroup.cpp
@@ -95,7 +95,7 @@ void LLVOPartGroup::setPixelAreaAndAngle(LLAgent &agent)
 {
        // mPixelArea is calculated during render
        F32 mid_scale = getMidScale();
-        F32 range = (getRenderPosition()-gCamera->getOrigin()).magVec();
+        F32 range = (getRenderPosition()-LLViewerCamera::getInstance()->getOrigin()).magVec();
        if (range < 0.001f || isHUDAttachment())                // range == zero
        {
@@ -141,7 +141,7 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
        LLVector3 at;
        LLVector3 position_agent;
-        LLVector3 camera_agent = gCamera->getOrigin();
+        LLVector3 camera_agent = LLViewerCamera::getInstance()->getOrigin();
        
        S32 num_parts = mViewerPartGroupp->getCount();
        LLFace *facep;
@@ -176,7 +176,7 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
        F32 tot_area = 0;
        F32 max_area = LLViewerPartSim::getMaxPartCount() * MAX_PARTICLE_AREA_SCALE; 
-        F32 pixel_meter_ratio = gCamera->getPixelMeterRatio();
+        F32 pixel_meter_ratio = LLViewerCamera::getInstance()->getPixelMeterRatio();
        pixel_meter_ratio *= pixel_meter_ratio;
        S32 count=0;
@@ -309,7 +309,7 @@ void LLVOPartGroup::getGeometry(S32 idx,
        right *= 0.5f*part.mScale.mV[0];
        up *= 0.5f*part.mScale.mV[1];
-        const LLVector3& normal = -gCamera->getXAxis();
+        const LLVector3& normal = -LLViewerCamera::getInstance()->getXAxis();
                
        *verticesp++ = part_pos_agent + up - right;
        *verticesp++ = part_pos_agent - up - right;
@@ -391,7 +391,7 @@ void LLParticlePartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_co
                        }
                        
                        count++;
-                        facep->mDistance = (facep->mCenterLocal - gCamera->getOrigin()) * gCamera->getAtAxis();
+                        facep->mDistance = (facep->mCenterLocal - LLViewerCamera::getInstance()->getOrigin()) * LLViewerCamera::getInstance()->getAtAxis();
                        obj->mDepth += facep->mDistance;
                        
                        mFaceList.push_back(facep);
diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp
index 37f6f30..8e60010 100644
--- a/linden/indra/newview/llvosky.cpp
+++ b/linden/indra/newview/llvosky.cpp
@@ -439,7 +439,7 @@ void LLVOSky::initCubeMap()
        {
                mCubeMap->init(images);
        }
-        else if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap"))
+        else if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"))
        {
                mCubeMap = new LLCubeMap();
                mCubeMap->init(images);
@@ -477,7 +477,7 @@ void LLVOSky::restoreGL()
        calcAtmospherics();     
        if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap
-            && gFeatureManagerp->isFeatureAvailable("RenderCubeMap"))
+            && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap"))
        {
                LLCubeMap* cube_map = getCubeMap();
@@ -1102,7 +1102,7 @@ BOOL LLVOSky::updateSky()
                                {
                    if (mForceUpdate)
                                        {
-                                                updateFog(gCamera->getFar());
+                                                updateFog(LLViewerCamera::getInstance()->getFar());
                                                for (int side = 0; side < 6; side++) 
                                                {
                                                        for (int tile = 0; tile < NUM_TILES; tile++) 
@@ -1331,7 +1331,7 @@ BOOL LLVOSky::updateGeometry(LLDrawable *drawable)
                }
        }
-        const LLVector3 &look_at = gCamera->getAtAxis();
+        const LLVector3 &look_at = LLViewerCamera::getInstance()->getAtAxis();
        LLVector3 right = look_at % LLVector3::z_axis;
        LLVector3 up = right % look_at;
        right.normVec();
@@ -1343,7 +1343,7 @@ BOOL LLVOSky::updateGeometry(LLDrawable *drawable)
        mMoon.setDraw(updateHeavenlyBodyGeometry(drawable, FACE_MOON, FALSE, mMoon, cos_max_angle, up, right));
        const F32 water_height = gAgent.getRegion()->getWaterHeight() + 0.01f;
-                // gWorldPointer->getWaterHeight() + 0.01f;
+                // LLWorld::getInstance()->getWaterHeight() + 0.01f;
        const F32 camera_height = mCameraPosAgent.mV[2];
        const F32 height_above_water = camera_height - water_height;
@@ -1691,9 +1691,9 @@ F32 dtClip(const LLVector3& v0, const LLVector3& v1, F32 far_clip2)
 void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
                                                                                 const LLHeavenBody& HB)
 {
-        const LLVector3 &look_at = gCamera->getAtAxis();
+        const LLVector3 &look_at = LLViewerCamera::getInstance()->getAtAxis();
        // const F32 water_height = gAgent.getRegion()->getWaterHeight() + 0.001f;
-        // gWorldPointer->getWaterHeight() + 0.001f;
+        // LLWorld::getInstance()->getWaterHeight() + 0.001f;
        LLVector3 to_dir = HB.getDirection();
        LLVector3 hb_pos = to_dir * (HORIZON_DIST - 10);
@@ -1824,7 +1824,7 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
                side = 2;
        }
-        //const F32 far_clip = (gCamera->getFar() - 0.01) / far_clip_factor;
+        //const F32 far_clip = (LLViewerCamera::getInstance()->getFar() - 0.01) / far_clip_factor;
        const F32 far_clip = 512;
        const F32 far_clip2 = far_clip*far_clip;
@@ -2022,10 +2022,10 @@ void LLVOSky::updateFog(const F32 distance)
        LLColor4 target_fog(0.f, 0.2f, 0.5f, 0.f);
        const F32 water_height = gAgent.getRegion()->getWaterHeight();
-        // gWorldPointer->getWaterHeight();
+        // LLWorld::getInstance()->getWaterHeight();
        F32 camera_height = gAgent.getCameraPositionAgent().mV[2];
-        F32 near_clip_height = gCamera->getAtAxis().mV[VZ] * gCamera->getNear();
+        F32 near_clip_height = LLViewerCamera::getInstance()->getAtAxis().mV[VZ] * LLViewerCamera::getInstance()->getNear();
        camera_height += near_clip_height;
        F32 fog_distance = 0.f;
diff --git a/linden/indra/newview/llvotextbubble.cpp b/linden/indra/newview/llvotextbubble.cpp
index 4f5ca38..5424cc8 100644
--- a/linden/indra/newview/llvotextbubble.cpp
+++ b/linden/indra/newview/llvotextbubble.cpp
@@ -36,7 +36,7 @@
 #include "imageids.h"
 #include "llviewercontrol.h"
 #include "llprimitive.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llagent.h"
 #include "llbox.h"
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 4630127..a55afe1 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -399,8 +399,8 @@ void LLVOTree::setPixelAreaAndAngle(LLAgent &agent)
        F32 area = max_scale * (max_scale*mBillboardRatio);
        // Compute pixels per meter at the given range
-        F32 pixels_per_meter = gCamera->getViewHeightInPixels() / 
+        F32 pixels_per_meter = LLViewerCamera::getInstance()->getViewHeightInPixels() / 
-                                                   (tan(gCamera->getView()) * range);
+                                                   (tan(LLViewerCamera::getInstance()->getView()) * range);
        mPixelArea = (pixels_per_meter) * (pixels_per_meter) * area;
 #if 0
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index e4318ff..4b357e2 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -83,8 +83,8 @@ LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *re
          mVolumeImpl(NULL)
 {
        mTexAnimMode = 0;
-        mRelativeXform.identity();
+        mRelativeXform.setIdentity();
-        mRelativeXformInvTrans.identity();
+        mRelativeXformInvTrans.setIdentity();
        mLOD = MIN_LOD;
        mTextureAnimp = NULL;
@@ -326,7 +326,7 @@ void LLVOVolume::animateTextures()
                        }
                        LLMatrix4& tex_mat = *facep->mTextureMatrix;
-                        tex_mat.identity();
+                        tex_mat.setIdentity();
                        tex_mat.translate(LLVector3(-0.5f, -0.5f, 0.f));
                        tex_mat.rotate(quat);                           
@@ -452,7 +452,7 @@ void LLVOVolume::updateTextures()
                
                if (isHUDAttachment())
                {
-                        F32 area = (F32) gCamera->getScreenPixelArea();
+                        F32 area = (F32) LLViewerCamera::getInstance()->getScreenPixelArea();
                        vsize = area;
                        imagep->setBoostLevel(LLViewerImage::BOOST_HUD);
                        face->setPixelArea(area); // treat as full screen
@@ -557,7 +557,7 @@ F32 LLVOVolume::getTextureVirtualSize(LLFace* face)
        LLVector3 center = face->getPositionAgent();
        LLVector3 size = (face->mExtents[1] - face->mExtents[0]) * 0.5f;
        
-        F32 face_area = LLPipeline::calcPixelArea(center, size, *gCamera);
+        F32 face_area = LLPipeline::calcPixelArea(center, size, *LLViewerCamera::getInstance());
        face->setPixelArea(face_area);
@@ -651,7 +651,7 @@ LLDrawable *LLVOVolume::createDrawable(LLPipeline *pipeline)
        }
        
        updateRadius();
-        mDrawable->updateDistance(*gCamera);
+        mDrawable->updateDistance(*LLViewerCamera::getInstance());
        return mDrawable;
 }
@@ -741,7 +741,23 @@ void LLVOVolume::sculpt()
                
                S32 current_discard = getVolume()->getSculptLevel();
-                llassert_always(current_discard >= -2 && current_discard <= max_discard);
+                if(current_discard < -2)
+                {
+                        llwarns << "WARNING!!: Current discard of sculpty at " << current_discard 
+                                << " is less than -2." << llendl;
+                        
+                        // corrupted volume... don't update the sculpty
+                        return;
+                }
+                else if (current_discard > max_discard)
+                {
+                        llwarns << "WARNING!!: Current discard of sculpty at " << current_discard 
+                                << " is more than than allowed max of " << max_discard << llendl;
+                        
+                        // corrupted volume... don't update the sculpty                 
+                        return;
+                }
                if (current_discard == discard_level)  // no work to do here
                        return;
                
@@ -2047,6 +2063,8 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
        {
                if (group->isState(LLSpatialGroup::MESH_DIRTY))
                {
+                        S32 num_mapped_veretx_buffer = LLVertexBuffer::sMappedCount ;
                        group->mBuilt = 1.f;
                        LLFastTimer ftm(LLFastTimer::FTM_REBUILD_VBO);  
@@ -2055,6 +2073,12 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
                        for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter)
                        {
                                LLDrawable* drawablep = *drawable_iter;
+                                if (drawablep->isDead() || drawablep->isState(LLDrawable::FORCE_INVISIBLE) )
+                                {
+                                        continue;
+                                }
                                if (drawablep->isState(LLDrawable::REBUILD_ALL))
                                {
                                        LLVOVolume* vobj = drawablep->getVOVolume();
@@ -2096,6 +2120,24 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
                                group->mVertexBuffer->setBuffer(0);
                        }
+                        //if not all buffers are unmapped
+                        if(num_mapped_veretx_buffer != LLVertexBuffer::sMappedCount) 
+                        {
+                                llwarns << "Not all mapped vertex buffers are unmapped!" << llendl ; 
+                                for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter)
+                                {
+                                        LLDrawable* drawablep = *drawable_iter;
+                                        for (S32 i = 0; i < drawablep->getNumFaces(); ++i)
+                                        {
+                                                LLFace* face = drawablep->getFace(i);
+                                                if (face && face->mVertexBuffer.notNull() && face->mVertexBuffer->isLocked())
+                                                {
+                                                        face->mVertexBuffer->setBuffer(0) ;
+                                                }
+                                        }
+                                } 
+                        }
                        group->clearState(LLSpatialGroup::MESH_DIRTY);
                }
diff --git a/linden/indra/newview/llvowater.cpp b/linden/indra/newview/llvowater.cpp
index 1acda16..1ab6fbd 100644
--- a/linden/indra/newview/llvowater.cpp
+++ b/linden/indra/newview/llvowater.cpp
@@ -67,7 +67,6 @@ const U32 N_RES_HALF	= (N_RES >> 1);
 const U32 WIDTH                 = (N_RES * WAVE_STEP); //128.f //64             // width of wave tile, in meters
 const F32 WAVE_STEP_INV = (1. / WAVE_STEP);
-const F32 g                             = 9.81f;          // gravitational constant (m/s^2)
 LLVOWater::LLVOWater(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
 :       LLStaticViewerObject(id, LL_VO_WATER, regionp)
@@ -133,7 +132,7 @@ LLDrawable *LLVOWater::createDrawable(LLPipeline *pipeline)
        }
        else
        {
-                mDrawable->setNumFaces(1, pool, gWorldp->getDefaultWaterTexture());
+                mDrawable->setNumFaces(1, pool, LLWorld::getInstance()->getDefaultWaterTexture());
        }
        return mDrawable;
diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp
index ae913af..f121d46 100644
--- a/linden/indra/newview/llwaterparammanager.cpp
+++ b/linden/indra/newview/llwaterparammanager.cpp
@@ -39,7 +39,7 @@
 #include "llsliderctrl.h"
 #include "llspinctrl.h"
 #include "llcheckboxctrl.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 #include "llviewercamera.h"
 #include "llcombobox.h"
@@ -227,7 +227,7 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader)
        if (shader->mShaderGroup == LLGLSLShader::SG_WATER)
        {
                shader->uniform4fv(LLShaderMgr::LIGHTNORM, 1, LLWLParamManager::instance()->getRotatedLightDir().mV);
-                shader->uniform3fv("camPosLocal", 1, gCamera->getOrigin().mV);
+                shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV);
                shader->uniform4fv("waterFogColor", 1, LLDrawPoolWater::sWaterFogColor.mV);
                shader->uniform4fv("waterPlane", 1, mWaterPlane.mV);
                shader->uniform1f("waterFogDensity", getFogDensity());
diff --git a/linden/indra/newview/llwaterparamset.cpp b/linden/indra/newview/llwaterparamset.cpp
index d3068a7..78d882a 100644
--- a/linden/indra/newview/llwaterparamset.cpp
+++ b/linden/indra/newview/llwaterparamset.cpp
@@ -72,8 +72,6 @@ LLWaterParamSet::LLWaterParamSet(void) :
        wave2.append(0.58f);
        wave2.append(-.67f);
-        LLUUID normalMap = LLUUID(gViewerArt.getString("water_normal.tga"));
        mParamValues.insert("waterFogColor", vec4);
        mParamValues.insert("waterFogDensity", 16.0f);
        mParamValues.insert("underWaterFogMod", 0.25f);
@@ -85,7 +83,7 @@ LLWaterParamSet::LLWaterParamSet(void) :
        mParamValues.insert("blurMultiplier", 0.01f);
        mParamValues.insert("wave1Dir", wave1);
        mParamValues.insert("wave2Dir", wave2);
-        mParamValues.insert("normalMap", normalMap);
+        mParamValues.insert("normalMap", DEFAULT_WATER_NORMAL);
 }
diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp
index 22b8142..01a2459 100644
--- a/linden/indra/newview/llwearablelist.cpp
+++ b/linden/indra/newview/llwearablelist.cpp
@@ -160,10 +160,7 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
                {
                        LLFile::remove(filename);
                }
-                if( gViewerStats )
+                LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                {
-                        gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                }
                llwarns << "Wearable download failed: " << LLAssetStorage::getErrorString( status ) << " " << uuid << llendl;
                switch( status )
@@ -207,39 +204,6 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
 }
-LLWearable* LLWearableList::createLegacyWearableFromAvatar( EWearableType type )
-{
-        llinfos << "LLWearableList::createLegacyWearableFromAvatar" << llendl;
-        
-        LLTransactionID tid;
-        LLAssetID new_asset_id;
-        tid.generate();
-        new_asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
-        
-        LLWearable* wearable = new LLWearable( tid );
-        wearable->setType( type );
-        wearable->setName( wearable->getTypeLabel() );
-        wearable->setDescription( "Recovered from lost asset." );
-        LLVOAvatar* avatar = gAgent.getAvatarObject();
-        LLPermissions perm;
-        perm.init( avatar->getID(), avatar->getID(), LLUUID::null, LLUUID::null );
-        perm.initMasks(PERM_TRANSFER, PERM_TRANSFER, PERM_NONE, PERM_NONE, PERM_MOVE | PERM_TRANSFER);
-        wearable->setPermissions( perm );
-        
-        // Save info is the default.
-        wearable->readFromAvatar();
-        
-        mList[ new_asset_id ] = wearable;
-        // Send to the dataserver
-        wearable->saveNewAsset();
-        return wearable;
-}
 // Creates a new wearable just like the old_wearable but with data copied over from item
 LLWearable* LLWearableList::createWearableMatchedToInventoryItem( LLWearable* old_wearable, LLViewerInventoryItem* item )
 {
diff --git a/linden/indra/newview/llwearablelist.h b/linden/indra/newview/llwearablelist.h
index cd15b78..7a01be0 100644
--- a/linden/indra/newview/llwearablelist.h
+++ b/linden/indra/newview/llwearablelist.h
@@ -51,8 +51,6 @@ public:
                                                        void(*asset_arrived_callback)(LLWearable*, void* userdata),
                                                        void* userdata );
-        LLWearable*                     createLegacyWearableFromAvatar( EWearableType type );
        LLWearable*                     createWearableMatchedToInventoryItem( LLWearable* old_wearable, LLViewerInventoryItem* item );
        LLWearable*                     createCopyFromAvatar( LLWearable* old_wearable, const std::string& new_name = std::string() );
        LLWearable*                     createCopy( LLWearable* old_wearable );
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index 79f5a21..a9c1ec8 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -54,6 +54,8 @@
 const S32 MAX_DIMENSION = 2000;
 const S32 MAX_TEXTURE_DIMENSION = 2048;
+static LLRegisterWidget<LLWebBrowserCtrl> r("web_browser");
 LLWebBrowserCtrl::LLWebBrowserCtrl( const std::string& name, const LLRect& rect ) :
        LLUICtrl( name, rect, FALSE, NULL, NULL ),
        mTextureDepthBytes( 4 ),
@@ -68,6 +70,7 @@ LLWebBrowserCtrl::LLWebBrowserCtrl( const std::string& name, const LLRect& rect
        mHomePageUrl( "" ),
        mIgnoreUIScale( true ),
        mAlwaysRefresh( false ),
+        mExternalUrl( "" ),
        mMediaSource( 0 )
 {
        S32 screen_width = mIgnoreUIScale ? 
@@ -270,7 +273,7 @@ void LLWebBrowserCtrl::onFocusLost()
 ////////////////////////////////////////////////////////////////////////////////
 //
-BOOL LLWebBrowserCtrl::handleKey( KEY key, MASK mask, BOOL called_from_parent )
+BOOL LLWebBrowserCtrl::handleKeyHere( KEY key, MASK mask )
 {
        unsigned long media_key;
@@ -325,7 +328,7 @@ BOOL LLWebBrowserCtrl::handleKey( KEY key, MASK mask, BOOL called_from_parent )
        return TRUE;
 }
-BOOL LLWebBrowserCtrl::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
+BOOL LLWebBrowserCtrl::handleUnicodeCharHere(llwchar uni_char)
 {
        // only accept 'printable' characters, sigh...
        if (uni_char >= 32 // discard 'control' characters
@@ -409,8 +412,7 @@ bool LLWebBrowserCtrl::canNavigateForward()
 ////////////////////////////////////////////////////////////////////////////////
 //
+bool LLWebBrowserCtrl::set404RedirectUrl( std::string redirect_url )
-bool LLWebBrowserCtrl::set404RedirectUrl(  std::string redirect_url )
 {
        if(mMediaSource)
                return mMediaSource->set404RedirectUrl( redirect_url );
@@ -432,31 +434,19 @@ bool LLWebBrowserCtrl::clr404RedirectUrl()
 //
 void LLWebBrowserCtrl::navigateTo( std::string urlIn )
 {
-        const std::string protocol( "secondlife://" );
+        // don't browse to anything that starts with secondlife:// or sl://
-        const std::string protocol2( "sl://" );
+        const std::string protocol1 = "secondlife://";
+        const std::string protocol2 = "sl://";
-        // don't browse to anything that starts with secondlife://
+        if ((LLString::compareInsensitive(urlIn.substr(0, protocol1.length()).c_str(), protocol1.c_str()) == 0) ||
-        if ( urlIn.length() >= protocol.length() )
+            (LLString::compareInsensitive(urlIn.substr(0, protocol2.length()).c_str(), protocol2.c_str()) == 0))
-        {
-                if ( LLString::compareInsensitive( urlIn.substr( 0, protocol.length() ).c_str(), protocol.c_str() ) != 0 )
-                {
-                if (mMediaSource)
-                        mMediaSource->navigateTo(urlIn);
-                }
-        }
-        else if ( urlIn.length() >= protocol2.length() )
-        {
-                if ( LLString::compareInsensitive( urlIn.substr( 0, protocol2.length() ).c_str(), protocol2.c_str() ) != 0 )
-                {
-                if (mMediaSource)
-                        mMediaSource->navigateTo(urlIn);
-                }
-        }
-        else
        {
-                if (mMediaSource)
+                // TODO: Print out/log this attempt?
-                        mMediaSource->navigateTo(urlIn);
+                // llinfos << "Rejecting attempt to load restricted website :" << urlIn << llendl;
+                return;
        }
+        
+        if (mMediaSource)
+                mMediaSource->navigateTo(urlIn);
 }
@@ -535,9 +525,6 @@ std::string LLWebBrowserCtrl::getHomePageUrl()
 //
 void LLWebBrowserCtrl::draw()
 {
-        if ( ! getVisible() )
-                return;
        if ( ! mWebBrowserImage )
                return;
@@ -601,7 +588,7 @@ void LLWebBrowserCtrl::draw()
        if ( mBorder->getVisible() )
                mBorder->setKeyboardFocusHighlight( gFocusMgr.childHasKeyboardFocus( this ) );
+        
        LLUICtrl::draw();
 }
@@ -677,9 +664,32 @@ void LLWebBrowserCtrl::onMediaContentsChange( const EventType& event_in )
 }
 ////////////////////////////////////////////////////////////////////////////////
+// static 
+void LLWebBrowserCtrl::onClickLinkExternalTarget( S32 option, void* userdata )
+{
+        if ( 0 == option )
+        {
+                // open in external browser because we don't support 
+                // creation of our own secondary browser windows
+                LLWeb::loadURLExternal( ((LLWebBrowserCtrl*)userdata)->mExternalUrl );
+        };
+}
+////////////////////////////////////////////////////////////////////////////////
 // virtual
 void LLWebBrowserCtrl::onClickLinkHref( const EventType& eventIn )
 {
+        // if there is a value for the target (passed in stringValueEx)
+        if ( eventIn.getStringValueEx().length() )
+        {
+                // if the target = "_new"
+                if ( eventIn.getStringValueEx() == "_external" )                {
+                        mExternalUrl = eventIn.getStringValue();
+                        gViewerWindow->alertXml( "WebLaunchExternalTarget", onClickLinkExternalTarget, (void*)this );
+                        return;
+                };
+        };
        const std::string protocol1( "http://" );
        const std::string protocol2( "https://" );
        if( mOpenLinksInExternalBrowser )
@@ -704,14 +714,18 @@ void LLWebBrowserCtrl::onClickLinkHref( const EventType& eventIn )
                                // If we spawn a new LLFloaterHTML, assume we want it to
                                // follow this LLWebBrowserCtrl's setting for whether or
                                // not to open secondlife:///app/ links. JC.
-                                bool open_links_externally = false;
+                                const bool open_links_externally = false;
-                                LLFloaterHtml::getInstance()->show( eventIn.getStringValue(), "Second Life Browser", mOpenAppSLURLs, open_links_externally);
+                                LLFloaterHtml::getInstance()->show( 
+                                        eventIn.getStringValue(), 
+                                                "Second Life Browser",
+                                                        open_links_externally,
+                                                                mOpenAppSLURLs);
                        };
                };
        };
        // chain this event on to observers of an instance of LLWebBrowserCtrl
-        LLWebBrowserCtrlEvent event( eventIn.getStringValue() );
+        LLWebBrowserCtrlEvent event( eventIn.getStringValue(), eventIn.getStringValueEx() );
        mEventEmitter.update( &LLWebBrowserCtrlObserver::onClickLinkHref, event );
 }
@@ -735,7 +749,6 @@ void LLWebBrowserCtrl::onClickLinkNoFollow( const EventType& eventIn )
        mEventEmitter.update( &LLWebBrowserCtrlObserver::onClickLinkNoFollow, event );
 }
 ////////////////////////////////////////////////////////////////////////////////
 //
 LLWebBrowserTexture::LLWebBrowserTexture( S32 width, S32 height, LLWebBrowserCtrl* browserCtrl, LLMediaBase *media_source ) :
diff --git a/linden/indra/newview/llwebbrowserctrl.h b/linden/indra/newview/llwebbrowserctrl.h
index abfb18b..f7c9647 100644
--- a/linden/indra/newview/llwebbrowserctrl.h
+++ b/linden/indra/newview/llwebbrowserctrl.h
@@ -51,6 +51,12 @@ class LLWebBrowserCtrlEvent
                {
                };
+                LLWebBrowserCtrlEvent( std::string stringValIn,  std::string stringValExIn ) :
+                        mStringVal( stringValIn ),
+                        mStringValEx( stringValExIn )
+                {
+                };
                virtual ~LLWebBrowserCtrlEvent()
                {
                };
@@ -65,9 +71,15 @@ class LLWebBrowserCtrlEvent
                        return mStringVal;
                };
+                std::string getStringValueEx() const
+                {
+                        return mStringValEx;
+                };
        private:
                int mIntVal;
                std::string mStringVal;
+                std::string mStringValEx;
 };
 ////////////////////////////////////////////////////////////////////////////////
@@ -172,10 +184,6 @@ class LLWebBrowserCtrl :
                static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-                // for XML construction
-                virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_WEBBROWSER; }
-                virtual LLString getWidgetTag() const { return LL_WEB_BROWSER_CTRL_TAG; }
                // handle mouse related methods
                virtual BOOL handleHover( S32 x, S32 y, MASK mask );
                virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );
@@ -226,8 +234,8 @@ class LLWebBrowserCtrl :
                // over-rides
-                virtual BOOL handleKey( KEY key, MASK mask, BOOL called_from_parent );
+                virtual BOOL handleKeyHere( KEY key, MASK mask);
-                virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
+                virtual BOOL handleUnicodeCharHere(llwchar uni_char);
                virtual void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE);
                virtual void draw();
                virtual void onVisibilityChange ( BOOL curVisibilityIn );
@@ -254,6 +262,7 @@ class LLWebBrowserCtrl :
                void convertInputCoords(S32& x, S32& y);
        private:
+                static void onClickLinkExternalTarget( S32 option, void* userdata );
                LLWebBrowserCtrlEventEmitter< LLWebBrowserCtrlObserver > mEventEmitter;
                const S32 mTextureDepthBytes;
                int mEmbeddedBrowserWindowId;
@@ -265,6 +274,7 @@ class LLWebBrowserCtrl :
                bool mOpenLinksInInternalBrowser;
                bool mOpenAppSLURLs;
                std::string mHomePageUrl;
+                std::string mExternalUrl;
                bool mIgnoreUIScale;
                bool mAlwaysRefresh;
                LLMediaBase* mMediaSource;
diff --git a/linden/indra/newview/llwind.cpp b/linden/indra/newview/llwind.cpp
index 5d20112..3b18835 100644
--- a/linden/indra/newview/llwind.cpp
+++ b/linden/indra/newview/llwind.cpp
@@ -237,7 +237,7 @@ LLVector3 LLWind::getVelocity(const LLVector3 &pos_region)
        LLVector3 pos_clamped_region(pos_region);
        
-        F32 region_width_meters = gWorldPointer->getRegionWidthInMeters();
+        F32 region_width_meters = LLWorld::getInstance()->getRegionWidthInMeters();
        if (pos_clamped_region.mV[VX] < 0.f)
        {
@@ -299,7 +299,7 @@ LLVector3 LLWind::getCloudVelocity(const LLVector3 &pos_region)
        LLVector3 pos_clamped_region(pos_region);
        
-        F32 region_width_meters = gWorldPointer->getRegionWidthInMeters();
+        F32 region_width_meters = LLWorld::getInstance()->getRegionWidthInMeters();
        if (pos_clamped_region.mV[VX] < 0.f)
        {
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 11ed43c..9f59947 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -39,7 +39,7 @@
 #include "llsliderctrl.h"
 #include "llspinctrl.h"
 #include "llcheckboxctrl.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewercamera.h"
 #include "llcombobox.h"
 #include "lllineeditor.h"
@@ -280,7 +280,7 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
        if (shader->mShaderGroup == LLGLSLShader::SG_DEFAULT)
        {
                shader->uniform4fv(LLShaderMgr::LIGHTNORM, 1, mRotatedLightDir.mV);
-                shader->uniform3fv("camPosLocal", 1, gCamera->getOrigin().mV);
+                shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV);
        } 
        else if (shader->mShaderGroup == LLGLSLShader::SG_SKY)
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 60312db..8c95260 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -61,7 +61,6 @@
 //
 // Globals
 //
-LLWorld*        gWorldp = NULL;
 U32                     gAgentPauseSerialNum = 0;
 //
@@ -72,15 +71,19 @@ const S32 WORLD_PATCH_SIZE = 16;
 extern LLColor4U MAX_WATER_COLOR;
+const U32 LLWorld::mWidth = 256;
+// meters/point, therefore mWidth * mScale = meters per edge
+const F32 LLWorld::mScale = 1.f;
+const F32 LLWorld::mWidthInMeters = mWidth * mScale;
 //
 // Functions
 //
 // allocate the stack
-LLWorld::LLWorld(const U32 grids_per_region, const F32 meters_per_grid)
+LLWorld::LLWorld()
-:       mWidth(grids_per_region), 
-        mScale(meters_per_grid), 
-        mWidthInMeters( grids_per_region * meters_per_grid )
 {
        mSpaceTimeUSec = 0;
        mLastPacketsIn = 0;
@@ -112,10 +115,15 @@ LLWorld::LLWorld(const U32 grids_per_region, const F32 meters_per_grid)
 }
-LLWorld::~LLWorld()
+void LLWorld::destroyClass()
 {
-        gObjectList.killAllObjects();
+        gObjectList.destroy();
-        for_each(mRegionList.begin(), mRegionList.end(), DeletePointer());
+        for(region_list_t::iterator region_it = mRegionList.begin(); region_it != mRegionList.end(); )
+        {
+                LLViewerRegion* region_to_delete = *region_it++;
+                removeRegion(region_to_delete->getHost());
+        }
+        LLViewerPartSim::getInstance()->destroyClass();
 }
@@ -523,6 +531,11 @@ F32 LLWorld::resolveStepHeightGlobal(const LLVOAvatar* avatarp, const LLVector3d
                        intersection.mdV[VZ] -= norm_dist_from_plane * segment_length;
                        intersection_normal = foot_plane_normal;
                }
+                else
+                {
+                        intersection = land_intersection;
+                        intersection_normal = resolveLandNormalGlobal(land_intersection);
+                }
        }
        return normalized_land_distance;
@@ -556,9 +569,9 @@ LLVector3 LLWorld::resolveLandNormalGlobal(const LLVector3d &pos_global)
 void LLWorld::updateVisibilities()
 {
-        F32 cur_far_clip = gCamera->getFar();
+        F32 cur_far_clip = LLViewerCamera::getInstance()->getFar();
-        gCamera->setFar(mLandFarClip);
+        LLViewerCamera::getInstance()->setFar(mLandFarClip);
        F32 diagonal_squared = F_SQRT2 * F_SQRT2 * mWidth * mWidth;
        // Go through the culled list and check for visible regions
@@ -570,7 +583,7 @@ void LLWorld::updateVisibilities()
                F32 height = regionp->getLand().getMaxZ() - regionp->getLand().getMinZ();
                F32 radius = 0.5f*fsqrtf(height * height + diagonal_squared);
                if (!regionp->getLand().hasZData()
-                        || gCamera->sphereInFrustum(regionp->getCenterAgent(), radius))
+                        || LLViewerCamera::getInstance()->sphereInFrustum(regionp->getCenterAgent(), radius))
                {
                        mCulledRegionList.erase(curiter);
                        mVisibleRegionList.push_back(regionp);
@@ -590,7 +603,7 @@ void LLWorld::updateVisibilities()
                F32 height = regionp->getLand().getMaxZ() - regionp->getLand().getMinZ();
                F32 radius = 0.5f*fsqrtf(height * height + diagonal_squared);
-                if (gCamera->sphereInFrustum(regionp->getCenterAgent(), radius))
+                if (LLViewerCamera::getInstance()->sphereInFrustum(regionp->getCenterAgent(), radius))
                {
                        regionp->calculateCameraDistance();
                        if (!gNoRender)
@@ -608,7 +621,7 @@ void LLWorld::updateVisibilities()
        // Sort visible regions
        mVisibleRegionList.sort(LLViewerRegion::CompareDistance());
        
-        gCamera->setFar(cur_far_clip);
+        LLViewerCamera::getInstance()->setFar(cur_far_clip);
 }
 void LLWorld::updateRegions(F32 max_update_time)
@@ -631,7 +644,7 @@ void LLWorld::updateRegions(F32 max_update_time)
 void LLWorld::updateParticles()
 {
-        mPartSim.updateSimulation();
+        LLViewerPartSim::getInstance()->updateSimulation();
 }
 void LLWorld::updateClouds(const F32 dt)
@@ -727,19 +740,19 @@ void LLWorld::updateNetStats()
        S32 actual_in_bits = gMessageSystem->mPacketRing.getAndResetActualInBits();
        S32 actual_out_bits = gMessageSystem->mPacketRing.getAndResetActualOutBits();
-        gViewerStats->mActualInKBitStat.addValue(actual_in_bits/1024.f);
+        LLViewerStats::getInstance()->mActualInKBitStat.addValue(actual_in_bits/1024.f);
-        gViewerStats->mActualOutKBitStat.addValue(actual_out_bits/1024.f);
+        LLViewerStats::getInstance()->mActualOutKBitStat.addValue(actual_out_bits/1024.f);
-        gViewerStats->mKBitStat.addValue(bits/1024.f);
+        LLViewerStats::getInstance()->mKBitStat.addValue(bits/1024.f);
-        gViewerStats->mPacketsInStat.addValue(packets_in);
+        LLViewerStats::getInstance()->mPacketsInStat.addValue(packets_in);
-        gViewerStats->mPacketsOutStat.addValue(packets_out);
+        LLViewerStats::getInstance()->mPacketsOutStat.addValue(packets_out);
-        gViewerStats->mPacketsLostStat.addValue(gMessageSystem->mDroppedPackets);
+        LLViewerStats::getInstance()->mPacketsLostStat.addValue(gMessageSystem->mDroppedPackets);
        if (packets_in)
        {
-                gViewerStats->mPacketsLostPercentStat.addValue(100.f*((F32)packets_lost/(F32)packets_in));
+                LLViewerStats::getInstance()->mPacketsLostPercentStat.addValue(100.f*((F32)packets_lost/(F32)packets_in));
        }
        else
        {
-                gViewerStats->mPacketsLostPercentStat.addValue(0.f);
+                LLViewerStats::getInstance()->mPacketsLostPercentStat.addValue(0.f);
        }
        mLastPacketsIn = gMessageSystem->mPacketsIn;
@@ -771,8 +784,7 @@ void LLWorld::printPacketsLost()
 void LLWorld::processCoarseUpdate(LLMessageSystem* msg, void** user_data)
 {
-        if(!gWorldp) return;
+        LLViewerRegion* region = LLWorld::getInstance()->getRegion(msg->getSender());
-        LLViewerRegion* region = gWorldp->getRegion(msg->getSender());
        if( region )
        {
                region->updateCoarseLocations(msg);
@@ -812,7 +824,7 @@ void LLWorld::updateWaterObjects()
        S32 rwidth = 256;
        // We only want to fill in water for stuff that's near us, say, within 256 or 512m
-        S32 range = gCamera->getFar() > 256.f ? 512 : 256;
+        S32 range = LLViewerCamera::getInstance()->getFar() > 256.f ? 512 : 256;
        LLViewerRegion* regionp = gAgent.getRegion();
        from_region_handle(regionp->getHandle(), &region_x, &region_y);
@@ -940,7 +952,7 @@ void LLWorld::shiftRegions(const LLVector3& offset)
                region->updateRenderMatrix();
        }
-        mPartSim.shift(offset);
+        LLViewerPartSim::getInstance()->shift(offset);
 }
 LLViewerImage* LLWorld::getDefaultWaterTexture()
@@ -1022,8 +1034,7 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data)
        // Viewer trusts the simulator.
        msg->enableCircuit(sim, TRUE);
-        if(!gWorldp) return;
+        LLWorld::getInstance()->addRegion(handle, sim);
-        gWorldp->addRegion(handle, sim);
        // give the simulator a message it can use to get ip and port
        llinfos << "simulator_enable() Enabling " << sim << " with code " << msg->getOurCircuitCode() << llendl;
@@ -1060,8 +1071,7 @@ public:
                LLHost sim(input["body"]["sim-ip-and-port"].asString());
        
-                if(!gWorldp) return;
+                LLViewerRegion* regionp = LLWorld::getInstance()->getRegion(sim);
-                LLViewerRegion* regionp = gWorldp->getRegion(sim);
                if (!regionp)
                {
                        llwarns << "Got EstablishAgentCommunication for unknown region "
@@ -1079,8 +1089,7 @@ void process_disable_simulator(LLMessageSystem *mesgsys, void **user_data)
        LLHost host = mesgsys->getSender();
        //llinfos << "Disabling simulator with message from " << host << llendl;
-        if(!gWorldp) return;
+        LLWorld::getInstance()->removeRegion(host);
-        gWorldp->removeRegion(host);
        mesgsys->disableCircuit(host);
 }
@@ -1089,8 +1098,7 @@ void process_disable_simulator(LLMessageSystem *mesgsys, void **user_data)
 void process_region_handshake(LLMessageSystem* msg, void** user_data)
 {
        LLHost host = msg->getSender();
-        if(!gWorldp) return;
+        LLViewerRegion* regionp = LLWorld::getInstance()->getRegion(host);
-        LLViewerRegion* regionp = gWorldp->getRegion(host);
        if (!regionp)
        {
                llwarns << "Got region handshake for unknown region "
@@ -1104,8 +1112,10 @@ void process_region_handshake(LLMessageSystem* msg, void** user_data)
 void send_agent_pause()
 {
-        // world not initialized yet
+        // Note: used to check for LLWorld initialization before it became a singleton.
-        if (!gWorldp)
+        // Rather than just remove this check I'm changing it to assure that the message 
+        // system has been initialized. -MG
+        if (!gMessageSystem)
        {
                return;
        }
@@ -1118,8 +1128,8 @@ void send_agent_pause()
        gAgentPauseSerialNum++;
        gMessageSystem->addU32Fast(_PREHASH_SerialNum, gAgentPauseSerialNum);
-        for (LLWorld::region_list_t::iterator iter = gWorldp->mActiveRegionList.begin();
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                 iter != gWorldp->mActiveRegionList.end(); ++iter)
+                 iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
        {
                LLViewerRegion* regionp = *iter;
                gMessageSystem->sendReliable(regionp->getHost());
@@ -1131,8 +1141,13 @@ void send_agent_pause()
 void send_agent_resume()
 {
-        // world not initialized yet
+        // Note: used to check for LLWorld initialization before it became a singleton.
-        if (!gWorldp) return;
+        // Rather than just remove this check I'm changing it to assure that the message 
+        // system has been initialized. -MG
+        if (!gMessageSystem)
+        {
+                return;
+        }
        gMessageSystem->newMessageFast(_PREHASH_AgentResume);
        gMessageSystem->nextBlockFast(_PREHASH_AgentData);
@@ -1143,15 +1158,15 @@ void send_agent_resume()
        gMessageSystem->addU32Fast(_PREHASH_SerialNum, gAgentPauseSerialNum);
        
-        for (LLWorld::region_list_t::iterator iter = gWorldp->mActiveRegionList.begin();
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin();
-                 iter != gWorldp->mActiveRegionList.end(); ++iter)
+                 iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter)
        {
                LLViewerRegion* regionp = *iter;
                gMessageSystem->sendReliable(regionp->getHost());
        }
        // Reset the FPS counter to avoid an invalid fps
-        gViewerStats->mFPSStat.start();
+        LLViewerStats::getInstance()->mFPSStat.start();
 }
diff --git a/linden/indra/newview/llworld.h b/linden/indra/newview/llworld.h
index 7b935e8..d297d47 100644
--- a/linden/indra/newview/llworld.h
+++ b/linden/indra/newview/llworld.h
@@ -35,12 +35,12 @@
 #include "llpatchvertexarray.h"
 #include "llmath.h"
-//#include "vmath.h"
 #include "v3math.h"
 #include "llmemory.h"
 #include "llstring.h"
 #include "llviewerpartsim.h"
 #include "llviewerimage.h"
+#include "llvowater.h"
 class LLViewerRegion;
 class LLVector3d;
@@ -49,7 +49,6 @@ class LLNetMap;
 class LLHost;
 class LLViewerObject;
-class LLVOWater;
 class LLSurfacePatch;
 class LLCloudPuff;
@@ -60,11 +59,11 @@ class LLVOAvatar;
 // as simulators are connected to, viewer_regions are popped off the stack and connected as required
 // as simulators are removed, they are pushed back onto the stack
-class LLWorld
+class LLWorld : public LLSingleton<LLWorld>
 {
 public:
-        LLWorld(const U32 grids_per_region, const F32 meters_per_grid);
+        LLWorld();
-        ~LLWorld();
+        void destroyClass();
        LLViewerRegion* addRegion(const U64 &region_handle, const LLHost &host);
                // safe to call if already present, does the "right thing" if
@@ -114,7 +113,7 @@ public:
        // region X and Y size in meters
        F32                                             getRegionWidthInMeters() const  { return mWidthInMeters; }
        F32                                             getRegionMinHeight() const              { return -mWidthInMeters; }
-        F32                                             getRegionMaxHeight() const              { return 3.f*mWidthInMeters; }
+        F32                                             getRegionMaxHeight() const              { return MAX_OBJECT_Z; }
        void                                    updateRegions(F32 max_update_time);
        void                                    updateVisibilities();
@@ -149,7 +148,6 @@ public:
        typedef std::list<LLViewerRegion*> region_list_t;
        
        region_list_t   mActiveRegionList;
-        LLViewerPartSim mPartSim;
        region_list_t& getRegionList() { return mActiveRegionList; }
@@ -159,12 +157,12 @@ private:
        region_list_t   mCulledRegionList;
        // Number of points on edge
-        const U32 mWidth;
+        static const U32 mWidth;
        // meters/point, therefore mWidth * mScale = meters per edge
-        const F32 mScale;
+        static const F32 mScale;
-        const F32 mWidthInMeters;
+        static const F32 mWidthInMeters;
        F32 mLandFarClip;                                       // Far clip distance for land.
        LLPatchVertexArray              mLandPatch;
@@ -190,8 +188,6 @@ private:
        U64 mSpaceTimeUSec;
 };
-extern LLWorld *gWorldp;
-#define gWorldPointer gWorldp
 void process_enable_simulator(LLMessageSystem *mesgsys, void **user_data);
 void process_disable_simulator(LLMessageSystem *mesgsys, void **user_data);
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index 0a2b33e..28ae94a 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -46,8 +46,6 @@
 #include "llviewerregion.h"
 #include "llregionflags.h"
-LLWorldMap* gWorldMap = NULL;
 const F32 REQUEST_ITEMS_TIMER =  10.f * 60.f; // 10 minutes
 LLItemInfo::LLItemInfo(F32 global_x, F32 global_y,
@@ -108,6 +106,7 @@ LLWorldMap::LLWorldMap() :
        mNeighborMapWidth(0),
        mNeighborMapHeight(0),
        mSLURLRegionName(),
+        mSLURLRegionHandle(0),
        mSLURL(),
        mSLURLCallback(0),
        mSLURLTeleport(false)
@@ -344,6 +343,8 @@ void LLWorldMap::sendItemRequest(U32 type, U64 handle)
 // public
 void LLWorldMap::sendMapLayerRequest()
 {
+        if (!gAgent.getRegion()) return;
        LLSD body;
        body["Flags"] = mCurrentMap;
        std::string url = gAgent.getRegion()->getCapability(
@@ -409,6 +410,7 @@ void LLWorldMap::sendNamedRegionRequest(std::string region_name,
                bool teleport)  // immediately teleport when result returned
 {
        mSLURLRegionName = region_name;
+        mSLURLRegionHandle = 0;
        mSLURL = callback_url;
        mSLURLCallback = callback;
        mSLURLTeleport = teleport;
@@ -416,6 +418,26 @@ void LLWorldMap::sendNamedRegionRequest(std::string region_name,
        sendNamedRegionRequest(region_name);
 }
+void LLWorldMap::sendHandleRegionRequest(U64 region_handle, 
+                url_callback_t callback,
+                const std::string& callback_url,
+                bool teleport)  // immediately teleport when result returned
+{
+        mSLURLRegionName.clear();
+        mSLURLRegionHandle = region_handle;
+        mSLURL = callback_url;
+        mSLURLCallback = callback;
+        mSLURLTeleport = teleport;
+        U32 global_x;
+        U32 global_y;
+        from_region_handle(region_handle, &global_x, &global_y);
+        U16 grid_x = (U16)(global_x / REGION_WIDTH_UNITS);
+        U16 grid_y = (U16)(global_y / REGION_WIDTH_UNITS);
+        
+        sendMapBlockRequest(grid_x, grid_y, grid_x, grid_y, true);
+}
 // public
 void LLWorldMap::sendMapBlockRequest(U16 min_x, U16 min_y, U16 max_x, U16 max_y, bool return_nonexistent)
 {
@@ -463,7 +485,7 @@ void LLWorldMap::processMapLayerReply(LLMessageSystem* msg, void**)
        U32 agent_flags;
        msg->getU32Fast(_PREHASH_AgentData, _PREHASH_Flags, agent_flags);
-        if (agent_flags != (U32)gWorldMap->mCurrentMap)
+        if (agent_flags != (U32)LLWorldMap::getInstance()->mCurrentMap)
        {
                llwarns << "Invalid or out of date map image type returned!" << llendl;
                return;
@@ -474,7 +496,7 @@ void LLWorldMap::processMapLayerReply(LLMessageSystem* msg, void**)
        S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_LayerData);
-        gWorldMap->mMapLayers[agent_flags].clear();
+        LLWorldMap::getInstance()->mMapLayers[agent_flags].clear();
        BOOL adjust = FALSE;
        for (S32 block=0; block<num_blocks; ++block)
@@ -499,14 +521,14 @@ void LLWorldMap::processMapLayerReply(LLMessageSystem* msg, void**)
                F32 x_meters = F32(left*REGION_WIDTH_UNITS);
                F32 y_meters = F32(bottom*REGION_WIDTH_UNITS);
-                adjust = gWorldMap->extendAABB(U32(x_meters), U32(y_meters), 
+                adjust = LLWorldMap::getInstance()->extendAABB(U32(x_meters), U32(y_meters), 
                                                           U32(x_meters+REGION_WIDTH_UNITS*new_layer.LayerExtents.getWidth()),
                                                           U32(y_meters+REGION_WIDTH_UNITS*new_layer.LayerExtents.getHeight())) || adjust;
-                gWorldMap->mMapLayers[agent_flags].push_back(new_layer);
+                LLWorldMap::getInstance()->mMapLayers[agent_flags].push_back(new_layer);
        }
-        gWorldMap->mMapLoaded[agent_flags] = TRUE;
+        LLWorldMap::getInstance()->mMapLoaded[agent_flags] = TRUE;
        if(adjust) gFloaterWorldMap->adjustZoomSliderBounds();
 }
@@ -554,32 +576,21 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
                if (access == 255)
                {
                        // This region doesn't exist
-                        if (gWorldMap->mIsTrackingUnknownLocation &&
+                        if (LLWorldMap::getInstance()->mIsTrackingUnknownLocation &&
-                                gWorldMap->mUnknownLocation.mdV[0] >= x_meters &&
+                                LLWorldMap::getInstance()->mUnknownLocation.mdV[0] >= x_meters &&
-                                gWorldMap->mUnknownLocation.mdV[0] < x_meters + 256 &&
+                                LLWorldMap::getInstance()->mUnknownLocation.mdV[0] < x_meters + 256 &&
-                                gWorldMap->mUnknownLocation.mdV[1] >= y_meters &&
+                                LLWorldMap::getInstance()->mUnknownLocation.mdV[1] >= y_meters &&
-                                gWorldMap->mUnknownLocation.mdV[1] < y_meters + 256)
+                                LLWorldMap::getInstance()->mUnknownLocation.mdV[1] < y_meters + 256)
                        {
                                // We were tracking this location, but it doesn't exist
-                                gWorldMap->mInvalidLocation = TRUE;
+                                LLWorldMap::getInstance()->mInvalidLocation = TRUE;
                        }
                        found_null_sim = true;
                }
-                else if(gWorldMap->mSLURLCallback != NULL)
-                {
-                        // Server returns definitive capitalization, SLURL might
-                        // not have that.
-                        if (!stricmp(gWorldMap->mSLURLRegionName.c_str(), name))
-                        {
-                                gWorldMap->mSLURLCallback(handle, gWorldMap->mSLURL, image_id, gWorldMap->mSLURLTeleport);
-                                gWorldMap->mSLURLCallback = NULL;
-                                gWorldMap->mSLURLRegionName.clear();
-                        }
-                }
                else
                {
-                        adjust = gWorldMap->extendAABB(x_meters, 
+                        adjust = LLWorldMap::getInstance()->extendAABB(x_meters, 
                                                                                y_meters, 
                                                                                x_meters+REGION_WIDTH_UNITS,
                                                                                y_meters+REGION_WIDTH_UNITS) || adjust;
@@ -587,8 +598,8 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
 //                      llinfos << "Map sim " << name << " image layer " << agent_flags << " ID " << image_id.getString() << llendl;
                        
                        LLSimInfo* siminfo = new LLSimInfo();
-                        sim_info_map_t::iterator iter = gWorldMap->mSimInfoMap.find(handle);
+                        sim_info_map_t::iterator iter = LLWorldMap::getInstance()->mSimInfoMap.find(handle);
-                        if (iter != gWorldMap->mSimInfoMap.end())
+                        if (iter != LLWorldMap::getInstance()->mSimInfoMap.end())
                        {
                                LLSimInfo* oldinfo = iter->second;
                                for (S32 image=0; image<MAP_SIM_IMAGE_TYPES; ++image)
@@ -597,7 +608,7 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
                                }
                                delete oldinfo;
                        }
-                        gWorldMap->mSimInfoMap[handle] = siminfo;
+                        LLWorldMap::getInstance()->mSimInfoMap[handle] = siminfo;
                        siminfo->mHandle = handle;
                        siminfo->mName.assign( name );
@@ -605,7 +616,7 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
                        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 = gImageList.getImage(siminfo->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE);
                        siminfo->mCurrentImage->bindTexture(0);
                        siminfo->mCurrentImage->setClamp(TRUE, TRUE);
                        
@@ -618,22 +629,22 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
                                siminfo->mOverlayImage = NULL;
                        }
-                        if (gWorldMap->mIsTrackingUnknownLocation &&
+                        if (LLWorldMap::getInstance()->mIsTrackingUnknownLocation &&
-                                gWorldMap->mUnknownLocation.mdV[0] >= x_meters &&
+                                LLWorldMap::getInstance()->mUnknownLocation.mdV[0] >= x_meters &&
-                                gWorldMap->mUnknownLocation.mdV[0] < x_meters + 256 &&
+                                LLWorldMap::getInstance()->mUnknownLocation.mdV[0] < x_meters + 256 &&
-                                gWorldMap->mUnknownLocation.mdV[1] >= y_meters &&
+                                LLWorldMap::getInstance()->mUnknownLocation.mdV[1] >= y_meters &&
-                                gWorldMap->mUnknownLocation.mdV[1] < y_meters + 256)
+                                LLWorldMap::getInstance()->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;
+                                        LLWorldMap::getInstance()->mInvalidLocation = true;
                                }
                                else
                                {
                                        // We were tracking this location, and it does exist
-                                        bool is_tracking_dbl = gWorldMap->mIsTrackingDoubleClick == TRUE;
+                                        bool is_tracking_dbl = LLWorldMap::getInstance()->mIsTrackingDoubleClick == TRUE;
-                                        gFloaterWorldMap->trackLocation(gWorldMap->mUnknownLocation);
+                                        gFloaterWorldMap->trackLocation(LLWorldMap::getInstance()->mUnknownLocation);
                                        if (is_tracking_dbl)
                                        {
                                                LLVector3d pos_global = LLTracker::getTrackedPositionGlobal();
@@ -642,6 +653,22 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
                                }
                        }
                }
+                                
+                if(LLWorldMap::getInstance()->mSLURLCallback != NULL)
+                {
+                        // Server returns definitive capitalization, SLURL might
+                        // not have that.
+                        if (!stricmp(LLWorldMap::getInstance()->mSLURLRegionName.c_str(), name) || (LLWorldMap::getInstance()->mSLURLRegionHandle == handle))
+                        {
+                                url_callback_t callback = LLWorldMap::getInstance()->mSLURLCallback;
+                                LLWorldMap::getInstance()->mSLURLCallback = NULL;
+                                LLWorldMap::getInstance()->mSLURLRegionName.clear();
+                                LLWorldMap::getInstance()->mSLURLRegionHandle = 0;
+                                callback(handle, LLWorldMap::getInstance()->mSLURL, image_id, LLWorldMap::getInstance()->mSLURLTeleport);
+                        }
+                }
        }
        if(adjust) gFloaterWorldMap->adjustZoomSliderBounds();
@@ -675,7 +702,7 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
                Y /= REGION_WIDTH_UNITS;
                
                LLItemInfo new_item(world_x, world_y, name, uuid, extra, extra2);
-                LLSimInfo* siminfo = gWorldMap->simInfoFromHandle(new_item.mRegionHandle);
+                LLSimInfo* siminfo = LLWorldMap::getInstance()->simInfoFromHandle(new_item.mRegionHandle);
                switch (type)
                {
@@ -697,11 +724,11 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
                                // extra2 specifies whether this is an infohub or a telehub.
                                if (extra2)
                                {
-                                        gWorldMap->mInfohubs.push_back(new_item);
+                                        LLWorldMap::getInstance()->mInfohubs.push_back(new_item);
                                }
                                else
                                {
-                                        gWorldMap->mTelehubs.push_back(new_item);
+                                        LLWorldMap::getInstance()->mTelehubs.push_back(new_item);
                                }
                                break;
@@ -728,31 +755,31 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
                                new_item.mPosGlobal.mdV[VZ] = (F64)extra2;
                                if (type == MAP_ITEM_PG_EVENT)
                                {
-                                        gWorldMap->mPGEvents.push_back(new_item);
+                                        LLWorldMap::getInstance()->mPGEvents.push_back(new_item);
                                }
                                else
                                {
-                                        gWorldMap->mMatureEvents.push_back(new_item);
+                                        LLWorldMap::getInstance()->mMatureEvents.push_back(new_item);
                                }
                                break;
                        }
                        case MAP_ITEM_POPULAR: // popular
                        {
                                new_item.mPosGlobal.mdV[VZ] = (F64)extra2;
-                                gWorldMap->mPopular.push_back(new_item);
+                                LLWorldMap::getInstance()->mPopular.push_back(new_item);
                                break;
                        }
                        case MAP_ITEM_LAND_FOR_SALE: // land for sale
                        {
                                new_item.mToolTip = llformat("%d sq. m. L$%d", new_item.mExtra, new_item.mExtra2);
-                                gWorldMap->mLandForSale.push_back(new_item);
+                                LLWorldMap::getInstance()->mLandForSale.push_back(new_item);
                                break;
                        }
                        case MAP_ITEM_CLASSIFIED: // classifieds
                        {
                                // HACK: Z-height is in Extra2 field.
                                new_item.mPosGlobal.mdV[VZ] = (F64)extra2;
-                                gWorldMap->mClassifieds.push_back(new_item);
+                                LLWorldMap::getInstance()->mClassifieds.push_back(new_item);
                                break;
                        }
                        case MAP_ITEM_AGENT_LOCATIONS: // agent locations
@@ -764,7 +791,7 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
                                }
 //                              llinfos << "New Location " << new_item.mName << llendl;
-                                item_info_list_t& agentcounts = gWorldMap->mAgentLocationsMap[new_item.mRegionHandle];
+                                item_info_list_t& agentcounts = LLWorldMap::getInstance()->mAgentLocationsMap[new_item.mRegionHandle];
                                // Find the last item in the list with a different name and erase them
                                item_info_list_t::iterator lastiter;
diff --git a/linden/indra/newview/llworldmap.h b/linden/indra/newview/llworldmap.h
index bc8d653..041dfc0 100644
--- a/linden/indra/newview/llworldmap.h
+++ b/linden/indra/newview/llworldmap.h
@@ -110,7 +110,7 @@ struct LLWorldMapLayer
 };
-class LLWorldMap
+class LLWorldMap : public LLSingleton<LLWorldMap>
 {
 public:
        typedef void(*url_callback_t)(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport);
@@ -153,6 +153,10 @@ public:
                url_callback_t callback,
                const std::string& callback_url,
                bool teleport);
+        void sendHandleRegionRequest(U64 region_handle, 
+                url_callback_t callback,
+                const std::string& callback_url,
+                bool teleport);
        void sendItemRequest(U32 type, U64 handle = 0);
        static void processMapLayerReply(LLMessageSystem*, void**);
@@ -217,11 +221,10 @@ private:
        // search for named region for url processing
        std::string mSLURLRegionName;
+        U64 mSLURLRegionHandle;
        std::string mSLURL;
        url_callback_t mSLURLCallback;
        bool mSLURLTeleport;
 };
-extern LLWorldMap* gWorldMap;
 #endif
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 2fac51a..ccf5903 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -59,7 +59,6 @@
 #include "llviewerparceloverlay.h"
 #include "llviewerregion.h"
 #include "llviewerwindow.h"
-#include "llworld.h"
 #include "llworldmap.h"
 #include "llappviewer.h"                                // Only for constants!
@@ -70,24 +69,24 @@ const S32 SCROLL_HINT_WIDTH = 65;
 const F32 BIG_DOT_RADIUS = 5.f;
 BOOL LLWorldMapView::sHandledLastClick = FALSE;
-LLPointer<LLViewerImage> LLWorldMapView::sAvatarYouSmallImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarYouSmallImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sAvatarSmallImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarSmallImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sAvatarLargeImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarLargeImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sAvatarAboveImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarAboveImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sAvatarBelowImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarBelowImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sTelehubImage = NULL;
+LLUIImagePtr LLWorldMapView::sTelehubImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sInfohubImage = NULL;
+LLUIImagePtr LLWorldMapView::sInfohubImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sHomeImage = NULL;
+LLUIImagePtr LLWorldMapView::sHomeImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sEventImage = NULL;
+LLUIImagePtr LLWorldMapView::sEventImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sEventMatureImage = NULL;
+LLUIImagePtr LLWorldMapView::sEventMatureImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sTrackCircleImage = NULL;
+LLUIImagePtr LLWorldMapView::sTrackCircleImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sTrackArrowImage = NULL;
+LLUIImagePtr LLWorldMapView::sTrackArrowImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sClassifiedsImage = NULL;
+LLUIImagePtr LLWorldMapView::sClassifiedsImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sPopularImage = NULL;
+LLUIImagePtr LLWorldMapView::sPopularImage = NULL;
-LLPointer<LLViewerImage> LLWorldMapView::sForSaleImage = NULL;
+LLUIImagePtr LLWorldMapView::sForSaleImage = NULL;
 F32 LLWorldMapView::sThresholdA = 48.f;
 F32 LLWorldMapView::sThresholdB = 96.f;
@@ -114,53 +113,21 @@ void LLWorldMapView::initClass()
 {
        LLUUID image_id;
        
-        image_id.set( gViewerArt.getString("map_avatar_you_8.tga") );
+        sAvatarYouSmallImage =  LLUI::getUIImage("map_avatar_you_8.tga");
-        sAvatarYouSmallImage = gImageList.getImage( image_id, MIPMAP_FALSE, TRUE);
+        sAvatarSmallImage =     LLUI::getUIImage("map_avatar_8.tga");
+        sAvatarLargeImage =     LLUI::getUIImage("map_avatar_16.tga");
-        image_id.set( gViewerArt.getString("map_avatar_8.tga") );
+        sAvatarAboveImage =     LLUI::getUIImage("map_avatar_above_8.tga");
-        sAvatarSmallImage = gImageList.getImage( image_id, MIPMAP_FALSE, TRUE);
+        sAvatarBelowImage =     LLUI::getUIImage("map_avatar_below_8.tga");
+        sHomeImage =                    LLUI::getUIImage("map_home.tga");
-        image_id.set( gViewerArt.getString("map_avatar_16.tga") );
+        sTelehubImage =                 LLUI::getUIImage("map_telehub.tga");
-        sAvatarLargeImage = gImageList.getImage( image_id, MIPMAP_FALSE, TRUE);
+        sInfohubImage =                 LLUI::getUIImage("map_infohub.tga");
+        sEventImage =                   LLUI::getUIImage("map_event.tga");
-        image_id.set( gViewerArt.getString("map_avatar_above_8.tga") );
+        sEventMatureImage =             LLUI::getUIImage("map_event_mature.tga");
-        sAvatarAboveImage = gImageList.getImage( image_id, MIPMAP_FALSE, TRUE);
+        sTrackCircleImage =             LLUI::getUIImage("map_track_16.tga");
+        sTrackArrowImage =              LLUI::getUIImage("direction_arrow.tga");
-        image_id.set( gViewerArt.getString("map_avatar_below_8.tga") );
+        sClassifiedsImage =             LLUI::getUIImage("icon_top_pick.tga");
-        sAvatarBelowImage = gImageList.getImage( image_id, MIPMAP_FALSE, TRUE);
+        sPopularImage =                 LLUI::getUIImage("icon_popular.tga");
+        sForSaleImage =                 LLUI::getUIImage("icon_for_sale.tga");
-        image_id.set( gViewerArt.getString("map_home.tga") );
-        sHomeImage = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
-        image_id.set( gViewerArt.getString("map_telehub.tga") );
-        sTelehubImage = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
-        image_id.set( gViewerArt.getString("map_infohub.tga") );
-        sInfohubImage = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
-        image_id.set( gViewerArt.getString("map_event.tga") );
-        sEventImage = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
-        image_id.set( gViewerArt.getString("map_event_mature.tga") );
-        sEventMatureImage = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
-        image_id.set( gViewerArt.getString("map_track_16.tga") );
-        sTrackCircleImage = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
-        image_id.set( gViewerArt.getString("direction_arrow.tga") );
-        sTrackArrowImage = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
-        // Make sure tracker arrow doesn't wrap
-        sTrackArrowImage->bindTexture(0);
-        sTrackArrowImage->setClamp(TRUE, TRUE);
-        image_id.set( gViewerArt.getString("icon_top_pick.tga") );
-        sClassifiedsImage = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
-        image_id.set( gViewerArt.getString("icon_popular.tga") );
-        sPopularImage = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
-        image_id.set( gViewerArt.getString("icon_for_sale.tga") );
-        sForSaleImage = gImageList.getImage(image_id, MIPMAP_FALSE, TRUE);
 }
 // static
@@ -312,11 +279,6 @@ BOOL is_agent_in_region(LLViewerRegion* region, LLSimInfo* info)
 void LLWorldMapView::draw()
 {
-        if (!getVisible() || !gWorldPointer)
-        {
-                return;
-        }
        LLTextureView::clearDebugImages();
        F64 current_time = LLTimer::getElapsedSeconds();
@@ -356,13 +318,13 @@ void LLWorldMapView::draw()
        F32 layer_alpha = 1.f;
        // Draw one image per layer
-        for (U32 layer_idx=0; layer_idx<gWorldMap->mMapLayers[gWorldMap->mCurrentMap].size(); ++layer_idx)
+        for (U32 layer_idx=0; layer_idx<LLWorldMap::getInstance()->mMapLayers[LLWorldMap::getInstance()->mCurrentMap].size(); ++layer_idx)
        {
-                if (!gWorldMap->mMapLayers[gWorldMap->mCurrentMap][layer_idx].LayerDefined)
+                if (!LLWorldMap::getInstance()->mMapLayers[LLWorldMap::getInstance()->mCurrentMap][layer_idx].LayerDefined)
                {
                        continue;
                }
-                LLWorldMapLayer *layer = &gWorldMap->mMapLayers[gWorldMap->mCurrentMap][layer_idx];
+                LLWorldMapLayer *layer = &LLWorldMap::getInstance()->mMapLayers[LLWorldMap::getInstance()->mCurrentMap][layer_idx];
                LLViewerImage *current_image = layer->LayerImage;
 #if 1 || LL_RELEASE_FOR_DOWNLOAD
                if (current_image->isMissingAsset())
@@ -400,7 +362,7 @@ void LLWorldMapView::draw()
                }
                
                current_image->setBoostLevel(LLViewerImage::BOOST_MAP_LAYER);
-                current_image->setKnownDrawSize(llround(pix_width), llround(pix_height));
+                current_image->setKnownDrawSize(llround(pix_width * LLUI::sGLScaleFactor.mV[VX]), llround(pix_height * LLUI::sGLScaleFactor.mV[VY]));
                
                if (!current_image->getHasGLTexture())
                {
@@ -455,15 +417,15 @@ void LLWorldMapView::draw()
        F32 sim_alpha = 1.f;
        // Draw one image per region, centered on the camera position.
-        for (LLWorldMap::sim_info_map_t::iterator it = gWorldMap->mSimInfoMap.begin();
+        for (LLWorldMap::sim_info_map_t::iterator it = LLWorldMap::getInstance()->mSimInfoMap.begin();
-                 it != gWorldMap->mSimInfoMap.end(); ++it)
+                 it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
        {
                U64 handle = (*it).first;
                LLSimInfo* info = (*it).second;
                if (info->mCurrentImage.isNull())
                {
-                        info->mCurrentImage = gImageList.getImage(info->mMapImageID[gWorldMap->mCurrentMap], MIPMAP_TRUE, FALSE);
+                        info->mCurrentImage = gImageList.getImage(info->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE);
                }
                if (info->mOverlayImage.isNull() && info->mMapImageID[2].notNull())
                {
@@ -544,7 +506,7 @@ void LLWorldMapView::draw()
                // See if the agents need updating
                if (current_time - info->mAgentsUpdateTime > AGENTS_UPDATE_TIME)
                {
-                        gWorldMap->sendItemRequest(MAP_ITEM_AGENT_LOCATIONS, info->mHandle);
+                        LLWorldMap::getInstance()->sendItemRequest(MAP_ITEM_AGENT_LOCATIONS, info->mHandle);
                        info->mAgentsUpdateTime = current_time;
                }
                
@@ -555,12 +517,12 @@ void LLWorldMapView::draw()
                S32 draw_size = llround(gMapScale);
                simimage->setBoostLevel(LLViewerImage::BOOST_MAP);
-                simimage->setKnownDrawSize(draw_size, draw_size);
+                simimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
                if (overlayimage)
                {
                        overlayimage->setBoostLevel(LLViewerImage::BOOST_MAP);
-                        overlayimage->setKnownDrawSize(draw_size, draw_size);
+                        overlayimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
                }
                        
 //              LLTextureView::addDebugImage(simimage);
@@ -717,13 +679,13 @@ void LLWorldMapView::draw()
        // Infohubs
        if (gSavedSettings.getBOOL("MapShowInfohubs"))   //(gMapScale >= sThresholdB)
        {
-                drawGenericItems(gWorldMap->mInfohubs, sInfohubImage);
+                drawGenericItems(LLWorldMap::getInstance()->mInfohubs, sInfohubImage);
        }
        // Telehubs
        if (gSavedSettings.getBOOL("MapShowTelehubs"))   //(gMapScale >= sThresholdB)
        {
-                drawGenericItems(gWorldMap->mTelehubs, sTelehubImage);
+                drawGenericItems(LLWorldMap::getInstance()->mTelehubs, sTelehubImage);
        }
        // Home Sweet Home
@@ -735,17 +697,17 @@ void LLWorldMapView::draw()
        if (gSavedSettings.getBOOL("MapShowLandForSale"))
        {
-                drawGenericItems(gWorldMap->mLandForSale, sForSaleImage);
+                drawGenericItems(LLWorldMap::getInstance()->mLandForSale, sForSaleImage);
        }
        if (gSavedSettings.getBOOL("MapShowClassifieds"))
        {
-                drawGenericItems(gWorldMap->mClassifieds, sClassifiedsImage);
+                drawGenericItems(LLWorldMap::getInstance()->mClassifieds, sClassifiedsImage);
        }
        if (gSavedSettings.getBOOL("MapShowPopular"))
        {
-                drawGenericItems(gWorldMap->mPopular, sPopularImage);
+                drawGenericItems(LLWorldMap::getInstance()->mPopular, sPopularImage);
        }
        
        if (gSavedSettings.getBOOL("MapShowEvents"))
@@ -795,20 +757,20 @@ void LLWorldMapView::draw()
                        drawTracking( pos_global, gTrackColor, TRUE, LLTracker::getLabel(), LLTracker::getToolTip() );
                }
        }
-        else if (gWorldMap->mIsTrackingUnknownLocation)
+        else if (LLWorldMap::getInstance()->mIsTrackingUnknownLocation)
        {
-                if (gWorldMap->mInvalidLocation)
+                if (LLWorldMap::getInstance()->mInvalidLocation)
                {
                        // We know this location to be invalid
                        LLColor4 loading_color(0.0, 0.5, 1.0, 1.0);
-                        drawTracking( gWorldMap->mUnknownLocation, loading_color, TRUE, "Invalid Location", "");
+                        drawTracking( LLWorldMap::getInstance()->mUnknownLocation, loading_color, TRUE, "Invalid Location", "");
                }
                else
                {
                        double value = fmod(current_time, 2);
                        value = 0.5 + 0.5*cos(value * 3.14159f);
                        LLColor4 loading_color(0.0, F32(value/2), F32(value), 1.0);
-                        drawTracking( gWorldMap->mUnknownLocation, loading_color, TRUE, "Loading...", "");
+                        drawTracking( LLWorldMap::getInstance()->mUnknownLocation, loading_color, TRUE, "Loading...", "");
                }
        }
 #endif
@@ -828,21 +790,21 @@ void LLWorldMapView::draw()
 void LLWorldMapView::setVisible(BOOL visible)
 {
        LLPanel::setVisible(visible);
-        if (!visible && gWorldMap)
+        if (!visible)
        {
                for (S32 map = 0; map < MAP_SIM_IMAGE_TYPES; map++)
                {
-                        for (U32 layer_idx=0; layer_idx<gWorldMap->mMapLayers[map].size(); ++layer_idx)
+                        for (U32 layer_idx=0; layer_idx<LLWorldMap::getInstance()->mMapLayers[map].size(); ++layer_idx)
                        {
-                                if (gWorldMap->mMapLayers[map][layer_idx].LayerDefined)
+                                if (LLWorldMap::getInstance()->mMapLayers[map][layer_idx].LayerDefined)
                                {
-                                        LLWorldMapLayer *layer = &gWorldMap->mMapLayers[map][layer_idx];
+                                        LLWorldMapLayer *layer = &LLWorldMap::getInstance()->mMapLayers[map][layer_idx];
                                        layer->LayerImage->setBoostLevel(0);
                                }
                        }
                }
-                for (LLWorldMap::sim_info_map_t::iterator it = gWorldMap->mSimInfoMap.begin();
+                for (LLWorldMap::sim_info_map_t::iterator it = LLWorldMap::getInstance()->mSimInfoMap.begin();
-                         it != gWorldMap->mSimInfoMap.end(); ++it)
+                         it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
                {
                        LLSimInfo* info = (*it).second;
                        if (info->mCurrentImage.notNull())
@@ -857,7 +819,7 @@ void LLWorldMapView::setVisible(BOOL visible)
        }
 }
-void LLWorldMapView::drawGenericItems(const LLWorldMap::item_info_list_t& items, LLPointer<LLViewerImage> image)
+void LLWorldMapView::drawGenericItems(const LLWorldMap::item_info_list_t& items, LLUIImagePtr image)
 {
        LLWorldMap::item_info_list_t::const_iterator e;
        for (e = items.begin(); e != items.end(); ++e)
@@ -866,30 +828,28 @@ void LLWorldMapView::drawGenericItems(const LLWorldMap::item_info_list_t& items,
        }
 }
-void LLWorldMapView::drawGenericItem(const LLItemInfo& item, LLPointer<LLViewerImage> image)
+void LLWorldMapView::drawGenericItem(const LLItemInfo& item, LLUIImagePtr image)
 {
        drawImage(item.mPosGlobal, image);
 }
-void LLWorldMapView::drawImage(const LLVector3d& global_pos, LLPointer<LLViewerImage> image, const LLColor4& color)
+void LLWorldMapView::drawImage(const LLVector3d& global_pos, LLUIImagePtr image, const LLColor4& color)
 {
        LLVector3 pos_map = globalPosToView( global_pos );
-        gl_draw_image(llround(pos_map.mV[VX] - image->getWidth() /2.f),
+        image->draw(llround(pos_map.mV[VX] - image->getWidth() /2.f),
-                                  llround(pos_map.mV[VY] - image->getHeight()/2.f),
+                                llround(pos_map.mV[VY] - image->getHeight()/2.f),
-                                  image,
+                                color);
-                                  color);
 }
-void LLWorldMapView::drawImageStack(const LLVector3d& global_pos, LLPointer<LLViewerImage> image, U32 count, F32 offset, const LLColor4& color)
+void LLWorldMapView::drawImageStack(const LLVector3d& global_pos, LLUIImagePtr image, U32 count, F32 offset, const LLColor4& color)
 {
        LLVector3 pos_map = globalPosToView( global_pos );
        for(U32 i=0; i<count; i++)
        {
-                gl_draw_image(llround(pos_map.mV[VX] - image->getWidth() /2.f),
+                image->draw(llround(pos_map.mV[VX] - image->getWidth() /2.f),
-                                          llround(pos_map.mV[VY] - image->getHeight()/2.f + i*offset),
+                                        llround(pos_map.mV[VY] - image->getHeight()/2.f + i*offset),
-                                          image,
+                                        color);
-                                          color);
        }
 }
@@ -901,13 +861,13 @@ void LLWorldMapView::drawAgents()
        for (handle_list_t::iterator iter = mVisibleRegions.begin(); iter != mVisibleRegions.end(); ++iter)
        {
                U64 handle = *iter;
-                LLSimInfo* siminfo = gWorldMap->simInfoFromHandle(handle);
+                LLSimInfo* siminfo = LLWorldMap::getInstance()->simInfoFromHandle(handle);
                if (siminfo && (siminfo->mAccess == SIM_ACCESS_DOWN))
                {
                        continue;
                }
-                LLWorldMap::agent_list_map_t::iterator counts_iter = gWorldMap->mAgentLocationsMap.find(handle);
+                LLWorldMap::agent_list_map_t::iterator counts_iter = LLWorldMap::getInstance()->mAgentLocationsMap.find(handle);
-                if (siminfo && siminfo->mShowAgentLocations && counts_iter != gWorldMap->mAgentLocationsMap.end())
+                if (siminfo && siminfo->mShowAgentLocations && counts_iter != LLWorldMap::getInstance()->mAgentLocationsMap.end())
                {
                        // Show Individual agents (or little stacks where real agents are)
                        LLWorldMap::item_info_list_t& agentcounts = counts_iter->second;
@@ -922,12 +882,12 @@ void LLWorldMapView::drawAgents()
                                //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? gFriendMapColor : gAvatarMapColor;
                                drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor);
                        }
-                        gWorldMap->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim
+                        LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim
                }
                else
                {
                        // Show agent 'stack' at center of sim
-                        S32 num_agents = gWorldMap->mNumAgents[handle];
+                        S32 num_agents = LLWorldMap::getInstance()->mNumAgents[handle];
                        if (num_agents > 0)
                        {
                                LLVector3d region_center = from_region_handle(handle);
@@ -948,7 +908,7 @@ void LLWorldMapView::drawEvents()
    // First the non-selected events
    LLWorldMap::item_info_list_t::const_iterator e;
-    for (e = gWorldMap->mPGEvents.begin(); e != gWorldMap->mPGEvents.end(); ++e)
+    for (e = LLWorldMap::getInstance()->mPGEvents.begin(); e != LLWorldMap::getInstance()->mPGEvents.end(); ++e)
    {
        if (!e->mSelected)
        {
@@ -957,7 +917,7 @@ void LLWorldMapView::drawEvents()
    }
    if (show_mature)
    {
-        for (e = gWorldMap->mMatureEvents.begin(); e != gWorldMap->mMatureEvents.end(); ++e)
+        for (e = LLWorldMap::getInstance()->mMatureEvents.begin(); e != LLWorldMap::getInstance()->mMatureEvents.end(); ++e)
        {
            if (!e->mSelected)
            {
@@ -967,7 +927,7 @@ void LLWorldMapView::drawEvents()
    }
    // Then the selected events
-    for (e = gWorldMap->mPGEvents.begin(); e != gWorldMap->mPGEvents.end(); ++e)
+    for (e = LLWorldMap::getInstance()->mPGEvents.begin(); e != LLWorldMap::getInstance()->mPGEvents.end(); ++e)
    {
        if (e->mSelected)
        {
@@ -976,7 +936,7 @@ void LLWorldMapView::drawEvents()
    }
    if (show_mature)
    {
-        for (e = gWorldMap->mMatureEvents.begin(); e != gWorldMap->mMatureEvents.end(); ++e)
+        for (e = LLWorldMap::getInstance()->mMatureEvents.begin(); e != LLWorldMap::getInstance()->mMatureEvents.end(); ++e)
        {
            if (e->mSelected)
            {
@@ -992,8 +952,8 @@ void LLWorldMapView::drawFrustum()
        // Draw frustum
        F32 meters_to_pixels = gMapScale/ REGION_WIDTH_METERS;
-        F32 horiz_fov = gCamera->getView() * gCamera->getAspect();
+        F32 horiz_fov = LLViewerCamera::getInstance()->getView() * LLViewerCamera::getInstance()->getAspect();
-        F32 far_clip_meters = gCamera->getFar();
+        F32 far_clip_meters = LLViewerCamera::getInstance()->getFar();
        F32 far_clip_pixels = far_clip_meters * meters_to_pixels;
        F32 half_width_meters = far_clip_meters * tan( horiz_fov / 2 );
@@ -1007,7 +967,7 @@ void LLWorldMapView::drawFrustum()
        // Since we don't rotate the map, we have to rotate the frustum.
        gGL.pushMatrix();
                gGL.translatef( ctr_x, ctr_y, 0 );
-                glRotatef( atan2( gCamera->getAtAxis().mV[VX], gCamera->getAtAxis().mV[VY] ) * RAD_TO_DEG, 0.f, 0.f, -1.f);
+                glRotatef( atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] ) * RAD_TO_DEG, 0.f, 0.f, -1.f);
                // Draw triangle with more alpha in far pixels to make it 
                // fade out in distance.
@@ -1138,7 +1098,7 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_
 {
        LLVector3d pos_global = viewPosToGlobal(x, y);
-        LLSimInfo* info = gWorldMap->simInfoFromPosGlobal(pos_global);
+        LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromPosGlobal(pos_global);
        if (info)
        {
                LLViewerRegion *region = gAgent.getRegion();
@@ -1150,7 +1110,7 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_
                if (info->mAccess != SIM_ACCESS_DOWN)
                {
-                        S32 agent_count = gWorldMap->mNumAgents[info->mHandle];                 
+                        S32 agent_count = LLWorldMap::getInstance()->mNumAgents[info->mHandle];                 
                        if (region && region->getHandle() == info->mHandle)
                        {
                                ++agent_count; // Bump by 1 if we're here
@@ -1199,15 +1159,14 @@ static void drawDot(F32 x_pixels, F32 y_pixels,
                         const LLColor4& color,
                         F32 relative_z,
                         F32 dot_radius,
-                         LLPointer<LLViewerImage> dot_image)
+                         LLUIImagePtr dot_image)
 {
        const F32 HEIGHT_THRESHOLD = 7.f;
        if(-HEIGHT_THRESHOLD <= relative_z && relative_z <= HEIGHT_THRESHOLD)
        {
-                gl_draw_image(  llround(x_pixels) - dot_image->getWidth()/2,
+                dot_image->draw(llround(x_pixels) - dot_image->getWidth()/2,
                                                llround(y_pixels) - dot_image->getHeight()/2, 
-                                                dot_image, 
                                                color);
        }
        else
@@ -1241,7 +1200,7 @@ void LLWorldMapView::drawAvatar(F32 x_pixels,
                                                                F32 dot_radius)
 {
        const F32 HEIGHT_THRESHOLD = 7.f;
-        LLViewerImage* dot_image = sAvatarSmallImage;
+        LLUIImagePtr dot_image = sAvatarSmallImage;
        if(relative_z < -HEIGHT_THRESHOLD) 
        {
                dot_image = sAvatarBelowImage; 
@@ -1250,10 +1209,10 @@ void LLWorldMapView::drawAvatar(F32 x_pixels,
        { 
                dot_image = sAvatarAboveImage;
        }
-        gl_draw_image(
+        dot_image->draw(
                llround(x_pixels) - dot_image->getWidth()/2,
                llround(y_pixels) - dot_image->getHeight()/2, 
-                dot_image, color);
+                color);
 }
 // Pass relative Z of 0 to draw at same level.
@@ -1447,7 +1406,7 @@ void LLWorldMapView::drawTrackingArrow(const LLRect& rect, S32 x, S32 y,
                sTrackingArrowY,
                arrow_size, arrow_size, 
                RAD_TO_DEG * angle, 
-                sTrackArrowImage, 
+                sTrackArrowImage->getImage(), 
                color);
 }
@@ -1521,7 +1480,7 @@ bool LLWorldMapView::checkItemHit(S32 x, S32 y, LLItemInfo& item, LLUUID* id, bo
        if (y < item_y - BIG_DOT_RADIUS) return false;
        if (y > item_y + BIG_DOT_RADIUS) return false;
-        LLSimInfo* sim_info = gWorldMap->simInfoFromHandle(item.mRegionHandle);
+        LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromHandle(item.mRegionHandle);
        if (sim_info)
        {
                if (track)
@@ -1551,7 +1510,7 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
        // *HACK: Adjust Z values automatically for liaisons & gods so
        // we swoop down when they click on the map. Sadly, the P2P
        // branch does not pay attention to this value; however, the
-        // Distributed Messaging branch honors kt.
+        // Distributed Messaging branch honors it.
        if(gAgent.isGodlike())
        {
                pos_global.mdV[VZ] = 200.0;
@@ -1559,30 +1518,30 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
        *hit_type = 0; // hit nothing
-        gWorldMap->mIsTrackingUnknownLocation = FALSE;
+        LLWorldMap::getInstance()->mIsTrackingUnknownLocation = FALSE;
-        gWorldMap->mIsTrackingDoubleClick = FALSE;
+        LLWorldMap::getInstance()->mIsTrackingDoubleClick = FALSE;
-        gWorldMap->mIsTrackingCommit = FALSE;
+        LLWorldMap::getInstance()->mIsTrackingCommit = FALSE;
        LLWorldMap::item_info_list_t::iterator it;
        // clear old selected stuff
-        for (it = gWorldMap->mPGEvents.begin(); it != gWorldMap->mPGEvents.end(); ++it)
+        for (it = LLWorldMap::getInstance()->mPGEvents.begin(); it != LLWorldMap::getInstance()->mPGEvents.end(); ++it)
        {
                (*it).mSelected = FALSE;
        }
-        for (it = gWorldMap->mMatureEvents.begin(); it != gWorldMap->mMatureEvents.end(); ++it)
+        for (it = LLWorldMap::getInstance()->mMatureEvents.begin(); it != LLWorldMap::getInstance()->mMatureEvents.end(); ++it)
        {
                (*it).mSelected = FALSE;
        }
-        for (it = gWorldMap->mPopular.begin(); it != gWorldMap->mPopular.end(); ++it)
+        for (it = LLWorldMap::getInstance()->mPopular.begin(); it != LLWorldMap::getInstance()->mPopular.end(); ++it)
        {
                (*it).mSelected = FALSE;
        }
-        for (it = gWorldMap->mLandForSale.begin(); it != gWorldMap->mLandForSale.end(); ++it)
+        for (it = LLWorldMap::getInstance()->mLandForSale.begin(); it != LLWorldMap::getInstance()->mLandForSale.end(); ++it)
        {
                (*it).mSelected = FALSE;
        }
-        for (it = gWorldMap->mClassifieds.begin(); it != gWorldMap->mClassifieds.end(); ++it)
+        for (it = LLWorldMap::getInstance()->mClassifieds.begin(); it != LLWorldMap::getInstance()->mClassifieds.end(); ++it)
        {
                (*it).mSelected = FALSE;
        }
@@ -1590,7 +1549,7 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
        // Select event you clicked on
        if (gSavedSettings.getBOOL("MapShowEvents"))
        {
-                for (it = gWorldMap->mPGEvents.begin(); it != gWorldMap->mPGEvents.end(); ++it)
+                for (it = LLWorldMap::getInstance()->mPGEvents.begin(); it != LLWorldMap::getInstance()->mPGEvents.end(); ++it)
                {
                        LLItemInfo& event = *it;
@@ -1604,7 +1563,7 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
                }
                if (gSavedSettings.getBOOL("ShowMatureEvents"))
                {
-                        for (it = gWorldMap->mMatureEvents.begin(); it != gWorldMap->mMatureEvents.end(); ++it)
+                        for (it = LLWorldMap::getInstance()->mMatureEvents.begin(); it != LLWorldMap::getInstance()->mMatureEvents.end(); ++it)
                        {
                                LLItemInfo& event = *it;
@@ -1621,7 +1580,7 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
        if (gSavedSettings.getBOOL("MapShowPopular"))
        {
-                for (it = gWorldMap->mPopular.begin(); it != gWorldMap->mPopular.end(); ++it)
+                for (it = LLWorldMap::getInstance()->mPopular.begin(); it != LLWorldMap::getInstance()->mPopular.end(); ++it)
                {
                        LLItemInfo& popular = *it;
@@ -1636,7 +1595,7 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
        if (gSavedSettings.getBOOL("MapShowLandForSale"))
        {
-                for (it = gWorldMap->mLandForSale.begin(); it != gWorldMap->mLandForSale.end(); ++it)
+                for (it = LLWorldMap::getInstance()->mLandForSale.begin(); it != LLWorldMap::getInstance()->mLandForSale.end(); ++it)
                {
                        LLItemInfo& land = *it;
@@ -1651,7 +1610,7 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
        if (gSavedSettings.getBOOL("MapShowClassifieds"))
        {
-                for (it = gWorldMap->mClassifieds.begin(); it != gWorldMap->mClassifieds.end(); ++it)
+                for (it = LLWorldMap::getInstance()->mClassifieds.begin(); it != LLWorldMap::getInstance()->mClassifieds.end(); ++it)
                {
                        LLItemInfo& classified = *it;
@@ -1732,11 +1691,11 @@ BOOL LLWorldMapView::handleMouseUp( S32 x, S32 y, MASK mask )
 void LLWorldMapView::updateBlock(S32 block_x, S32 block_y)
 {
        S32 offset = block_x | (block_y * MAP_BLOCK_RES);
-        if (!gWorldMap->mMapBlockLoaded[gWorldMap->mCurrentMap][offset])
+        if (!LLWorldMap::getInstance()->mMapBlockLoaded[LLWorldMap::getInstance()->mCurrentMap][offset])
        {
 //              llinfos << "Loading Block (" << block_x << "," << block_y << ")" << llendl;
-                gWorldMap->sendMapBlockRequest(block_x << 3, block_y << 3, (block_x << 3) + 7, (block_y << 3) + 7);
+                LLWorldMap::getInstance()->sendMapBlockRequest(block_x << 3, block_y << 3, (block_x << 3) + 7, (block_y << 3) + 7);
-                gWorldMap->mMapBlockLoaded[gWorldMap->mCurrentMap][offset] = TRUE;
+                LLWorldMap::getInstance()->mMapBlockLoaded[LLWorldMap::getInstance()->mCurrentMap][offset] = TRUE;
        }
 }
@@ -1857,15 +1816,15 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
                        }
                default:
                        {
-                                if (gWorldMap->mIsTrackingUnknownLocation)
+                                if (LLWorldMap::getInstance()->mIsTrackingUnknownLocation)
                                {
-                                        gWorldMap->mIsTrackingDoubleClick = TRUE;
+                                        LLWorldMap::getInstance()->mIsTrackingDoubleClick = TRUE;
                                }
                                else
                                {
                                        // Teleport if we got a valid location
                                        LLVector3d pos_global = viewPosToGlobal(x,y);
-                                        LLSimInfo* sim_info = gWorldMap->simInfoFromPosGlobal(pos_global);
+                                        LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromPosGlobal(pos_global);
                                        if (sim_info && sim_info->mAccess != SIM_ACCESS_DOWN)
                                        {
                                                gAgent.teleportViaLocation( pos_global );
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index 32f2d6e..18626b5 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -83,10 +83,10 @@ public:
        LLVector3d              viewPosToGlobal(S32 x,S32 y);
        virtual void    draw();
-        void                    drawGenericItems(const LLWorldMap::item_info_list_t& items, LLPointer<LLViewerImage> image);
+        void                    drawGenericItems(const LLWorldMap::item_info_list_t& items, LLUIImagePtr image);
-        void                    drawGenericItem(const LLItemInfo& item, LLPointer<LLViewerImage> image);
+        void                    drawGenericItem(const LLItemInfo& item, LLUIImagePtr image);
-        void                    drawImage(const LLVector3d& global_pos, LLPointer<LLViewerImage> image, const LLColor4& color = LLColor4::white);
+        void                    drawImage(const LLVector3d& global_pos, LLUIImagePtr image, const LLColor4& color = LLColor4::white);
-        void                    drawImageStack(const LLVector3d& global_pos, LLPointer<LLViewerImage> image, U32 count, F32 offset, const LLColor4& color);
+        void                    drawImageStack(const LLVector3d& global_pos, LLUIImagePtr image, U32 count, F32 offset, const LLColor4& color);
        void                    drawAgents();
        void                    drawEvents();
        void                    drawFrustum();
@@ -136,21 +136,21 @@ protected:
 public:
        LLColor4                mBackgroundColor;
-        static LLPointer<LLViewerImage> sAvatarYouSmallImage;
+        static LLUIImagePtr     sAvatarYouSmallImage;
-        static LLPointer<LLViewerImage> sAvatarSmallImage;
+        static LLUIImagePtr     sAvatarSmallImage;
-        static LLPointer<LLViewerImage> sAvatarLargeImage;
+        static LLUIImagePtr     sAvatarLargeImage;
-        static LLPointer<LLViewerImage> sAvatarAboveImage;
+        static LLUIImagePtr     sAvatarAboveImage;
-        static LLPointer<LLViewerImage> sAvatarBelowImage;
+        static LLUIImagePtr     sAvatarBelowImage;
-        static LLPointer<LLViewerImage> sTelehubImage;
+        static LLUIImagePtr     sTelehubImage;
-        static LLPointer<LLViewerImage> sInfohubImage;
+        static LLUIImagePtr     sInfohubImage;
-        static LLPointer<LLViewerImage> sHomeImage;
+        static LLUIImagePtr     sHomeImage;
-        static LLPointer<LLViewerImage> sEventImage;
+        static LLUIImagePtr     sEventImage;
-        static LLPointer<LLViewerImage> sEventMatureImage;
+        static LLUIImagePtr     sEventMatureImage;
-        static LLPointer<LLViewerImage> sTrackCircleImage;
+        static LLUIImagePtr     sTrackCircleImage;
-        static LLPointer<LLViewerImage> sTrackArrowImage;
+        static LLUIImagePtr     sTrackArrowImage;
-        static LLPointer<LLViewerImage> sClassifiedsImage;
+        static LLUIImagePtr     sClassifiedsImage;
-        static LLPointer<LLViewerImage> sPopularImage;
+        static LLUIImagePtr     sPopularImage;
-        static LLPointer<LLViewerImage> sForSaleImage;
+        static LLUIImagePtr     sForSaleImage;
        static F32              sThresholdA;
        static F32              sThresholdB;
diff --git a/linden/indra/newview/llxmlrpctransaction.cpp b/linden/indra/newview/llxmlrpctransaction.cpp
index bc10c1b..7179104 100644
--- a/linden/indra/newview/llxmlrpctransaction.cpp
+++ b/linden/indra/newview/llxmlrpctransaction.cpp
@@ -238,8 +238,9 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
 //      mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // usefull for debugging
        mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
        mCurlRequest->setWriteCallback(&curlDownloadCallback, (void*)this);
-        mCurlRequest->setopt(CURLOPT_SSL_VERIFYPEER, gVerifySSLCert);
+        BOOL vefifySSLCert = !gSavedSettings.getBOOL("NoVerifySSLCert");
-        mCurlRequest->setopt(CURLOPT_SSL_VERIFYHOST, gVerifySSLCert? 2 : 0);
+        mCurlRequest->setopt(CURLOPT_SSL_VERIFYPEER, vefifySSLCert);
+        mCurlRequest->setopt(CURLOPT_SSL_VERIFYHOST, vefifySSLCert ? 2 : 0);
        // Be a little impatient about establishing connections.
        mCurlRequest->setopt(CURLOPT_CONNECTTIMEOUT, 40L);
diff --git a/linden/indra/newview/lsl_guide.html b/linden/indra/newview/lsl_guide.html
index 9f8c673..aa660b8 100644
--- a/linden/indra/newview/lsl_guide.html
+++ b/linden/indra/newview/lsl_guide.html
@@ -2252,22 +2252,22 @@ HREF="#AEN6323"
 ></DT
 ><DT
 >C.28. <A
-HREF="#AEN6405"
+HREF="#AEN6409"
 >XML-RPC Constants</A
 ></DT
 ><DT
 >C.29. <A
-HREF="#AEN6408"
+HREF="#AEN6412"
 >Permission Mask Constants</A
 ></DT
 ><DT
 >C.30. <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >Parcel Media Constants</A
 ></DT
 ><DT
 >C.31. <A
-HREF="#AEN6517"
+HREF="#AEN6521"
 >Click Action Constants</A
 ></DT
 ></DL
@@ -8817,7 +8817,7 @@ CLASS="parameter"
 >mask</CODE
 > for the 
        specified inventory item.  See <A
-HREF="#AEN6408"
+HREF="#AEN6412"
 >Permission Mask Constants</A
 >
        for more information.  Example usage:
@@ -9512,7 +9512,7 @@ CLASS="parameter"
 >mask</CODE
 > for the root object the
        task is attached to.  See <A
-HREF="#AEN6408"
+HREF="#AEN6412"
 >Permission Mask Constants</A
 >
        for more information.  Example usage:
@@ -10631,8 +10631,7 @@ CLASS="FUNCDEF"
 CLASS="parameter"
 >category</CODE
 > in the
-    recipients inventory. The avatar must be, or have recently been, within the same
+    recipients inventory. If the recipient is an object, the same
-    Region as the sending object. If the recipient is an object, the same
    permissions apply as if you were dragging inventory onto the
    object by hand, ie if <A
 HREF="#AEN1047"
@@ -12503,55 +12502,55 @@ CLASS="parameter"
 >command</CODE
 > can be one of 
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_STOP</A
 >, 
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_PAUSE</A
 >, 
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_PLAY</A
 >,
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_LOOP</A
 >,
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_TEXTURE</A
 >,
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_URL</A
 >,
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_TYPE</A
 >,
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_DESC</A
 >,
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_SIZE</A
 >,
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_TIME</A
 >,
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_AGENT</A
 >,
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_UNLOAD</A
 >, or
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_AUTO_ALIGN</A
 >.
        </P
@@ -12734,11 +12733,11 @@ CLASS="parameter"
 >command</CODE
 > can be one of 
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_TEXTURE</A
 > or
        <A
-HREF="#AEN6455"
+HREF="#AEN6459"
 >PARCEL_MEDIA_COMMAND_URL</A
 >.
        </P
@@ -21759,6 +21758,12 @@ CLASS="variablelist"
        PRIM_BUMP_GRAVEL, PRIM_BUMP_BLOBS, PRIM_BUMP_SIDING, PRIM_BUMP_LARGETILE, PRIM_BUMP_STUCCO, PRIM_BUMP_SUCTION,
        or PRIM_BUMP_WEAVE.</P
 ></DD
+><DT
+>PRIM_GLOW</DT
+><DD
+><P
+>Followed by an integer face and a float glow value (in range 0.0 to 1.0).</P
+></DD
 ></DL
 ></DIV
 ></DIV
@@ -21767,7 +21772,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6405"
+NAME="AEN6409"
 >C.28. XML-RPC Constants</A
 ></H2
 ><P
@@ -21778,7 +21783,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6408"
+NAME="AEN6412"
 >C.29. Permission Mask Constants</A
 ></H2
 ><P
@@ -21866,7 +21871,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6455"
+NAME="AEN6459"
 >C.30. Parcel Media Constants</A
 ></H2
 ><P
@@ -21986,7 +21991,7 @@ CLASS="section"
 ><HR><H2
 CLASS="section"
 ><A
-NAME="AEN6517"
+NAME="AEN6521"
 >C.31. Click Action Constants</A
 ></H2
 ><P
@@ -22070,4 +22075,4 @@ CLASS="variablelist"
 ></DIV
 ></BODY
 ></HTML
->
+>
+\ No newline at end of file
diff --git a/linden/indra/newview/macview.xcodeproj/project.pbxproj b/linden/indra/newview/macview.xcodeproj/project.pbxproj
index dd07ea3..33a709c 100644
--- a/linden/indra/newview/macview.xcodeproj/project.pbxproj
+++ b/linden/indra/newview/macview.xcodeproj/project.pbxproj
@@ -37,6 +37,7 @@
                1A47B8E00860FDF100F73746 /* llpanelweb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A47B8DE0860FDF100F73746 /* llpanelweb.cpp */; };
                1A5104450ABF5B5A00520F6D /* llnotecard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5104440ABF5B5A00520F6D /* llnotecard.cpp */; };
                1A5104570ABF60A800520F6D /* llviewerassetstorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5104560ABF60A800520F6D /* llviewerassetstorage.cpp */; };
+                1A531BFC0D81056E00DEB305 /* llfloatercamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A531BFB0D81056E00DEB305 /* llfloatercamera.cpp */; };
                1A5B3B550A70147000A90391 /* llfloaterbump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5B3B540A70147000A90391 /* llfloaterbump.cpp */; };
                1A61A7F00A5ED446009FE3D2 /* llfloateravatarpicker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A61A7EF0A5ED446009FE3D2 /* llfloateravatarpicker.cpp */; };
                1A758C920A436FCA00589675 /* llagentdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A758C910A436FCA00589675 /* llagentdata.cpp */; };
@@ -58,6 +59,7 @@
                1AD394110CAB000F004BA76A /* llurldispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD3940F0CAB000F004BA76A /* llurldispatcher.cpp */; };
                1AD394130CAB001B004BA76A /* llcommandhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD394120CAB001B004BA76A /* llcommandhandler.cpp */; };
                1AD61F6B0AC09B1900507FB9 /* llimview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD61F6A0AC09B1900507FB9 /* llimview.cpp */; };
+                1ADE58940D7CCF6000183F7F /* llfloaterhud.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ADE58920D7CCF6000183F7F /* llfloaterhud.cpp */; };
                1AE5D7120844FBD300278605 /* llwebbrowserctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE5D7100844FBD300278605 /* llwebbrowserctrl.cpp */; };
                1AEF0A580B2DFE67003F107C /* llctrlselectioninterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AEF0A560B2DFE67003F107C /* llctrlselectioninterface.cpp */; };
                1AEF0A5B0B2DFE72003F107C /* llrootview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AEF0A5A0B2DFE72003F107C /* llrootview.cpp */; };
@@ -68,7 +70,7 @@
                1AFA40A20A2DFC9000C13F70 /* llprefschat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3143E00A02B73D005B87E7 /* llprefschat.cpp */; };
                1AFA40A50A2DFC9400C13F70 /* llfloatertest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8BF3780A1AAB99005B9D5A /* llfloatertest.cpp */; };
                1AFA40B50A2DFD7200C13F70 /* llsavedsettingsglue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA40B40A2DFD7200C13F70 /* llsavedsettingsglue.cpp */; };
-                1C0D59510CF0B2B800222B10 /* libboost_regex-gcc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C0D59500CF0B2B800222B10 /* libboost_regex-gcc.a */; };
+                1C0D59510CF0B2B800222B10 /* libboost_regex-mt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C0D59500CF0B2B800222B10 /* libboost_regex-mt.a */; };
                1CBB67D80C7CCCB2007DAAAE /* llfloaterwater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CBB67D20C7CCCB2007DAAAE /* llfloaterwater.cpp */; };
                1CBB67D90C7CCCB2007DAAAE /* llwaterparammanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CBB67D40C7CCCB2007DAAAE /* llwaterparammanager.cpp */; };
                1CBB67DA0C7CCCB2007DAAAE /* llwaterparamset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CBB67D60C7CCCB2007DAAAE /* llwaterparamset.cpp */; };
@@ -102,7 +104,6 @@
                5503BB2F05446B20003D051F /* llstatbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529B3051F61DF00A80050 /* llstatbar.cpp */; };
                5503BB3405446B20003D051F /* pipeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529BA051F61DF00A80050 /* pipeline.cpp */; };
                5503BB3705446B20003D051F /* noise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529BD051F61DF00A80050 /* noise.cpp */; };
-                5503BB3805446B20003D051F /* moviemaker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529BE051F61DF00A80050 /* moviemaker.cpp */; };
                5503BB3905446B20003D051F /* llworldmapview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529BF051F61DF00A80050 /* llworldmapview.cpp */; };
                5503BB3A05446B20003D051F /* llworldmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C0051F61DF00A80050 /* llworldmap.cpp */; };
                5503BB3B05446B20003D051F /* llworld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529C1051F61DF00A80050 /* llworld.cpp */; };
@@ -138,7 +139,7 @@
                5503BB5D05446B20003D051F /* llviewermessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E3051F61DF00A80050 /* llviewermessage.cpp */; };
                5503BB5E05446B20003D051F /* llviewermenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E4051F61DF00A80050 /* llviewermenu.cpp */; };
                5503BB5F05446B20003D051F /* llsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E5051F61DF00A80050 /* llsprite.cpp */; };
-                5503BB6105446B20003D051F /* llsphere.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E7051F61DF00A80050 /* llsphere.cpp */; };
+                5503BB6105446B20003D051F /* llrendersphere.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E7051F61DF00A80050 /* llrendersphere.cpp */; };
                5503BB6305446B20003D051F /* llpreviewtexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529E9051F61DF00A80050 /* llpreviewtexture.cpp */; };
                5503BB6405446B20003D051F /* llpreviewsound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529EA051F61DF00A80050 /* llpreviewsound.cpp */; };
                5503BB6505446B20003D051F /* llspatialpartition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F529EB051F61DF00A80050 /* llspatialpartition.cpp */; };
@@ -171,7 +172,6 @@
                5503BB9105446B20003D051F /* llfloaterland.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A17051F61DF00A80050 /* llfloaterland.cpp */; };
                5503BB9205446B20003D051F /* llpanelface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A18051F61DF00A80050 /* llpanelface.cpp */; };
                5503BB9305446B20003D051F /* llpanelevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A19051F61DF00A80050 /* llpanelevent.cpp */; };
-                5503BB9505446B20003D051F /* llcontroldef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A1B051F61DF00A80050 /* llcontroldef.cpp */; };
                5503BB9805446B20003D051F /* llframestatview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A1E051F61DF00A80050 /* llframestatview.cpp */; };
                5503BB9905446B20003D051F /* llframestats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A1F051F61DF00A80050 /* llframestats.cpp */; };
                5503BB9E05446B20003D051F /* llhudobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52A24051F61DF00A80050 /* llhudobject.cpp */; };
@@ -254,7 +254,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 */; };
-                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 */; };
                5503BC1905446B20003D051F /* llpanelpermissions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AA1051F61DF00A80050 /* llpanelpermissions.cpp */; };
@@ -278,7 +277,6 @@
                5503BC3405446B20003D051F /* llpreview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52ABD051F61DF00A80050 /* llpreview.cpp */; };
                5503BC3605446B20003D051F /* llbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52ABF051F61DF00A80050 /* llbox.cpp */; };
                5503BC3905446B20003D051F /* llfloaterreporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AC2051F61DF00A80050 /* llfloaterreporter.cpp */; };
-                5503BC3C05446B20003D051F /* llcameraview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AC5051F61DF00A80050 /* llcameraview.cpp */; };
                5503BC3D05446B20003D051F /* llcompilequeue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AC6051F61DF00A80050 /* llcompilequeue.cpp */; };
                5503BC3E05446B20003D051F /* llpanelgroupvoting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52AC7051F61DF00A80050 /* llpanelgroupvoting.cpp */; };
                5503BC4105446B20003D051F /* lldrawpoolsimple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F52ACA051F61DF00A80050 /* lldrawpoolsimple.cpp */; };
@@ -431,7 +429,10 @@
                61923D6C074AE3C0005E1F34 /* llstatemachine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D25074AE3C0005E1F34 /* llstatemachine.cpp */; };
                61923D6E074AE3C0005E1F34 /* lltargetingmotion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D27074AE3C0005E1F34 /* lltargetingmotion.cpp */; };
                61923D70074AE3C0005E1F34 /* llvisualparam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 61923D29074AE3C0005E1F34 /* llvisualparam.cpp */; };
-                79256EA30C57D6A5000AAFA4 /* llfloatervoicewizard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79256EA10C57D6A4000AAFA4 /* llfloatervoicewizard.cpp */; };
+                79E592770D1B4932002135A7 /* llimagepng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8833693B0C18AF33007F52DA /* llimagepng.cpp */; };
+                79E592870D1B4961002135A7 /* llpngwrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8833693C0C18AF33007F52DA /* llpngwrapper.cpp */; };
+                79E5928A0D1B4A1A002135A7 /* libpng12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 88AA282B0C17720D0032DF53 /* libpng12.a */; };
+                79E593440D1B4A72002135A7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FDAA36BE09B919DF00FBF1CA /* libz.dylib */; };
                84401E2F0A13CC9A006720A5 /* llfloatergroupinvite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84401E2D0A13CC9A006720A5 /* llfloatergroupinvite.cpp */; };
                84401E320A13CCB2006720A5 /* llpanelgroupinvite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84401E300A13CCB2006720A5 /* llpanelgroupinvite.cpp */; };
                8833693F0C18AF33007F52DA /* llimagepng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8833693B0C18AF33007F52DA /* llimagepng.cpp */; };
@@ -588,12 +589,17 @@
                AA0E2A640A2FDB340066250A /* lltoolpipette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA0E2A620A2FDB340066250A /* lltoolpipette.cpp */; };
                AA1183500C1DF9C400FDE5BA /* llpanelaudiovolume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA11834E0C1DF9C400FDE5BA /* llpanelaudiovolume.cpp */; };
                AA348DFA0B0EAB31002C3015 /* llcurl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA348DF80B0EAB31002C3015 /* llcurl.cpp */; };
+                AA38F8F20D8A3687003B39F9 /* llfloaterjoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA38F8F00D8A3687003B39F9 /* llfloaterjoystick.cpp */; };
+                AA38F8FE0D8AFCF4003B39F9 /* libndofdev.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AA38F8FD0D8AFCF4003B39F9 /* libndofdev.dylib */; };
                AAA1336B0A3F94D000419F7C /* lluistring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAA133690A3F94D000419F7C /* lluistring.cpp */; };
+                AABD9F130D4AD7E7007FB7C4 /* libboost_signals-mt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AABD9F120D4AD7E7007FB7C4 /* libboost_signals-mt.a */; };
+                AABD9F140D4AD7E7007FB7C4 /* libboost_signals-mt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AABD9F120D4AD7E7007FB7C4 /* libboost_signals-mt.a */; };
                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 */; };
+                C19628F50D53D7AB007C909A /* llfloatersettingsdebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C19628F30D53D7AB007C909A /* llfloatersettingsdebug.cpp */; };
                C1E4A5760CC020FC005FB0A6 /* llcrashloggermac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C1E4A5750CC020FC005FB0A6 /* llcrashloggermac.cpp */; };
                C1E4A5790CC0210F005FB0A6 /* llcrashlogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C1E4A5770CC0210F005FB0A6 /* llcrashlogger.cpp */; };
                C1E4A57B0CC02160005FB0A6 /* lldate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1558220A06BB5F00DE9AE5 /* lldate.cpp */; };
@@ -709,6 +715,9 @@
                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 */; };
+                CB0873B60D62226B009600F8 /* lldelayedgestureerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CB0873B40D62226B009600F8 /* lldelayedgestureerror.cpp */; };
+                D1BB623D0D91BBEC00001516 /* llfloatervoicedevicesettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1BB623B0D91BBEB00001516 /* llfloatervoicedevicesettings.cpp */; };
+                D1CA83CE0D62634400C61743 /* llfloaterstats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1CA83CD0D62634400C61743 /* llfloaterstats.cpp */; };
                D23289B50C453A3600304FEF /* llfloaterreleasemsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D23289B30C453A3600304FEF /* llfloaterreleasemsg.cpp */; };
                D2768CE50CEA38940000BD66 /* llfloaterlagmeter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D2768CE30CEA38940000BD66 /* llfloaterlagmeter.cpp */; };
                D62830DB0B4DC76300F8830F /* llimagej2coj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D62830D80B4DC76300F8830F /* llimagej2coj.cpp */; };
@@ -766,7 +775,6 @@
                EB3EE6FA083ABB5E002BF676 /* lluictrlfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6C2083ABB5D002BF676 /* lluictrlfactory.cpp */; };
                EB3EE6FC083ABB5E002BF676 /* llviewborder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE6C4083ABB5E002BF676 /* llviewborder.cpp */; };
                EB3EE720083AC23D002BF676 /* llviewertexteditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE712083AC23D002BF676 /* llviewertexteditor.cpp */; };
-                EB3EE722083AC23D002BF676 /* llvieweruictrlfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB3EE714083AC23D002BF676 /* llvieweruictrlfactory.cpp */; };
                EB9E831F082AEEF3007B4479 /* llmenugl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB9E8314082AEEF2007B4479 /* llmenugl.cpp */; };
                EB9E8321082AEEF3007B4479 /* llresmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB9E8316082AEEF2007B4479 /* llresmgr.cpp */; };
                EB9E8323082AEEF3007B4479 /* llui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EB9E8318082AEEF3007B4479 /* llui.cpp */; };
@@ -830,6 +838,8 @@
                FDE8766609BEA3C800AF6316 /* libxmlrpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FDE8765809BEA39700AF6316 /* libxmlrpc.a */; };
                FE0AEE2D0D2D96D20097256A /* libllmozlib2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FE0AEE2C0D2D96D20097256A /* libllmozlib2.dylib */; };
                FE0AEE4D0D2D9C6E0097256A /* llparcelselection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE0AEE4A0D2D9C6E0097256A /* llparcelselection.cpp */; };
+                FE42C3140D231D1A00D9F143 /* llcommandlineparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE42C3120D231D1A00D9F143 /* llcommandlineparser.cpp */; };
+                FE43BB870D368B4100C93D63 /* libboost_program_options-mt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FE43BB860D368B4100C93D63 /* libboost_program_options-mt.a */; };
                FE5138790CD80BAE00F32EE3 /* lldebugmessagebox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5138700CD80BAE00F32EE3 /* lldebugmessagebox.cpp */; };
                FE51387B0CD80BAE00F32EE3 /* llfloaterclassified.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5138730CD80BAE00F32EE3 /* llfloaterclassified.cpp */; };
                FE51387C0CD80BAE00F32EE3 /* llfloaterevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5138750CD80BAE00F32EE3 /* llfloaterevent.cpp */; };
@@ -1012,6 +1022,8 @@
                1A5104460ABF5B6600520F6D /* llnotecard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llnotecard.h; sourceTree = "<group>"; };
                1A5104560ABF60A800520F6D /* llviewerassetstorage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewerassetstorage.cpp; sourceTree = "<group>"; };
                1A5104580ABF60BF00520F6D /* llviewerassetstorage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewerassetstorage.h; sourceTree = "<group>"; };
+                1A531BFA0D81056E00DEB305 /* llfloatercamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloatercamera.h; sourceTree = "<group>"; };
+                1A531BFB0D81056E00DEB305 /* llfloatercamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatercamera.cpp; sourceTree = "<group>"; };
                1A57B92C09F8303A004D8B1A /* lllslconstants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllslconstants.h; sourceTree = "<group>"; };
                1A57B92D09F8303A004D8B1A /* llagentconstants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llagentconstants.h; sourceTree = "<group>"; };
                1A5B3B530A70146900A90391 /* llfloaterbump.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterbump.h; sourceTree = "<group>"; };
@@ -1061,6 +1073,8 @@
                1AD394140CAB0023004BA76A /* llcommandhandler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcommandhandler.h; sourceTree = "<group>"; };
                1AD61F6A0AC09B1900507FB9 /* llimview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimview.cpp; sourceTree = "<group>"; };
                1AD61F6C0AC09B2600507FB9 /* llimview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimview.h; sourceTree = "<group>"; };
+                1ADE58920D7CCF6000183F7F /* llfloaterhud.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterhud.cpp; sourceTree = "<group>"; };
+                1ADE58930D7CCF6000183F7F /* llfloaterhud.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloaterhud.h; sourceTree = "<group>"; };
                1AE5D70F0844FBD200278605 /* llwebbrowserctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llwebbrowserctrl.h; sourceTree = "<group>"; };
                1AE5D7100844FBD300278605 /* llwebbrowserctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwebbrowserctrl.cpp; sourceTree = "<group>"; };
                1AEF0A560B2DFE67003F107C /* llctrlselectioninterface.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llctrlselectioninterface.cpp; sourceTree = "<group>"; };
@@ -1076,7 +1090,7 @@
                1AF9D85008B405630094E8E7 /* llqueuedthread.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llqueuedthread.h; sourceTree = "<group>"; };
                1AFA40B40A2DFD7200C13F70 /* llsavedsettingsglue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsavedsettingsglue.cpp; sourceTree = "<group>"; };
                1AFA40B60A2DFD8200C13F70 /* llsavedsettingsglue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsavedsettingsglue.h; sourceTree = "<group>"; };
-                1C0D59500CF0B2B800222B10 /* libboost_regex-gcc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libboost_regex-gcc.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+                1C0D59500CF0B2B800222B10 /* libboost_regex-mt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_regex-mt.a"; path = "build/Development/libboost_regex-mt.a"; sourceTree = "<group>"; };
                1CBB67D20C7CCCB2007DAAAE /* llfloaterwater.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterwater.cpp; sourceTree = "<group>"; };
                1CBB67D30C7CCCB2007DAAAE /* llfloaterwater.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterwater.h; sourceTree = "<group>"; };
                1CBB67D40C7CCCB2007DAAAE /* llwaterparammanager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llwaterparammanager.cpp; sourceTree = "<group>"; };
@@ -1108,7 +1122,6 @@
                26F529B3051F61DF00A80050 /* llstatbar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llstatbar.cpp; sourceTree = SOURCE_ROOT; };
                26F529BA051F61DF00A80050 /* pipeline.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = pipeline.cpp; sourceTree = SOURCE_ROOT; };
                26F529BD051F61DF00A80050 /* noise.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = noise.cpp; sourceTree = "<group>"; };
-                26F529BE051F61DF00A80050 /* moviemaker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = moviemaker.cpp; sourceTree = SOURCE_ROOT; };
                26F529BF051F61DF00A80050 /* llworldmapview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llworldmapview.cpp; sourceTree = SOURCE_ROOT; };
                26F529C0051F61DF00A80050 /* llworldmap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llworldmap.cpp; sourceTree = SOURCE_ROOT; };
                26F529C1051F61DF00A80050 /* llworld.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llworld.cpp; sourceTree = SOURCE_ROOT; };
@@ -1145,7 +1158,7 @@
                26F529E3051F61DF00A80050 /* llviewermessage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewermessage.cpp; sourceTree = SOURCE_ROOT; };
                26F529E4051F61DF00A80050 /* llviewermenu.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewermenu.cpp; sourceTree = SOURCE_ROOT; };
                26F529E5051F61DF00A80050 /* llsprite.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsprite.cpp; sourceTree = SOURCE_ROOT; };
-                26F529E7051F61DF00A80050 /* llsphere.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llsphere.cpp; sourceTree = SOURCE_ROOT; };
+                26F529E7051F61DF00A80050 /* llrendersphere.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llrendersphere.cpp; sourceTree = SOURCE_ROOT; };
                26F529E9051F61DF00A80050 /* llpreviewtexture.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpreviewtexture.cpp; sourceTree = SOURCE_ROOT; };
                26F529EA051F61DF00A80050 /* llpreviewsound.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpreviewsound.cpp; sourceTree = SOURCE_ROOT; };
                26F529EB051F61DF00A80050 /* llspatialpartition.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llspatialpartition.cpp; sourceTree = SOURCE_ROOT; };
@@ -1178,7 +1191,6 @@
                26F52A17051F61DF00A80050 /* llfloaterland.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterland.cpp; sourceTree = SOURCE_ROOT; };
                26F52A18051F61DF00A80050 /* llpanelface.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelface.cpp; sourceTree = SOURCE_ROOT; };
                26F52A19051F61DF00A80050 /* llpanelevent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelevent.cpp; sourceTree = SOURCE_ROOT; };
-                26F52A1B051F61DF00A80050 /* llcontroldef.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcontroldef.cpp; sourceTree = SOURCE_ROOT; };
                26F52A1E051F61DF00A80050 /* llframestatview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llframestatview.cpp; sourceTree = SOURCE_ROOT; };
                26F52A1F051F61DF00A80050 /* llframestats.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llframestats.cpp; sourceTree = SOURCE_ROOT; };
                26F52A24051F61DF00A80050 /* llhudobject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llhudobject.cpp; sourceTree = SOURCE_ROOT; };
@@ -1263,7 +1275,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; };
-                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; };
                26F52AA1051F61DF00A80050 /* llpanelpermissions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelpermissions.cpp; sourceTree = SOURCE_ROOT; };
@@ -1287,7 +1298,6 @@
                26F52ABD051F61DF00A80050 /* llpreview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpreview.cpp; sourceTree = SOURCE_ROOT; };
                26F52ABF051F61DF00A80050 /* llbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llbox.cpp; sourceTree = SOURCE_ROOT; };
                26F52AC2051F61DF00A80050 /* llfloaterreporter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterreporter.cpp; sourceTree = SOURCE_ROOT; };
-                26F52AC5051F61DF00A80050 /* llcameraview.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcameraview.cpp; sourceTree = SOURCE_ROOT; };
                26F52AC6051F61DF00A80050 /* llcompilequeue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcompilequeue.cpp; sourceTree = SOURCE_ROOT; };
                26F52AC7051F61DF00A80050 /* llpanelgroupvoting.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgroupvoting.cpp; sourceTree = SOURCE_ROOT; };
                26F52ACA051F61DF00A80050 /* lldrawpoolsimple.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldrawpoolsimple.cpp; sourceTree = SOURCE_ROOT; };
@@ -1326,6 +1336,8 @@
                38D0FA6F0B4BF8C5003323BA /* lltemplatemessagebuilder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lltemplatemessagebuilder.h; sourceTree = "<group>"; };
                38D0FA700B4BF8C5003323BA /* llmessagebuilder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmessagebuilder.h; sourceTree = "<group>"; };
                38D0FA710B4BF8C5003323BA /* llmsgvariabletype.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmsgvariabletype.h; sourceTree = "<group>"; };
+                496B968B0C022A69009833CB /* llline.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llline.cpp; sourceTree = "<group>"; };
+                496B968C0C022A69009833CB /* llline.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llline.h; sourceTree = "<group>"; };
                5503B89A05446B15003D051F /* Info-SecondLifeVorbis.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Info-SecondLifeVorbis.plist"; sourceTree = "<group>"; };
                5503BD0605446B20003D051F /* Info-SecondLife.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Info-SecondLife.plist"; sourceTree = "<group>"; };
                5503BD0705446B20003D051F /* Second Life.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Second Life.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1666,8 +1678,6 @@
                61923DA5074AE4F2005E1F34 /* llimagetga.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagetga.h; sourceTree = "<group>"; };
                61923DA8074AE4F3005E1F34 /* llmapimagetype.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llmapimagetype.h; sourceTree = "<group>"; };
                6192E764074A7CE9005E1F34 /* libllcommon.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libllcommon.a; sourceTree = BUILT_PRODUCTS_DIR; };
-                79256EA10C57D6A4000AAFA4 /* llfloatervoicewizard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatervoicewizard.cpp; sourceTree = "<group>"; };
-                79256EA20C57D6A4000AAFA4 /* llfloatervoicewizard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatervoicewizard.h; sourceTree = "<group>"; };
                84401E2D0A13CC9A006720A5 /* llfloatergroupinvite.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatergroupinvite.cpp; sourceTree = "<group>"; };
                84401E2E0A13CC9A006720A5 /* llfloatergroupinvite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloatergroupinvite.h; sourceTree = "<group>"; };
                84401E300A13CCB2006720A5 /* llpanelgroupinvite.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llpanelgroupinvite.cpp; sourceTree = "<group>"; };
@@ -1805,7 +1815,6 @@
                997B4BD406015820001B0407 /* randgauss.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = randgauss.h; sourceTree = SOURCE_ROOT; };
                997B4BD506015820001B0407 /* pipeline.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = pipeline.h; sourceTree = SOURCE_ROOT; };
                997B4BD906015821001B0407 /* noise.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = noise.h; sourceTree = SOURCE_ROOT; };
-                997B4BDA06015821001B0407 /* moviemaker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = moviemaker.h; sourceTree = SOURCE_ROOT; };
                997B4BDB06015821001B0407 /* macview_Prefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = macview_Prefix.h; sourceTree = SOURCE_ROOT; };
                997B4BDC06015821001B0407 /* macmain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = macmain.h; sourceTree = SOURCE_ROOT; };
                997B4BDE06015821001B0407 /* llworldmapview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llworldmapview.h; sourceTree = SOURCE_ROOT; };
@@ -1888,7 +1897,7 @@
                997B4C4206015821001B0407 /* llstatgraph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstatgraph.h; sourceTree = SOURCE_ROOT; };
                997B4C4306015821001B0407 /* llstatbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llstatbar.h; sourceTree = SOURCE_ROOT; };
                997B4C4406015821001B0407 /* llsprite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsprite.h; sourceTree = SOURCE_ROOT; };
-                997B4C4606015821001B0407 /* llsphere.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsphere.h; sourceTree = SOURCE_ROOT; };
+                997B4C4606015821001B0407 /* llrendersphere.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llrendersphere.h; sourceTree = SOURCE_ROOT; };
                997B4C4706015821001B0407 /* llspatialpartition.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llspatialpartition.h; sourceTree = SOURCE_ROOT; };
                997B4C4A06015821001B0407 /* llsurfacepatch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsurfacepatch.h; sourceTree = SOURCE_ROOT; };
                997B4C4B06015821001B0407 /* llsurface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llsurface.h; sourceTree = SOURCE_ROOT; };
@@ -2002,7 +2011,6 @@
                997B4CEC06015822001B0407 /* llface.inl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = llface.inl; sourceTree = SOURCE_ROOT; };
                997B4CEE06015822001B0407 /* llcylinder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcylinder.h; sourceTree = SOURCE_ROOT; };
                997B4CEF06015822001B0407 /* llcubemap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcubemap.h; sourceTree = SOURCE_ROOT; };
-                997B4CF006015822001B0407 /* audiosettings.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = audiosettings.h; sourceTree = SOURCE_ROOT; };
                997B4CF106015822001B0407 /* llface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llface.h; sourceTree = SOURCE_ROOT; };
                997B4CF206015822001B0407 /* llemote.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llemote.h; sourceTree = SOURCE_ROOT; };
                997B4CF406015822001B0407 /* lldriverparam.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldriverparam.h; sourceTree = SOURCE_ROOT; };
@@ -2026,7 +2034,6 @@
                997B4D0C06015823001B0407 /* llcolorscheme.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcolorscheme.h; sourceTree = SOURCE_ROOT; };
                997B4D0D06015823001B0407 /* llcloud.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcloud.h; sourceTree = SOURCE_ROOT; };
                997B4D1006015823001B0407 /* llchatbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llchatbar.h; sourceTree = SOURCE_ROOT; };
-                997B4D1106015823001B0407 /* llcameraview.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcameraview.h; sourceTree = SOURCE_ROOT; };
                997B4D1206015823001B0407 /* llcallingcard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcallingcard.h; sourceTree = SOURCE_ROOT; };
                997B4D1306015823001B0407 /* llcallbacklist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcallbacklist.h; sourceTree = SOURCE_ROOT; };
                997B4D1606015823001B0407 /* llbox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llbox.h; sourceTree = SOURCE_ROOT; };
@@ -2034,7 +2041,6 @@
                997B4D1E06015823001B0407 /* llappearance.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llappearance.h; sourceTree = SOURCE_ROOT; };
                997B4D2206015823001B0407 /* llagentpilot.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llagentpilot.h; sourceTree = SOURCE_ROOT; };
                997B4D2306015823001B0407 /* llagent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llagent.h; sourceTree = SOURCE_ROOT; };
-                997B4D2406015823001B0407 /* head.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = head.h; sourceTree = SOURCE_ROOT; };
                9985A08E0AC1FE3600579AFB /* llwindowmacosx-objc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "llwindowmacosx-objc.h"; sourceTree = "<group>"; };
                9985A08F0AC1FE3600579AFB /* llwindowmacosx-objc.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = "llwindowmacosx-objc.mm"; sourceTree = "<group>"; };
                9985A1270AC1FE4E00579AFB /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = ../../../../../../../../System/Library/Frameworks/AppKit.framework; sourceTree = "<group>"; };
@@ -2167,8 +2173,12 @@
                AA11834F0C1DF9C400FDE5BA /* llpanelaudiovolume.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llpanelaudiovolume.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>"; };
+                AA38F8F00D8A3687003B39F9 /* llfloaterjoystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterjoystick.cpp; sourceTree = "<group>"; };
+                AA38F8F10D8A3687003B39F9 /* llfloaterjoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloaterjoystick.h; sourceTree = "<group>"; };
+                AA38F8FD0D8AFCF4003B39F9 /* libndofdev.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libndofdev.dylib; path = "../../libraries/universal-darwin/lib_release/libndofdev.dylib"; sourceTree = SOURCE_ROOT; };
                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>"; };
+                AABD9F120D4AD7E7007FB7C4 /* libboost_signals-mt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libboost_signals-mt.a"; path = "../../libraries/i386-darwin/lib_release/libboost_signals-mt.a"; sourceTree = SOURCE_ROOT; };
                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>"; };
@@ -2181,6 +2191,8 @@
                ABD8702D0B3C68630007C63B /* llvoavatar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvoavatar.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>"; };
+                C19628F30D53D7AB007C909A /* llfloatersettingsdebug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatersettingsdebug.cpp; sourceTree = "<group>"; };
+                C19628F40D53D7AB007C909A /* llfloatersettingsdebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloatersettingsdebug.h; sourceTree = "<group>"; };
                C1B2AF890CD679EB004CD4EF /* llcrashloggermac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llcrashloggermac.h; sourceTree = "<group>"; };
                C1E4A5750CC020FC005FB0A6 /* llcrashloggermac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llcrashloggermac.cpp; sourceTree = "<group>"; };
                C1E4A5770CC0210F005FB0A6 /* llcrashlogger.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = llcrashlogger.cpp; path = ../llcrashlogger/llcrashlogger.cpp; sourceTree = SOURCE_ROOT; };
@@ -2191,7 +2203,14 @@
                C64F673E0AFBED80009732B5 /* lllogchat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lllogchat.h; sourceTree = "<group>"; };
                C64F67400AFBED91009732B5 /* lldirpicker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldirpicker.cpp; sourceTree = "<group>"; };
                C64F67410AFBED91009732B5 /* lldirpicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldirpicker.h; sourceTree = "<group>"; };
+                CB0873B40D62226B009600F8 /* lldelayedgestureerror.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lldelayedgestureerror.cpp; sourceTree = "<group>"; };
+                CB0873B50D62226B009600F8 /* lldelayedgestureerror.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lldelayedgestureerror.h; sourceTree = "<group>"; };
                CB162DB40C6CCCFE00BF83BB /* llextendedstatus.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llextendedstatus.h; sourceTree = "<group>"; };
+                D158CB820D75F0580060BD44 /* llsmoothstep.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llsmoothstep.h; sourceTree = "<group>"; };
+                D1BB623B0D91BBEB00001516 /* llfloatervoicedevicesettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloatervoicedevicesettings.cpp; sourceTree = "<group>"; };
+                D1BB623C0D91BBEC00001516 /* llfloatervoicedevicesettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llfloatervoicedevicesettings.h; sourceTree = "<group>"; };
+                D1CA83CC0D62634400C61743 /* llfloaterstats.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterstats.h; sourceTree = "<group>"; };
+                D1CA83CD0D62634400C61743 /* llfloaterstats.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterstats.cpp; sourceTree = "<group>"; };
                D23289B30C453A3600304FEF /* llfloaterreleasemsg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterreleasemsg.cpp; sourceTree = "<group>"; };
                D23289B40C453A3600304FEF /* llfloaterreleasemsg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llfloaterreleasemsg.h; sourceTree = "<group>"; };
                D2768CE30CEA38940000BD66 /* llfloaterlagmeter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llfloaterlagmeter.cpp; sourceTree = "<group>"; };
@@ -2294,8 +2313,6 @@
                EB3EE70F083AC23D002BF676 /* llviewercontrol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewercontrol.h; sourceTree = "<group>"; };
                EB3EE712083AC23D002BF676 /* llviewertexteditor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llviewertexteditor.cpp; sourceTree = "<group>"; };
                EB3EE713083AC23D002BF676 /* llviewertexteditor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llviewertexteditor.h; sourceTree = "<group>"; };
-                EB3EE714083AC23D002BF676 /* llvieweruictrlfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llvieweruictrlfactory.cpp; sourceTree = "<group>"; };
-                EB3EE715083AC23D002BF676 /* llvieweruictrlfactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llvieweruictrlfactory.h; sourceTree = "<group>"; };
                EB3EE725083AC2F2002BF676 /* llimagedxt.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llimagedxt.cpp; sourceTree = "<group>"; };
                EB3EE726083AC2F2002BF676 /* llimagedxt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llimagedxt.h; sourceTree = "<group>"; };
                EB9E8314082AEEF2007B4479 /* llmenugl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = llmenugl.cpp; sourceTree = "<group>"; };
@@ -2384,6 +2401,9 @@
                FE0AEE490D2D9C6E0097256A /* lllcd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lllcd.h; sourceTree = SOURCE_ROOT; };
                FE0AEE4A0D2D9C6E0097256A /* llparcelselection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llparcelselection.cpp; sourceTree = SOURCE_ROOT; };
                FE0AEE4B0D2D9C6E0097256A /* llparcelselection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llparcelselection.h; sourceTree = SOURCE_ROOT; };
+                FE42C3120D231D1A00D9F143 /* llcommandlineparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = llcommandlineparser.cpp; sourceTree = "<group>"; };
+                FE42C3130D231D1A00D9F143 /* llcommandlineparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = llcommandlineparser.h; sourceTree = "<group>"; };
+                FE43BB860D368B4100C93D63 /* libboost_program_options-mt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libboost_program_options-mt.a"; sourceTree = BUILT_PRODUCTS_DIR; };
                FE51386F0CD80BAE00F32EE3 /* llclassifiedinfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = llclassifiedinfo.h; sourceTree = "<group>"; };
                FE5138700CD80BAE00F32EE3 /* lldebugmessagebox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lldebugmessagebox.cpp; sourceTree = "<group>"; };
                FE5138710CD80BAE00F32EE3 /* lldebugmessagebox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lldebugmessagebox.h; sourceTree = "<group>"; };
@@ -2473,7 +2493,10 @@
                                88A95BCA0C14D92C0027E363 /* libresolv.dylib in Frameworks */,
                                88AA282C0C17720D0032DF53 /* libpng12.a in Frameworks */,
                                FE0AEE2D0D2D96D20097256A /* libllmozlib2.dylib in Frameworks */,
-                                1C0D59510CF0B2B800222B10 /* libboost_regex-gcc.a in Frameworks */,
+                                1C0D59510CF0B2B800222B10 /* libboost_regex-mt.a in Frameworks */,
+                                FE43BB870D368B4100C93D63 /* libboost_program_options-mt.a in Frameworks */,
+                                AABD9F130D4AD7E7007FB7C4 /* libboost_signals-mt.a in Frameworks */,
+                                AA38F8FE0D8AFCF4003B39F9 /* libndofdev.dylib in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2492,6 +2515,7 @@
                                FDD3FD720B6A89A0009173F1 /* libcares.a in Frameworks */,
                                DA9C412B0B54B9DA00DD6F44 /* libaprutil-1.a in Frameworks */,
                                DA9C412C0B54B9DE00DD6F44 /* libexpat.a in Frameworks */,
+                                AABD9F140D4AD7E7007FB7C4 /* libboost_signals-mt.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2529,6 +2553,8 @@
                                D6F77CBC0B445C3B0040826D /* AppKit.framework in Frameworks */,
                                D645940C0B3B6D9000FAB68F /* libapr-1.a in Frameworks */,
                                D645940D0B3B6D9A00FAB68F /* libaprutil-1.a in Frameworks */,
+                                79E593440D1B4A72002135A7 /* libz.dylib in Frameworks */,
+                                79E5928A0D1B4A1A002135A7 /* libpng12.a in Frameworks */,
                                DA8C5F9B0B61A9F900BCA79A /* libexpat.a in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
@@ -2598,6 +2624,8 @@
                20286C2CFDCF999611CA2CEA /* Resources */ = {
                        isa = PBXGroup;
                        children = (
+                                D1CA83CC0D62634400C61743 /* llfloaterstats.h */,
+                                D1CA83CD0D62634400C61743 /* llfloaterstats.cpp */,
                                019200F204DD7D3500A800A7 /* macview.r */,
                                0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */,
                                99C9FA660B6AD9BF00A1BBA6 /* SLVoice */,
@@ -2624,10 +2652,20 @@
                26F529A0051F61CD00A80050 /* newview */ = {
                        isa = PBXGroup;
                        children = (
+                                AA38F8F00D8A3687003B39F9 /* llfloaterjoystick.cpp */,
+                                AA38F8F10D8A3687003B39F9 /* llfloaterjoystick.h */,
+                                1ADE58920D7CCF6000183F7F /* llfloaterhud.cpp */,
+                                1ADE58930D7CCF6000183F7F /* llfloaterhud.h */,
+                                D1BB623B0D91BBEB00001516 /* llfloatervoicedevicesettings.cpp */,
+                                D1BB623C0D91BBEC00001516 /* llfloatervoicedevicesettings.h */,
                                FE0AEE480D2D9C6E0097256A /* lllcd.cpp */,
                                FE0AEE490D2D9C6E0097256A /* lllcd.h */,
                                FE0AEE4A0D2D9C6E0097256A /* llparcelselection.cpp */,
                                FE0AEE4B0D2D9C6E0097256A /* llparcelselection.h */,
+                                C19628F30D53D7AB007C909A /* llfloatersettingsdebug.cpp */,
+                                C19628F40D53D7AB007C909A /* llfloatersettingsdebug.h */,
+                                FE42C3120D231D1A00D9F143 /* llcommandlineparser.cpp */,
+                                FE42C3130D231D1A00D9F143 /* llcommandlineparser.h */,
                                FEE6C8390D2D6E1500C97E9C /* llfloaterhtmlhelp.cpp */,
                                FEE6C83A0D2D6E1500C97E9C /* llfloaterhtmlhelp.h */,
                                FEE6C83B0D2D6E1500C97E9C /* llfloaterurlentry.cpp */,
@@ -2644,6 +2682,8 @@
                                FEE6C8460D2D6E1500C97E9C /* llviewerparcelmedia.h */,
                                FEE6C8470D2D6E1500C97E9C /* llviewerparcelmediaautoplay.cpp */,
                                FEE6C8480D2D6E1500C97E9C /* llviewerparcelmediaautoplay.h */,
+                                CB0873B40D62226B009600F8 /* lldelayedgestureerror.cpp */,
+                                CB0873B50D62226B009600F8 /* lldelayedgestureerror.h */,
                                D2768CE30CEA38940000BD66 /* llfloaterlagmeter.cpp */,
                                D2768CE40CEA38940000BD66 /* llfloaterlagmeter.h */,
                                FE679A350CDFF5AC00959041 /* llappviewer.cpp */,
@@ -2676,7 +2716,6 @@
                                A26560500C9F53CC004042A0 /* llfloaterhardwaresettings.cpp */,
                                A26560510C9F53CC004042A0 /* llfloaterhardwaresettings.h */,
                                1AD3940F0CAB000F004BA76A /* llurldispatcher.cpp */,
-                                26F52A9D051F61DF00A80050 /* head.cpp */,
                                26F52A41051F61DF00A80050 /* llagent.cpp */,
                                1A758C910A436FCA00589675 /* llagentdata.cpp */,
                                26F52A5D051F61DF00A80050 /* llagentpilot.cpp */,
@@ -2687,7 +2726,6 @@
                                26F52ABF051F61DF00A80050 /* llbox.cpp */,
                                26F529F0051F61DF00A80050 /* llcallbacklist.cpp */,
                                26F52A8C051F61DF00A80050 /* llcallingcard.cpp */,
-                                26F52AC5051F61DF00A80050 /* llcameraview.cpp */,
                                9C18425A0B9F951500208356 /* llcaphttpsender.cpp */,
                                91D530D2056EE57900CD1AD7 /* llchatbar.cpp */,
                                991ED2DF0883646B003EC818 /* llclassifiedinfo.cpp */,
@@ -2700,7 +2738,6 @@
                                99BB5175099AC2A4004BF9F2 /* llconfirmationmanager.h */,
                                26F52A03051F61DF00A80050 /* llconsole.cpp */,
                                26F52A78051F61DF00A80050 /* llcontainerview.cpp */,
-                                26F52A1B051F61DF00A80050 /* llcontroldef.cpp */,
                                26F52ACB051F61DF00A80050 /* llcubemap.cpp */,
                                99BB5170099AC1FC004BF9F2 /* llcurrencyuimanager.cpp */,
                                99BB5171099AC1FC004BF9F2 /* llcurrencyuimanager.h */,
@@ -2813,8 +2850,6 @@
                                FD6C9A4209C75B8900AA1849 /* llfloatertopobjects.cpp */,
                                FD6C9A4309C75B8900AA1849 /* llfloatertopobjects.h */,
                                26F52A8E051F61DF00A80050 /* llfloatertos.cpp */,
-                                79256EA10C57D6A4000AAFA4 /* llfloatervoicewizard.cpp */,
-                                79256EA20C57D6A4000AAFA4 /* llfloatervoicewizard.h */,
                                1CBB67D20C7CCCB2007DAAAE /* llfloaterwater.cpp */,
                                1CBB67D30C7CCCB2007DAAAE /* llfloaterwater.h */,
                                A2A8C5520C649F480001FEB2 /* llfloaterwindlight.cpp */,
@@ -2947,7 +2982,7 @@
                                26F52AD2051F61DF00A80050 /* llselectmgr.cpp */,
                                26F52AD1051F61DF00A80050 /* llsky.cpp */,
                                26F529EB051F61DF00A80050 /* llspatialpartition.cpp */,
-                                26F529E7051F61DF00A80050 /* llsphere.cpp */,
+                                26F529E7051F61DF00A80050 /* llrendersphere.cpp */,
                                26F529E5051F61DF00A80050 /* llsprite.cpp */,
                                88A95BB10C14D5FC0027E363 /* llsrv.cpp */,
                                91DF401F06A739BA00CA7FE5 /* llstartup.cpp */,
@@ -3036,8 +3071,6 @@
                                EB3EE713083AC23D002BF676 /* llviewertexteditor.h */,
                                26F529D9051F61DF00A80050 /* llviewertextureanim.cpp */,
                                26F529D8051F61DF00A80050 /* llviewerthrottle.cpp */,
-                                EB3EE714083AC23D002BF676 /* llvieweruictrlfactory.cpp */,
-                                EB3EE715083AC23D002BF676 /* llvieweruictrlfactory.h */,
                                26F529D7051F61DF00A80050 /* llviewervisualparam.cpp */,
                                26F529D6051F61DF00A80050 /* llviewerwindow.cpp */,
                                26F529D5051F61DF00A80050 /* llvlcomposition.cpp */,
@@ -3089,10 +3122,11 @@
                                99BB516A099AC1AE004BF9F2 /* llxmlrpctransaction.cpp */,
                                99BB5169099AC1AE004BF9F2 /* llxmlrpctransaction.h */,
                                019200F004DD7D2B00A800A7 /* macview_Prefix.h */,
-                                26F529BE051F61DF00A80050 /* moviemaker.cpp */,
                                26F529BD051F61DF00A80050 /* noise.cpp */,
                                26F529BA051F61DF00A80050 /* pipeline.cpp */,
                                D8CA570D0BAF74FC0093D6D4 /* llvoicevisualizer.h */,
+                                1A531BFA0D81056E00DEB305 /* llfloatercamera.h */,
+                                1A531BFB0D81056E00DEB305 /* llfloatercamera.cpp */,
                        );
                        name = newview;
                        sourceTree = "<group>";
@@ -3100,6 +3134,7 @@
                6192211E074A9B57005E1F34 /* llcommon */ = {
                        isa = PBXGroup;
                        children = (
+                                D158CB820D75F0580060BD44 /* llsmoothstep.h */,
                                8849626B0C7B3E8A00A777FB /* llares.cpp */,
                                295542580C3B371500025801 /* llversionviewer.h */,
                                CB162DB40C6CCCFE00BF83BB /* llextendedstatus.h */,
@@ -3273,6 +3308,8 @@
                61922190074A9B58005E1F34 /* llmath */ = {
                        isa = PBXGroup;
                        children = (
+                                496B968B0C022A69009833CB /* llline.cpp */,
+                                496B968C0C022A69009833CB /* llline.h */,
                                A3653EBB0AC5F3D500E1E936 /* lltreenode.h */,
                                A241CB9407B3E3A7001A39E3 /* llperlin.cpp */,
                                A241CB8807B3E324001A39E3 /* llperlin.h */,
@@ -3907,8 +3944,6 @@
                                1AD394140CAB0023004BA76A /* llcommandhandler.h */,
                                1AD3940C0CAB0003004BA76A /* llurlsimstring.h */,
                                1AD3940D0CAB0003004BA76A /* llurldispatcher.h */,
-                                997B4CF006015822001B0407 /* audiosettings.h */,
-                                997B4D2406015823001B0407 /* head.h */,
                                997B4D2306015823001B0407 /* llagent.h */,
                                1A758C990A43700400589675 /* llagentdata.h */,
                                997B4D2206015823001B0407 /* llagentpilot.h */,
@@ -3917,7 +3952,6 @@
                                997B4D1606015823001B0407 /* llbox.h */,
                                997B4D1306015823001B0407 /* llcallbacklist.h */,
                                997B4D1206015823001B0407 /* llcallingcard.h */,
-                                997B4D1106015823001B0407 /* llcameraview.h */,
                                9C1842500B9F94F200208356 /* llcaphttpsender.h */,
                                997B4D1006015823001B0407 /* llchatbar.h */,
                                997B4D0D06015823001B0407 /* llcloud.h */,
@@ -4089,7 +4123,7 @@
                                997B4C4E06015821001B0407 /* llselectmgr.h */,
                                997B4C4D06015821001B0407 /* llsky.h */,
                                997B4C4706015821001B0407 /* llspatialpartition.h */,
-                                997B4C4606015821001B0407 /* llsphere.h */,
+                                997B4C4606015821001B0407 /* llrendersphere.h */,
                                997B4C4406015821001B0407 /* llsprite.h */,
                                91DF402206A739CB00CA7FE5 /* llstartup.h */,
                                997B4C4306015821001B0407 /* llstatbar.h */,
@@ -4180,7 +4214,6 @@
                                997B4BDC06015821001B0407 /* macmain.h */,
                                FD53B3DB09BDE88B00BFE3BC /* macutil_Prefix.h */,
                                997B4BDB06015821001B0407 /* macview_Prefix.h */,
-                                997B4BDA06015821001B0407 /* moviemaker.h */,
                                997B4BD906015821001B0407 /* noise.h */,
                                997B4BD506015820001B0407 /* pipeline.h */,
                                997B4BD406015820001B0407 /* randgauss.h */,
@@ -4251,8 +4284,11 @@
                FDE8761909BE9C7D00AF6316 /* Third Party Libraries */ = {
                        isa = PBXGroup;
                        children = (
+                                AA38F8FD0D8AFCF4003B39F9 /* libndofdev.dylib */,
                                FE0AEE2C0D2D96D20097256A /* libllmozlib2.dylib */,
-                                1C0D59500CF0B2B800222B10 /* libboost_regex-gcc.a */,
+                                1C0D59500CF0B2B800222B10 /* libboost_regex-mt.a */,
+                                FE43BB860D368B4100C93D63 /* libboost_program_options-mt.a */,
+                                AABD9F120D4AD7E7007FB7C4 /* libboost_signals-mt.a */,
                                FDD3FD700B6A89A0009173F1 /* libcares.a */,
                                FD34696A0B5C3C55007318E5 /* libllcurl.a */,
                                FDE8764E09BEA39600AF6316 /* libapr-1.a */,
@@ -4493,7 +4529,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                        shellScript = "# Glue together intel and ppc versions of .a files\nLIBS=\"apr-1 aprutil-1 expat ogg vorbis fmod freetype cares llcurl lljpeg png12 openjpeg vorbisenc vorbisfile xmlrpc boost_regex-gcc\"\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\" != \"false\" ]; 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 png12 openjpeg vorbisenc vorbisfile xmlrpc boost_regex-mt boost_program_options-mt boost_signals-mt\"\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\" != \"false\" ]; 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 */
@@ -4514,7 +4550,6 @@
                                5503BB2F05446B20003D051F /* llstatbar.cpp in Sources */,
                                5503BB3405446B20003D051F /* pipeline.cpp in Sources */,
                                5503BB3705446B20003D051F /* noise.cpp in Sources */,
-                                5503BB3805446B20003D051F /* moviemaker.cpp in Sources */,
                                5503BB3905446B20003D051F /* llworldmapview.cpp in Sources */,
                                5503BB3A05446B20003D051F /* llworldmap.cpp in Sources */,
                                5503BB3B05446B20003D051F /* llworld.cpp in Sources */,
@@ -4550,7 +4585,7 @@
                                5503BB5D05446B20003D051F /* llviewermessage.cpp in Sources */,
                                5503BB5E05446B20003D051F /* llviewermenu.cpp in Sources */,
                                5503BB5F05446B20003D051F /* llsprite.cpp in Sources */,
-                                5503BB6105446B20003D051F /* llsphere.cpp in Sources */,
+                                5503BB6105446B20003D051F /* llrendersphere.cpp in Sources */,
                                5503BB6305446B20003D051F /* llpreviewtexture.cpp in Sources */,
                                5503BB6405446B20003D051F /* llpreviewsound.cpp in Sources */,
                                5503BB6505446B20003D051F /* llspatialpartition.cpp in Sources */,
@@ -4583,7 +4618,6 @@
                                5503BB9105446B20003D051F /* llfloaterland.cpp in Sources */,
                                5503BB9205446B20003D051F /* llpanelface.cpp in Sources */,
                                5503BB9305446B20003D051F /* llpanelevent.cpp in Sources */,
-                                5503BB9505446B20003D051F /* llcontroldef.cpp in Sources */,
                                5503BB9805446B20003D051F /* llframestatview.cpp in Sources */,
                                5503BB9905446B20003D051F /* llframestats.cpp in Sources */,
                                5503BB9E05446B20003D051F /* llhudobject.cpp in Sources */,
@@ -4666,7 +4700,6 @@
                                5503BC1005446B20003D051F /* llnamelistctrl.cpp in Sources */,
                                5503BC1205446B20003D051F /* llmaniptranslate.cpp in Sources */,
                                5503BC1305446B20003D051F /* llmanipscale.cpp in Sources */,
-                                5503BC1505446B20003D051F /* head.cpp in Sources */,
                                5503BC1705446B20003D051F /* llfloaternamedesc.cpp in Sources */,
                                5503BC1805446B20003D051F /* llpanelplace.cpp in Sources */,
                                5503BC1905446B20003D051F /* llpanelpermissions.cpp in Sources */,
@@ -4690,7 +4723,6 @@
                                5503BC3405446B20003D051F /* llpreview.cpp in Sources */,
                                5503BC3605446B20003D051F /* llbox.cpp in Sources */,
                                5503BC3905446B20003D051F /* llfloaterreporter.cpp in Sources */,
-                                5503BC3C05446B20003D051F /* llcameraview.cpp in Sources */,
                                5503BC3D05446B20003D051F /* llcompilequeue.cpp in Sources */,
                                5503BC3E05446B20003D051F /* llpanelgroupvoting.cpp in Sources */,
                                5503BC4105446B20003D051F /* lldrawpoolsimple.cpp in Sources */,
@@ -4814,7 +4846,6 @@
                                EB3EE6FA083ABB5E002BF676 /* lluictrlfactory.cpp in Sources */,
                                EB3EE6FC083ABB5E002BF676 /* llviewborder.cpp in Sources */,
                                EB3EE720083AC23D002BF676 /* llviewertexteditor.cpp in Sources */,
-                                EB3EE722083AC23D002BF676 /* llvieweruictrlfactory.cpp in Sources */,
                                1A9EC237083EA0100023D510 /* llfloatereditui.cpp in Sources */,
                                1AE5D7120844FBD300278605 /* llwebbrowserctrl.cpp in Sources */,
                                1A1C61620847AEE6005D7227 /* llvolumemgr.cpp in Sources */,
@@ -4937,7 +4968,6 @@
                                1A0DA5130C3AC07800361F49 /* llviewerjointmesh_vec.cpp in Sources */,
                                1A0DA5140C3AC07800361F49 /* llviewerjointmesh_sse2.cpp in Sources */,
                                1A0DA5150C3AC07800361F49 /* llviewerjointmesh_sse.cpp in Sources */,
-                                79256EA30C57D6A5000AAFA4 /* llfloatervoicewizard.cpp in Sources */,
                                D23289B50C453A3600304FEF /* llfloaterreleasemsg.cpp in Sources */,
                                8849626C0C7B3E8A00A777FB /* llares.cpp in Sources */,
                                1AD394100CAB000F004BA76A /* llurlsimstring.cpp in Sources */,
@@ -4956,6 +4986,8 @@
                                FE679A3F0CDFF5AC00959041 /* llvectorperfoptions.cpp in Sources */,
                                FE679A400CDFF5AC00959041 /* llvieweraudio.cpp in Sources */,
                                D2768CE50CEA38940000BD66 /* llfloaterlagmeter.cpp in Sources */,
+                                FE42C3140D231D1A00D9F143 /* llcommandlineparser.cpp in Sources */,
+                                C19628F50D53D7AB007C909A /* llfloatersettingsdebug.cpp in Sources */,
                                FEE6C82D0D2D6DAC00C97E9C /* llmediaimplcommon.cpp in Sources */,
                                FEE6C82E0D2D6DAC00C97E9C /* llmediaimplexample1.cpp in Sources */,
                                FEE6C82F0D2D6DAC00C97E9C /* llmediaimplexample2.cpp in Sources */,
@@ -4993,6 +5025,12 @@
                                1CFFA2D60C90472B000CF7DD /* llfloaterenvsettings.cpp in Sources */,
                                1CFFA2ED0C9048D7000CF7DD /* llrendertarget.cpp in Sources */,
                                A26560520C9F53CC004042A0 /* llfloaterhardwaresettings.cpp in Sources */,
+                                D1CA83CE0D62634400C61743 /* llfloaterstats.cpp in Sources */,
+                                1ADE58940D7CCF6000183F7F /* llfloaterhud.cpp in Sources */,
+                                CB0873B60D62226B009600F8 /* lldelayedgestureerror.cpp in Sources */,
+                                1A531BFC0D81056E00DEB305 /* llfloatercamera.cpp in Sources */,
+                                D1BB623D0D91BBEC00001516 /* llfloatervoicedevicesettings.cpp in Sources */,
+                                AA38F8F20D8A3687003B39F9 /* llfloaterjoystick.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -5127,9 +5165,11 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                                79E592770D1B4932002135A7 /* llimagepng.cpp in Sources */,
                                61922443074A9B5C005E1F34 /* indra.y in Sources */,
                                61922442074A9B5C005E1F34 /* indra.l in Sources */,
                                912541AF0691FF79008C66F7 /* llfasttimerview.cpp in Sources */,
+                                79E592870D1B4961002135A7 /* llpngwrapper.cpp in Sources */,
                                619222F0074A9B5B005E1F34 /* llcriticaldamp.cpp in Sources */,
                                619222F8074A9B5B005E1F34 /* llerror.cpp in Sources */,
                                619222FE074A9B5B005E1F34 /* llfasttimer.cpp in Sources */,
@@ -5431,7 +5471,13 @@
                                        ../llcrashlogger,
                                );
                                INFOPLIST_FILE = "crashreporter-Info.plist";
-                                LIBRARY_SEARCH_PATHS = "$(inherited)";
+                                LIBRARY_SEARCH_PATHS = (
+                                        "$(inherited)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
+                                );
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
                                OTHER_LDFLAGS = "-Wl,-search_paths_first";
                                PRODUCT_NAME = crashreporter;
                        };
@@ -5454,8 +5500,16 @@
                                        "$(SRCROOT)/../../libraries/universal-darwin/lib_release",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
                                );
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/universal-darwin/lib_debug\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/build/Development\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
                                OTHER_CFLAGS = (
                                        "-DLL_DARWIN=1",
                                        "-DLL_RELEASE=1",
@@ -5510,6 +5564,7 @@
                                GCC_WARN_UNUSED_VALUE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                HEADER_SEARCH_PATHS = (
+                                        ../,
                                        "../../libraries/$(arch)-darwin/include",
                                        ../../libraries/include,
                                        ../llcommon,
@@ -5518,6 +5573,7 @@
                                MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
                                MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
                                OTHER_CFLAGS = (
+                                        "-DLL_CURRENT_HAVOK_VERSION=460",
                                        "-DLL_DARWIN=1",
                                        "-DLL_RELEASE=1",
                                        "-DLL_RELEASE_FOR_DOWNLOAD=1",
@@ -5656,7 +5712,13 @@
                                GCC_PREFIX_HEADER = macutil_Prefix.h;
                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
                                INFOPLIST_FILE = "crashreporter-Info.plist";
-                                LIBRARY_SEARCH_PATHS = "$(inherited)";
+                                LIBRARY_SEARCH_PATHS = (
+                                        "$(inherited)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
+                                );
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
                                OTHER_LDFLAGS = "-Wl,-search_paths_first";
                                PRODUCT_NAME = crashreporter;
                                ZERO_LINK = NO;
@@ -5671,7 +5733,13 @@
                                GCC_PREFIX_HEADER = macutil_Prefix.h;
                                GCC_SYMBOLS_PRIVATE_EXTERN = NO;
                                INFOPLIST_FILE = "crashreporter-Info.plist";
-                                LIBRARY_SEARCH_PATHS = "$(inherited)";
+                                LIBRARY_SEARCH_PATHS = (
+                                        "$(inherited)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
+                                );
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
                                OTHER_LDFLAGS = "-Wl,-search_paths_first";
                                PRODUCT_NAME = crashreporter;
                        };
@@ -5718,9 +5786,16 @@
                                        "$(SRCROOT)/../../libraries/universal-darwin/lib_release",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
                                );
                                LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/universal-darwin/lib_debug\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
                                OTHER_LDFLAGS = "-Wl,-search_paths_first";
                                PRODUCT_NAME = "Second Life";
                                SHARED_PRECOMPS_DIR = "$(BUILD_DIR)/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders";
@@ -5751,10 +5826,18 @@
                                        "$(SRCROOT)/../../libraries/universal-darwin/lib_release",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_3)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
+                                        "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
                                );
                                LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/vivox-runtime/universal-darwin\"";
                                LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/build/Universal\"";
-                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/universal-darwin/lib_debug\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/build/Universal\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/build/Development\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_debug\"";
+                                LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../libraries/i386-darwin/lib_release\"";
                                OTHER_CFLAGS = (
                                        "-DLL_DARWIN=1",
                                        "-DLL_RELEASE=1",
@@ -5798,6 +5881,7 @@
                                GCC_WARN_UNUSED_VALUE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                HEADER_SEARCH_PATHS = (
+                                        ../,
                                        "../../libraries/$(arch)-darwin/include",
                                        ../../libraries/include,
                                        ../llcommon,
@@ -5806,6 +5890,7 @@
                                MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
                                MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
                                OTHER_CFLAGS = (
+                                        "-DLL_CURRENT_HAVOK_VERSION=460",
                                        "-DLL_DARWIN=1",
                                        "-DLL_DEBUG=1",
                                        "-D_DEBUG",
@@ -5860,6 +5945,7 @@
                                GCC_WARN_UNUSED_VALUE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                HEADER_SEARCH_PATHS = (
+                                        ../,
                                        "../../libraries/$(arch)-darwin/include",
                                        ../../libraries/include,
                                        ../llcommon,
@@ -5868,6 +5954,7 @@
                                MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
                                MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
                                OTHER_CFLAGS = (
+                                        "-DLL_CURRENT_HAVOK_VERSION=460",
                                        "-DLL_DARWIN=1",
                                        "-DLL_RELEASE=1",
                                        "-DLL_RELEASE_FOR_DOWNLOAD=1",
diff --git a/linden/indra/newview/macview_Prefix.h b/linden/indra/newview/macview_Prefix.h
index acb31d9..d71dc38 100644
--- a/linden/indra/newview/macview_Prefix.h
+++ b/linden/indra/newview/macview_Prefix.h
@@ -58,7 +58,6 @@
 #include "llbox.h"
 #include "llbutton.h"
-#include "llcameraview.h"
 #include "llconsole.h"
 #include "lldrawable.h"
 #include "llfirstuse.h"
@@ -83,7 +82,7 @@
 #include "llmoveview.h"
 #include "llselectmgr.h"
 #include "llsky.h"
-#include "llsphere.h"
+#include "llrendersphere.h"
 #include "llstatusbar.h"
 #include "lltalkview.h"
 #include "lltool.h"
@@ -117,7 +116,7 @@
 #include "llresmgr.h"
 #include "llui.h"
 #include "llviewborder.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 /////////////////// From lldrawpool.cpp
@@ -172,7 +171,7 @@
 #include "llviewerwindow.h"
 #include "llcontrol.h"
 #include "lluictrl.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llviewborder.h"
 #include "llviewerimagelist.h"
 #include "llbutton.h"
diff --git a/linden/indra/newview/moviemaker.cpp b/linden/indra/newview/moviemaker.cpp
deleted file mode 100644
index 369637a..0000000
--- a/linden/indra/newview/moviemaker.cpp
+++ /dev/null
@@ -1,811 +0,0 @@
-/** 
- * @file moviemaker.cpp
- * @brief MovieMaker implementation
- *
- * $LicenseInfo:firstyear=2003&license=viewergpl$
- * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-//  ===============================================
-//  MovieMaker.cpp
-//  ===============================================
-#include "llviewerprecompiledheaders.h"
-#include "moviemaker.h"
-#include <memory>
-#include "llmemtype.h"
-#if LL_WINDOWS
-#include <windowsx.h>
-HANDLE  MakeDib( HBITMAP hbitmap, UINT bits );
-HBITMAP LoadBMPFromFB( int w, int h );
-/*
-    ===============================================
-        Constructors, Destructor
-    ===============================================
-*/
-MovieMaker::MovieMaker()
-{
-    snprintf( fname, sizeof(fname), "movie.avi" );              /* Flawfinder: ignore */
-    width  = -1;
-    height = -1;
-    bOK = true;
-    nFrames = 0;
-        pfile = NULL;
-        ps = NULL;
-        psCompressed = NULL;
-        psText = NULL;
-        aopts[0] = &opts;
-    // Check VFW version.
-        WORD wVer = HIWORD( VideoForWindowsVersion() );
-        if ( wVer < 0x010A )
-        {
-        fprintf( stderr, "VFW version is too old.\n" );
-        exit( -1 );
-            }
-        else
-            {
-                AVIFileInit();
-            }
-}
-MovieMaker::~MovieMaker()
-{
-        if (ps)
-                AVIStreamClose(ps);
-        if (psCompressed)
-                AVIStreamClose(psCompressed);
-        if (psText)
-                AVIStreamClose(psText);
-        if (pfile)
-        {
-                AVIFileClose(pfile);
-        }
-        WORD wVer = HIWORD(VideoForWindowsVersion());
-        if (wVer >= 0x010A)
-            {
-                AVIFileExit();
-            }
-}
-void MovieMaker::StartCapture( char *name , int x, int y)
-{
-    strncpy( fname, name, sizeof(fname) -1 );           /* Flawfinder: ignore */
-    fname[sizeof(fname) -1] = '\0';
-    // Get the width and height.
-    width = x;
-    height = y;
-    fprintf( stderr, "Starting %d x %d capture to file: %s\n", width, height, fname );
-        bOK = TRUE;
-        nFrames = 0;
-}
-void MovieMaker::EndCapture()
-{
-    fprintf( stderr, "\n" );
-        if (ps)
-        {
-                AVIStreamClose(ps);
-        ps = NULL;
-        }
-        if (psCompressed)
-        {
-                AVIStreamClose(psCompressed);
-        psCompressed = NULL;
-        }
-        if (psText)
-        {
-                AVIStreamClose(psText);
-        psText = NULL;
-        }
-        if (pfile)
-        {
-                AVIFileClose(pfile);
-        pfile = NULL;
-        }
-        WORD wVer = HIWORD(VideoForWindowsVersion());
-        if (wVer >= 0x010A)
-            {
-                AVIFileExit();
-            }
-}
-bool MovieMaker::Snap()
-{
-        HRESULT hr;
-        if (!bOK)
-                return false;
-    // Get an image and stuff it into a bitmap.
-    HBITMAP bmp;
-    bmp = LoadBMPFromFB( width, height );
-        LPBITMAPINFOHEADER alpbi = (LPBITMAPINFOHEADER)GlobalLock(MakeDib(bmp, 32));
-    DeleteObject( bmp );
-        if (alpbi == NULL)
-        {
-        bOK = false;
-                return false;
-        }
-        if (width>=0 && width != alpbi->biWidth)
-        {
-                GlobalFreePtr(alpbi);
-        bOK = false;
-                return false;
-        }
-        if (height>=0 && height != alpbi->biHeight)
-        {
-                GlobalFreePtr(alpbi);
-        bOK = false;
-                return false;
-        }
-        width = alpbi->biWidth;
-        height = alpbi->biHeight;
-        if (nFrames == 0)
-        {
-                hr = AVIFileOpenA(&pfile,                   // returned file pointer
-                               fname,                                                   // file name
-                                   OF_WRITE | OF_CREATE,                    // mode to open file with
-                                   NULL);                                                       // use handler determined
-                                                                                                        // from file extension....
-                if (hr != AVIERR_OK)
-                {
-                        GlobalFreePtr(alpbi);
-                        bOK = false;
-                        return false;
-                }
-                _fmemset(&strhdr, 0, sizeof(strhdr));
-                strhdr.fccType                = streamtypeVIDEO;// stream type
-                strhdr.fccHandler             = 0;
-                strhdr.dwScale                = 1;
-                strhdr.dwRate                 = 15;
-                strhdr.dwSuggestedBufferSize  = alpbi->biSizeImage;
-                SetRect(&strhdr.rcFrame, 0, 0,              // rectangle for stream
-                        (int) alpbi->biWidth,
-                        (int) alpbi->biHeight);
-                // And create the stream;
-                hr = AVIFileCreateStream(pfile,             // file pointer
-                                                         &ps,               // returned stream pointer
-                                                                 &strhdr);          // stream header
-                if (hr != AVIERR_OK)
-                {
-                        GlobalFreePtr(alpbi);
-                        bOK = false;
-                        return false;
-                }
-                _fmemset(&opts, 0, sizeof(opts));
-                if (!AVISaveOptions(NULL, ICMF_CHOOSE_KEYFRAME, 1, &ps, (LPAVICOMPRESSOPTIONS FAR *) &aopts))
-                {
-            fprintf( stderr, "AVISaveOptions failed.\n" );
-                        GlobalFreePtr(alpbi);
-                        bOK = false;
-                        return false;
-                }
-                hr = AVIMakeCompressedStream(&psCompressed, ps, &opts, NULL);
-                if (hr != AVIERR_OK)
-                {
-            fprintf( stderr, "AVIMakeCompressedStream failed.\n" );
-                        GlobalFreePtr(alpbi);
-                        bOK = false;
-                        return false;
-                }
-                hr = AVIStreamSetFormat(psCompressed, 0,
-                                           alpbi,           // stream format
-                                       alpbi->biSize +   // format size
-                                       alpbi->biClrUsed * sizeof(RGBQUAD));
-                if (hr != AVIERR_OK)
-                {
-            fprintf( stderr, "AVIStreamSetFormat failed.\n" );
-                        GlobalFreePtr(alpbi);
-                        bOK = false;
-                        return false;
-                }
-                // Fill in the stream header for the text stream....
-                // The text stream is in 60ths of a second....
-/*
-                _fmemset(&strhdr, 0, sizeof(strhdr));
-                strhdr.fccType                = streamtypeTEXT;
-                strhdr.fccHandler             = mmioFOURCC('D', 'R', 'A', 'W');
-                strhdr.dwScale                = 1;
-                strhdr.dwRate                 = 60;
-                strhdr.dwSuggestedBufferSize  = sizeof(szText);
-                SetRect(&strhdr.rcFrame, 0, (int) alpbi->biHeight,
-                        (int) alpbi->biWidth, (int) alpbi->biHeight + TEXT_HEIGHT);
-                // ....and create the stream.
-                hr = AVIFileCreateStream(pfile, &psText, &strhdr);
-                if (hr != AVIERR_OK)
-                {
-                        GlobalFreePtr(alpbi);
-                        bOK = false;
-                        return false;
-                }
-                dwTextFormat = sizeof(dwTextFormat);
-                hr = AVIStreamSetFormat(psText, 0, &dwTextFormat, sizeof(dwTextFormat));
-                if (hr != AVIERR_OK)
-                {
-                        GlobalFreePtr(alpbi);
-                        bOK = false;
-                        return false;
-                }
-*/
-        }
-        // Now actual writing
-        hr = AVIStreamWrite(psCompressed,       // stream pointer
-                nFrames * 1, // 10,                             // time of this frame
-                1,                              // number to write
-                (LPBYTE) alpbi +                // pointer to data
-                        alpbi->biSize +
-                        alpbi->biClrUsed * sizeof(RGBQUAD),
-                        alpbi->biSizeImage,     // size of this frame
-                AVIIF_KEYFRAME,                  // flags....
-                NULL,
-                NULL);
-        if (hr != AVIERR_OK)
-        {
-        fprintf( stderr, "AVIStreamWrite failed.\n" );
-                GlobalFreePtr(alpbi);
-                bOK = false;
-                return false;
-        }
-        // Make some text to put in the file ...
-        //LoadString(hInstance, IDS_TEXTFORMAT, szMessage, BUFSIZE );
-        /*
-        strcpy(szMessage, "This is frame #%d");
-                
-        int iLen = wsprintf(szText, szMessage, (int)(nFrames + 1));
-        // ... and write it as well.
-        hr = AVIStreamWrite(psText,
-                        nFrames * 40,
-                        1,
-                        szText,
-                        iLen + 1,
-                        AVIIF_KEYFRAME,
-                        NULL,
-                        NULL);
-        if (hr != AVIERR_OK)
-        {
-                GlobalFreePtr(alpbi);
-                bOK = false;
-                return false;
-        }
-        */
-        GlobalFreePtr(alpbi);
-        nFrames++;
-    fprintf( stderr, "Wrote frame %d.\r", nFrames );
-        return true;
-}
-static HANDLE  MakeDib( HBITMAP hbitmap, UINT bits )
-{
-        HANDLE              hdib ;
-        HDC                 hdc ;
-        BITMAP              bitmap ;
-        UINT                wLineLen ;
-        DWORD               dwSize ;
-        DWORD               wColSize ;
-        LPBITMAPINFOHEADER  lpbi ;
-        LPBYTE              lpBits ;
-        
-        GetObject(hbitmap,sizeof(BITMAP),&bitmap) ;
-        //
-        // DWORD align the width of the DIB
-        // Figure out the size of the colour table
-        // Calculate the size of the DIB
-        //
-        wLineLen = (bitmap.bmWidth*bits+31)/32 * 4;
-        wColSize = sizeof(RGBQUAD)*((bits <= 8) ? 1<<bits : 0);
-        dwSize = sizeof(BITMAPINFOHEADER) + wColSize +
-                (DWORD)(UINT)wLineLen*(DWORD)(UINT)bitmap.bmHeight;
-        //
-        // Allocate room for a DIB and set the LPBI fields
-        //
-        hdib = GlobalAlloc(GHND,dwSize);
-        if (!hdib)
-                return hdib ;
-        lpbi = (LPBITMAPINFOHEADER)GlobalLock(hdib) ;
-        lpbi->biSize = sizeof(BITMAPINFOHEADER) ;
-        lpbi->biWidth = bitmap.bmWidth ;
-        lpbi->biHeight = bitmap.bmHeight ;
-        lpbi->biPlanes = 1 ;
-        lpbi->biBitCount = (WORD) bits ;
-        lpbi->biCompression = BI_RGB ;
-        lpbi->biSizeImage = dwSize - sizeof(BITMAPINFOHEADER) - wColSize ;
-        lpbi->biXPelsPerMeter = 0 ;
-        lpbi->biYPelsPerMeter = 0 ;
-        lpbi->biClrUsed = (bits <= 8) ? 1<<bits : 0;
-        lpbi->biClrImportant = 0 ;
-        //
-        // Get the bits from the bitmap and stuff them after the LPBI
-        //
-        lpBits = (LPBYTE)(lpbi+1)+wColSize ;
-        hdc = CreateCompatibleDC(NULL) ;
-        GetDIBits(hdc,hbitmap,0,bitmap.bmHeight,lpBits,(LPBITMAPINFO)lpbi, DIB_RGB_COLORS);
-        // Fix this if GetDIBits messed it up....
-        lpbi->biClrUsed = (bits <= 8) ? 1<<bits : 0;
-        DeleteDC(hdc) ;
-        GlobalUnlock(hdib);
-        return hdib ;
-}
-static HBITMAP LoadBMPFromFB( int w, int h )
-{
-    // Create a normal DC and a memory DC for the entire screen. The 
-    // normal DC provides a "snapshot" of the screen contents. The 
-    // memory DC keeps a copy of this "snapshot" in the associated 
-    // bitmap. 
- 
-    HDC hdcScreen = wglGetCurrentDC();
-    HDC hdcCompatible = CreateCompatibleDC(hdcScreen); 
- 
-    // Create a compatible bitmap for hdcScreen. 
-    HBITMAP hbmScreen = CreateCompatibleBitmap(hdcScreen, 
-                           //  GetDeviceCaps(hdcScreen, HORZRES), 
-                           //  GetDeviceCaps(hdcScreen, VERTRES)); 
-                             w, 
-                             h ); 
-    if (hbmScreen == 0)
-        {
-        fprintf( stderr, "hbmScreen == NULL\nExiting.\n" );
-        exit( -1 );
-        //errhandler("hbmScreen", hwnd); 
-        }
- 
-    // Select the bitmaps into the compatible DC. 
- 
-    if (!SelectObject(hdcCompatible, hbmScreen)) 
-        {
-        fprintf( stderr, "Couldn't SelectObject()\nExiting.\n" );
-        exit( -1 );
-        //errhandler("Compatible Bitmap Selection", hwnd); 
-        }
- 
-    // Hide the application window. 
- 
-     //       ShowWindow(hwnd, SW_HIDE); 
- 
-    //Copy color data for the entire display into a 
-    //bitmap that is selected into a compatible DC. 
- 
-    if (!BitBlt(hdcCompatible, 
-                 0,0, 
-                 w, h, 
-                 hdcScreen, 
-                // 512,512,
-                 0, 0,
-                 SRCCOPY)) 
-        {
-        fprintf( stderr, "Screen to Compat Blt Failed\nExiting.\n" );
-        exit( -1 );
-        //errhandler("Screen to Compat Blt Failed", hwnd); 
-        }
- 
-   // Redraw the application window.  
-   //ShowWindow(hwnd, SW_SHOW); 
-    DeleteDC( hdcCompatible );
-    return( hbmScreen );
-}
-#elif LL_DARWIN
- #include <AGL/agl.h>
- #include <AGL/gl.h>
- #include <AGL/glu.h>
-// BAD Apple.  BAD!
-#ifdef verify
-        #undef verify
-#endif
-#include "llviewerwindow.h"
-#include "llworld.h"
-MovieMaker::MovieMaker()
-{
-        movie = NULL;
-        movieResRef = 0;
-        track = NULL;
-        media = NULL;
-        width = 0;
-        height = 0;
-        bufferSize = 0;
-        rowBytes = 0;
-        buffer = NULL;
-        invertedBuffer = NULL;
-        ci = NULL;
-        gworld = NULL;
-        idh = NULL;
-}
-MovieMaker::~MovieMaker()
-{
-        EndCapture();
-}
-void MovieMaker::StartCapture( char *name , int x, int y)
-{
-    strncpy( fname, name, sizeof(fname));               /* Flawfinder: ignore */
-        width = x;
-        height = y;
-        
-        setupMovie();
-}
-OSStatus MovieMaker::setupMovie()
-{
-        OSStatus        error = noErr;
-        FSRef           fileRef;
-        FSSpec          fileSpec;
-        
-        rowBytes = width * 4;
-        bufferSize = height * rowBytes;
-        LLMemType mt(LLMemType::MTYPE_SCRIPT);
-        buffer = (char*) new char(bufferSize);
-        invertedBuffer = (char*) new char(bufferSize);
-        rect.left = 0;
-        rect.top = 0;
-        rect.right = width;
-        rect.bottom = height;
-        
-        error = NewGWorldFromPtr(&gworld, k32ARGBPixelFormat, &rect, 0, 0, 0, buffer, rowBytes);
-        if (error == noErr)
-        {
-                LockPixels(GetGWorldPixMap(gworld));
-        }
-// MBW -- I think this needs to happen after all the dialogs, etc.      
-//      if (error == noErr)
-//      {
-//              Microseconds(&lastFrameTime);
-//              error = grabFrame();
-//      }
-        if (error == noErr)
-        {
-                error = EnterMovies();
-        }
-        
-        if (error == noErr)
-        {
-                ci = OpenDefaultComponent(StandardCompressionType,StandardCompressionSubType);
-                if(ci == NULL)
-                        error = paramErr;
-        }
-                
-        if (error == noErr)
-        {
-                long flags;
-                
-                SCGetInfo(ci,scPreferenceFlagsType,&flags);
-                flags &= ~scShowBestDepth;
-                flags |= scAllowZeroFrameRate;
-                SCSetInfo(ci,scPreferenceFlagsType,&flags);
-        }
-        if (error == noErr)
-        {
-                send_agent_pause();
-                gViewerWindow->mWindow->beforeDialog();
-                error = SCRequestSequenceSettings(ci);
-                gViewerWindow->mWindow->afterDialog();
-                send_agent_resume();
-                if (error == scUserCancelled) 
-                {
-                        // deal with user cancelling.
-                        EndCapture();
-                }
-        }
-        
-        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");         /* Flawfinder: ignore */
-                if (file)
-                {
-                        fclose(file);
-                        
-                        error = FSPathMakeRef((UInt8*)fname, &fileRef, NULL);
-                        if (error == noErr)
-                                error = FSGetCatalogInfo(&fileRef, 0, NULL, NULL, &fileSpec, NULL);
-                }
-                else
-                {
-                        error = paramErr;
-                }
-        }
-        
-        if (error == noErr)
-        {
-                error = CreateMovieFile(&fileSpec, 'TVOD', smCurrentScript, createMovieFileDeleteCurFile | createMovieFileDontCreateResFile, &movieResRef, &movie);
-        }
-        
-        if (error == noErr)
-        {
-                track = NewMovieTrack(movie, FixRatio(width, 1), FixRatio(height, 1), kNoVolume);
-                error = GetMoviesError();
-        }
-        
-        if (error == noErr)
-        {
-                media = NewTrackMedia(track, VideoMediaType, 600, NULL, 0);
-                error = GetMoviesError();
-        }
-        
-        if (error == noErr)
-        {
-                Microseconds(&lastFrameTime);
-                error = grabFrame();
-        }
-        if (error == noErr)
-        {
-                error = SCCompressSequenceBegin(ci,GetPortPixMap(gworld),nil,&idh);
-        }
-        if (error == noErr)
-        {
-                error = BeginMediaEdits(media);
-        }
-        
-        if (error != noErr)
-        {
-                media = NULL;
-        }
-        
-        return error;
-}
-void MovieMaker::EndCapture()
-{
-        OSStatus        error = noErr;
-        if (movie && movieResRef)
-        {
-                if (media && track)
-                {
-                        // Errors adding the frame aren't too important here.
-                        (void)addFrame();
-                        
-                        error = EndMediaEdits(media);
-                        if (error == noErr)
-                        {
-                                error = SCCompressSequenceEnd(ci);
-                        }
-                        if (error == noErr)
-                        {
-                                error = InsertMediaIntoTrack(track, 0, 0, GetMediaDuration(media), fixed1);
-                        }
-                        media = NULL;
-                        track = NULL;
-                }
-                
-                short resId = movieInDataForkResID;
-                error = AddMovieResource(movie, movieResRef, &resId, "\pSecond Life");
-                CloseMovieFile(movieResRef);
-                movieResRef = 0;
-                movie = NULL;
-        }
-        
-        // NOTE:  idh is disposed by SCCompressSequenceEnd.
-        idh = NULL;
-        
-        if(ci)
-        {
-                CloseComponent(ci);
-                ci = NULL;
-        }
-        
-        if(gworld)
-        {
-                DisposeGWorld(gworld);
-                gworld = NULL;
-        }
-        if(buffer)
-        {
-                delete(buffer);
-                buffer = NULL;
-        }
-        if(invertedBuffer)
-        {
-                delete(invertedBuffer);
-                invertedBuffer = NULL;
-        }
-}
-OSStatus MovieMaker::grabFrame()
-{
-        OSStatus        error = noErr;
-        GLenum          glerr;
-        
-        // Grab a frome from GL
-        glReadBuffer(GL_BACK);
-        glReadPixels(0 ,0, width, height,  
-#ifdef LL_BIG_ENDIAN    
-        // PowerPC Mac
-        GL_BGRA,
-        GL_UNSIGNED_INT_8_8_8_8_REV,
-#else                           
-        // Intel Mac
-        GL_BGRA,
-        GL_UNSIGNED_INT_8_8_8_8,
-#endif  
-        invertedBuffer);
-        glerr = glGetError();
-        
-        // Invert the lines top to bottom
-        if (glerr == GL_NO_ERROR)
-        {
-                long i, j;
-                
-                i = j = 0;
-                        
-                // Copy rows into tmp buffer one at a time, reversing their order
-                for (i = 0, j = bufferSize - rowBytes; i < bufferSize; i += rowBytes, j -= rowBytes)
-                        BlockMoveData(&invertedBuffer[i], &buffer[j], rowBytes);
-        }
-        else
-        {
-                error = paramErr;
-        }
-        
-        return error;
-}
-OSStatus MovieMaker::addFrame()
-{
-        OSStatus        error = noErr;
-        Handle  compressedData;
-        short   syncFlag;
-        long    dataSize;
-        UnsignedWide now;
-        CGrafPtr oldPort;
-        GDHandle oldGDeviceH;
-        GetGWorld(&oldPort, &oldGDeviceH);
-        SetGWorld(gworld, nil);
-        
-        // Compress the frame and add it to the movie
-        error = SCCompressSequenceFrame(ci,GetPortPixMap(gworld),&rect,&compressedData,&dataSize,&syncFlag);
-        
-        Microseconds(&now);
-        if (error == noErr)
-        {
-                double duration = (now.lo - lastFrameTime.lo);  // duration in microseconds
-                duration *= GetMovieTimeScale(movie);   
-                duration *= 1.0 / 1000000.0;                            
-                error = AddMediaSample(
-                                media,
-                                compressedData,
-                                0,
-                                dataSize,
-                                (TimeValue)duration,
-                                (SampleDescriptionHandle)idh,
-                                1,
-                                syncFlag,
-                                nil);
-                
-        }
-        lastFrameTime = now;
-        SetGWorld(oldPort, oldGDeviceH);
-        
-        return error;
-}
-bool MovieMaker::Snap()
-{
-        bool    result = false;
-        
-        if (movie && movieResRef && media && track)
-        {
-                OSStatus error = noErr;
-                
-                error = addFrame();
-                
-                if (error == noErr)
-                {
-                        error = grabFrame();
-                }
-                if (error == noErr)
-                {
-                        result = true;
-                }
-        }
-        
-        return result;
-}
-#endif
diff --git a/linden/indra/newview/moviemaker.h b/linden/indra/newview/moviemaker.h
deleted file mode 100644
index f18ce3e..0000000
--- a/linden/indra/newview/moviemaker.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/** 
- * @file moviemaker.h
- * @brief MovieMaker class definition
- *
- * $LicenseInfo:firstyear=2003&license=viewergpl$
- * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-#ifndef _MOVIEMAKER_H
-#define _MOVIEMAKER_H
-#if LL_DARWIN
-#import <QuickTime/QuickTime.h>
-#endif
-//
-// *TODO: Refactor this implementation such that we provide an abstact
-// interface in this file, and provide platform specific
-// implementation in the cpp file. This is just crazy to have nearly
-// the same class re-defined for different platforms, because then
-// usage of the class is platform dependent.
-//
-#if LL_WINDOWS
-#include <vfw.h>
-#define TEXT_HEIGHT     20
-#define AVIIF_KEYFRAME  0x00000010L // this frame is a key frame.
-#define BUFSIZE 260
-class MovieMaker {
-private:
-    //CString FName;
-    char fname[64];
-    int width;
-    int height;
-        AVISTREAMINFO strhdr;
-        PAVIFILE pfile;
-        PAVISTREAM ps;
-        PAVISTREAM psCompressed;
-        PAVISTREAM psText;
-        AVICOMPRESSOPTIONS opts;
-        AVICOMPRESSOPTIONS FAR * aopts[1];
-        DWORD dwTextFormat;
-        COMPVARS cvars;
-        char szText[BUFSIZE];
-        int nFrames;
-        bool bOK;
-public:
-    MovieMaker();
-    ~MovieMaker();
-    inline bool IsOK() const { return bOK; };
-    void StartCapture( char *name , int x, int y);
-    void EndCapture();
-    bool Snap();
-};
-#elif LL_DARWIN
-class MovieMaker {
-private:
-    char fname[64];             /*Flawfinder: ignore*/
-        Movie   movie;
-        short   movieResRef;
-        Track   track;
-        Media   media;
-        int             width;
-        int             height;
-        long    bufferSize;
-        long    rowBytes;
-        char    *buffer;
-        char    *invertedBuffer;
-        GWorldPtr       gworld;
-        Rect            rect;
-        ComponentInstance ci;
-        
-        ImageDescriptionHandle idh;
-        SCTemporalSettings ts;
-        SCDataRateSettings ds;
-        UnsignedWide    lastFrameTime;
-        
-        OSStatus setupMovie();
-        OSStatus grabFrame();
-        OSStatus addFrame();
-public:
-    MovieMaker();
-    ~MovieMaker();
-    inline bool IsOK() const { return true; };
-    void StartCapture( char *name , int x, int y);
-    void EndCapture();
-    bool Snap();
-};
-        
-#elif LL_LINUX
-// *FIX: we need a working implementation on linux.
-class MovieMaker {
-public:
-    MovieMaker() {}
-    ~MovieMaker() {}
-    inline bool IsOK() const { return false; };
-    void StartCapture( char *name , int x, int y) {}
-    void EndCapture() {}
-    bool Snap() { return false; }
-};
-#endif
-#endif
diff --git a/linden/indra/newview/newview.vcproj b/linden/indra/newview/newview.vcproj
index 7a8fc2a..3fe72e6 100644
--- a/linden/indra/newview/newview.vcproj
+++ b/linden/indra/newview/newview.vcproj
@@ -31,18 +31,18 @@
                                UsePrecompiledHeader="0"
                                PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
                                WarningLevel="3"
-                                WarnAsError="TRUE"
+                                WarnAsError="FALSE"
                                Detect64BitPortabilityProblems="FALSE"
                                DebugInformationFormat="4"/>
                        <Tool
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib EZ_LCD_Wrapper.lib lgLcd.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurld.lib libeay32.lib libexpatMT.lib OpenJPEGd.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib EZ_LCD_Wrapper_d.lib lgLcd.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-sgd-1_34_1.lib libboost_signals-vc71-mt-sgd-1_34_1.lib libboost_program_options-vc71-mt-sgd-1_34_1.lib  libcurld.lib libeay32.lib libexpatMT.lib OpenJPEGd.lib llmozlib2d.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib libndofdev.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"
+                                IgnoreDefaultLibraryNames="msvcrt.lib;MSVCRTD.lib;libcd.lib"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile="$(TargetName).pdb"
                                SubSystem="2"
@@ -105,7 +105,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.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-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.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 png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper.lib lgLcd.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s-1_34_1.lib libboost_signals-vc71-mt-s-1_34_1.lib libboost_program_options-vc71-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2.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 png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper.lib lgLcd.lib libndofdev.lib"
                                OutputFile="$(ConfigurationName)/newview.exe"
                                LinkIncremental="1"
                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -172,7 +172,7 @@
                                Outputs="$(TargetFileName)"/>
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.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-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.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 png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper.lib lgLcd.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s-1_34_1.lib libboost_signals-vc71-mt-s-1_34_1.lib libboost_program_options-vc71-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2.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 png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper.lib lgLcd.lib libndofdev.lib"
                                OutputFile="$(ConfigurationName)/SecondLife.exe"
                                LinkIncremental="1"
                                AdditionalLibraryDirectories="&quot;../lib_release/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -238,7 +238,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.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-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper.lib lgLcd.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s-1_34_1.lib libboost_signals-vc71-mt-s-1_34_1.lib libboost_program_options-vc71-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llmozlib2.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper.lib lgLcd.lib libndofdev.lib"
                                OutputFile="$(ConfigurationName)/newview_noopt.exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="&quot;../lib_releasenoopt/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -286,12 +286,6 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                        <File
-                                RelativePath=".\fakevoicesoundsignal.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\head.cpp">
-                        </File>
-                        <File
                                RelativePath=".\llagent.cpp">
                        </File>
                        <File
@@ -325,9 +319,6 @@
                                RelativePath=".\llcallingcard.cpp">
                        </File>
                        <File
-                                RelativePath=".\llcameraview.cpp">
-                        </File>
-                        <File
                                RelativePath=".\llcaphttpsender.cpp">
                        </File>
                        <File
@@ -352,6 +343,9 @@
                                RelativePath=".\llcommandhandler.cpp">
                        </File>
                        <File
+                                RelativePath=".\llcommandlineparser.cpp">
+                        </File>
+                        <File
                                RelativePath=".\llcompass.cpp">
                        </File>
                        <File
@@ -367,9 +361,6 @@
                                RelativePath=".\llcontainerview.cpp">
                        </File>
                        <File
-                                RelativePath=".\llcontroldef.cpp">
-                        </File>
-                        <File
                                RelativePath=".\llcubemap.cpp">
                        </File>
                        <File
@@ -385,6 +376,9 @@
                                RelativePath=".\lldebugview.cpp">
                        </File>
                        <File
+                                RelativePath=".\lldelayedgestureerror.cpp">
+                        </File>
+                        <File
                                RelativePath=".\lldirpicker.cpp">
                        </File>
                        <File
@@ -502,6 +496,9 @@
                                RelativePath=".\llfloaterbuyland.cpp">
                        </File>
                        <File
+                                RelativePath=".\llfloatercamera.cpp">
+                        </File>
+                        <File
                                RelativePath=".\llfloaterchat.cpp">
                        </File>
                        <File
@@ -529,10 +526,10 @@
                                RelativePath=".\llfloatereditui.cpp">
                        </File>
                        <File
-                                RelativePath=".\llfloaterevent.cpp">
+                                RelativePath=".\llfloaterenvsettings.cpp">
                        </File>
                        <File
-                                RelativePath=".\llfloaterenvsettings.cpp">
+                                RelativePath=".\llfloaterevent.cpp">
                        </File>
                        <File
                                RelativePath=".\llfloaterfriends.cpp">
@@ -562,12 +559,18 @@
                                RelativePath=".\llfloaterhtmlhelp.cpp">
                        </File>
                        <File
+                                RelativePath=".\llfloaterhud.cpp">
+                        </File>
+                        <File
                                RelativePath=".\llfloaterimagepreview.cpp">
                        </File>
                        <File
                                RelativePath=".\llfloaterinspect.cpp">
                        </File>
                        <File
+                                RelativePath=".\llfloaterjoystick.cpp">
+                        </File>
+                        <File
                                RelativePath=".\llfloaterlagmeter.cpp">
                        </File>
                        <File
@@ -628,9 +631,15 @@
                                RelativePath=".\llfloatersellland.cpp">
                        </File>
                        <File
+                                RelativePath=".\llfloatersettingsdebug.cpp">
+                        </File>
+                        <File
                                RelativePath=".\llfloatersnapshot.cpp">
                        </File>
                        <File
+                                RelativePath=".\llfloaterstats.cpp">
+                        </File>
+                        <File
                                RelativePath=".\llfloatertelehub.cpp">
                        </File>
                        <File
@@ -652,7 +661,7 @@
                                RelativePath=".\llfloaterurlentry.cpp">
                        </File>
                        <File
-                                RelativePath=".\llfloatervoicewizard.cpp">
+                                RelativePath=".\llfloatervoicedevicesettings.cpp">
                        </File>
                        <File
                                RelativePath=".\llfloaterwater.cpp">
@@ -1009,6 +1018,9 @@
                                RelativePath=".\llregionposition.cpp">
                        </File>
                        <File
+                                RelativePath=".\llrendersphere.cpp">
+                        </File>
+                        <File
                                RelativePath=".\llremoteparcelrequest.cpp">
                        </File>
                        <File
@@ -1024,9 +1036,6 @@
                                RelativePath=".\llspatialpartition.cpp">
                        </File>
                        <File
-                                RelativePath=".\llsphere.cpp">
-                        </File>
-                        <File
                                RelativePath=".\llsprite.cpp">
                        </File>
                        <File
@@ -1332,9 +1341,6 @@
                                RelativePath=".\llviewerthrottle.cpp">
                        </File>
                        <File
-                                RelativePath=".\llvieweruictrlfactory.cpp">
-                        </File>
-                        <File
                                RelativePath=".\llviewervisualparam.cpp">
                        </File>
                        <File
@@ -1452,9 +1458,6 @@
                                RelativePath=".\llxmlrpctransaction.cpp">
                        </File>
                        <File
-                                RelativePath=".\moviemaker.cpp">
-                        </File>
-                        <File
                                RelativePath=".\noise.cpp">
                        </File>
                        <File
@@ -1466,15 +1469,6 @@
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
                        <File
-                                RelativePath=".\audiosettings.h">
-                        </File>
-                        <File
-                                RelativePath=".\fakevoicesoundsignal.h">
-                        </File>
-                        <File
-                                RelativePath=".\head.h">
-                        </File>
-                        <File
                                RelativePath=".\llagent.h">
                        </File>
                        <File
@@ -1517,9 +1511,6 @@
                                RelativePath=".\llcallingcard.h">
                        </File>
                        <File
-                                RelativePath=".\llcameraview.h">
-                        </File>
-                        <File
                                RelativePath=".\llcaphttpsender.h">
                        </File>
                        <File
@@ -1544,6 +1535,9 @@
                                RelativePath=".\llcommandhandler.h">
                        </File>
                        <File
+                                RelativePath=".\llcommandlineparser.h">
+                        </File>
+                        <File
                                RelativePath=".\llcompass.h">
                        </File>
                        <File
@@ -1574,6 +1568,9 @@
                                RelativePath=".\lldebugview.h">
                        </File>
                        <File
+                                RelativePath=".\lldelayedgestureerror.h">
+                        </File>
+                        <File
                                RelativePath=".\lldirpicker.h">
                        </File>
                        <File
@@ -1694,6 +1691,9 @@
                                RelativePath=".\llfloaterbuyland.h">
                        </File>
                        <File
+                                RelativePath=".\llfloatercamera.h">
+                        </File>
+                        <File
                                RelativePath=".\llfloaterchat.h">
                        </File>
                        <File
@@ -1721,10 +1721,10 @@
                                RelativePath=".\llfloatereditui.h">
                        </File>
                        <File
-                                RelativePath=".\llfloaterevent.h">
+                                RelativePath=".\llfloaterenvsettings.h">
                        </File>
                        <File
-                                RelativePath=".\llfloaterenvsettings.h">
+                                RelativePath=".\llfloaterevent.h">
                        </File>
                        <File
                                RelativePath=".\llfloaterfriends.h">
@@ -1754,12 +1754,18 @@
                                RelativePath=".\llfloaterhtmlhelp.h">
                        </File>
                        <File
+                                RelativePath=".\llfloaterhud.h">
+                        </File>
+                        <File
                                RelativePath=".\llfloaterimagepreview.h">
                        </File>
                        <File
                                RelativePath=".\llfloaterinspect.h">
                        </File>
                        <File
+                                RelativePath=".\llfloaterjoystick.h">
+                        </File>
+                        <File
                                RelativePath=".\llfloaterlagmeter.h">
                        </File>
                        <File
@@ -1817,9 +1823,15 @@
                                RelativePath=".\llfloatersellland.h">
                        </File>
                        <File
+                                RelativePath=".\llfloatersettingsdebug.h">
+                        </File>
+                        <File
                                RelativePath=".\llfloatersnapshot.h">
                        </File>
                        <File
+                                RelativePath=".\llfloaterstats.h">
+                        </File>
+                        <File
                                RelativePath=".\llfloatertelehub.h">
                        </File>
                        <File
@@ -1841,7 +1853,7 @@
                                RelativePath=".\llfloaterurlentry.h">
                        </File>
                        <File
-                                RelativePath=".\llfloatervoicewizard.h">
+                                RelativePath=".\llfloatervoicedevicesettings.h">
                        </File>
                        <File
                                RelativePath=".\llfloaterwindlight.h">
@@ -2195,6 +2207,9 @@
                                RelativePath=".\llregionposition.h">
                        </File>
                        <File
+                                RelativePath=".\llrendersphere.h">
+                        </File>
+                        <File
                                RelativePath=".\llremoteparcelrequest.h">
                        </File>
                        <File
@@ -2216,9 +2231,6 @@
                                RelativePath=".\llspatialpartition.h">
                        </File>
                        <File
-                                RelativePath=".\llsphere.h">
-                        </File>
-                        <File
                                RelativePath=".\llsprite.h">
                        </File>
                        <File
@@ -2465,9 +2477,6 @@
                                RelativePath=".\llviewerthrottle.h">
                        </File>
                        <File
-                                RelativePath=".\llvieweruictrlfactory.h">
-                        </File>
-                        <File
                                RelativePath=".\llviewervisualparam.h">
                        </File>
                        <File
@@ -2576,9 +2585,6 @@
                                RelativePath=".\macmain.h">
                        </File>
                        <File
-                                RelativePath=".\moviemaker.h">
-                        </File>
-                        <File
                                RelativePath=".\noise.h">
                        </File>
                        <File
diff --git a/linden/indra/newview/newview_vc8.vcproj b/linden/indra/newview/newview_vc8.vcproj
index 070968e..24a3459 100644
--- a/linden/indra/newview/newview_vc8.vcproj
+++ b/linden/indra/newview/newview_vc8.vcproj
@@ -69,7 +69,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.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 libcurld.lib libeay32.lib libexpatMT.lib OpenJPEGd.lib llmozlib2d-vc80.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.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-sgd-1_34_1.lib libboost_signals-vc80-mt-sgd-1_34_1.lib libboost_program_options-vc80-mt-sgd-1_34_1.lib libcurld.lib libeay32.lib libexpatMT.lib OpenJPEGd.lib llmozlib2d-vc80.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
                                OutputFile="$(ConfigurationName)/debugview.exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"
@@ -166,7 +166,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.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 OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-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 png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.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-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libboost_program_options-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-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 png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
                                OutputFile="$(ConfigurationName)/newview.exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -263,7 +263,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                LinkLibraryDependencies="false"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.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 OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_compile.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.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-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_compile.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
                                OutputFile="$(ConfigurationName)/SecondLife.exe"
                                LinkIncremental="0"
                                AdditionalLibraryDirectories="&quot;../lib_release/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -357,7 +357,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.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 OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-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 png12.lib psapi.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 dnsapi.lib lgLcd.lib EZ_LCD_Wrapper_vc8.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.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-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libboost_program_options-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-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 png12.lib psapi.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 dnsapi.lib lgLcd.lib EZ_LCD_Wrapper_vc8.lib libndofdev.lib"
                                OutputFile="$(ConfigurationName)/newview_noopt.exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="&quot;../lib_releasenoopt/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -409,10 +409,6 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                        <File
-                                RelativePath=".\head.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llagent.cpp"
                                >
                        </File>
@@ -457,10 +453,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llcameraview.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llcaphttpsender.cpp"
                                >
                        </File>
@@ -493,6 +485,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llcommandlineparser.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llcompass.cpp"
                                >
                        </File>
@@ -513,10 +509,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llcontroldef.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llcubemap.cpp"
                                >
                        </File>
@@ -537,6 +529,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\lldelayedgestureerror.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\lldirpicker.cpp"
                                >
                        </File>
@@ -693,6 +689,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloatercamera.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterchat.cpp"
                                >
                        </File>
@@ -701,6 +701,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterclassified.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterclothing.cpp"
                                >
                        </File>
@@ -729,6 +733,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterevent.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterfriends.cpp"
                                >
                        </File>
@@ -765,6 +773,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterhud.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterimagepreview.cpp"
                                >
                        </File>
@@ -773,6 +785,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterjoystick.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterlagmeter.cpp"
                                >
                        </File>
@@ -809,6 +825,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterparcel.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterpermissionsmgr.cpp"
                                >
                        </File>
@@ -853,10 +873,18 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloatersettingsdebug.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloatersnapshot.cpp"
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterstats.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloatertelehub.cpp"
                                >
                        </File>
@@ -885,7 +913,7 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llfloatervoicewizard.cpp"
+                                RelativePath=".\llfloatervoicedevicesettings.cpp"
                                >
                        </File>
                        <File
@@ -1361,6 +1389,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llrendersphere.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llsavedsettingsglue.cpp"
                                >
                        </File>
@@ -1377,10 +1409,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llsphere.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llsprite.cpp"
                                >
                        </File>
@@ -1565,6 +1593,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llviewerassetstorage.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llvieweraudio.cpp"
                                >
                        </File>
@@ -1789,10 +1821,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llvieweruictrlfactory.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llviewervisualparam.cpp"
                                >
                        </File>
@@ -1941,10 +1969,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\moviemaker.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\noise.cpp"
                                >
                        </File>
@@ -1959,14 +1983,6 @@
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                        >
                        <File
-                                RelativePath=".\audiosettings.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\head.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llagent.h"
                                >
                        </File>
@@ -2019,10 +2035,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llcameraview.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llcaphttpsender.h"
                                >
                        </File>
@@ -2055,6 +2067,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llcommandlineparser.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llcompass.h"
                                >
                        </File>
@@ -2095,6 +2111,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\lldelayedgestureerror.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\lldirpicker.h"
                                >
                        </File>
@@ -2255,6 +2275,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloatercamera.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterchat.h"
                                >
                        </File>
@@ -2263,6 +2287,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterclassified.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterclothing.h"
                                >
                        </File>
@@ -2291,6 +2319,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterevent.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterfriends.h"
                                >
                        </File>
@@ -2320,14 +2352,17 @@
                        </File>
                        <File
                                RelativePath=".\llfloaterhtml.h"
-                        >
+                                >
                        </File>
                        <File
                                RelativePath=".\llfloaterhtmlhelp.h"
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterhud.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterimagepreview.h"
                                >
                        </File>
@@ -2336,6 +2371,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterjoystick.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterlagmeter.h"
                                >
                        </File>
@@ -2372,6 +2411,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterparcel.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterpermissionsmgr.h"
                                >
                        </File>
@@ -2412,6 +2455,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloatersettingsdebug.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterskysettings.h"
                                >
                        </File>
@@ -2420,6 +2467,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterstats.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloatertelehub.h"
                                >
                        </File>
@@ -2448,7 +2499,7 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llfloatervoicewizard.h"
+                                RelativePath=".\llfloatervoicedevicesettings.h"
                                >
                        </File>
                        <File
@@ -2924,6 +2975,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llrendersphere.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llresourcedata.h"
                                >
                        </File>
@@ -2936,15 +2991,15 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llsky.h"
+                                RelativePath=".\llselectmgr.h"
                                >
                        </File>
                        <File
-                                RelativePath=".\llspatialpartition.h"
+                                RelativePath=".\llsky.h"
                                >
                        </File>
                        <File
-                                RelativePath=".\llsphere.h"
+                                RelativePath=".\llspatialpartition.h"
                                >
                        </File>
                        <File
@@ -3096,6 +3151,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\lluiconstants.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\lluploaddialog.h"
                                >
                        </File>
@@ -3280,10 +3339,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llvieweruictrlfactory.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llviewervisualparam.h"
                                >
                        </File>
@@ -3432,14 +3487,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\macmain.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\moviemaker.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\noise.h"
                                >
                        </File>
@@ -4070,11 +4117,11 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\skins\xui\en-us\mime_types.xml"
+                                RelativePath=".\app_settings\mid_graphics.xml"
                                >
                        </File>
                        <File
-                                RelativePath=".\app_settings\mid_graphics.xml"
+                                RelativePath=".\skins\xui\en-us\mime_types.xml"
                                >
                        </File>
                        <File
diff --git a/linden/indra/newview/newview_vc9.vcproj b/linden/indra/newview/newview_vc9.vcproj
index f4fdeb9..40851cb 100644
--- a/linden/indra/newview/newview_vc9.vcproj
+++ b/linden/indra/newview/newview_vc9.vcproj
@@ -70,7 +70,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurld.lib libeay32.lib libexpatMT.lib OpenJPEGd.lib llmozlib2d-vc80.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-sgd-1_34_1.lib libboost_signals-vc80-mt-sgd-1_34_1.lib libboost_program_options-vc80-mt-sgd-1_34_1.lib libcurld.lib libeay32.lib libexpatMT.lib OpenJPEGd.lib llmozlib2d-vc80.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
                                OutputFile="$(ConfigurationName)/debugview.exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"
@@ -163,7 +163,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.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 OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-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 png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libboost_program_options-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-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 png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
                                OutputFile="$(ConfigurationName)/newview.exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -256,7 +256,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                LinkLibraryDependencies="false"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.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 OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_compile.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-vc80.lib llprimitive.lib llrender.lib llui.lib llvfs.lib llwindow.lib llxml.lib lscript_compile.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.lib png12.lib psapi.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 dnsapi.lib EZ_LCD_Wrapper_vc8.lib lgLcd.lib libndofdev.lib"
                                OutputFile="$(ConfigurationName)/SecondLife.exe"
                                LinkIncremental="0"
                                AdditionalLibraryDirectories="&quot;../lib_release/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -346,7 +346,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.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 OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-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 png12.lib psapi.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 dnsapi.lib lgLcd.lib EZ_LCD_Wrapper_vc8.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib areslib.lib comdlg32.lib dinput8.lib dsound.lib dxerr.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.lib libboost_program_options-vc80-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib OpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib2-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 png12.lib psapi.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 dnsapi.lib lgLcd.lib EZ_LCD_Wrapper_vc8.lib libndofdev.lib"
                                OutputFile="$(ConfigurationName)/newview_noopt.exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="&quot;../lib_releasenoopt/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -394,10 +394,6 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                        <File
-                                RelativePath=".\head.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llagent.cpp"
                                >
                        </File>
@@ -442,10 +438,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llcameraview.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llcaphttpsender.cpp"
                                >
                        </File>
@@ -478,6 +470,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llcommandlineparser.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llcompass.cpp"
                                >
                        </File>
@@ -498,10 +494,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llcontroldef.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llcubemap.cpp"
                                >
                        </File>
@@ -522,6 +514,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\lldelayedgestureerror.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\lldirpicker.cpp"
                                >
                        </File>
@@ -678,6 +674,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloatercamera.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterchat.cpp"
                                >
                        </File>
@@ -686,6 +686,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterclassified.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterclothing.cpp"
                                >
                        </File>
@@ -714,6 +718,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterevent.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterfriends.cpp"
                                >
                        </File>
@@ -750,6 +758,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterhud.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterimagepreview.cpp"
                                >
                        </File>
@@ -758,6 +770,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterjoystick.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterlagmeter.cpp"
                                >
                        </File>
@@ -794,6 +810,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterparcel.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterpermissionsmgr.cpp"
                                >
                        </File>
@@ -838,10 +858,18 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloatersettingsdebug.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloatersnapshot.cpp"
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterstats.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloatertelehub.cpp"
                                >
                        </File>
@@ -870,7 +898,7 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llfloatervoicewizard.cpp"
+                                RelativePath=".\llfloatervoicedevicesettings.cpp"
                                >
                        </File>
                        <File
@@ -1346,6 +1374,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llrendersphere.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llsavedsettingsglue.cpp"
                                >
                        </File>
@@ -1362,10 +1394,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llsphere.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llsprite.cpp"
                                >
                        </File>
@@ -1550,6 +1578,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llviewerassetstorage.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llvieweraudio.cpp"
                                >
                        </File>
@@ -1774,10 +1806,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llvieweruictrlfactory.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llviewervisualparam.cpp"
                                >
                        </File>
@@ -1926,10 +1954,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\moviemaker.cpp"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\noise.cpp"
                                >
                        </File>
@@ -1944,14 +1968,6 @@
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                        >
                        <File
-                                RelativePath=".\audiosettings.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\head.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llagent.h"
                                >
                        </File>
@@ -2004,10 +2020,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llcameraview.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llcaphttpsender.h"
                                >
                        </File>
@@ -2040,6 +2052,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llcommandlineparser.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llcompass.h"
                                >
                        </File>
@@ -2080,6 +2096,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\lldelayedgestureerror.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\lldirpicker.h"
                                >
                        </File>
@@ -2240,6 +2260,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloatercamera.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterchat.h"
                                >
                        </File>
@@ -2248,6 +2272,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterclassified.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterclothing.h"
                                >
                        </File>
@@ -2276,6 +2304,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterevent.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterfriends.h"
                                >
                        </File>
@@ -2312,6 +2344,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterhud.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterimagepreview.h"
                                >
                        </File>
@@ -2320,6 +2356,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterjoystick.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterlagmeter.h"
                                >
                        </File>
@@ -2356,6 +2396,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterparcel.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterpermissionsmgr.h"
                                >
                        </File>
@@ -2396,6 +2440,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloatersettingsdebug.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloaterskysettings.h"
                                >
                        </File>
@@ -2404,6 +2452,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llfloaterstats.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llfloatertelehub.h"
                                >
                        </File>
@@ -2432,7 +2484,7 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llfloatervoicewizard.h"
+                                RelativePath=".\llfloatervoicedevicesettings.h"
                                >
                        </File>
                        <File
@@ -2908,6 +2960,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llrendersphere.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llresourcedata.h"
                                >
                        </File>
@@ -2920,15 +2976,15 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llsky.h"
+                                RelativePath=".\llselectmgr.h"
                                >
                        </File>
                        <File
-                                RelativePath=".\llspatialpartition.h"
+                                RelativePath=".\llsky.h"
                                >
                        </File>
                        <File
-                                RelativePath=".\llsphere.h"
+                                RelativePath=".\llspatialpartition.h"
                                >
                        </File>
                        <File
@@ -3080,6 +3136,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\lluiconstants.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\lluploaddialog.h"
                                >
                        </File>
@@ -3264,10 +3324,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llvieweruictrlfactory.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llviewervisualparam.h"
                                >
                        </File>
@@ -3416,14 +3472,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\macmain.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\moviemaker.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\noise.h"
                                >
                        </File>
@@ -4054,11 +4102,11 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\skins\xui\en-us\mime_types.xml"
+                                RelativePath=".\app_settings\mid_graphics.xml"
                                >
                        </File>
                        <File
-                                RelativePath=".\app_settings\mid_graphics.xml"
+                                RelativePath=".\skins\xui\en-us\mime_types.xml"
                                >
                        </File>
                        <File
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index e0c2de7..5f45e26 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -99,7 +99,7 @@
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
 #include "llspatialpartition.h"
+#include "llmutelist.h"
 #ifdef _DEBUG
 // Debug indices is disabled for now for debug performance - djs 4/24/02
@@ -374,7 +374,6 @@ void LLPipeline::cleanup()
        mBloomImagep = NULL;
        mBloomImage2p = NULL;
        mFaceSelectImagep = NULL;
-        mAlphaSizzleImagep = NULL;
        mMovedBridge.clear();
@@ -573,19 +572,16 @@ void LLPipeline::restoreGL()
                LLShaderMgr::setShaders();
        }
-        if (gWorldp)
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
        {
-                for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
+                LLViewerRegion* region = *iter;
-                                iter != gWorldp->getRegionList().end(); ++iter)
+                for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
                {
-                        LLViewerRegion* region = *iter;
+                        LLSpatialPartition* part = region->getSpatialPartition(i);
-                        for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
+                        if (part)
                        {
-                                LLSpatialPartition* part = region->getSpatialPartition(i);
+                                part->restoreGL();
-                                if (part)
-                                {
-                                        part->restoreGL();
-                                }
                        }
                }
        }
@@ -596,7 +592,7 @@ BOOL LLPipeline::canUseVertexShaders()
 {
        if (!gGLManager.mHasVertexShader ||
                !gGLManager.mHasFragmentShader ||
-                !gFeatureManagerp->isFeatureAvailable("VertexShaderEnable") ||
+                !LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable") ||
                (assertInitialized() && mVertexShadersLoaded != 1) )
        {
                return FALSE;
@@ -725,20 +721,17 @@ void LLPipeline::dirtyPoolObjectTextures(const std::set<LLViewerImage*>& texture
                }
        }
        
-        if (gWorldp)
+        LLOctreeDirtyTexture dirty(textures);
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
        {
-                LLOctreeDirtyTexture dirty(textures);
+                LLViewerRegion* region = *iter;
-                for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
+                for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
-                                iter != gWorldp->getRegionList().end(); ++iter)
                {
-                        LLViewerRegion* region = *iter;
+                        LLSpatialPartition* part = region->getSpatialPartition(i);
-                        for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
+                        if (part)
                        {
-                                LLSpatialPartition* part = region->getSpatialPartition(i);
+                                dirty.traverse(part->mOctree);
-                                if (part)
-                                {
-                                        dirty.traverse(part->mOctree);
-                                }
                        }
                }
        }
@@ -1111,8 +1104,8 @@ void LLPipeline::updateMove()
        {
                LLFastTimer ot(LLFastTimer::FTM_OCTREE_BALANCE);
-                for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
+                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
                {
                        LLViewerRegion* region = *iter;
                        for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
@@ -1189,8 +1182,8 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
        glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
        LLGLDepthTest depth(GL_TRUE, GL_FALSE);
-        for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
        {
                LLViewerRegion* region = *iter;
                if (water_clip != 0)
@@ -1252,6 +1245,10 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
                mScreen.flush();
                glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
        }
+        else if (LLPipeline::sUseOcclusion > 1)
+        {
+                glFlush();
+        }
 }
 void LLPipeline::markNotCulled(LLSpatialGroup* group, LLCamera& camera)
@@ -1339,6 +1336,7 @@ void LLPipeline::doOcclusion(LLCamera& camera)
        }
        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
+        glFlush();
 }
        
 BOOL LLPipeline::updateDrawableGeom(LLDrawable* drawablep, BOOL priority)
@@ -1569,8 +1567,8 @@ void LLPipeline::shiftObjects(const LLVector3 &offset)
        }
        mShiftList.resize(0);
-        for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
        {
                LLViewerRegion* region = *iter;
                for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
@@ -1896,7 +1894,7 @@ void renderPhysicalBeacons(LLDrawable* drawablep)
        LLViewerObject *vobj = drawablep->getVObj();
        if (vobj 
                && !vobj->isAvatar() 
-                && !vobj->getParent()
+                //&& !vobj->getParent()
                && vobj->usePhysics())
        {
                if (gPipeline.sRenderBeacons)
@@ -2101,7 +2099,7 @@ void LLPipeline::postSort(LLCamera& camera)
        mSelectedFaces.clear();
        
        // Draw face highlights for selected faces.
-        if (gSelectMgr->getTEMode())
+        if (LLSelectMgr::getInstance()->getTEMode())
        {
                struct f : public LLSelectedTEFunctor
                {
@@ -2114,7 +2112,7 @@ void LLPipeline::postSort(LLCamera& camera)
                                return true;
                        }
                } func;
-                gSelectMgr->getSelection()->applyToTEs(&func);
+                LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func);
        }
 }
@@ -2124,8 +2122,6 @@ void render_hud_elements()
        LLFastTimer t(LLFastTimer::FTM_RENDER_UI);
        gPipeline.disableLights();              
        
-        gPipeline.renderDebug();
        LLGLDisable fog(GL_FOG);
        LLGLSUIDefault gls_ui;
@@ -2143,15 +2139,9 @@ void render_hud_elements()
                LLTracker::render3D();
                
                // Show the property lines
-                if (gWorldp)
+                LLWorld::getInstance()->renderPropertyLines();
-                {
+                LLViewerParcelMgr::getInstance()->render();
-                        gWorldp->renderPropertyLines();
+                LLViewerParcelMgr::getInstance()->renderParcelCollision();
-                }
-                if (gParcelMgr)
-                {
-                        gParcelMgr->render();
-                        gParcelMgr->renderParcelCollision();
-                }
        
                // Render debugging beacons.
                gObjectList.renderObjectBeacons();
@@ -2161,7 +2151,7 @@ void render_hud_elements()
        else if (gForceRenderLandFence)
        {
                // This is only set when not rendering the UI, for parcel snapshots
-                gParcelMgr->render();
+                LLViewerParcelMgr::getInstance()->render();
        }
        else if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD))
        {
@@ -2257,11 +2247,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
                }
        }
-        if (!mAlphaSizzleImagep)
-        {
-                mAlphaSizzleImagep = gImageList.getImage(LLUUID(gViewerArt.getString("alpha_sizzle.tga")), MIPMAP_TRUE, TRUE);
-        }
        ///////////////////////////////////////////
        //
        // Sync and verify GL state
@@ -2289,15 +2274,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
        LLVertexBuffer::startRender();
        
-        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
-        {
-                LLDrawPool *poolp = *iter;
-                if (hasRenderType(poolp->getType()))
-                {
-                        poolp->prerender();
-                }
-        }
        //by bao
        //fake vertex buffer updating
        //to guaranttee at least updating one VBO buffer every frame
@@ -2314,7 +2290,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
        glMatrixMode(GL_MODELVIEW);
        LLGLSPipeline gls_pipeline;
-        
+        LLGLEnable multisample(GL_MULTISAMPLE_ARB);
        LLGLState gls_color_material(GL_COLOR_MATERIAL, mLightingDetail < 2);
                                
        // Toggle backface culling for debugging
@@ -2346,8 +2323,22 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
        {
                gObjectList.renderObjectsForSelect(camera);
        }
+        else if (gSavedSettings.getBOOL("RenderDeferred"))
+        {
+                renderGeomDeferred();
+        }
        else
        {
+                for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
+                {
+                        LLDrawPool *poolp = *iter;
+                        if (hasRenderType(poolp->getType()))
+                        {
+                                poolp->prerender();
+                        }
+                }
                LLFastTimer t(LLFastTimer::FTM_POOLS);
                calcNearbyLights(camera);
                setupHWLights(NULL);
@@ -2456,7 +2447,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
        // have touch-handlers.
        mHighlightFaces.clear();
-        render_hud_elements();
+        renderDebug();
        LLVertexBuffer::stopRender();
        LLVertexBuffer::unbind();
@@ -2479,6 +2470,19 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 #endif
 }
+void LLPipeline::renderGeomDeferred()
+{
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        glEnableClientState(GL_NORMAL_ARRAY);
+        glEnableClientState(GL_COLOR_ARRAY);
+        gDeferredDiffuseProgram.bind();
+        gPipeline.renderObjects(LLRenderPass::PASS_SIMPLE, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_NORMAL, TRUE);
+        gDeferredDiffuseProgram.unbind();
+        glDisableClientState(GL_COLOR_ARRAY);
+        glDisableClientState(GL_NORMAL_ARRAY);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+}
 void LLPipeline::addTrianglesDrawn(S32 count)
 {
        assertInitialized();
@@ -2512,8 +2516,8 @@ void LLPipeline::renderDebug()
        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
        // Debug stuff.
-        for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
        {
                LLViewerRegion* region = *iter;
                for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
@@ -2585,7 +2589,7 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects)
        for (std::set<LLViewerObject*>::iterator iter = objects.begin(); iter != objects.end(); ++iter)
        {
-                stateSort((*iter)->mDrawable, *gCamera);
+                stateSort((*iter)->mDrawable, *LLViewerCamera::getInstance());
        }
        LLMemType mt(LLMemType::MTYPE_PIPELINE);
@@ -3055,7 +3059,7 @@ void LLPipeline::setupAvatarLights(BOOL for_edit)
        {
                LLColor4 diffuse(0.8f, 0.8f, 0.8f, 0.f);
                LLVector4 light_pos_cam(-8.f, 0.25f, 10.f, 0.f);  // w==0 => directional light
-                LLMatrix4 camera_mat = gCamera->getModelview();
+                LLMatrix4 camera_mat = LLViewerCamera::getInstance()->getModelview();
                LLMatrix4 camera_rot(camera_mat.getMat3());
                camera_rot.invert();
                LLVector4 light_pos = light_pos_cam * camera_rot;
@@ -3161,7 +3165,7 @@ void LLPipeline::calcNearbyLights(LLCamera& camera)
                // begin() == the closest light and rbegin() == the farthest light
                const S32 MAX_LOCAL_LIGHTS = 6;
 //              LLVector3 cam_pos = gAgent.getCameraPositionAgent();
-                LLVector3 cam_pos = LLViewerJoystick::sOverrideCamera ?
+                LLVector3 cam_pos = LLViewerJoystick::getInstance()->getOverrideCamera() ?
                                                camera.getOrigin() : 
                                                gAgent.getPositionAgent();
@@ -3397,7 +3401,7 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
                LLColor4  light_color = LLColor4::white;
                light_color.mV[3] = 0.0f;
-                LLVector3 light_pos(gCamera->getOrigin());
+                LLVector3 light_pos(LLViewerCamera::getInstance()->getOrigin());
                LLVector4 light_pos_gl(light_pos, 1.0f);
                F32 light_radius = 16.f;
@@ -3958,8 +3962,8 @@ LLViewerObject* LLPipeline::pickObject(const LLVector3 &start, const LLVector3 &
 {
        LLDrawable* drawable = NULL;
-        for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
        {
                LLViewerRegion* region = *iter;
                LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_VOLUME);
@@ -4013,19 +4017,16 @@ void LLPipeline::resetVertexBuffers()
 {
        sRenderBump = gSavedSettings.getBOOL("RenderObjectBump");
-        if (gWorldp)
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
        {
-                for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
+                LLViewerRegion* region = *iter;
-                                iter != gWorldp->getRegionList().end(); ++iter)
+                for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
                {
-                        LLViewerRegion* region = *iter;
+                        LLSpatialPartition* part = region->getSpatialPartition(i);
-                        for (U32 i = 0; i < LLViewerRegion::NUM_PARTITIONS; i++)
+                        if (part)
                        {
-                                LLSpatialPartition* part = region->getSpatialPartition(i);
+                                part->resetVertexBuffers();
-                                if (part)
-                                {
-                                        part->resetVertexBuffers();
-                                }
                        }
                }
        }
@@ -4217,7 +4218,7 @@ void LLPipeline::generateReflectionMap(LLCubeMap* cube_map, LLCamera& cube_cam)
                glTranslatef(-origin.mV[0], -origin.mV[1], -origin.mV[2]);
                cube_cam.setOrigin(origin);
                LLViewerCamera::updateFrustumPlanes(cube_cam);
-                cube_cam.setOrigin(gCamera->getOrigin());
+                cube_cam.setOrigin(LLViewerCamera::getInstance()->getOrigin());
                static LLCullResult result;
                gPipeline.updateCull(cube_cam, result);
                gPipeline.stateSort(cube_cam, result);
@@ -4814,6 +4815,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                
                mScreen.bindTexture();
                
+                LLGLEnable multisample(GL_MULTISAMPLE_ARB);
                glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
                
                glDisable(GL_TEXTURE_RECTANGLE_ARB);
@@ -4840,8 +4842,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 void LLPipeline::processImagery(LLCamera& camera)
 {
-        for (LLWorld::region_list_t::iterator iter = gWorldp->getRegionList().begin(); 
+        for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
-                        iter != gWorldp->getRegionList().end(); ++iter)
+                        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
        {
                LLViewerRegion* region = *iter;
                LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_VOLUME);
@@ -4886,7 +4888,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                F32 pd;
                S32 water_clip = 0;
-                if (!gCamera->cameraUnderWater())
+                if (!LLViewerCamera::getInstance()->cameraUnderWater())
                { //camera is above water, clip plane points up
                        pnorm.setVec(0,0,1);
                        pd = -height;
@@ -4903,7 +4905,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
-                if (!gCamera->cameraUnderWater())
+                if (!LLViewerCamera::getInstance()->cameraUnderWater())
                {       //generate planar reflection map
                        LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
                        glClearColor(0,0,0,0);
@@ -4948,13 +4950,12 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                                mRenderTypeMask = tmp;
                        }
-                        if (LLDrawPoolWater::sNeedsReflectionUpdate)
+                        if (LLDrawPoolWater::sNeedsDistortionUpdate)
                        {
                                mRenderTypeMask &=      ~((1<<LLPipeline::RENDER_TYPE_WATER) |
                                                                          (1<<LLPipeline::RENDER_TYPE_GROUND) |
                                                                          (1<<LLPipeline::RENDER_TYPE_SKY) |
-                                                                          (1<<LLPipeline::RENDER_TYPE_CLOUDS) |
+                                                                          (1<<LLPipeline::RENDER_TYPE_CLOUDS)); 
-                                                                          (1<<LLPipeline::RENDER_TYPE_WL_SKY)); 
                                if (gSavedSettings.getBOOL("RenderWaterReflections"))
                                { //mask out selected geometry based on reflection detail
@@ -5000,7 +5001,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                                                                                        (1<<LLPipeline::RENDER_TYPE_GROUND));   
                        stop_glerror();
-                        LLPipeline::sUnderWaterRender = gCamera->cameraUnderWater() ? FALSE : TRUE;
+                        LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater() ? FALSE : TRUE;
                        if (LLPipeline::sUnderWaterRender)
                        {
@@ -5034,7 +5035,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                        LLPipeline::sUnderWaterRender = FALSE;
                        mWaterDis.flush();
                }
-                last_update = LLDrawPoolWater::sNeedsReflectionUpdate;
+                last_update = LLDrawPoolWater::sNeedsReflectionUpdate && LLDrawPoolWater::sNeedsDistortionUpdate;
                glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
                LLPipeline::sReflectionRender = FALSE;
@@ -5048,14 +5049,15 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                gViewerWindow->setupViewport();
                mRenderTypeMask = type_mask;
                LLDrawPoolWater::sNeedsReflectionUpdate = FALSE;
-                gCamera->setUserClipPlane(LLPlane(-pnorm, -pd));
+                LLDrawPoolWater::sNeedsDistortionUpdate = FALSE;
+                LLViewerCamera::getInstance()->setUserClipPlane(LLPlane(-pnorm, -pd));
                LLPipeline::sUseOcclusion = occlusion;
        }
 }
 LLCubeMap* LLPipeline::findReflectionMap(const LLVector3& location)
 {
-        LLViewerRegion* region = gWorldp->getRegionFromPosAgent(location);
+        LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosAgent(location);
        if (region)
        {
                LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_VOLUME);
@@ -5075,10 +5077,6 @@ LLCubeMap* LLPipeline::findReflectionMap(const LLVector3& location)
 void LLPipeline::renderGroups(LLRenderPass* pass, U32 type, U32 mask, BOOL texture)
 {
-#if !LL_RELEASE_FOR_DOWNLOAD
-        LLGLState::checkClientArrays(mask);
-#endif
        for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
        {
                LLSpatialGroup* group = *i;
@@ -5105,22 +5103,23 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
        assertInitialized();
-        if (!avatar->mImpostor.isComplete())
+        U32 mask;
+        BOOL muted = LLMuteList::getInstance()->isMuted(avatar->getID());
+        if (muted)
        {
-                avatar->mImpostor.allocate(128,256,GL_RGBA,TRUE);
+                mask  = 1 << LLPipeline::RENDER_TYPE_AVATAR;
-                avatar->mImpostor.bindTexture();
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
        }
+        else
-        U32 mask = (1<<LLPipeline::RENDER_TYPE_VOLUME) |
+        {
+                mask  = (1<<LLPipeline::RENDER_TYPE_VOLUME) |
                                (1<<LLPipeline::RENDER_TYPE_AVATAR) |
                                (1<<LLPipeline::RENDER_TYPE_BUMP) |
                                (1<<LLPipeline::RENDER_TYPE_GRASS) |
                                (1<<LLPipeline::RENDER_TYPE_SIMPLE) |
                                (1<<LLPipeline::RENDER_TYPE_ALPHA) | 
                                (1<<LLPipeline::RENDER_TYPE_INVISIBLE);
+        }
        
        mask = mask & gPipeline.getRenderTypeMask();
        U32 saved_mask = gPipeline.mRenderTypeMask;
@@ -5131,7 +5130,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
        sReflectionRender = TRUE;
        sImpostorRender = TRUE;
-        markVisible(avatar->mDrawable, *gCamera);
+        markVisible(avatar->mDrawable, *LLViewerCamera::getInstance());
        LLVOAvatar::sUseImpostors = FALSE;
        LLVOAvatar::attachment_map_t::iterator iter;
@@ -5142,36 +5141,18 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
                LLViewerObject* object = iter->second->getObject();
                if (object)
                {
-                        markVisible(object->mDrawable->getSpatialBridge(), *gCamera);
+                        markVisible(object->mDrawable->getSpatialBridge(), *LLViewerCamera::getInstance());
                }
        }
-        stateSort(*gCamera, result);
+        stateSort(*LLViewerCamera::getInstance(), result);
        
-        glClearColor(0.0f,0.0f,0.0f,0.0f);
-        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-        glStencilMask(0xFFFFFFFF);
-        glClearStencil(0);
-        {
-                LLGLEnable scissor(GL_SCISSOR_TEST);
-                glScissor(0, 0, 128, 256);
-                avatar->mImpostor.bindTarget();
-                avatar->mImpostor.getViewport(gGLViewport);
-                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-        }
-        
-        LLGLEnable stencil(GL_STENCIL_TEST);
-        glStencilFunc(GL_ALWAYS, 1, 0xFFFFFFFF);
-        glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
        const LLVector3* ext = avatar->mDrawable->getSpatialExtents();
        LLVector3 pos(avatar->getRenderPosition()+avatar->getImpostorOffset());
-        LLCamera camera = *gCamera;
+        LLCamera camera = *LLViewerCamera::getInstance();
-        camera.lookAt(gCamera->getOrigin(), pos, gCamera->getUpAxis());
+        camera.lookAt(LLViewerCamera::getInstance()->getOrigin(), pos, LLViewerCamera::getInstance()->getUpAxis());
        
        LLVector2 tdim;
@@ -5190,9 +5171,13 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
        glMatrixMode(GL_PROJECTION);
        glPushMatrix();
-        glh::matrix4f ortho = gl_ortho(-tdim.mV[0], tdim.mV[0], -tdim.mV[1], tdim.mV[1], 1.0, 256.0);
+        //glh::matrix4f ortho = gl_ortho(-tdim.mV[0], tdim.mV[0], -tdim.mV[1], tdim.mV[1], 1.0, 256.0);
-        glh_set_current_projection(ortho);
+        F32 distance = (pos-camera.getOrigin()).magVec();
-        glLoadMatrixf(ortho.m);
+        F32 fov = atanf(tdim.mV[1]/distance)*2.f*RAD_TO_DEG;
+        F32 aspect = tdim.mV[0]/tdim.mV[1]; //128.f/256.f;
+        glh::matrix4f persp = gl_perspective(fov, aspect, 1.f, 256.f);
+        glh_set_current_projection(persp);
+        glLoadMatrixf(persp.m);
        glMatrixMode(GL_MODELVIEW);
        glPushMatrix();
@@ -5204,24 +5189,68 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
        glLoadMatrixf(mat.m);
        glh_set_current_modelview(mat);
+        glClearColor(0.0f,0.0f,0.0f,0.0f);
+        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+        glStencilMask(0xFFFFFFFF);
+        glClearStencil(0);
+        // get the number of pixels per angle
+        F32 pa = gViewerWindow->getWindowDisplayHeight() / (RAD_TO_DEG * LLViewerCamera::getInstance()->getView());
+        //get resolution based on angle width and height of impostor (double desired resolution to prevent aliasing)
+        U32 resY = llmin(nhpo2((U32) (fov*pa)), (U32) 512);
+        U32 resX = llmin(nhpo2((U32) (atanf(tdim.mV[0]/distance)*2.f*RAD_TO_DEG*pa)), (U32) 512);
+        if (!avatar->mImpostor.isComplete() || resX != avatar->mImpostor.getWidth() ||
+                resY != avatar->mImpostor.getHeight())
+        {
+                avatar->mImpostor.allocate(resX,resY,GL_RGBA,TRUE);
+                avatar->mImpostor.bindTexture();
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        }
+        {
+                LLGLEnable scissor(GL_SCISSOR_TEST);
+                glScissor(0, 0, resX, resY);
+                avatar->mImpostor.bindTarget();
+                avatar->mImpostor.getViewport(gGLViewport);
+                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+        }
+        
+        LLGLEnable stencil(GL_STENCIL_TEST);
+        glStencilFunc(GL_ALWAYS, 1, 0xFFFFFFFF);
+        glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
        renderGeom(camera);
        
        glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
        glStencilFunc(GL_EQUAL, 1, 0xFFFFFF);
        {
-                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
                LLVector3 left = camera.getLeftAxis()*tdim.mV[0]*2.f;
                LLVector3 up = camera.getUpAxis()*tdim.mV[1]*2.f;
-                LLGLEnable blend(GL_BLEND);
+                LLGLEnable blend(muted ? 0 : GL_BLEND);
+                if (muted)
+                {
+                        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+                }
+                else
+                {
+                        glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE);
+                }
+                
                gGL.blendFunc(GL_ONE, GL_ONE);
                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
                LLGLDepthTest depth(GL_FALSE, GL_FALSE);
                gGL.start();
-                gGL.color4ub(0,0,0,1);
+                gGL.color4ub(64,64,64,1);
                gGL.begin(GL_QUADS);
                gGL.vertex3fv((pos+left-up).mV);
                gGL.vertex3fv((pos-left-up).mV);
@@ -5230,9 +5259,11 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
                gGL.end();
                gGL.stop();
                gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        }
        avatar->mImpostor.flush();
        avatar->setImpostorDim(tdim);
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h
index 0e3e1c0..a2a404f 100644
--- a/linden/indra/newview/pipeline.h
+++ b/linden/indra/newview/pipeline.h
@@ -72,6 +72,7 @@ void glh_set_current_modelview(glh::matrix4f& mat);
 glh::matrix4f glh_get_current_projection();
 void glh_set_current_projection(glh::matrix4f& mat);
 glh::matrix4f gl_ortho(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat znear, GLfloat zfar);
+glh::matrix4f gl_perspective(GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar);
 class LLPipeline
 {
@@ -179,6 +180,8 @@ public:
        void grabReferences(LLCullResult& result);
        void renderGeom(LLCamera& camera, BOOL forceVBOUpdate = FALSE);
+        void renderGeomDeferred();
        void processImagery(LLCamera& camera);
        void generateWaterReflection(LLCamera& camera);
        void renderHighlights();
@@ -328,10 +331,9 @@ public:
                RENDER_DEBUG_TEXTURE_ANIM               = 0x080000,
                RENDER_DEBUG_LIGHTS                             = 0x100000,
                RENDER_DEBUG_BATCH_SIZE                 = 0x200000,
+                RENDER_DEBUG_SHAME                              = 0x400000,
        };
-        LLPointer<LLViewerImage>        mAlphaSizzleImagep;
 public:
        
        LLSpatialPartition* getSpatialPartition(LLViewerObject* vobj);
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index dfee1b0..040c1da 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,117 +1,155 @@
-Release Notes for Second Life 1.19.1(4) April 2nd, 2008
+Release Notes for Second Life 1.20(2) April 18th, 2008
+=====================================
+Changes:
+* Record Movie to Disk option missing intentionally removed (VWR-6315)
+* Color changes to improve text contrast in title bar, scroll bar and menu highlight (VWR-5080)
+* Updated disabled button art
+* Updated login/teleport progress screen art and colors
+* Set the top-level 'opaque' parameter to false in menu_viewer.xml
+Crash Fixes:
+* Fixed: VWR-6576: panel_speaker_controls.xml broken for german, korean, japanese viewers
+* Fixed: VWR-3822: ATI crashes on startup when in 16 bit color mode
+* Fixed: crash with attached obj using Avatar Rendering Cost
+* Fixed: Linux crash parsing command-line arguments 
+* Fixed: crash on LLVertexBuffer::destroyGLBuffer
+Fixes:
+* Fixed: VWR-6269: Text in Chat Console does not show when Communicate window is minimized having last focus on Local Chat tab
+* Fixed: VWR-6298: Some RC settings don't persist properly when settings.xml is present
+* Fixed: VWR-6265: Various communications preferences arent saved
+* Fixed: VWR-6251: Snapshots no longer able to capture the full screen.
+* Fixed: VWR-5929: Some UI translation texts are ignored because of missing names in XUI files
+* Fixed: VWR-6430: Comment area of "Debug Settings" floater (dialog box) is aligned badly
+* Fixed: VWR-6232: Tap-Tap-Hold Running should be an 'Advanced' character preference
+* Fixed: Disabled buttons are darker than normal
+* Fixed: Better distinguish button-depressed from disabled state
+* Fixed: Can't drag custom colors in color picker to the color palette
+* Fixed: Age Verified Account cannot access plots blocked for age verification
+* Fixed: Voice can become totally disabled aftrer using multiple viewers
+* Fixed: Lag Meter help and close buttons hidden offscreen
+* Fixed: can not take hi-res snapshot with size bigger than 4k by 4k.
+* Fixed: Unexpected text on the Build Tool's Object tab
+Localization Fixes:
+* Fixed: Korean files floater_buy_object.xml and panel_voice_enable.xml have a leading CRLF before XML declaration
+* Fixed: Eliminate unused xml files in skins\xui\en-us and language folders
+Release Notes for Second Life 1.20(1) April 14th, 2008
+=====================================
+Changes:
+* The Tools menu now displays in the main menu when editing/creating objects.  Click on the Build button or right click and select Create.  Existing short cuts  (CTL + 1, 2, 3) all still work and will also activate the Tools menu.
+* Disabled Avatar Imposters to address suspected cause of increased crashes on nVidia cards
+* Allowed disabling of Joystick devices globally and selectively for avatar/build/flycam
+* Backed out changes to put the Friends dropdown back on the world map.
+Fixes:
+* External slurls don't detect that viewer 1.20.0 is already running
+* VWR-6392: Voice Chat Setup doesn't work in Preferences dialog box.
+* VWR-5812: Some media sizes will be placed on the wrong size texture when played by the viewer
+* Primary clicks toggle flycam with Mighty Mouse
+* Logging In screen's Quit button does not exit
+* crash on LLUIImageList::onUIImageLoaded
+* crash on LLViewerJointMesh::updateFaceData
+* Person to Person voice calls UI, volume slider overlaps end call button
+* Window opens large, then small, then large on startup 
+* VWR-5929: Some UI translation texts are ignored because of missing names in XUI files
+* VWR-6386, VWR- 6384, VWR-6385: Clean up duplicate and malformed sibling names in en-us xml
+* (potential fix) Runtime Library error after quitting SL
+* Restored some missing textures
+Open Source changes:
+* Added 3DConnexion library export
+* Updated llkdu.dll for 1.20 OSS export
+Release Notes for Second Life 1.20(0) April 9th, 2008
 =====================================
 New features and changes:
+* Updates to the user interface (UI) visual design and architecture:
+** A new, lighter color scheme
+** Improved UI graphics (icons, buttons, etc)
+** Ability to customize text color of Instant Messages
+** Enhancements to the UI texture rendering system
+** Ability to reference textures by filename
+** Support for non-powers-of-two textures
+** Support for PNG textures
-* Physically accurate atmospheric rendering and lighting (previously code named WindLight)
+* LSL scripting for object glow!
-** Animateable day cycles
+** Script a prim's glow attribute, details here:
-** Vastly improved realistic water with reflections and glimmer
+http://wiki.secondlife.com/wiki/LlSetPrimitiveParams
-** "Glow" as new object attribute
-** Avatar Impostoring, which can speed up crowded scenes tremendously
+* Improved Joystick and 3D input device support
-** A new cleaned-up, easy to use Graphics Preferences tab with simple and advanced options for performance/quality settings
+** Integrated a new open source library created by 3Dconnexion designed to integrate multi axis input devices with Second Life
+** Joystick devices can now control the Avatar, Edited Objects, or the Flycam (View menu > Joystick Flycam)
-* Parcel Media - adds the ability to display Web based media on a parcel
+** Added a "Joystick Setup" window to the Preferences under "Input & Camera" for adjusting multi axis input devices
-** New API for Media Rendering
+** Settings are currently optimized for Logitech's 3Dconnexion SpaceNavigator but should be tunable for any joystic or 3D imput device
-** Enables Web content inworld
-** Added two new click actions, one for playing movies, and one for opening media
+Changes:
-** Embedded web browser
+* Removed voice setup wizard from Viewer
-** Added support for Media resizing
+* Removed "Detecting hardware" from first-use startup to save 10 seconds of start time
+* Removed "Critical Message" string from startup community standards dialog
-* Estate-Level Abuse Reporting
+* Removed "Start Gesture" from menu bar
-** Estate owners and managers now have the ability (under World > Region/Estate) to enter an email address where abuse reports will be sent. 
+* Removed "do you want streaming audio" dialog
-** If this address is empty, abuse reports will go to Linden Lab as usual. If the address is present, the abuse reports will be sent there instead. In both cases, all abuse reports are logged by Linden Lab.
+* Removed Friends dropdown on Map
+* Display the Camera and Movement controls by default
-* Voice changes
+* Added online offline notification to open IM windows
-** Changed the default voice volume to be a bit higher, to better match the volume of in-world sounds 
+* One click sit not be available if you're already sitting
-** Changed the voice volume slider to default to the middle of its range, so voice volume can be boosted above the default
+* Replaced "(hippos)" and "(waiting)" with "(Loading...)"
+* Print the name of the missing gesture in the error message
-* Improved Linux Voice support
+* Double-tap forward to run 
-** Better support for USB headsets and other devices
+* Adjusted the right-justified text on the splash screen 
-** Better voice audio quality
+* Ctrl-shift-1 now displays Statistics in a floater
+* Login progress bar change
-* Additional rendering optimizations:
+* Option available to turn off all group titles to make name tags smaller
-** Faster, more reliable occlusion culling - occluded regions are discovered instantaneously, eliminating random bad frames due to the camera moving too quickly
+* Small UI tweaks made to the "near me" floater for usability
-** No geometry transform overhead on region crossing - results in region crossings being slightly smoother
-** Faster frustum culling - less time is spent determining what's visible, thus giving better overall framerates
+Fixes:
-** No copy-to-texture for ripple water - objects under water are rendered to texture at half resolution, resulting in better overall framerates
+* SVC-1072: Havok 4 -- Objects can exist up to 4096 meters up, but scripted rez above 1024 meters fails silently
-** Faster sky updates - the non-WindLight (aka no-shader) skies update quicker - even faster than the pre-WindLight skies!
+* SVC-747: Estate Banned Residents list doesn't increment higher than 252
-** Single pass shiny when using shaders - making an object shiny will no longer require it to be rendered twice, which results in virtually free shiny functionality from a performance standpoint
+* VWR-5498: WindLight Release Candidate doesn't rembember correct size of IM window between sessions
-** Single pass terrain when using shaders - the terrain is no longer drawn in two passes, which, from a performance standpoint, results in virtually free high detail terrain for shader friendly cards (See the System Recommendations at http://secondlife.com/corporate/sysreqs.php)
+* VWR-747: Texture preview should not have constrained aspect ratio
-** Improved object update code (less work for the CPU) - attachments are no longer added to the active list, which improves performance in crowded areas
+* VWR-3984: WindLight: Certain snapshot options incorrectly capture a part of the screen
-** Better scheduling of Avatar LOD (Level of Detail) updates - Avatar LOD is now calculated every 16 frames as opposed to every single frame, which removes redundant work
+* VWR-3438: WindLight: Glow (including water reflections) shows through HUD objects
-** Better Avatar culling through more accurate bounding boxes - Avatar bounding boxes now match their current animation, resulting in more optimized culling of avatars that are not visible in the frame
+* VWR-4616: Snapshot, clicking on more removes current pic
-** Better tree rendering (70% fewer matrix operations, no reliance on GL matrix stack) - results in improved performance for tree rendering
+* VWR-1405: llMapDestination does not work as designed for OS X/Intel viewers
-** Trimmed unused state in LLDrawable, LLSpatialGroup, LLOctree, and LLFace - results in memory savings
+* VWR-3625: Highlights don't affect non-root prims
-** 16-bit index buffers are now used instead of 32-bit buffers - improves memory bandwidth for rendering geometry
+* VWR-2113: Mac Auto Updater "hides", giving appearance of failing
-** For more information, see: https://wiki.secondlife.com/wiki/WindLight
+* VWR-2755: duplicate PARCEL_FLAG_RESTRICT_PUSHOBJECT line in keywords.ini
-** Known Issue:
+* VWR-442: Require confirmation when inviting a new group owner
-*** VWR-1749: Second Life viewer client freezes on MacBook Pro
+* VWR-4903: Show avatar's name in the "Eject" and "Freeze" confirmation screens
+* VWR-6066: "Are you sure you want to clear you browser cache" in "Perferences > Web > Clear Now" has a typo
-Fixes:
+* VWR-5656: Secondlife icon missing in Linux version 1.19.1 RC1 ?
-* VWR-5087: Attach To... from inventory ignores selected postion and attaches to stored location.
+* VWR-2600: Add option to enable Full-Scene Anti-Aliasing (FSAA) in the viewer
-* VWR-5372 Specific Search (People, Places, etc) queries are modified and words less then 3 characters are removed. Now allow searches for resident names of  2 characters, and place/group names containing 1 char words.
+* VWR-3633: Avatar impostor of not-yet-rezzed avatar not appearing
-* VWR-2628: Fix for crash in operator*(LLVector3 const&, LLQuaternion const&) / LL ...
+* Localization of camera controls/tooltips
-* VWR-2682: Possible crash fix when accessing dead cubemap
+* Fixed: glow is rendered on property lines and selection silhouettes
-* VWR-1852: Edit Manipulators have Wrong Orientation with Local Ruler Mode on Linked Objects
+* LLImageJ2C now indicates what en/decoding implementation is being used
-* VWR-4963: Group archive freezes viewer
+* New messaging to inform Residents about consequences of selecting "Can modify my objects"
-* VWR-2273: View menu > Instant Message should be changed to "Communicate"
+* Fixed: Estate tools in non-english UI cannot change maturity level of islands from PG to Mature.
-* VWR-1722: Profiles are editable in two places (including Search browser)
+* Fixed: Agent Limit spontaneously resets to zero
-* VWR-434: HUD textures are attaching but not being seen
+* Fixed: Web control code does not correctly reject sl:// links
-* VWR-2030: Avatar only turns half-way in Appearance Mode
+* Fixed: Wait before printing missing gestures if the name isn't yet available
-* VWR-2920: Sculptie LOD causes object to be deformed into a flattened sphere close while correct far
+* Abrupt velocity changes of SL camera are smoother
-* VWR-2164: Particle Alpha transition is done incorrectly
+* llMapDestination() can be used to open place dialog to teleport user without opening map
-* VWR-1609: disabling "Show Selection Beam" makes beam render incorrectly for others
+* Fixed: Cannot close Buy Land floater when (waiting for data) from web site
-* VWR-2834: Builds fail on 1.18.4.0 with no mozlib
+* Fixed: Gestures appear in random order
-* VWR-983: Particles -> Offscreen/hidden particles get extended life -> as of 1.16.x at least.
+* Fixed: Preference Help button is not pointing to the correct url
-* VWR-882: Group name showing as (???) in About Land, IM tabs, and object edit window
+* Added Hyperlink to MOTD.
-* VWR-4921: not recognising in Linux that client is already running
+* Fixed: Occlusion crash on SIS cards
-* VWR-4548: Linux Intel945 feature-blacklist not being applied (Unresponsive, blackscreen, if not using LL_GL_NOEXT=x)
+* Fixed: VBO related crash on ATI R100 cards 
-* Propagate client language setting into search URL
+* Fixed: lowest avatar detail is higher than before
-* Fix for crash in LLViewerPartGroup::updateParticles
+* Fixed: Avatar Impostor sprites have opaque black edges
-* Updated help text for llGiveInventoryList.
+* Fixed: Impostors tilt 
-* Notecards crash users when passed from person to person
+* Fixed: Impostors need to update once after they stop walking
-* Add "getting data" progress display to buy currency dialog.
+* Fixed: Provide way to visually mute "costly" avatars (check cost: client->rendering->info displays->avatar render cost)
-* Feature table and gpu table changes to help with lenovo.
-* SL Viewer's Client Memory Tool is missing
-* Fix for white areas on lenovo with ATI FireGL 5200
-* Fixed list of names in Friends List showing (Waiting)
-* Help menus have been combined
-* Clean up the Client and Server menu user interface: ctrl-alt-D now toggles the 'Advanced' menu, requesting god status does not display the 'Admin' menu
-* Place Information is hidden behind the tool bar when opened from Second Life Help
-* Fixed: bulk upload of a single file (on Windows) includes the path in the item name and description
-* "Mute" button on script permission dialogs closes all dialogs from the sender
-* Translated camera controls +64 in both directions.
-* Fixed a bug causing the viewer to update the wrong parcel. 
-* revert name of "Local Chat(history)" tab to "Local Chat"
-* Removed confusing "Start in Push-to-Talk mode" preference.
-* JA, KO, DE localizations are truncated on Preferences>Graphics tab> Run in a window descriptor
-* commit JA,KO,DE localization changes to accommodate truncations
-* bumpmapping flips on active objects
-* Fixed various Teleport and Show on Map bugs
-* More Help Buttons in Graphics Preferences
-* (Linux) Working device enumeration A.K.A. USB headset support
-* Linux Voice quality issues in 1.19.0
-* Change the way local output volume is handled 
-* Checkboxes in About Land untick when selected
-* Add missing header file to export list for public SVN repository
-* Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved
-* Resolve instant message crash report
-* Textures/Snapshots in a notecard are opened again when you click copy to inventory.
-* Packet-loss while viewing inventory currently results in perceived inventory loss
-* stop and pause Media and music buttons do not work
-* Displayed page in the client browser disappears when crossing property boundaries.
-* replace misspellings in alerts.xml parameters (<message name="messsage")  (3 S's)
-* fix a misspelling of 'participants' in floater_chat_history.xml tool tip
-* Media browser history dropdown does not save items across sessions
-* XML CLEANUP:  duplicate sibling names in en-us xml
-* Crash in LLTabContainer::draw() if selected tab is invalid
-* The Search floater does not enable the "Search" button until the user has typed 3 characters to reduce db load
-* truncated english word 'water' in Advanced Water Editor modal help dialog
-* sculpties on the top10 crash list
-* Adjust gpu-table based on data from default graphics level framerate for specific graphics cards in viewer stats
-* Added command line option to crash on command line startup (-crash).
 Source changes:
-* VWR-3290: Linux scons build script doesn't work with distcc
+* The settings system has been significantly revamped. llcontroldef.cpp has been replaced with an XML file controlling all settings values: app_settings/settings.xml
+* The command line parser has also been revamped. All but a few special arguments are now associated with control settings and controlled by the file app_settings/cmd_line.xml
+* VWR-2645: Source typo RELEASE_FOR_DOWNLOAD should be LL_RELEASE_FOR_DOWNLOAD ?
+* Fixed: g++ 4 viewer compile issues
+* Dead code removal createLegacyWearableFromAvatar
 Release Notes for Second Life 1.19.0(4) February 28th, 2008
@@ -250,3 +288,1311 @@ Source changes:
 * Rebuild and/or update libraries  to use statically linked libs.
 * Remove llfloaterhtmlhelp.cpp / h and floater_html_help.xml
+<<<<<<< .working
+=======
+Release Notes for Second Life 1.18.5(3) November 29, 2007
+=====================================
+New features:
+* New inworld search via the 'All' tab
+** Includes improved search functionality on land parcels, profiles, groups, wiki documents, events, classifieds, and some individual objects
+** Classifieds are returned both within and next to search results
+Changes:
+* slurls with 3 slashes (secondlife:///app....) are now highlighted in the text window
+* UI elements placement/sizing updated to accommodate localized versions of Second Life viewer
+* Korean text displays correctly on Leopard (Mac OS X 10.5)
+* Permissions dialogs are now throttled to avoid griefing
+Fixes:
+* Public source bundle not getting all ares libs
+* VWR-2959: Windows (Visual Studio) solution file refers to a non-existing project "build_all"
+* VWR-2551: Error in macview.xcodeproj -- invalid dependencies
+* VWR-2856: libs package missing c-ares
+* VWR-3073: Right-clicking someone's attachments to view profile loads (???) (???) instead
+* VWR-592: crash in LLTemplateMessageBuilder::addString
+* VWR-2826: Several problems on handling Japanese input (and possiblly Chinese/Korean also)
+* VWR-2834: Builds fail on 1.18.4.0 with no mozlib
+* VWR-2030: Avatar only turns half-way in Appearance Mode
+* VWR-2803: Lag Meter network ping metric doesn't account for residents outside the USA
+* VWR-3311: Web UI elements' focus rectangle are offset from their displayed position
+Release Notes for Second Life 1.18.4(3) November 7, 2007
+=====================================
+New features:
+* Help > Lag Meter; monitors Client, Network and Server lag and reports possible causes
+Changes:
+* Visual changes in preparation for a forthcoming release of new in-world search
+** Opt-in and opt-out checkboxes for Resident Profile, Parcels, For Sale Objects, Not For Sale Objects, Regions, and Groups 
+* About Land description field is now a three-line text box
+* Minimap indicators for "above" and "below" updated
+** After the next server update, friends will appear in a different color
+Bug fixes:
+* Fixed a sculptie LOD issue
+* Fixed region Mature setting reverting to PG after Estate/Region changes
+* Fixed several UI elements
+* Fixed new group not appearing in group window until relog
+* Fixed Trash folders in user inventory
+* Fixed missing line of information on land sales
+* Fixed parcel listings showing [AREA] instead of parcel size
+* Fixed bad teleports from landmarks
+* Fixed up/down arrows for Repeats Per Face
+* Fixed a viewer nested message crash
+* Fixed a viewer crash with editing classifieds
+* Fixed a viewer crash when pressing Ctrl-F with a minimized Search window
+* Fixed secondlife.log spam when group info window opens
+* Fixed Publish on Web not saving for parcels
+* Fixed missing dialog for Publish in Classifieds
+* Fixed updates for Land and L$
+* Fixed invisible sculpted prims when sculpted texture contains alpha
+* Fixed scope of drag-select with locked objects
+* Fixed link order of drag-selected objects
+* Fixed Accept Notices flag in Group Panel General tab not saving value
+* Fixed Linux viewer preferences for choosing the cache location or chat log location
+* Fixed  Apply button disabled after setting group preferences
+* Fixed Apply button failing to grey out after selecting 'List Group in Profile'
+* Fixed filename filter for Linux/GTK file picker
+* Fixed Linux/GTK file picker not remembering most recent directory
+* Fixed channel argument in Linux client
+* Fixed muted particles not clearing
+* Fixed Show in Search option not carrying over to copied object
+* Fixed muted users disappearing from Active Speakers
+* Fixed Mature content flag when searching All
+* Fixed viewer crash when pasting/typing UTF8 text in the object For Sale price box
+* Fixed Gesture Editor sounds not initialized
+* Fixed Group enrollment fee accepting floating point
+* Fixed 'Quiet Snapshots to Disk' and 'Disable Camera Constraints' not persisting across sessions
+* Fixed dot characters in various fields
+* Fixed a crash on startup (due to empty list of rewritten login URIs)
+* Fixed a Viewer crash while trying to rez an object
+* Fixed a crash when editing classifieds
+* Fixed Land & L$ fields no longer update
+* Fixed a crash by minimizing the search window followed by Ctrl+F
+* Fixed parcel option doesnt save publish listing on the web setting
+* Fixed texture editing user interface is confusing
+* Fixed can't set Repeats Per Face with up/down arrows
+* Fixed Auction ID and Land Description Overlap in the 'About Land' window
+* Disabled Add to Outfit and Replace Outfit options on the top-level Clothing folder
+* MISC-567: Multiple system folders (e.g., '100 Lost and Found Folders') in inventory
+* VWR-2471: SL-viewer chrashes after opening the 10th group-info-window
+* VWR-2444: Menu background colors aren't settable in colors_base.xml
+* VWR-2291: LOD defaults are now too aggressive in RC 1.18.3
+* VWR-2283: Some changes to groups cannot be saved
+* VWR-2116: Viewer crashes when starting a new Group IM session under Japanese UI
+* VWR-2104: long avatar names overflow on the chat history window volume control/muting section
+* VWR-2065: Custom Snapshot setting do not save for next Snapshot
+* VWR-2041: Allow using voice component on another computer
+* VWR-1945: toolbox floater displays window elements incorrectly when minimized then moved.
+* VWR-1944: Active gestures sometimes fail to show in the Active Gestures list
+* VWR-1888: Characters missing in IM window
+* VWR-1724: HUD zoom snaps back after selecting another HUD object
+* VWR-1695: llGiveInventoryList objects spam the owner with messages when the recipient is in Busy mode
+* VWR-1590: Keyboard changes inventory selection after right-click
+* VWR-1562: llassert(mNumDescendantsSelected >= 0) with crash and loop. (Debug build)
+* VWR-1448: llSetText on non-root prims is unreliable (including after relogs)
+* VWR-1408: Online status viewable via Groups even if 'Make my online status visible only to my Friends' is set
+* VWR-1399: Client crashes when viewing details of an empty proposal window
+* VWR-1096: llPlaySound does not play whilst in HUD depending on HUD attachment point
+* VWR-1045: Client crashes with no warning when uploading corrupted TGA file
+* VWR-851: Viewer Crashes in high texture environments when moving or when panning with camera.
+* VWR-813: Recent Items tab shows folders with no matching items
+* VWR-738: SL crashes when loading with a GTK_IM scim module
+* VWR-379: Fix shell scripts to use bash and not sh when appropriate.
+* VWR-333: 'Unable to load gesture.' or 'Gesture is missing from database.' on login
+* VWR-315: Script changes in the editor may be cancelled because of lag
+* VWR-851: Viewer Crashes in high texture environments when moving or when panning with camera.
+* VWR-813: Recent Items tab shows folders with no matching items
+* VWR-738: SL crashes when loading with a GTK_IM scim module
+* VWR-379: Fix shell scripts to use bash and not sh when appropriate.
+* VWR-333: 'Unable to load gesture.' or 'Gesture is missing from database.' on login
+* VWR-315: Script changes in the editor may be cancelled because of lag
+Release Notes for Second Life 1.18.3(5) September 28, 2007
+=====================================
+Changes:
+* Changed Bug Reporting links to http:// instead of https://
+* Build mode no longer automatically turns on beacons
+* Removed 'Ping User' in statistics window (was returning 0, as userserver no longer exists)
+* Removed 'Open' menu option when clothing is selected (as 'Wear' is available)
+* Added minimize button to Inventory
+* Updated voice components to improve quality and address VWR-1532
+* Added name of viewer release channel to embedded browser agent ID string
+* Reverted map beacon behavior (per VWR-2270)
+Known issues:
+* Sculpted prims with alpha in the sculpted texture are invisible
+* The command line option '-drop' does not work on Linux or OSX clients.
+* VWR-2268: Role Description causes Apply Changes, Ignore Changes, Cancel alert even if you don't have rights to change
+* VWR-2551: Error in macview.xcodeproj -- invalid dependencies
+* VWR-2404: lossless texture compression on small textures not lossless
+* VWR-2552: Telehub gui very broken in RC
+LSL changes:
+* Ability to get details about an object by object key:
+** list llGetObjectDetails(key id, list params)
+*** id = the key of the object to get info about.
+*** params = a list of the object details requested: [OBJECT_NAME, OBJECT_OWNER]
+*** returns a list of values in the order requested: [ 'Object_Name', <the UUID key of the owner>]
+**** OBJECT_UNKNOWN_DETAIL Returned by llGetObjectDetails when passed an invalid object parameter type.
+**** OBJECT_NAME Used with llGetObjectDetails to get an object's name.
+**** OBJECT_DESC Used with llGetObjectDetails to get an object's description.
+**** OBJECT_POS Used with llGetObjectDetails to get an object's position.
+**** OBJECT_ROT Used with llGetObjectDetails to get an object's rotation.
+**** OBJECT_VELOCITY Used with llGetObjectDetails to get an object's velocity.
+**** OBJECT_OWNER Used with llGetObjectDetails to get an object's owner's key. Will be NULL_KEY if group owned.
+**** OBJECT_GROUP Used with llGetObjectDetails to get an object's group's key.
+**** OBJECT_CREATOR Used with llGetObjectDetails to get an object's creator's key. 
+Bug fixes:
+* Fixed default eyes appearing gray 
+* Fixed viewer source linking error
+* Enrollment fees are no longer displayed with decimals
+* Fixed inworld map region search failing if a space is included after the region name
+* Fixed Appearance editor preview squares after changing tabs
+* Fixed a bug with LODs for sculpted prims
+* Fixed flexy causes llTargetOmega child objects to not rotate
+* Fixed an incorrect Support link
+* Fixed clipboard capture on login screen's config info
+* Fixed web browser widget shows up blank when connecting via https
+* Fixed doubleclicking text entry fields should select a single word first, then the entire field
+* Fixed items renamed from Recent Items not displaying the correct name in All Items
+* Fixed physical memory calls with more than 4GB of memory
+* Fixed viewer crash by clicking Connect button repeatedly
+* Fixed crash in viewer when receiving bad HUD Effects
+* Fixed a Linux client crash
+* Fixed client on 64-bit Linux systems that cannot find their GL drivers
+* Improved Linux client threading
+* Improved client performance after closing an inventory folder with a large number of items
+* VWR-2487: Covenant Details between live version and release candidate version
+* VWR-2275: Linux 1.18.3 Won't Link
+* VWR-2152: Possible crash in llviewerobjectlist
+* VWR-2144: Client crashes when deleting unsaved gestures
+* VWR-2036: Build tools floater does not remember its position on restart
+* VWR-1987: Segfault on startup if audio doesn't initialize.
+* VWR-1976: Solaris' fprintf segfaults on NULL arguments
+* VWR-1968: Possible crash in llmultigesture.cpp
+* VWR-1951: Hide Particles is not working from the View > Beacons menu item
+* VWR-1942: An error in the do-while example of the LSL Scripting Guide could cause infinite looping.
+* VWR-1892: Use pkgconfig for more libraries in the standalone build
+* VWR-1891: Detect a Debian bulid-host, as is done for Fedora
+* VWR-1880: Modify 'Ctrl-F' to call Search/Replace Dialog when invoked inside Script Window
+* VWR-1872: An attempt to fix the 'empty inventory trash' crashes
+* VWR-1861: Renaming items in inventory folders does not update item sort order
+* VWR-1823: Bad typecast for 64 bit systems, llagent llfloatercustomize
+* VWR-1808: Possible crash in llviewerobjectlist
+* VWR-1761: Group Invite Suggestion--add 'view group info' to invite dialog box
+* VWR-1743: LLFloaterGroups source code inconsistencies
+* VWR-1736: Add a Invite to Group option to the Avatar Pie Menu
+* VWR-1722: Profiles are editable in two places (including Search browser)
+* VWR-1721: GUI quirk in groups
+* VWR-1714: Folders flashing in Inventory window with Filters and 'Always show folders' checked
+* VWR-1699: Sculpt map preview inaccurate
+* VWR-1647: 'Show end of last IM conversation' in Preferences/Communication automatically remains checked after OK-ing unchecked
+* VWR-1640: login retires cause LLFrameStatView::setup() to seg fault
+* VWR-1638: confused viewer - displays login and regular menus and buttons
+* VWR-1567: Change the default item name for 'snapshot to inventory' to something more usefull than 'snapshot'
+* VWR-1566: An attempt to fix the glDrawRangeElements crashes (refcount LLDrawInfo )
+* VWR-1564: Viewer crashes when started with the '-local' argument.
+* VWR-1460: Can not see permissions of objects in Buy Contents window when item has long name
+* VWR-1398: Appearance editor's previews do not render correctly (1.17.2)
+* VWR-1372: Sculpt prim topology reverts to sphere unexpectedly
+* VWR-1230: Text highlighting in Chat History window is cancelled when history scrolls
+* VWR-1225: Embedded notecards not functioning
+* VWR-1187: Profile > Classifieds tab shows confirmation dialog when no changes are made
+* VWR-1079: Group Notice dialog: message text can't be copied and pasted
+* VWR-942: logRanOffEndOfPacket is too terse when it logs packet data, add some more info
+* VWR-866: Sculpties suffer HORRIBLY from JPEG artifacts
+* VWR-819: Open the 'More>>' section of the edit tools by default and persist it across sessions
+* VWR-749: Bandwidth indicator: Kbps, should not have capital k
+* VWR-493: Statistics bar, Packet Loss: % sign is doubled
+* VWR-493: Objects with 'Linden' in their name can't be muted
+* VWR-423: Selecting group charter text causes Apply/Ignore/Cancel popup even if the text wasn't changed
+* VWR-240: Cannot input Japanese characters from keyboard on Linux
+* SVC-300: Spam upon TP out of Help Island Public, per calling card and landmark
+Release Notes for Second Life 1.18.2(1) September 19, 2007
+=====================================
+Changes:
+* Fix URL handler exploit described here: http://blog.secondlife.com/2007/09/18/second-life-url-handler-exploit/
+* Update voice components to improve quality and address VWR-1532
+* Add name of viewer release channel to embedded browser agent ID string
+Release Notes for Second Life 1.18.2(0) August 10, 2007
+=====================================
+Bug fixes:
+* VWR-1936: Line editor history missing from First Look: Voice
+* Adjusted thread priorities and buffering algorithms in SLVoice to improve performance on low-end machines
+* Added a DC bias removal filter to SLVoice, which should remove 'popping' artifacts heard with some microphones
+* Fixed: Audio devices added to a system after launch of client do not appear in the device menu
+* Fixed: The first time opening the prefs window after launch kicks the user out of their voice channel
+Release Notes for Second Life 1.18.1(2) August 2, 2007
+=====================================
+New Features:
+* In-World Voice Chat
+** In-world Voice Chat is now part of the main viewer. 
+** You can see and manage all voice settings in Edit > Preferences > Voice Chat. 
+** Voice is off by default.  To enable (and disable) voice, visit Edit > Preferences > Voice Chat and check/uncheck the box beside 'Enable voice chat'.
+** A voice set-up wizard appears during first voice use to help residents set up voice and adjust their mic volume and tuning.  You should run the voice set-up wizard even if you only want the ability to hear others and do not wish to speak.
+** Push-to-Talk is part of the Voice feature.  Push-to-Talk is ON by default, which means Resident mics are OFF by default. 
+** Speech gestures for voice are included in the Library, in Gestures > Speech Gestures. These gestures need to be activated in order to work; they are off by default.
+* Streaming video support for Linux client.
+Changes:
+* Shortcut keys for menu items in the Client & Server menus are now disabled if the menus are hidden.
+* Text from objects can be muted.
+Bug fixes:
+* VWR-1797: Remove mention of 'Live Help' from Crash Logger
+* VWR-1732: Pressing Enter, with multiple inventory objects selected, crashes viewer
+* VWR-1729: indra/lscript/lscript_compile/indra.l: avoid yyunput hack on Windows build
+* VWR-1723: Possible crash in llvopartgroup
+* VWR-1706: Minor quirk (and cleanup) in llfloater.cpp
+* VWR-1705: indra/lscript/lscript_compile/indra.y: disable compiler warning #4065 for 'switch' statements
+* VWR-1704: indra/llui/files.lst: delete llhtmlhelp.h entry
+* VWR-1698: Clean up parcel flag manipulation
+* VWR-1655: Script Warnings/errors window is hard to resize, resets size after closing tabs.
+* VWR-1646: Possible crash when login server is unavailable.
+* VWR-1626: Patch to avoid IM window from resizing when sessions open or close
+* VWR-1613: Overuse of virtual
+* VWR-1612: LLRenderPass::Pushbatch and LLViewerImage::addTextureStats tuning
+* VWR-1586: Mismatched delete in llviewerparcelmgr.cpp
+* VWR-1578: Two quirks in IM regarding 'xxxx is typing'
+* VWR-1471: Inspect (Pie menu > More > More > Inspect) shows nothing on first use when 'only select own objects' is enabled
+* VWR-1470: Buttons (IM, Teleport, Profile, ...) in friends list are disabled when opening friends list window
+* VWR-1468: LoginPacketNeverReceived dialog text is incorrect
+* VWR-1462: Order of right-click menu on Inventory is confusing
+* VWR-1453: A few old-school changes for llviewerregion.cpp
+* VWR-1434: Null pointer crash when terraforming
+* VWR-1406: Unchecking 'Go Away/AFK when idle' has no effect in 1.17.2.0
+* VWR-1382: Some scripted objects are highlighted in red while pressing Alt with tools open
+* VWR-1381: libpng12.a for MacOS X is missing in 1.17.1.0 and build fails.
+* VWR-1358: Physical objects remain red if tools window is closed while holding Alt key
+* VWR-1358: Physical objects remain red if tools window is closed while holding Alt key
+* VWR-1353: Misleading variable names in LLTextEditor
+* VWR-1344: Reverse order of popups, so that new ones appear underneath existing ones rather than on top.
+* VWR-1318: Selecting Cancel while saving a snapshot to disk still triggers snapshot gesture
+* VWR-1314: Multiple selection then individual deselection of attachments broken
+* VWR-1294: Possibly threads not fully cleaned up at end of program
+* VWR-1289: On logging in, sound volume for stream is low, despite the actual setting in the music control
+* VWR-1282: Better error handling when fonts are missing
+* VWR-1270: Script error window keeps reverting to a very small size
+* VWR-1246: Mac: File menu > Snapshot to Disk lists wrong shortcut key
+* VWR-1105: Set internal limit of particle count to max value from GUI preferences.
+* VWR-1092: Disable mouse hover text on HUDs, since it always only shows the owner's name and generally gets in the way of HUD functionality.
+* VWR-727: Torn of IM windows should be minimizable (was re: VWR-233: ... resizeable and minimizable)
+* VWR-447: Allow minimized windows to be repositioned in client
+* VWR-353: Rebake command - add a keyboard shortcut and put in tools menu
+* VWR-349: Change keyboard shortcuts, because entering { [ ] } on German and some other international keyboards (AltGr 7, 8, 9, 0) triggers Rendering Features accelerators Ctrl-Alt-7, 8, 9, 0 (previously resulting in unstable viewer)
+* VWR-238: Permissions of Roles and Rights in the german version are mased up.
+* VWR-102: md5 slow
+* SVC-371: Fix the legibility and grammar/consistency of the new llOwnerSay implementation
+* SVC-193: llParticleSystem - halo of rogue particles around original particle system after 1.15 update* SVC-373: Deleting a script's code results in a non-existent file and 'missing from database' error
+* Fixed preference for showing or hiding server combo box was not preserved
+* Fixed residents with negative L$ balance can't purchase items set for sale 'Original' or 'Copy' that are being sold for L$0
+* 'Copy SLURL to clipboard' is now enabled for an avatar's current coordinates
+* Macintosh viewer now correctly opens the map and selects the destination on a SLURL request
+* Leading and trailing spaces are now automatically trimmed from parcel media URLs
+* Corrected the spacing of the yellow 'next dialog' chevron (was partially blocked by the Mute button)
+* Corrected the error message shown when adding 11th Estate Manager
+* Added CPU detection for Intel Core Duo/Solo and Intel Core 2 Duo
+* 'Set Window Size...' setting is now correctly resumed after being minimized
+* Added link to Qa wiki in the viewer bug reporter menu.
+* Updated text in Second Life Crash Logger with new support portal information
+* Corrected an issue with UI font scaling in the bug reporter window
+Release Notes for Second Life 1.18.0(6) July 11, 2007
+=====================================
+Changes:
+* Message system changes to support transport via TCP (HTTP) as well as UDP.
+** More details are available here: http://blog.secondlife.com/2006/12/21/a-big-change-youll-barely-notice/
+** And here: http://blog.secondlife.com/2007/06/25/dia-de-la-liberacion/
+* German language added to the Windows installer
+* Updated translations for German language viewer
+* Updated translations for Japanese language viewer
+* Updated translations for Korean language viewer
+* Viewer 'channel' (Release, First Look, etc) now visible at login in the lower right corner next to the version number
+Bug fixes:
+* Fixed SVC-286: deleted fully-permissive objects owned by others skip trash
+* Fixed SVC-251: Death teleport fails when teleporting to a home point you no longer have access to
+* Fixed MISC-273: Enrollment fee is incorrectly deducted if you belong to max. # of groups and try to join new ones
+Release Notes for Second Life 1.17.3(0) July 5, 2007
+=====================================
+Changes:
+* Added muting for permissions requests
+* Added viewer channel info to Help > About Second Life...
+Bug fixes:
+* SVC-21: Request for making identification of llOwnerSay messages possible
+* VWR-1418: Progressive memory consumption (leak) since 1.17.1
+* VWR-1410: Quirk in net.cpp
+* VWR-1351: Violation against the conding standard in llfloaterchat.cpp
+* VWR-1203: Avatars eyes are constantly crossing in 1.17
+* VWR-1184: [Linux VWR] Signal 7 (SIGBUS) Error (caused by libtcmalloc)
+* VWR-1147: A patch set is provided to add an optional 'Confirm Exit' pop-up window for most user client exit methods. Prevents the 'Accidental Quit'.
+* VWR-605: Include the SL date & day with the time
+* VWR-561: Blurry arrows in camera control and other graphics issues
+* VWR-53: Inconsistency in order of AV texture layer between the upper and lower body
+* Fixed Top Scripts window not refreshing when button is pressed while Top Colliders list is still open
+* Fixed odd text overlay on About Land > General tab
+* Fixed format of llOwnerSay chat text
+Release Notes for Second Life 1.17.2(0) June 27, 2007
+=====================================
+Bug fixes:
+* VWR-1369: Creating, re-rezzing, then editing an object results in a viewer crash
+Release Notes for Second Life 1.17.1(0) June 25, 2007
+=====================================
+Changes:
+* VWR-650: Make 'Give money' permissions look different than the other permissions
+* VWR-427: Added new menu item: Tools > Edit Linked Parts
+* VWR-79: PNG image support submission
+* Sculpties now include a one-time explanation the first time a sculptie is created.
+* Client and Server menus now have a one-time dialog box to explain what they are.
+* 'Skip 'Show next time' Dialogs...' button added to Preferences > Popups tab to skip all one time dialog boxes.
+* Added Japanese and German language installers (Windows only)
+* The version of Mozilla used in the client is updated to 1.8.0.12 
+* F1 help now opens an external browser to the Second Life support web site.
+* F1 Help will now open an external browser to language specific support websites for Japanese, Korean and Portuguese based on client's language.
+* Delay added to folder opening while dragging items in an inventory window with a vertical scroll bar.
+* Default messages for postcards are replaced when adding text.
+* In the Inventory window the Filter menu is consolidated into the File menu.
+* The sculptie texture picker UI has changed to differentiate it from the surface texture picker.
+LSL changes:
+* Added support for alternate sculptie edge stitching.
+* VWR-68: LSL constant expression folding and proper constant parsing
+Bug fixes:
+* Fixed MISC-217: Accounts with negative L$ balance can't buy L$0 freebie
+* Fixed SVC-306: Objects are visible at <0,0,0> (sometimes before moving to their correct position)
+* Fixed SVC-225: Searching for Classifieds with blank field results no results
+* Fixed VWR-1339: Asset upload fails for certain saves, eg scripts and appearance
+* Fixed VWR-1296: Minor memory leak in lltexturecache.cpp
+* Fixed VWR-1223: Camera Controls keyboard shortcuts broke
+* Fixed VWR-1221: Possible crash in llfloaterland.cpp / line 1556
+* Fixed VWR-1217: Built-in avatar animations stop suddenly, rather than fading out. (jerky head movement)
+* Fixed VWR-1203: Avatars eyes are constantly crossing in 1.17
+* Fixed VWR-1170: LLMuteList::loadFromFile() improperly parses the mute list returned from the service
+* Fixed VWR-1140: About Land floater is not resizable, ban and access lists too small
+* Fixed VWR-1049: Trivial sizeof() miscalculatuion results in incomplete copying of CPU Brand ID string in CProcessor::AnalyzeAMDProcessor()
+* Fixed VWR-1044: Unchecking 'Go Away/AFK When Idle' doesn't work when manually setting Away status
+* Fixed VWR-944: Boost inclusion is inconsistent
+* Fixed VWR-941: Reading length data for a four-byte Variable template message misstores the length
+* Fixed VWR-938: ELFIO is technically optional, make this easy to capitalise on
+* Fixed VWR-876: sculpt texture map does not load or low priority when the texture itself is not visible in viewer frame or not cached
+* Fixed VWR-873: Dead members 'eVertexDataMask;' in various objects
+* Fixed VWR-856: llvfs.cpp: possible loss of memory blocks in LLVFS:audit()
+* Fixed VWR-822: 'Create new...' clothing buttons don't auto-wear items
+* Fixed VWR-746: Incorrect menu item referred to when member of maximum number of groups and a group invite is received
+* Fixed VWR-660: When turning off Flexible Object rendering, flexible objects become permanently invisible
+* Fixed VWR-652: A harmless compiler warning in indra.l.cpp
+* Fixed VWR-606: Some source files (llprocessor.cpp and llsdserialize_tut.cpp) contain non-ASCII characters
+* Fixed VWR-597: Abuse report tool should autofill abuser name when reporting an object
+* Fixed VWR-560: Crash in llscrolllistctl.cpp when sorting scroll list
+* Fixed VWR-459: Unicode supplementary characters typed in from keybaord are not handled properly on Windows (and potentially on Linux)
+* Fixed VWR-446: Automatically start renaming new user-created assets and automatically select new user-created folders
+* Fixed VWR-383: Chat logs do not have timestamps
+* Fixed VWR-364: Viewer memory leak
+* Fixed VWR-287: Inconsistent behaviour between agent_slide_left / agent_slide_right, and the rest of the movement functions.
+* Fixed VWR-251: Keystrokes are eaten by IME when no text input is possible, on Windows using Japanese
+* Fixed VWR-248: Inexplicable folding of Avatars such that they are walking around with their heads up their arses
+* Fixed VWR-247: Viewer generates undesired dialog when IM comes in while minimized
+* Fixed VWR-227: If a Find/Search returns no results, the results list is still focused and an attempt is made to select the first result anyway.
+* Fixed VWR-218: SConstruct script makes many assumptions that are invalid outside LL
+* Fixed VWR-213: Calling DestroyWindow with NULL window handle (win32 version)
+* Fixed VWR-207: Textures become increasingly blurry over time on systems with > ~2GB RAM
+* Fixed VWR-143: Compiler errors in llwebbrowserctrl.h
+* Fixed VWR-132: seg fault in lldrawpool.cpp
+* Fixed VWR-119: Zero missing in Sub-unit snap grid. for small fraction like 1/16 and 1/32
+* Fixed VWR-101: Get rid of 'Return All'
+* Fixed Inventory's 'Recent Items' tab settings not persisting across logins
+* Fixed line breaks showing up as * in various windows.
+Release Notes for Second Life 1.17.0(12) June 13, 2007
+=====================================
+Changes:
+* Inventory transfers
+** Auto-accept inventory and auto-preview texture/notecard/landmark are now separate preferences.
+** Viewing an embedded notecard or landmark no longer adds it to your inventory.
+** Muting the sender of notecards, inventory, textures, etc., now removes all blue pop-ups in the upper right corner from that sender.
+** Offline inventory transfers and group invites now include the name of the item or group, along with group role, in the email.
+* Added 'Clear Browser Cache' button to web prefs.
+** This only affects the embedded browser, not any other browsers installed on your system
+* Embedded Mozilla browser now supports cookies.
+* Preliminary support added to the Windows installer for selecting a language (English, Korean)
+* Closing a changed Classified now confirms changes
+Bug fixes:
+* Fixed a client crash while in startup
+* Fixed group chat reopening with one message and an error after closing group chat
+* Fixed 'Stop All Animations' when stuck in an animation after teleporting
+* Fixed group messages to allow the use of UTF8 characters
+* Fixed 'Show Owners' from automatically turning on again
+* Fixed an issue with 'Release Controls' when an object is taken and rerezed.
+* Fixed an issue with texture picker not displaying any results unless inventory had been shown
+* Fixed chat history to not show muted resident chat
+* Fixed 'Mute Resident' button, now opens the user picker
+* Fixed group ability settings for group owners in German language viewer
+* Fixed embedded Mozilla browser to work with HTTPS sites (affected Windows only)
+* Notecards no longer display the 'Keep' and 'Discard' buttons when opened from inventory
+* Acquired date is now set for items dragged from the contents of a container prim
+* VWR-1040: crash when opening several gestures quickly
+* VWR-966: Minor memory leak in llfloaterpreferences.cpp and a tiny leak in llstatup.cpp
+* VWR-908: Various memory leaks in the group dialog
+* VWR-871: More bad f00d: Two minor (or inconsequential) misses of initializing object members
+* VWR-870: Memory violation through uninitialized variable (invisible or unrendered flexis)
+* VWR-869: Possible hard-loop (endless, viewer-hang) in script editor
+* VWR-827: Toruses are borked after making/editing sculpted prims
+* VWR-823: Two unintialized variables in lltexturefetch.cpp
+* VWR-822: 'Create new...' clothing buttons don't auto-wear items
+* VWR-810: Destructor forgets to delete mFloaterContros member in llui/llview.cpp
+* VWR-809: Destructor fails to clean up global menus in llviewermenu.cpp
+* VWR-808: Incorrect cleanup in message.cpp
+* VWR-807: Forgets to delete gToolInspect in lltoolmgr.cpp
+* VWR-804: Quirk in llviewerwindow.cpp
+* VWR-805: LLCurl not properly cleaned up
+* VWR-765: Cannot open embedded notecards in other notecards when Automatic preview of new notecards/textures/landmarks is off
+* VWR-409: New Feature -> UI -> Dialog -> Buy Copy/Contents -> Default Action -> Cancel
+* VWR-682: Text Editors should try to preserve X cursor position
+* VWR-671: Line editor history for recalling previously typed lines
+* VWR-648: Texture picker should highlight the texture in the swatch
+* VWR-412: Object editing arrows hidden but clickable on objects you can't edit.
+* VWR-364: Viewer memory leak
+Release Notes for Second Life 1.16.0(5) May 23, 2007 
+===================================== 
+New Features:
+* Sculpted Prims
+** Sculpted Prims are a new primitive type that uses a texture to control its 3D shape
+** See http://wiki.secondlife.com/wiki/Sculpted_Prims for FAQ and detailed information
+* Add 'Mute' button to block unwanted notecards, landmarks, and textures
+Changes:
+* Improved muting of particle systems
+LSL Changes:
+* New function: llRegionSay() 
+** Allows object to communicate region-wide
+** Does not allow communication on channel 0
+** This is intended to reduce simulator load by eliminating the need for relay objects
+Bug fixes:
+* Text for several alert messages has been updated
+* Fixed positioning of maximize button when minimizing both script and lsl window 
+* Fixed positioning of LSL help window after minimizing/maximizing main script window
+* Fixed group chat IM showing sender as the only participant until someone responds
+* Fixed group chat IM reopening with an error when sending a message after user closes group chat
+* Fixed '... has left the session' when leaving group chat after talking
+* Fixed failed email when no subject is included
+* Fixed object loss occuring when taking an item
+* VWR-657: Beta -> Linux -> Startup -> Crash
+Release Notes for Second Life 1.15.3(0) May 22, 2007 (Server-Only Update)
+=====================================
+Bug fixes:
+* SVC-213: llGiveInventoryList not creating a folder to place items
+Release Notes for Second Life 1.15.2(0) May 18, 2007 (Server-Only Update)
+=====================================
+Changes:
+* IMs and emails received when inventory is given now include the item name, owner, position and SLURL. 
+** This is useful to track down spamming objects.
+Bug fixes:
+* SVC-85: Friends online in the grid does not reflect who is actually online
+* SVC-138: Land sales search sorting doesn't work
+* MISC-37: Continued breakdowns in group notice popup functionality
+* Teleporting to Help Island no longer allows you to teleport back to Orientation Island
+* No-copy objects that fail to rez now reappear in inventory (may require a relog)
+* Scripted attachments work again correctly on group land
+* Fixed a bug where email sent by script with an empty subject would fail (valid per RFC2822)
+* Fixed several server-side memory leaks, and changed to new memory allocation library
+* Fixed several server-side crashes
+Release Notes for Second Life 1.15.1(3) May 14, 2007 
+=====================================
+Changes:
+* Soft shadow for text is now an option available via the text style flag
+* Expanded Tools->Report Bug to include additional information and links
+* Alt-Left and Alt-Right switch between tabs in IM
+* Ctrl-W closes one tab in IM window (Ctrl-T closes IM window)
+* Ctrl-Shift-W closes all windows
+* Inventory system folders may be sorted to top
+* Busy mode declines notecards and textures and silently sends all other transfers to Inventory
+* L$ balance displays 'Loading...' (instead of a blank) when first checking your balance
+* Minimap is enabled when Second Life runs for the first time
+* Texture transfers are limited to 5 items per 10 seconds
+Bug fixes:
+* Fixed windows maximizing when opening other windows
+* Fixed floating text inworld (original hard shadow restored)
+* Fixed LSL Help window restoring when clicking on script editor
+* Fixed LSL Wiki Help window forgetting its size
+* Fixed Ctrl-W closing the floater instead of one IM panel
+* Fixed a client crash when deleting an object from inventory
+* Fixed avatar eyeball shader
+* Fixed closing an inventory folder while selection is inside moves selection to 'My Inventory'
+* Fixed nametag text leaving background box while moving
+* Fixed graphics cards with unlisted memory sizes defaulting to 16MB
+* Fixed right-clicking on self failing if you are wearing a HUD
+* Fixed llSetText appearance on HUD attachments
+* Fixed Alt-WASD behavior when sitting
+* Fixed first digit in Pay dialog cannot be erased
+* Fixed reference ruler measuring to region edge instead of reference object
+* Fixed permissions on group-owned object's script when group member clicks New Script
+* Improved detection of Linux video memory
+* VWR-38: Magic Opening Folders
+* VWR-42: llSetSoundQueueing() is broken
+* VWR-71: Tabulating and moving by word (Ctrl-left, ctrl-right) off-by-one errors in scripting editor.
+* VWR-136: Seg fault in llpolymorph.cpp
+* VWR-148: llListStatistics tooltip wrong
+* VWR-154: typo in en-US/floater_mute.xml 'Resident' not 'resident'
+* VWR-155: typo in en-US/floater_mute.xml 'Resident' not 'Person'
+* VWR-165: First Digit in the 'Pay' dialog does not erase without entering more digits
+* VWR-166: moving of open folders in the inventory to an other indentation level leaves the contents on the previous level
+* VWR-192: textures in windows only stretches horizontally
+* VWR-326: Allow a 'limit texture recieving' in the client
+* VWR-346: Selecting Client>Character>Flush Animations immediately crashes 1.14.0.x
+* VWR-379: Fix shell scripts to use bash and not sh when appropriate.
+* VWR-414: 8-bit character in llagent.cpp comment confuses Japanese text editors
+* VWR-415: Definitions of WM_MOUSEWHEEL and WHEEL_DELTA need conditionals (on Windows)
+* VWR-429: add scons option making FMOD optional
+Release Notes for Second Life 1.15.0(2) April 25, 2007 
+===================================== 
+Changes:
+* Improved Help menu with links to additional resources
+* 'Add as Friend' button added to Profile 
+* Added buttons to the IM window to scroll to the first and last tabs 
+* Added parcel flag for Mature Content 
+** Parcel searches use the parcel rating instead of the region rating 
+* Share With Group checkbox is cleared after object is deeded to group 
+* Groups list window taller and resizable 
+* Residents are now notified if they are the only ones present in a group IM or conference session 
+* Rating system removed from Profile 
+* Group Search improvements
+** Searches are done against the full text of the group, including charter 
+** Search index is updated daily; new groups may take 24 hours to appear
+** Clicking on a group found via search still shows up-to-date information 
+* Alpha textures sorted more accurately 
+** Example: the hollow inner surface of a sphere will no longer draw on top of the outer surface 
+** This change may cause content using alpha textures to appear differently 
+* Larger debug beacons (View > Beacon) 
+** You can now set the beacon size in Preferences -> Adv. Graphics (Range is 1-127) 
+LSL changes: 
+* LSL Wiki browser embedded in the viewer 
+** When editing a script, select a keyword, then select Help > LSL Wiki Help. in the Script window
+* New function: string llStringTrim(string src, integer trim_type) 
+** STRING_TRIM_HEAD: trim all leading spaces in src 
+** STRING_TRIM_TAIL: trim all trailing spaces in src 
+** STRING_TRIM: trim all leading and trailing spaces in src 
+Notes: 
+* LSL Wiki is not editable from within the Second Life viewer 
+* PARCEL_FLAG_ALLOW_ALL_OBJECT_ENTRY and PARCEL_FLAG_ALLOW_GROUP_OBJECT_ENTRY flags 
+  were added to llGetParcelFlags()/llSetParcelFlags in a previous release, but not 
+  documented. These will now appear correctly in the script editor. 
+* On systems with ATI Mobility X300/X600/X700 graphics cards, when upgrading from a previous 
+  version of Second Life, sound may be disabled on the first run of the viewer. It 
+  should function correctly on the second run.
+* HUD objects may temporarily appear in the wrong position following a region crossing.
+Bug fixes: 
+* Removed First Land filter in Search 
+* Improved performance of inventory operations 
+* Improved recognition of some processor types 
+* Fixed About Land reporting the wrong parcel when teleporting between estates 
+* Fixed a source of stalled Pending Uploads 
+* Fixed Texture Repeats Per Face rounding incorrectly when tabbing between fields 
+* Fixed objects appearing in two places while moving in editor 
+* Fixed a client crash with some mobile ATI chipsets 
+* Fixed button images when first running SL 
+* Fixed selecting group roles not updating UI 
+* Fixed avatar names not appearing when Show Avatar Names Temporarily is enabled 
+* Fixed New IM showing (nobody) for group names 
+* Fixed task email failing between regions 
+* Fixed broken embedded landmarks when editing their notecard 
+* Fixed a case where you could not modify your modifiable object 
+* Fixed attachments disappearing a minute after teleport 
+* Fixed ability to set Mature on parcels in non-Mature regions 
+* Fixed saving changes to notecards in contents 
+* Fixed HUD positioning guide misaligning when UI Size changed 
+* Fixed a case where no-copy objects could be lost during rez 
+* Fixed textures in windows only stretching horizontally 
+* Fixed texture animation rotation changing when Flip is enabled 
+* Fixed erroneous 'User has left this session' messages 
+* Fixed display bug with a cube with Path Cut Begin/End set to .150 
+* Fixed disappearing alpha HUD prims 
+* Fixed menu bar processing keystrokes when moused over 
+* Fixed detached IM windows not resizing 
+* Fixed animated textures when using llSetColor, llSetLinkColor, or PRIM_PROPERTIES 
+* Fixed HUD object movement when logging in at a no-script area 
+* Fixed HUD objects not loading new textures 
+* Fixed HUD objects becoming invisible the first time they are attached from inworld 
+* Fixed 'IM All Contacts In Folder' 
+* Fixed a viewer crash in the name cache 
+* Fixed Undo resetting position only on root prim 
+* Fixed Texture Picker search not showing results 
+* Fixed IM window reverting to default size 
+* Fixed overriding stand-up animation freezing you in place 
+* Fixed Appearance mode showing back of avatar 
+* Fixed: VWR-14: Inconsistency with reading binary data in llpolymesh.cpp 
+* Fixed: VWR-45: trivial patch, initialize variables 
+* Fixed: VWR-94: Buffer overflow in decoding image. 
+* Fixed: VWR-97: Several iterator bugs in llmessage
+* Fixed: VWR-100: Messages form OpenJPEG only in debug mode 
+* Fixed: VWR-109: Characters from fallback fonts don't scale properly 
+* Fixed: VWR-123: OpenJPEG meta decode, Second Life patches 
+* Fixed: VWR-130: llimagejpeg.h remove jinclude.h 
+* Fixed: VWR-144: HUD and possibly other alpha touch area problems 
+* Fixed: VWR-188: Patch: Refactor options handling in SConstruct 
+* Fixed: VWR-198: Missing line of code in source on FFSAVE_WAV 
+* Fixed: VWR-200: money(); events in a linked sets fail to trigger 
+* Fixed: VWR-261: lldir_mac.cpp @brief description is wrong 
+Release Notes for Second Life 1.14.0(1) March 30, 2007
+=====================================
+Fixes:
+* Fixed: When going to recent items tab in inventory, inventory contents do not download
+* Fixed: Crash in llvlcomposition
+* Fixed: VWR-200: money(); events in a linked sets fail to trigger
+* Fixed: VWR-109: Characters from fallback fonts don't scale properly
+* Fixed: VWR-100: Messages form OpenJPEG only in debug mode
+* Fixed: VWR-97: Several iterator bugs in llmessage
+* Fixed: VWR-45: trivial patch, initialize variables
+* Fixed: VWR-14: Inconsistancy with reading binary data in llpolymesh.cpp
+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.4(59510) March 22, 2007
+=====================================
+Changes:
+* Legacy particle system replacements
+* 'Share with Group' checkbox now cleared when deeding objects
+Bugs Fixed:
+* Fixed llParticleSystem( [] ) not shutting down reliably
+* Fixed SVC-48: llSetScriptState is failing in some tasks
+* Fixed SVC-47: llSetPrimitiveParameters with multiple setposition calls capped at 10m, affecting home made TPs
+* Fixed SVC-15: Random Prim Drift
+Release Notes for Second Life 1.13.4(59329) March 16, 2007
+=====================================
+Changes:
+* Replaced deprecated legacy particle systems (llMakeExplosion, llMakeFire, llMakeSmoke, llMakeFountain) 
+  with llparticleSystem approximations
+Release Notes for Second Life 1.13.4(8) March 12, 2007
+=====================================
+Bug fixes:
+* Fixed picks not appearing with older viewer
+* Fixed money() event failing to fire in a linked set
+Release Notes for Second Life 1.13.4(7) March 9, 2007
+=====================================
+Changes:
+* World -> Account History opens L$ transaction history instead of US$ transaction history
+Bug fixes:
+* Fixed a simulator crash with llParcelDetails
+* Fixed flex objects vanishing when LOD changes
+* Fixed flex objects not updating when modified
+* Fixed flex objects disappearing when linked
+* Fixed repositioning of HUD attachments when viewer is resized
+* Fixed objects copied to/from notecards stating they are missing from database
+Release Notes for Second Life 1.13.4(6) March 8, 2007
+=====================================
+Changes:
+* Light emiting objects are now affected by their own light
+Fixes:
+* Offline IMs now appear upon login
+* Fixed autoupdate on Mac viewers
+* Fixed Capslock key detection
+* Fixed llSetLinkPrimitiveParams to move specified child prim
+* Fixed linux client mozilla runtime
+* Fixed texture animations to ignore texture 'Flip' flags
+* Fixed animated textures with texture offset enabled
+* Fixed attachments becoming disembodied when attaching an object
+* Fixed a viewer crash that occurs when opening a script in a prim
+* Fixed classifieds being deleted instead of auto-renewing
+* Fixed jerky/stuttering physics based movement for hover vehicles
+* Fix for paying child prim not triggering money event.
+Release Notes for Second Life 1.13.3(58877) March 6, 2007
+=====================================
+Fixes:
+* Fix for animated textures ignoring texture offset.
+* Fix for animated textures not ignoring flip flags.
+* Fix for light emitting objects not being lit by their own light. 
+* Fix for Textures not being applied to the entire prim
+* Fix for Viewer occasionally getting stuck in drag select mode
+* Fix for Client crashes when deleting objects
+* Fix for Pay dialog is corrupted when attempting to pay while in busy mode
+* Fix for Not able to delete objects which contain no copy items
+Release Notes for Second Life 1.13.4(5) March 6, 2007
+=====================================
+Bug fixes:
+* Fixed 'Select Texture' applying changes to all sides
+* Fixed textures resizing outside their window
+* Fixed object rezzing being affected by Object Entry rules instead of Create Object rules
+* Fixed drag select mode sticking after mouse button release
+* Fixed a client crash when viewing objects
+* Fixed content icon for sounds and animations added to an object
+* Fixed texture request for textures quickly cycling between visible and not visible
+* Fixed several failure cases for offline IM-to-email
+* Fixed retrieval of group member list
+* Fixed landmark resizing after tear-off
+* Fixed ability to delete objects containing no-copy items
+* Fixed single items being created in tabbed window 
+Release Notes for Second Life 1.13.4(4) February 28, 2007
+=====================================
+Changes:
+* Moving your avatar no longer deselects objects in build mode automatically
+Bug fixes:
+* Fixed edit crosshairs moving while crossing region boundary
+* Fixed text entry in Mac/Linux embedded browser
+Release Notes for Second Life 1.13.4(3) February 26, 2007
+=====================================
+Bug fixes:
+* Fixed single-click failure for objects
+* Fixed status bar obscured when debug is off
+* Fixed escape key behavior
+* Fixed strange object counts in About Land when no parcel selected
+* Fixed avatar animations when editing an attached object
+* Fixed Offer Teleport appearing in your own profile
+* Fixed incorrect date display in group notices
+Release Notes for Second Life 1.13.4(2) February 26, 2007
+=====================================
+Bug fixes:
+* Clicking a menu a second time closes the menu
+* Fixed closing a blue dialog closes all dialogs
+* Fixed retrieval of archived group proposals
+* Fixed Ctrl-P shortcut failing when inventory has focus
+* Fixed objects using llGiveInventoryList spamming owner when recipient is Busy
+* Fixed no copy objects disappearing when given via llGiveInventory to a Busy avatar
+Release Notes for Second Life 1.13.4(1) February 21, 2007
+=====================================
+Changes:
+* User inworld money transaction history floater removed
+** Transaction history can be viewed via secondlife.com
+* 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
+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...
+Bug fixes:
+* Fixed taken items not appearing until relog
+* Fixed friends list abilities not being applied to friends
+* Fixed objects failing to attach when selected from a distance
+* Fixed replies to offline IM-to-email messages
+* Fixed renaming a no-copy clothing item during Make New Outfit
+* Fixed rezzed objects appearing at (0,0,0) if you have create rights, but are not wearing your title
+* Fixed modify for gestures/notecards in a prim
+* Fixed incorrect context menus for items in an object
+* Fixed confirmation dialog when uploading immages, sounds, animations, or snapshots
+* Fixed a viewer crash while taking an object
+* Fixed a viewer crash after modifying a script inside a prim
+* Fixed a viewer crash in People search with Picks tab
+* Fixed a script runtime error (list inside a while/do-while loop)
+* Fixed login screen not loading unless cache is cleared
+* Fixed Ctrl-W not closing snapshot floater
+* Fixed Ctrl-W not giving focus to next window
+* Fixed Search->Places not showing public estate parcels while on private estate
+* Fixed LSL converting numbers in body of email to 0
+* Fixed rejection of avatars as sit targets
+* Fixed blurry web browser widgets with UI Scale != 1.0
+* Fixed notecards opened in tabbed windows extending outside the preview window
+* Fixed opening multiple object inventory items not using tabbed windows
+* Fixed accidental selection of highly transparent objects
+* Fixed keyboard focus after selecting function dropdown in script editor
+* Fixed Build button in toolbar disabled on land where 'Create Objects' is set to group, even when avatar is in the correct group
+* Fixed Buy Dialog displays incorrect Prim Count when using prim multipliers
+* Fixed folders not retaining their closed status once opened in inventory
+* Fixed IMs of type IM_BUSY_AUTO_RESPONSE ignore mute
+* Fixed World->Buy Land menu failures
+* Fixed Friends list not displaying online friends on login if 'Can see my online status' is disabled
+* Fixed menus remaining open when something else is clicked
+* Fixed menus taking focus when leaving alt-zoom
+* Fixed accidental loss of no-copy textures by applying them to a prim
+* Fixed members of a group cannot set their home location when land is only set to a group and not deeded
+* Fixed sitting avatar standing up when close are dragged onto the avatar
+Linux client fixes:
+* Added Linux embedded Mozilla client
+* Fixed Linux client crash on shutdown
+Release Notes for Second Life 1.13.3(2) January 30, 2007
+=====================================
+Changes:
+* It is no longer possible to only search for online residents
+* Online status is no longer indicated in the Search -> People results list
+** The online status inside the profile shows 'Currently Online' or remains blank
+*** Friends can see your Online status if you give permission via the Friends list
+*** Anyone can see your Online status if 'Make my online status visible only to my Friends' is unchecked
+Release Notes for Second Life 1.13.3(58716) March 1, 2007
+Fixes:
+* Fix for: Textures that quickly cycle between visible and not visible never getting successfully requested
+* Fix for: Textures applied via 'Select Texture' are applied to all sides.
+* Fix for: Object selection moves to the next sim when crossing region boundary while objects are selected
+* Fix for: Landmarks window can be resized
+* Fix for: Textures should remain within their window when the viewer is resized
+* Fix for: Single items are being created in a tabbed window
+* Fix for: 'linux mozilla embedding support should be compile-time optional'
+Beta Grid Only:
+* Fix for: Object Entry rules block rezing of objects.
+Release Notes for Second Life 1.13.3(58603) March 1, 2007
+Changes: 
+(Note: this change was introduced several versions ago be we forgot to put this in the release notes)
+* The following 4 particle commands have been deprecated for some time, and no longer work:
+** 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
+** Please use llParticleSystem (http://wiki.secondlife.com/wiki/LlParticleSystem) instead.
+* Set the executable name back to SecondLifeFirstLook.exe (1.13.3(58537) inadvertently set it to SecondLifePreveiw.exe
+Fixes:
+* Fixed a bug with image requests, should reduce the latency when loading uncached images
+* Rediced frame rate spikes when spinning.
+* Fixed bad normals on tapered geometry.
+* Fix for bump maps not taking effect immediately.
+* Fix for animated texture coordinates not resetting when animation stops.
+Release Notes for Second Life 1.13.3(58537) February 27, 2007
+Changes:
+* Modified texture animations to use hardware acceleration
+* Improved framerate when rotating in certain areas that were lagging
+From the main development branch since 1.13.3.2
+(note: some of these were introduced in previous First Look releases)
+Changes:
+* User inworld money transaction history floater removed
+** Transaction history can be viewed via secondlife.com
+* 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
+Bug fixes:
+* Fixed single-click failure for objects
+* Fixed status bar obscured when debug is off
+* Fixed escape key behavior
+* Fixed strange object counts in About Land when no parcel selected
+* Fixed avatar animations when editing an attached object
+* Fixed Offer Teleport appearing in your own profile
+* Fixed incorrect date display in group notices
+* Clicking a menu a second time closes the menu
+* Fixed closing a blue dialog closes all dialogs
+* Fixed retrieval of archived group proposals
+* Fixed Ctrl-P shortcut failing when inventory has focus
+* Fixed objects using llGiveInventoryList spamming owner when recipient is Busy
+* Fixed no copy objects disappearing when given via llGiveInventory to a Busy avatar
+* Fixed taken items not appearing until relog
+* Fixed friends list abilities not being applied to friends
+* Fixed objects failing to attach when selected from a distance
+* Fixed replies to offline IM-to-email messages
+* Fixed renaming a no-copy clothing item during Make New Outfit
+* Fixed rezzed objects appearing at (0,0,0) if you have create rights, but are not wearing your title
+* Fixed modify for gestures/notecards in a prim
+* Fixed incorrect context menus for items in an object
+* Fixed confirmation dialog when uploading immages, sounds, animations, or snapshots
+* Fixed a viewer crash while taking an object
+* Fixed a viewer crash after modifying a script inside a prim
+* Fixed a viewer crash in People search with Picks tab
+* Fixed a script runtime error (list inside a while/do-while loop)
+* Fixed login screen not loading unless cache is cleared
+* Fixed Ctrl-W not closing snapshot floater
+* Fixed Ctrl-W not giving focus to next window
+* Fixed Search->Places not showing public estate parcels while on private estate
+* Fixed LSL converting numbers in body of email to 0
+* Fixed rejection of avatars as sit targets
+* Fixed blurry web browser widgets with UI Scale != 1.0
+* Fixed notecards opened in tabbed windows extending outside the preview window
+* Fixed opening multiple object inventory items not using tabbed windows
+* Fixed accidental selection of highly transparent objects
+* Fixed keyboard focus after selecting function dropdown in script editor
+* Fixed Build button in toolbar disabled on land where 'Create Objects' is set to group, even when avatar is in the correct group
+* Fixed Buy Dialog displays incorrect Prim Count when using prim multipliers
+* Fixed folders not retaining their closed status once opened in inventory
+* Fixed IMs of type IM_BUSY_AUTO_RESPONSE ignore mute
+* Fixed World->Buy Land menu failures
+* Fixed Friends list not displaying online friends on login if 'Can see my online status' is disabled
+* Fixed menus remaining open when something else is clicked
+* Fixed menus taking focus when leaving alt-zoom
+* Fixed accidental loss of no-copy textures by applying them to a prim
+* Fixed members of a group cannot set their home location when land is only set to a group and not deeded
+* Fixed sitting avatar standing up when close are dragged onto the avatar
+Linux client fixes:
+* Added Linux embedded Mozilla client
+* Fixed Linux client crash on shutdown
+Release Notes for Second Life 1.13.3(58390) February 23, 2007
+Fixes:
+* Fix for HUD objects being invisible on attach
+* Fix for HUD objects not repositioning
+* Fix for attachments getting left behind
+* Fix for flexible objects not updating on modification.
+* Fix for slow scrolling textures and tiny prims being invisible.
+* Fix for not being able to  change viewer language in firstlook
+* Fix for Viewer crash when switching between full screen and windowes with multiple threads
+* Fix for additional texture bandwidth usage in First look
+* Fix for low detail terrain textures failing to load
+* Fix for picking through transparent objects. 
+* Fix for Lighting turning bright orange or red intermittantly in rendering pipeline focus preview. 
+* Fix for dismissing one blue dialogs dismisses all blue dialogs
+* Fix for Avatar not changing anmations while editing an attached object 
+* Fix for Object counts in About Land change when floater loses focus 
+* Fix for clicking a menu a second time not closing it
+* Fix for First Look viewer interacting poorly with Norton Antivirus (Note: Unless you tell Norton Anti Virus to exclude the Second Life cache directory, it will delay texture loading, but should no longer affect frame rate)
+* Fix for crash on 945G when editing objects.
+Release Notes for Second Life 1.13.3(58185) February 20, 2007
+Changes:
+* Fixed a texture prioritization bug
+* Sped up texture cache maintenance on startup
+Bug fixes:
+* Fixed accidental loss of no-copy texture when applied to a prim
+* Fixed incorrect context menu for items inside an object
+* Fixed Linux client crash on startup
+* Fixed Ctrl-W failing to give focus to the next window
+* Fixed renaming no-copy object during Make New Outfit
+* Fixed group members cannot set home when land is Set to group but not deeded
+* Lost and Found now has an Empty folder option
+Release Notes for Second Life 1.13.3(58100) February 16, 2007
+New feature:
+* Linux client features embedded Mozilla
+Changes:
+* Texture Pipeline Architecture
+** Significant redesign of texture pipeline
+** Improved texture caching
+** Unlimited texture cache size
+** Texture cache can be relocated
+* 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
+* Added display that shows intersection of prims with translation plane when building. 
+* Objects set for sale default to 'Buy Copy' instead of 'Buy Original'
+Bug fixes:
+* Fixed a viewer crash when taking an object
+* Fixed viewer not loading after logout if cache is not cleared
+* Closing window passes focus to the next window
+* Fixed blurry web browser widgets
+* Fixed notecards in tabbd window extending outside the preview window
+* Fixed web browser widgets blurred when UI scale != 1.0
+* Updated link to Help -> Scripting Wiki
+* Fixed viewer crash when opening a script at the same time as other inventory objects
+* Fixed Build not enabling for group members on land where only group members can build
+* Fixed World -> Buy Land menu failures
+* Fixed menus not closing when other things are clicked
+* Fixed objects rezed from Library, edited, and taken to inventory being placed in Library
+Release Notes for Second Life 1.13.3(58018) February 14, 2007
+Changes:
+* Removed particle throttling; while a performance win in some areas, caused too many bad artifacts
+Fixes:
+* VWR-108 Fix for out of bounds error in avatar vertex shader attribute array.
+* Fix for toggling selection beam
+* Fix for LOD issues with small objects.
+* Fix for planar guide grid swimming around in local grid mode.
+* Fxed Texture priorities when turning around in place
+Release Notes for Second Life 1.13.3(57947) February 13, 2007
+Changes:
+Significant changes to texture prioritization
+Fixes:
+Fix for object flicker.
+Fix for HUD objects not moving properly when viewer is resized.
+Fix for scale handles not updating on mouse drag.
+Fix for undo not working.
+Fix for dark foot shadows.
+Fix for tree picking alpha threshold too low.
+Fix for stars staying out during the day. 
+Release Notes for Second Life 1.13.3(57876) February 9, 2006
+Changes:
+Improved LOD and alpha sorting
+Improved edits reverting with linked objects
+Fixes:
+* Fixed a few crashes
+* 'Clear Cache' was failing if the cache location was on a changed
+* 'Clear Cache' was not deleting the texture cache on OSX
+* Some Textures were never caching correctly
+Release Notes for Second Life 1.13.3(57837) February 8, 2006
+Fixes:
+* Fixed a major issue with texture requests where textures that first appeard behind you were not getting requested until you moved closer or zoomed in on them
+* Fixed a bug where 'skip this message' settings were not being remembered
+* Fixed several particle bugs, including some OSX specifix ones
+* Fixed several crash bugs
+Release Notes for Second Life 1.13.3(57787) February 7, 2006
+Notes:
+* This release will clear the cache on startup to eliminate potentially corrupt caches
+Changes:
+* Reduced the frequency of drag-edit updates to reduce the likelihood of changes reverting due to missed updates
+Fixes:
+* Fixed a bug where small flexi objects were sometimes stuck floating around an avatar
+* Fixed a significant memory leak
+* Fixed some issues with the texture cache
+* Fixed a bug where textures that were partially mapped to objects were not rezing
+* Fixed several crash bugs
+* Wind volume slider now takes effect immediately
+Release Notes for Second Life 1.13.3(57679) February 5, 2006
+Fixes:
+* Fix: Animating textures (using llSetTextureAnim) do not update their pixel area
+* Fix for disappearing hud objects. 
+* Fix for yellow avatars on some ATI cards.
+* Fix for flexi LOD issues
+* Fix for stars visible with 'Force Sun'
+* Several crash bugs fixed
+Fixes not specific to 'First Look'
+* Fix for library objects returning to library after being taken from world
+* Added help button for partner info in profile panel
+* Added inventory cache verification to reduce bugs due to cache corruption
+Release Notes for Second Life 1.13.2(57573) February 1, 2006
+Fixes:
+* Fixed: Chat text fadeout bug
+* Fixed: Yellow fog in snapshots
+* Fixed: Hardware detection incorrect for ATI X1900 and other cards
+* Fixed: Several crash bugs
+* Fixed: Missing login screen
+* Fixed: Avatar preview in image update missing
+Release Notes for Second Life 1.13.2(57463) January 30, 2006
+Changes:
+* Cache location can be set by residents
+* Textures from last scene are pre fetched, improving loading speed of inital speed
+Fixes:
+* Fixed: Avatars seated on objects don't move with objects
+* Fixed: More issues with prim selection silhouettes
+* Fixed: HUDS with transparent textures disappear when camera goes underwater
+* Fixed: Slowdown rendering Alpha objects
+* Fixed: Client crashes attempting to move a HUD attachment 
+Release Notes for Second Life 1.13.2(57270) January 26, 2006
+Changes:
+Added display that shows intersection of prims with translation plane when building.
+Fixes:
+* Fixed crash when changing lighting detail.
+* Fixed silhouette highlight render bug.
+Release Notes for Second Life 1.13.2(57208) January 25, 2006
+Changes:
+* IMPORTANT: 'First Look' now maintains its own settings. When this version is installed, settings will all be set to default values.
+* IMPORTANT: Uninstalling 'First Look' will no longer remove any user settings
+* More optimizations
+* Stability improvements
+Fixes:
+* Fixed bright red/orange ambient lighting at night
+* Fixed right-clicking on avatar names
+* Fixed LOD flicker on trees
+* Fixed missing avatar from upload window
+* Fixed bug with HUD attachments not appearing or rezing at the correct resolution
+* Fixed bug wit llSetPos
+* Fixed prim selection silhouettes
+* Fixed white invisiprim bug
+* Fixed smoke texture bug
+* Fixed alpha sorting issues
+* Fixed Highlight Transparent
+Release Notes for Second Life 1.13.2(56900) January 18, 2006
+Changes:
+* More framerate improvements
+* Improved texture LOD calculation
+* 'Enable VBO' option now defaults to on in most cases, and no longer conflicts with similar trunk version option
+Fixes:
+* Appearance of other avatars not changing
+* Shiny Brightness and Darkness don't work
+* Shiny doesn't work on black objects
+* Textures are failing to load to 100% clarity when repeats per face is less than 1.00
+* Low res 'cutout' images not transparent
+Release Notes for Second Life 1.13.1(56671) January 11, 2006
+Changes:
+* Texture Pipeline Architecture
+** Significant redesign of texture pipeline
+** Improved texture caching
+** Unlimited texture cache size
+* 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
+** Better particle system limits
+>>>>>>> .merge-right.r83893
diff --git a/linden/indra/newview/secondlife setup build dazzle.bat b/linden/indra/newview/secondlife setup build dazzle.bat
new file mode 100644
index 0000000..f09f657
--- /dev/null
+++ b/linden/indra/newview/secondlife setup build dazzle.bat
@@ -0,0 +1,4 @@
+@rem Invoke the script which preps then runs the installer.
+@rem This batch file is customized per grid.
+@"secondlife setup build.bat" --channel="Second Life First Look Dazzle"
diff --git a/linden/indra/newview/skins/textures/textures.xml b/linden/indra/newview/skins/textures/textures.xml
index 785d944..6e7553f 100644
--- a/linden/indra/newview/skins/textures/textures.xml
+++ b/linden/indra/newview/skins/textures/textures.xml
@@ -1,458 +1,386 @@
-<textures version = "101">
+<textures version="101">
-        <closebox.tga value="47a8c844-cd2a-4b1a-be01-df8b1612fe5d"/>
+  <sm_rounded_corners_simple.tga>
-        <close_in_blue.tga value="e5821134-23c0-4bd0-af06-7fa95b9fb01a"/>
+        <scale_rect left="4" top="4" bottom="4" right="4"/>
-        <tearoffbox.tga value="74e1a96f-4833-a24d-a1bb-1bce1468b0e7"/>
+  </sm_rounded_corners_simple.tga>
-        <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"/>
-        <down_arrow.tga value="476353fe-70a2-d407-d0b7-94de812f6966"/>
-        <up_arrow.tga value="6880c510-5517-21f8-228c-47d5adcc682b"/>
-        <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 bar icons-->
-        <status_health.tga value="4330e8ce-b39b-1eb8-c2ec-a97c0b3947b5"/>
-        <status_no_fly.tga value="1e9ff1e7-814a-41fb-ad67-129bdb65987e"/>
-        <status_no_build.tga value="e8423f32-5901-4a5c-b5b0-9ec76b6e7b2c"/>
-        <status_no_scripts.tga value="c31bae59-425a-4697-9b38-66d22624ac01"/>
-        <status_buy_currency.tga value="f43a535a-59ac-26e3-84bc-c786735fabe4"/>1
-        <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"/>
-  <status_script_debug.tga value="7775b5cc-93a5-6efd-0d9b-4e079afac217"/>
-  <status_no_push.tga value="016189df-11d5-4531-bdd1-4c46268f4ab0"/>
-  <status_no_voice.tga value="16b0730f-1221-419c-9338-fc10c3edd93d"/>
-  <status_search.tga value="6846fb08-fe38-40be-b145-d8d7b2e1d0d8"/>
  
-  <icn_menubar-build-warn.tga value="2794164a-153d-4b91-8f74-550c05019037"/>
+  <icn_textfield_enabled.tga>
+        <scale_rect left="5" top="5" bottom="5" right="5"/>
+  </icn_textfield_enabled.tga>
+  <button_disabled_32x128.tga   preload="true">
+    <scale_rect left="8" top="16" right="120" bottom="8"/>
+  </button_disabled_32x128.tga>
+  <button_enabled_32x128.tga    preload="true">
+    <scale_rect left="8" top="16" right="120" bottom="8"/>
+  </button_enabled_32x128.tga>
+  <toolbar_btn_enabled.tga>
+        <scale_rect left="26" top="24" right="102" bottom="0" />
+                </toolbar_btn_enabled.tga>
-  <terrain_dirt.tga value="b8d3965a-ad78-bf43-699b-bff8eca6c975"/>
+  <progressbar_fill.tga preload="true">
-        <terrain_grass.tga value="abb783e6-3e93-26c0-248a-247666855da3"/>
+    <scale_rect left="4" top="7" right="71" bottom="7"/>
-        <terrain_mountain.tga value="179cdabd-398a-9b6b-1391-4dc333ba321f"/>
+    </progressbar_fill.tga>
-        <terrain_rock.tga value="beb169c7-11ea-fff2-efe5-0f24dc881df2"/>
+  <progressbar_track.tga        preload="true">
-        <terrain_dirt_detail.tga value="0bc58228-74a0-7e83-89bc-5c23464bcec5"/>
+    <scale_rect left="3" top="7" right="87" bottom="7"/>
-        <terrain_grass_detail.tga value="63338ede-0037-c4fd-855b-015d77112fc8"/>
+    </progressbar_track.tga>
-        <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"/>
+  <toolbar_btn_disabled.tga>
-        <square_btn_selected_32x128.tga value="c48c9e95-191b-96d3-08b2-6e8ada58b651"/>
+        <scale_rect left="26" top="24" right="102" bottom="0" />
-        <tree_pine_1.tga value="0187babf-6c0d-5891-ebed-4ecab1426683"/>
+                </toolbar_btn_disabled.tga>
-        <tree_oak.tga value="8a515889-eac9-fb55-8eba-d2dc09eb32c8"/>
+  <toolbar_btn_selected.tga>
-        <tree_tropical_1.tga value="5bc11cd6-2f40-071e-a8da-0903394204f9"/>
+        <scale_rect left="26" top="24" right="102" bottom="0" />
-        <tree_palm_1.tga value="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c"/>
+                </toolbar_btn_selected.tga>
-        <tree_dogwood.tga value="64367bd1-697e-b3e6-0b65-3f862a577366"/>
+  <button_enabled_selected_32x128.tga   preload="true">
-        <tree_tropical_2.tga value="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8"/>
+    <scale_rect left="12" top="12" right="118" bottom="14"/>
-        <tree_palm_2.tga value="2d784476-d0db-9979-0cff-9408745a7cf3"/>
+  </button_enabled_selected_32x128.tga>
-        <tree_cypress_1.tga value="fb2ae204-3fd1-df33-594f-c9f882830e66"/>
+  <checkbox_disabled_false.tga  preload="true"/>
-        <tree_cypress_2.tga value="30047cec-269d-408e-0c30-b2603b887268"/>
+  <checkbox_disabled_true.tga   preload="true"/>
-        <tree_pine_2.tga value="d691a01c-13b7-578d-57c0-5caef0b4e7e1"/>
+  <checkbox_enabled_false.tga   preload="true"/>
-        <tree_plumeria.tga value="6de37e4e-7029-61f5-54b8-f5e63f983f58"/>
+  <checkbox_enabled_true.tga    preload="true"/>
-        <winter_tree_aspen.tga value="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a"/>
+  <close_in_blue.tga    preload="true"/>
-        <winter_tree_pine_1.tga value="10d2a01a-0818-84b9-4b96-c2eb63256519"/>
+  <combobox_arrow.tga   preload="true"/>
-        <winter_tree_pine_2.tga value="67931331-0c02-4876-1255-28770896c6a2"/>
+  <minimize.tga preload="true"/>
-        <tree_eucalyptus.tga value="a6162133-724b-54df-a12f-51cd070ad6f3"/>
+  <minimize_pressed.tga preload="true"/>
-        <tree_fern.tga value="8872f2b8-31db-42d8-580a-b3e4a91262de"/>
+  <radio_active_false.tga       preload="true"/>
-        <tree_eelgrass.tga value="96b4de31-f4fa-337d-ec78-451e3609769e"/>
+  <radio_active_true.tga        preload="true"/>
-        <tree_sea_sword.tga value="5894e2e7-ab8d-edfa-e61c-18cf16854ba3"/>
+  <radio_inactive_false.tga     preload="true"/>
-        <tree_kelp_1.tga value="2caf1179-7861-6ff3-4b7d-46e17780bdfa"/>
+  <radio_inactive_true.tga      preload="true"/>
-        <tree_kelp_2.tga value="2a4880b6-b7a3-690a-2049-bfbe38eafb9f"/>
+  <resize_handle_bottom_right_blue.tga preload="true"/>
-        <tree_beach_grass_1.tga value="18fb888b-e8f1-dce7-7da7-321d651ea6b0"/>
+  <rounded_square.tga   preload="true">
-        <tool_dozer.tga value="d2a0d4d4-54eb-4d16-be4b-4eae43845c74"/>
+    <scale_rect left="8" top="16" right="120" bottom="8"/>
-        <tool_dozer_active.tga value="d4afdbbe-1550-4b7d-91de-95731f47e8e3"/>
+  </rounded_square.tga>
-        <tool_land.tga value="86fe4df4-0ecb-4382-b9ae-475925a92388"/>
+  <rounded_square_soft.tga      preload="true">
-        <tool_land_active.tga value="34e60587-0791-4a07-8918-f5995fcc22a3"/>
+    <scale_rect left="8" top="16" right="120" bottom="8"/>
-        <tool_zoom.tga value="27eb8829-fe65-45ed-a49a-73aac42f4b38"/>
+  </rounded_square_soft.tga>
-        <tool_zoom_active.tga value="69445f58-5c8e-44e0-9d2e-47408bb43b39"/>
+  <toolbar_tab.tga      preload="true">
-        <tool_orbit.tga value="06964fe4-033f-448a-95c9-30dc41d1be8b"/>
+    <scale_rect left="6" top="42" right="104" bottom="8"/>
-        <tool_orbit_active.tga value="ee4e07db-3f72-4098-bd4c-aef34515a7bc"/>
+  </toolbar_tab.tga>
-        <tool_pan.tga value="a32aa302-0a15-48d2-b2b1-4d69f1161173"/>
+  <toolbar_bg.tga       preload="true">
-        <tool_pan_active.tga value="24d9ad33-0b42-4eb5-99a3-659d838bc5c0"/>
+    <scale_rect left="6" top="42" right="96" bottom="16"/>
-        <inv_folder_texture.tga value="743f035b-a049-43f4-16c7-7ec8daa2c481"/>
+  </toolbar_bg.tga>
-        <inv_folder_sound.tga value="e10cb910-1e71-da47-bd12-8c53f7793714"/>
+  <scrollbutton_down_in_blue.tga        preload="true"/>
-        <inv_folder_callingcard.tga value="a3735971-e2b2-d78a-580d-d265cd8f2484"/>
+  <scrollbutton_down_out_blue.tga       preload="true"/>
-        <inv_folder_landmark.tga value="9f921155-7c8c-e276-d5ec-03ac9340584d"/>
+  <scrollbutton_left_in_blue.tga        preload="true"/>
-        <inv_folder_script.tga value="baa5c310-6a6d-cc48-51eb-65196ba31d77"/>
+  <scrollbutton_left_out_blue.tga       preload="true"/>
-        <inv_folder_object.tga value="113e5133-fd0d-ee51-4a59-9d67ca10e8a7"/>
+  <scrollbutton_right_in_blue.tga       preload="true"/>
-        <inv_folder_notecard.tga value="a9e75d84-5073-9cb7-10a9-1ca68ef5c7ba"/>
+  <scrollbutton_right_out_blue.tga      preload="true"/>
-        <inv_folder_clothing.tga value="f1427d3d-b2e8-97c4-69ab-1f36d4c0e8f0"/>
+  <scrollbutton_up_in_blue.tga  preload="true"/>
-        <inv_folder_bodypart.tga value="1fe05580-1d2f-0345-b28b-52b6e3a20e5d"/>
+  <scrollbutton_up_out_blue.tga preload="true"/>
-        <inv_folder_trash.tga value="88ad072e-ea0b-aabd-5ac0-b37862a6eb66"/>
+  <spin_down_in_blue.tga        preload="true"/>
-        <inv_folder_plain_closed.tga value="86f00960-c3e9-9680-145d-3beffd743e9c"/>
+  <spin_down_out_blue.tga       preload="true"/>
-        <inv_folder_plain_open.tga value="d15dc243-2d0b-47af-0ce1-ec376464bdc8"/>
+  <spin_up_in_blue.tga  preload="true"/>
-        <inv_folder_snapshot.tga value="6efe85e7-800f-1843-296c-a5b7adffe091"/>
+  <spin_up_out_blue.tga preload="true"/>
-        <inv_folder_lostandfound.tga value="9a371a04-297d-bacf-0d16-5f49753efe1d"/>
+  <square_btn_32x128.tga        preload="true">
-        <inv_folder_animation.tga value="4d59b3ee-f29d-b912-2bcc-9bb1f8a07ec6"/>
+    <scale_rect left="8" top="10" right="120" bottom="10"/>
-        <inv_folder_gesture.tga value="4de9129a-9fc1-d759-d739-364293906ba2"/>
+  </square_btn_32x128.tga>
-        <inv_item_texture.tga value="19f452d7-4eee-9f46-76cc-5497d17f1dd9"/>
+  <square_btn_selected_32x128.tga       preload="true">
-        <inv_item_sound.tga value="eb414d69-c77d-d4e7-66e6-6c2e6f6c1976"/>
+    <scale_rect left="2" top="10" right="126" bottom="10"/>
-        <inv_item_callingcard_online.tga value="672cc53e-8dc0-ba91-2a4e-574104cf071c"/>
+  </square_btn_selected_32x128.tga>
-        <inv_item_callingcard_offline.tga value="d0afe86b-2489-7600-55b7-6abb0a63d9f9"/>
+  <tab_bottom_blue.tga  preload="true">
-        <inv_item_landmark.tga value="bf25a2a0-85da-7fa0-0993-e461768d0221"/>
+    <scale_rect left="8" top="8" right="120" bottom="9"/>
-        <inv_item_landmark_visited.tga value="229fac85-5428-4ab7-adeb-eb8389e91092"/>
+  </tab_bottom_blue.tga>
-        <inv_item_script.tga value="59a3df81-ed76-06c9-7264-6dada535e7a3"/>
+  <tab_bottom_selected_blue.tga preload="true">
-        <inv_item_clothing.tga value="34dfe476-8e26-0e3a-11cf-76cc4a7126ce"/>
+    <scale_rect left="8" top="8" right="96" bottom="9"/>
-        <inv_item_object.tga value="0f0780a0-89c4-742a-ef28-26405a41cf85"/>
+  </tab_bottom_selected_blue.tga>
-        <inv_item_object_multi.tga value="75ce8027-e029-4e24-b3f4-21b0dff52632"/>
+  <tab_left.tga preload="true">
-        <inv_item_notecard.tga value="23ce8a2c-9ea2-d863-6572-806f0645b0c7"/>
+    <scale_rect left="8" top="8" right="120" bottom="9"/>
-        <inv_item_bodypart.tga value="d2a5362d-5c55-57dd-a9e9-5c814d1ddc16"/>
+  </tab_left.tga>
-        <inv_item_attach.tga value="5bcae41e-aa5d-02f8-edf1-605ebdd875ab"/>
+  <tab_left_selected.tga        preload="true">
-        <inv_item_snapshot.tga value="3810d584-b092-7caa-57e0-010f192b9659"/>
+    <scale_rect left="8" top="8" right="96" bottom="9"/>
-        <inv_item_eyes.tga value="eaa5fd96-5c25-06ef-2280-7ef20203e167"/>
+  </tab_left_selected.tga>
-        <inv_item_gloves.tga value="117b11cb-c04e-5081-13da-1a8846070fd0"/>
+  <tab_top_blue.tga     preload="true">
-        <inv_item_hair.tga value="6bca3bf4-ed6d-d438-63a0-2a7066d03a0b"/>
+    <scale_rect left="8" top="8" right="120" bottom="9"/>
-        <inv_item_jacket.tga value="8df59386-56e0-c811-0443-840da3acb3a5"/>
+  </tab_top_blue.tga>
-        <inv_item_pants.tga value="a87a58ca-f857-63b1-0acf-072711ed1bdb"/>
+  <tab_top_selected_blue.tga preload="true">
-        <inv_item_shape.tga value="4463e433-4db5-79ef-c1b0-4821b03ddb07"/>
+    <scale_rect left="8" top="8" right="96" bottom="9"/>
-        <inv_item_shirt.tga value="e2ffb62b-6abc-22d6-952d-764759b4d636"/>
+  </tab_top_selected_blue.tga>
-        <inv_item_shoes.tga value="cf384fa5-1edd-c37c-2134-283dd4fe3396"/>
+  <startup_logo.j2c preload="true"/>
-        <inv_item_skirt.tga value="0b43f826-2abc-2944-7d72-10777a51d19b"/>
+  <color_swatch_alpha.tga preload="true"/>
-        <inv_item_socks.tga value="22137c6d-6ec5-6eee-9a2e-2d7a9e6cbcd4"/>
-        <inv_item_underpants.tga value="2f15dc09-4385-526c-aa5d-d9d516ec7d99"/>
+  <active_voice_tab.tga/>
-        <inv_item_undershirt.tga value="f72ab629-a3ab-de0c-35c0-5285e27478ce"/>
+  <button_anim_pause.tga/>
-        <inv_item_animation.tga value="b5cda0d6-d196-ce48-63db-d04323ef8931"/>
+  <button_anim_pause_selected.tga/>
-        <inv_item_gesture.tga value="5579245d-d5bf-5f13-46b0-8624490de24c"/>
+  <button_anim_play.tga/>
-        <pixiesmall.tga value="168e6813-096e-07ea-97ae-fd416826f627"/>
+  <button_anim_play_selected.tga/>
-        <legend.tga value="ca7609c6-6ec6-32d9-332e-0d8f437ef644"/>
+  <button_anim_stop.tga/>
-        <propertyline.tga value="e3548c46-8d5e-03da-fcab-4fc36ad818bb"/>
+  <button_anim_stop_selected.tga/>
-        <startup_logo.tga value="66864f3c-e095-d9c8-058d-d6575e6ed1b8"/>
+  <crosshairs.tga/>
-        <grass_texture_1.tga value="79504bf5-c3ec-0763-6563-d843de66d0a1"/>
+  <direction_arrow.tga/>
-        <grass_texture_2.tga value="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"/>
+  <foot_shadow.j2c use_mips="true"/>
-        <grass_texture_3.tga value="99bd60a2-3250-efc9-2e39-2fbcadefbecc"/>
-        <grass_texture_4.tga value="7a2b3a4a-53c2-53ac-5716-aac7d743c020"/>
+  <icon_auction.tga/>
-        <undergrowth_1.tga value="8f458549-173b-23ff-d4ff-bfaa5ea2371b"/>
+  <icon_avatar_offline.tga/>
-        <silhouette.tga value="da5d4079-7819-6b53-d2a4-dc9929381d7d"/>
+  <icon_avatar_online.tga/>
-        <avatar_thumb_bkgrnd.tga value="3a7f4f0d-be14-ee78-29e3-fc8b0b2a68d3"/>
+  <icon_day_cycle.tga/>
-        <missing_asset.tga value="32dfd1c8-7ff6-5909-d983-6d4adfb4255d"/>
+  <icon_diurnal.tga/>
-        <alpha_gradient.tga value="e97cf410-8e61-7005-ec06-629eba4cd1fb"/>
+  <icon_event.tga/>
-        <alpha_gradient_2d.tga value="38b86f85-2575-52a9-a531-23108d8da837"/>
+  <icon_event_mature.tga/>
-        <alpha_noise.tga value="b9e1cf8a-9660-c020-0c69-18f1ea27268a"/>
+  <icon_for_sale.tga/>
-        <alpha_sizzle.tga value="e121e2fc-7573-740f-edfd-0d45a9ba486e"/>
+  <icon_group.tga/>
-        <bump_woodgrain.tga value="058c75c0-a0d5-f2f8-43f3-e9699a89c2fc"/>
+  <icon_groupnotice.tga/>
-        <bump_bark.tga value="6c9fa78a-1c69-2168-325b-3e03ffa348ce"/>
+  <icon_groupnoticeinventory.tga/>
-        <bump_bricks.tga value="b8eed5f0-64b7-6e12-b67f-43fa8e773440"/>
+  <icon_lock.tga/>
-        <bump_checker.tga value="9deab416-9c63-78d6-d558-9a156f12044c"/>
+  <icon_place.tga/>
-        <bump_concrete.tga value="db9d39ec-a896-c287-1ced-64566217021e"/>
+  <icon_popular.tga/>
-        <bump_crustytile.tga value="f2d7b6f6-4200-1e9a-fd5b-96459e950f94"/>
+  <icon_top_pick.tga/>
-        <bump_cutstone.tga value="d9258671-868f-7511-c321-7baef9e948a4"/>
-        <bump_discs.tga value="d21e44ca-ff1c-a96e-b2ef-c0753426b7d9"/>
+  <inv_folder_animation.tga/>
-        <bump_gravel.tga value="4726f13e-bd07-f2fb-feb0-bfa2ac58ab61"/>
+  <inv_folder_bodypart.tga/>
-        <bump_petridish.tga value="e569711a-27c2-aad4-9246-0c910239a179"/>
+  <inv_folder_callingcard.tga/>
-        <bump_siding.tga value="073c9723-540c-5449-cdd4-0e87fdc159e3"/>
+  <inv_folder_clothing.tga/>
-        <bump_stonetile.tga value="ae874d1a-93ef-54fb-5fd3-eb0cb156afc0"/>
+  <inv_folder_gesture.tga/>
-        <bump_stucco.tga value="92e66e00-f56f-598a-7997-048aa64cde18"/>
+  <inv_folder_landmark.tga/>
-        <bump_suction.tga value="83b77fc6-10b4-63ec-4de7-f40629f238c5"/>
+  <inv_folder_lostandfound.tga/>
-        <bump_weave.tga value="735198cf-6ea0-2550-e222-21d3c6a341ae"/>
+  <inv_folder_notecard.tga/>
-        <icon_avatar_online.tga value="529ed15b-3d41-dcc1-79de-90bf21770b5b"/>
+  <inv_folder_object.tga/>
-        <icon_avatar_offline.tga value="34648c67-5bfb-5790-e05e-8bd6600fd087"/>
+  <inv_folder_plain_closed.tga/>
-        <icon_event.tga value="be235ae0-53cf-1d68-b3ae-cf375ed1fb58"/>
+  <inv_folder_script.tga/>
-        <icon_event_mature.tga value="cc090999-1b3e-2e97-7a38-c9f4afd10297"/>
+  <inv_folder_snapshot.tga/>
-        <icon_group.tga value="04237108-a879-5a95-9b0c-b18fd09bc447"/>
+  <inv_folder_sound.tga/>
-        <icon_place.tga value="ba0bac4e-815e-14e1-2895-5065b8c703b3"/>
+  <inv_folder_texture.tga/>
-        <icon_top_pick.tga value="77ca91a2-4431-aeaf-6249-3dd99c7dd86d"/>
+  <inv_folder_trash.tga/>
-        <icon_popular.tga value="bdd47da5-5b5b-c906-37ad-16aaa64f096f"/>
+  <inv_item_animation.tga/>
-        <icon_for_sale.tga value="f20728fd-1670-3771-2293-e0dd3f0bcaab"/>
+  <inv_item_skin.tga/>
-        <icon_auction.tga value="96abf5b1-335c-6b76-61e3-74ada07f3cb8"/>
+  <inv_item_callingcard_offline.tga/>
-        <icon_land_for_landless.tga value="c421ddf2-b9d7-b373-503c-f4c423f37f1c"/>
+  <inv_item_callingcard_online.tga/>
-        <icon_day_cycle.tga value="5b30a285-f1e3-92b1-dcd3-0d07366ced3e"/>
+  <inv_item_eyes.tga/>
-        <icon_lock.tga value="9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4"/>
+  <inv_item_gesture.tga/>
-        <icon_diurnal.tga value="6002a571-549c-472c-9443-9ab35b1a55ed"/>
+  <inv_item_gloves.tga/>
-        <noentrylines.tga value="5d3e196b-fd4d-ada7-e4c1-99f8e9f1cfbf"/>
+  <inv_item_hair.tga/>
-        <noentrypasslines.tga value="ac8f8627-6a30-8da8-d4bd-958668eea7a0"/>
+  <inv_item_jacket.tga/>
-        <notify_tip_icon.tga value="74ba3584-58ea-9984-5b76-62d37942ab77"/>
+  <inv_item_landmark.tga/>
-        <notify_box_icon.tga value="b2ef2d31-9714-a07b-6ca7-31638166364b"/>
+  <inv_item_landmark_visited.tga/>
-        <notify_next.tga value="07d0ea4c-af0c-aad1-dbbf-c24020ff2b80"/>
+  <inv_item_notecard.tga/>
-        <notify_caution_icon.tga value="3a22ac15-39ac-409c-acec-b08b1b6b689b"/>
+  <inv_item_object.tga/>
-        <map_avatar_you_8.tga value="02fbdc40-5e07-a6e1-228b-58e10f8335b7"/>
+  <inv_item_object_multi.tga/>
-        <map_avatar_8.tga value="0be58a91-8065-c02b-7a12-2cc14dddbc37"/>
+  <inv_item_pants.tga/>
-        <map_avatar_16.tga value="db0dadd5-026a-88cf-f5c1-523a0a2daa3e"/>
+  <inv_item_script.tga/>
-        <map_avatar_above_8.tga value="a3097b85-8b24-4545-9593-9525720150b2"/>
+  <inv_item_shape.tga/>
-        <map_avatar_below_8.tga value="a450f6d5-9a17-4907-aec5-41f60407cba1"/>
+  <inv_item_shirt.tga/>
-        <map_telehub.tga value="bf1b2bb0-13b1-40ae-3354-b1b93761bdb4"/>
+  <inv_item_shoes.tga/>
-        <map_infohub.tga value="85b1a79a-7f6c-9df3-4d6c-17b1a4efb55a"/>
+  <inv_item_skirt.tga/>
-        <map_home.tga value="ae9b8f5f-03a1-2e71-db77-6eb27a1ba181"/>
+  <inv_item_snapshot.tga/>
-        <map_event.tga value="6008be5e-9267-2a3a-9798-e81b076c22ca"/>
+  <inv_item_socks.tga/>
-        <map_event_mature.tga value="f9cdba28-a227-d613-2f16-ce06209314ae"/>
+  <inv_item_sound.tga/>
-        <map_track_8.tga value="bfdc7bf6-e2ee-1754-f4df-cc25887714ad"/>
+  <inv_item_texture.tga/>
-        <map_track_16.tga value="a3878395-ef00-a0e6-ee9a-f45ed6b9ce59"/>
+  <inv_item_underpants.tga/>
-        <object_cone.tga value="c2b8c90a-7dca-26e3-1a63-7aa4a0389cf9"/>
+  <inv_item_undershirt.tga/>
-        <object_cone_active.tga value="cf69c64b-f19e-e1f3-a586-42fef31a23be"/>
+  <lag_status_critical.tga/>
-        <object_cube.tga value="70c747ac-1de3-a8b9-514d-101753ca6ccb"/>
+  <lag_status_good.tga/>
-        <object_cube_active.tga value="f9c5e213-1076-7a7d-7889-52388aad2c1a"/>
+  <lag_status_warning.tga/>
-        <object_cylinder.tga value="13e35d95-5f6c-9a91-1766-49dedf9b1267"/>
+  <legend.tga/>
-        <object_cylinder_active.tga value="3f3e4932-8412-e2a7-cfe9-92caf5978b1b"/>
+  <map_avatar_16.tga/>
-        <object_grass.tga value="7ca8e672-920b-4653-3970-1abc91abef58"/>
+  <map_avatar_8.tga/>
-        <object_grass_active.tga value="d0fc7cc9-646a-6860-cf7c-1d9e58cd6dab"/>
+  <map_avatar_you_8.tga/>
-        <object_hemi_cone.tga value="69d5e60c-739a-40b1-b526-84072121e394"/>
+  <map_event.tga/>
-        <object_hemi_cone_active.tga value="2e0c5435-95bb-1c0d-5da1-42336fb1cfc0"/>
+  <map_event_mature.tga/>
-        <object_hemi_cylinder.tga value="f4be3e06-24a8-f86e-acc7-7daefc0572b7"/>
+  <map_home.tga/>
-        <object_hemi_cylinder_active.tga value="67279486-cfc1-3633-de42-85db65db373c"/>
+  <map_infohub.tga/>
-        <object_hemi_sphere.tga value="b67251ab-1716-b9fb-f911-967ba3fe027b"/>
+  <map_telehub.tga/>
-        <object_hemi_sphere_active.tga value="6c489466-3058-6475-6b1b-e5fc1d49f1f3"/>
+  <map_track_16.tga/>
-        <object_pyramid.tga value="9dde8b56-2cc4-a932-b63a-38c3a83221ad"/>
+  <media_icon.tga file_name="icn_label_media.tga" />
-        <object_pyramid_active.tga value="e7217b1a-e3d8-e339-d28a-d7714d0b5bee"/>
+  <music_icon.tga file_name="icn_lable_music.tga" />
-        <object_sphere.tga value="7fa122c0-b994-460e-8636-cdc451d67268"/>
+  <noentrylines.j2c use_mips="true"/>
-        <object_sphere_active.tga value="f2c3bcbc-2904-41a5-1c22-688f176fd1ee"/>
+  <noentrypasslines.j2c use_mips="true"/>
-        <object_tetrahedron.tga value="e17db404-9fc5-9534-1038-777c82b2771f"/>
+  <notify_tip_icon.tga/>
-        <object_tetrahedron_active.tga value="2792ea3b-c052-85fe-d168-a62b2f4e9d7c"/>
+  <notify_caution_icon.tga/>
-        <object_tree.tga value="710d1bec-fb33-28f1-e77e-ddbb5b51f5ed"/>
+  <notify_box_icon.tga/>
-        <object_tree_active.tga value="da4835c7-b12a-41dd-11db-dae452f040c2"/>
+  <object_cone.tga/>
-        <object_prism.tga value="02935f3a-dcda-3b42-1874-da89d4c12870"/>
+  <object_cone_active.tga/>
-        <object_prism_active.tga value="223aac97-bd2f-ec2e-ad45-5641b77c78f9"/>
+  <object_cube.tga/>
-        <object_torus.tga value="19e1f4c9-6aa6-4414-981d-59a1343a6472"/>
+  <object_cube_active.tga/>
-        <object_torus_active.tga value="ef2bca77-5004-4547-b00a-3b96e463f89f"/>
+  <object_cylinder.tga/>
-        <object_tube.tga value="7ce81316-a478-480f-961c-435fcbdecaf0"/>
+  <object_cylinder_active.tga/>
-        <object_tube_active.tga value="55c3e4d1-cfdc-48a8-af32-a34844b91832"/>
+  <object_grass.tga/>
-        <object_ring_active.tga value="2c955a73-fa31-237b-a4a1-5c8ede3bae50"/>
+  <object_grass_active.tga/>
-        <object_ring.tga value="a7610e41-4647-16d8-0e0e-85a1211c1596"/>
+  <object_hemi_cone.tga/>
-        <container_animation.tga value="c4e657a1-4c86-0159-2da0-32ff948484e6"/>
+  <object_hemi_cone_active.tga/>
-        <container_bodypart.tga value="770cb2df-758d-34d5-36c7-e3de06db5b5d"/>
+  <object_hemi_cylinder.tga/>
-        <container_clothing.tga value="dd90406f-4c8f-a3f9-41df-d562f94f09e0"/>
+  <object_hemi_cylinder_active.tga/>
-        <container_gesture.tga value="59cd31c0-2791-3c48-f740-f0a36c68653e"/>
+  <object_hemi_sphere.tga/>
-        <container_landmark.tga value="24c63386-04f7-ce6f-4ff2-dfb215d2e21f"/>
+  <object_hemi_sphere_active.tga/>
-        <container_many_things.tga value="849d3292-d9fa-7186-5465-dd7b5fc1ec48"/>
+  <object_prism.tga/>
-        <container_object.tga value="ad887ae1-2bee-f2c9-6786-5599de3c95c4"/>
+  <object_prism_active.tga/>
-        <container_script.tga value="b93bd494-c4bd-bcdf-4a59-35a9497d03f3"/>
+  <object_pyramid.tga/>
-        <container_sound.tga value="5ddea031-cfa3-2776-43e3-c7146c1b4cd6"/>
+  <object_pyramid_active.tga/>
-        <container_texture.tga value="b3f95caf-bd62-bef3-0ded-dea752920629"/>
+  <object_ring.tga/>
-        <fringe.tga value="8ac54e9d-ec09-d804-60ab-47404a9b4a36"/>
+  <object_ring_active.tga/>
-        <foot_shadow.tga value="14e8a47d-1055-0a68-5d55-eafd9ad3da5b"/>
+  <object_sphere.tga/>
-        <img_smoke_poof.tga value="c734da52-f2ba-f0ba-d59e-15ea49f3d5e9"/>
+  <object_sphere_active.tga/>
-        <img_shot.tga value="173b05c7-53a9-4cf8-ce6b-5eec21c5c63f"/>
+  <object_tetrahedron.tga/>
-        <folder_arrow.tga value="09a324a8-acc1-d9cd-2cbd-7465d90d3a98"/>
+  <object_tetrahedron_active.tga/>
-        <color_swatch_alpha.tga value="f13db22f-c55c-8bdf-7b1c-221e56fde253"/>
+  <object_torus.tga/>
-        <script_error.tga value="e5a0ec29-f59e-d29e-2c59-ed66c187c26c"/>
+  <object_torus_active.tga/>
-        <water_normal.tga value="822ded49-9a6c-f61c-cb89-6df54f42cdf4"/>
+  <object_tree.tga/>
-        <icon_groupnotice.tga value="21579c81-a85e-f11c-2d80-33a4c007d88c"/>
+  <object_tree_active.tga/>
-        <icon_groupnoticeinventory.tga value="8fcca699-08e7-3d58-2f05-86c9d52bbe82"/>
+  <object_tube.tga/>
-        <tab_background_lightgrey.tga value="c769e547-c307-43ca-2b6a-51cad6d1c527"/>
+  <object_tube_active.tga/>
-        <tab_background_purple.tga value="0ae8a2e9-aff4-249c-fc4a-0f41f89847dd"/>
+  <pixiesmall.j2c use_mips="true"/>
-        <tab_background_darkpurple.tga value="38ff4f7e-3078-a749-8302-d6cc94b404c4"/>
+  <script_error.j2c use_mips="true"/>
-        <smicon_warn.tga value="f47c17a3-8bfb-3c9f-22b8-77923de7eed9"/>
+  <silhouette.j2c use_mips="true"/>
-        <uv_test1.tga value="f43b75f5-9aa5-18ec-d5d9-e6d1b8442613"/>
+  <status_no_build.tga/>
-        <uv_test2.tga value="300ce95f-3d3f-7c1a-3a22-3fc48f873fb9"/>
+  <status_voice.tga/>
-        <eye_button_active.tga value="2b42b375-f9b4-788e-46c7-7ef38762d0ba"/>
+  <status_buy_currency.tga/>
-        <eye_button_inactive.tga value="be1b7225-98b5-eb2a-2c86-ddaae3328a6e"/>
+  <status_buy_currency_pressed.tga/>
-        <account_id_blue.tga value="6ab9179a-7308-58db-6c9d-893d3b52bece"/>
+  <status_buy_land.tga/>
-        <account_id_orange.tga value="fbe89371-1251-4e77-d2d8-8eeccffe3ca8"/>
+  <status_buy_land_pressed.tga/>
-        <account_id_green.tga value="3bf64d5a-38d3-b752-cf52-3d9f8fca353a"/>
+  <status_no_fly.tga/>
-        <ff_visible_online.tga value="d609a41f-34c0-7aae-b2c6-2fc3ab26d916"/>
+  <status_health.tga/>
-        <ff_visible_map.tga value="20b52706-c1ab-414a-9dea-1cb788ad5689"/>
+  <status_no_push.tga/>
-        <ff_edit_mine.tga value="1baee0b9-4b89-39eb-8815-866d82300ab5"/>
+  <status_no_scripts.tga/>
-        <ff_edit_theirs.tga value="32e981cd-4700-da5a-7fc7-d573ec3742f4"/>
+  <tool_dozer.tga/>
-        <inv_item_script_dangerous.tga value="0b502db8-6fcd-c442-ecfe-483a0dce875e"/>
+  <tool_dozer_active.tga/>
-        <ff_visible_map_button.tga value="c1079bef-5cf9-90f3-6dcd-48989851c252"/>
+  <tool_zoom.tga/>
-        <ff_visible_online_button.tga value="36749b47-93d6-2c5e-7ebd-d38d30311163"/>
+  <tool_zoom_active.tga/>
-        <ff_edit_theirs_button.tga value="ca229f65-d7e0-133e-1bc2-674abc33f3d5"/>
+  <icn_active-speakers-dot-lvl0.tga/>
-        <ff_edit_mine_button.tga value="57f05b46-63d8-c3d5-66d6-8b915746b956"/>
+  <icn_active-speakers-dot-lvl1.tga/>
-        <ff_online_status_button.tga value="3b1b6a53-9c8c-568a-22c5-2a8f3e5286f5"/>
+  <icn_active-speakers-dot-lvl2.tga/>
-        <ptt_lock_on.tga value="e0c447a5-87dd-4778-bedb-0ccab01fe078"/>
+  <icn_active-speakers-typing1.tga/>
-        <ptt_lock_off.tga value="1de17e87-b392-4a7d-80d1-852e1e518ff0"/>
+  <icn_active-speakers-typing2.tga/>
-        <oi_hud_cen_0_0.tga value="3c650257-9caf-7cad-b26c-84c9eca560f1"/>
+  <icn_active-speakers-typing3.tga/>
-        <oi_hud_intro.tga value="7611fb3d-9ff2-abd3-d98f-805c1c87e757"/>
+  <icn_voice_ptt-off.tga/>
-        <oi_hud_underwater.tga value="cde61aea-83c2-3001-d598-6b348f7a8e0b"/>
+  <icn_voice_ptt-on.tga/>
-        <oi_hud_got_passport.tga value="1271838d-d777-b811-7c4c-2a00308bd80a"/>
+  <icn_voice_ptt-on-lvl1.tga/>
-        <oi_hud_texture_off_edge.tga value="852be205-b1ea-6356-58c8-8c5ee5a841a6"/>
+  <icn_voice_ptt-on-lvl2.tga/>
-        <oi_hud_texture_on_edge.tga value="ab11e6ff-a732-be70-67df-c43131274562"/>
+  <icn_voice_ptt-on-lvl3.tga/>
-        <oi_hud_flyingabovewater.tga value="c9d150d6-2739-5f8b-cce6-3cf98242920a"/>
+  <icn_voice-call-end.tga/>
-        <oi_hud_walkingabovewater.tga value="78284eeb-05f3-ff25-11a0-3cc9dbb30f0c"/>
+  <icn_voice-call-start.tga/>
-        <oi_hud_landmark.tga value="6cd9c221-9d42-a283-256b-09a113a87271"/>
+  <mute_icon.tga/>
-        <oi_hud_cus_5_3.tga value="7c12f4fb-f502-26d1-a2f3-cdb6aff61663"/>
+  <icn_slide-groove_dark.tga>
-        <oi_hud_cus_5_2.tga value="c52c9c94-adc0-0f4e-6658-ed33d6ea8829"/>
+    <scale_rect left="2" top="5" right="29" bottom="4"/>
-        <oi_hud_cus_5_1.tga value="9f6d5d11-6ca9-608c-e8a6-b77989350292"/>
+  </icn_slide-groove_dark.tga>
-        <oi_hud_cus_5_0.tga value="2000cff1-119f-2023-66c0-ac5630d2f96e"/>
+  <icn_slide-highlight.tga>
-        <oi_hud_cus_4_5.tga value="f302a935-ccd1-e2f5-3a38-e185cc262f3a"/>
+    <scale_rect left="2" top="5" right="29" bottom="4"/>
-        <oi_hud_cus_4_3.tga value="af8d5b3c-b40f-cea5-b0b2-440fbd84a11a"/>
+  </icn_slide-highlight.tga>
-        <oi_hud_cus_4_2.tga value="11b26901-8207-12bc-5224-10a12ac4c651"/>
+  <icn_slide-thumb_dark.tga>
-        <oi_hud_cus_4_1.tga value="41baadb7-1b94-907e-9443-54e92bba77cd"/>
+    <scale_rect left="2" top="5" right="29" bottom="4"/>
-        <oi_hud_cus_4_0.tga value="9d627f8e-092c-5d32-6c12-ef76ab81cedc"/>
+  </icn_slide-thumb_dark.tga>
-        <oi_hud_cus_3_4.tga value="b196486e-d0d2-4fd7-529a-c84b4495fc74"/>
+  <icn_speaker-muted_dark.tga/>
-        <oi_hud_cus_3_2.tga value="0b81c4bb-de33-e493-7bcb-e7221d97e5e7"/>
+  <icn_speaker_dark.tga/>
-        <oi_hud_cus_3_1.tga value="436dab74-25ae-8b60-c648-50663b7faa1d"/>
+  <icn_voice-localchat.tga/>
-        <oi_hud_cus_3_0.tga value="6c1594de-1e66-273c-a2ab-8f0ffa8b4633"/>
+  <icn_voice-groupfocus.tga/>
-        <oi_hud_cus_2_4.tga value="bb31fe48-8566-eec0-e96b-64025f832b63"/>
+  <icn_voice-pvtfocus.tga/>
-        <oi_hud_cus_2_2.tga value="c946959a-26ae-eb66-efa0-20154057789d"/>
+  <icn_media-pause.tga/>
-        <oi_hud_cus_2_1.tga value="c946959a-26ae-eb66-efa0-20154057789d"/>
+  <icn_media-play.tga/>
-        <oi_hud_cus_2_0.tga value="d7833106-b4a8-7666-bde1-64886de289f9"/>
+  <icn_music-play.tga/>
-        <oi_hud_cus_1_0.tga value="811ded22-5940-940c-4821-6fbbfb6611d6"/>
+  <icn_music-pause.tga/>
-        <oi_hud_cus_1_1.tga value="eda8513b-a343-5109-1fd6-f1c7ad89b703"/>
+  <icn_media_web.tga preload="true"/>
-        <oi_hud_cus_1_2.tga value="7a4ce18c-e715-34d4-dfee-704c270a8ac8"/>
+  <icn_media_movie.tga preload="true"/>
-        <oi_hud_cus_1_4.tga value="d3771c15-ac03-b762-b992-d9fd2fedf38a"/>
+  <icn_chatbar.tga/>
-        <oi_hud_com_4_4.tga value="d9e1e90d-3cc3-6269-128e-67f7a2b32d26"/>
+  <btn_chatbar.tga>
-        <oi_hud_com_4_2.tga value="0f649a26-6fdb-c73b-ffac-e50fc311d5ce"/>
+    <scale_rect left="16" top="24" right="48" bottom="0"/>
-        <oi_hud_com_4_1.tga value="ae5b1ce6-a2d2-22d2-f532-6280b3bc6adb"/>
+  </btn_chatbar.tga>
-        <oi_hud_com_4_0.tga value="12cda3a0-58c7-dfa8-7f9b-380e5bb8baf9"/>
+  <btn_chatbar_selected.tga>
-        <oi_hud_com_3_4.tga value="ff326257-0530-356a-e0f8-be535044e540"/>
+    <scale_rect left="16" top="24" right="48" bottom="0"/>
-        <oi_hud_com_3_2.tga value="66740ddb-1d56-89f9-f0c9-ae5eb7bb9537"/>
+  </btn_chatbar_selected.tga>
-        <oi_hud_com_3_1.tga value="55d662f4-6a28-6388-7c75-af1c9fd33055"/>
+  <icn_rounded-text-field.tga/>
-        <oi_hud_com_3_0.tga value="de9d318f-b69e-82f9-0c61-43b868c5ca6b"/>
-        <oi_hud_com_2_4.tga value="01d47e68-400a-d0e1-afb7-d6806d1d477e"/>
+  <flyout_btn_right_selected.tga>
-        <oi_hud_com_2_0.tga value="09c98850-27d4-6a12-abae-4af4bba23b6b"/>
+    <scale_rect left="6" top="12" right="26" bottom="12"/>
-        <oi_hud_com_1_3.tga value="5c2049b9-f797-6608-ca71-758f3716aa90"/>
+  </flyout_btn_right_selected.tga>
-        <oi_hud_com_1_1.tga value="1116ff68-cdc4-1cfc-e137-30f8426afeda"/>
+  <flyout_btn_right.tga>
-        <oi_hud_com_1_0.tga value="bd847d31-f5af-95f7-2b9c-af47d8ba53bd"/>
+    <scale_rect left="6" top="12" right="26" bottom="12"/>
-        <oi_hud_nav_4_5.tga value="66194280-b087-db94-35d9-41e8f7518515"/>
+  </flyout_btn_right.tga>
-        <oi_hud_nav_4_4.tga value="180c4241-e309-4c05-13ee-9080ab69498d"/>
+  <flyout_btn_right_disabled.tga>
-        <oi_hud_nav_4_3.tga value="e98a6ba6-99c6-fa15-84b6-9afadea6c467"/>
+    <scale_rect left="6" top="12" right="122" bottom="12"/>
-        <oi_hud_nav_4_2.tga value="2e19f352-1893-59a9-949b-4d2cfd3a8222"/>
+  </flyout_btn_right_disabled.tga>  
-        <oi_hud_nav_4_1.tga value="13a1675b-fb5a-19b3-b5a3-74b0a6765f7d"/>
+  <flyout_btn_left_selected.tga>
-        <oi_hud_nav_4_0.tga value="e7526e8d-b085-b26c-b0ae-2708ec231401"/>
+    <scale_rect left="6" top="12" right="122" bottom="12"/>
-        <oi_hud_nav_3_5.tga value="5e67b0d0-29a2-6a08-c85e-b12d59e53d6e"/>
+  </flyout_btn_left_selected.tga>
-        <oi_hud_nav_3_4.tga value="2ed8fbc2-5c4d-53c2-b289-88baffceab1a"/>
+  <flyout_btn_left.tga>
-        <oi_hud_nav_3_3.tga value="e0a72f1a-282e-1c1a-2cb7-6423feb41759"/>
+    <scale_rect left="6" top="12" right="122" bottom="12"/>
-        <oi_hud_nav_3_2.tga value="4bcebb23-da5e-47d9-eac1-e4453f762c8c"/>
+  </flyout_btn_left.tga>
-        <oi_hud_nav_3_1.tga value="6ac87575-330e-3a2d-3b80-a34e7b277e50"/>
+ <flyout_btn_left_disabled.tga>
-        <oi_hud_nav_3_0.tga value="f1451e8e-7310-9152-47d5-5d037c28fef3"/>
+    <scale_rect left="6" top="12" right="122" bottom="12"/>
-        <oi_hud_nav_2_6.tga value="c60b42ff-ee60-98e4-e603-ca2470141d4b"/>
+  </flyout_btn_left_disabled.tga>
-        <oi_hud_nav_2_5.tga value="a02b5a1a-bbdb-5556-ae5b-a2e68494755a"/>
-        <oi_hud_nav_2_4.tga value="625535ab-8abf-b3e7-48fb-43f728b77c79"/>
+  <UIImgResizeBottomRightUUID file_name="resize_handle_bottom_right_blue.tga"/>
-        <oi_hud_nav_2_3.tga value="00a609c3-5750-3b5a-3ce3-458bdf632203"/>
-        <oi_hud_nav_2_2.tga value="94903387-d37f-092c-e4d2-c190f68577b8"/>
+  <UIImgBtnForwardOutUUID file_name="move_forward_out.tga" preload="true"/>
-        <oi_hud_nav_2_1.tga value="ee0cd82c-6ce8-8e73-307b-6d0dc77b19e8"/>
+  <UIImgBtnForwardInUUID file_name="move_forward_in.tga" preload="true"/>
-        <oi_hud_nav_2_0.tga value="3e10b379-ed2c-7424-1fe7-bef3558c7536"/>
+  <UIImgBtnSlideLeftOutUUID file_name="move_left_out.tga" preload="true"/>
-        <oi_hud_nav_1_4.tga value="bf8d0be8-2012-1664-3ea5-e69a71c206e9"/>
+  <UIImgBtnSlideLeftInUUID file_name="move_left_in.tga" preload="true"/>
-        <oi_hud_nav_1_2.tga value="72100f87-18a7-fc4a-4793-de281e8b02cc"/>
+  <UIImgBtnLeftOutUUID  file_name="move_turn_left_out.tga" preload="true"/>
-        <oi_hud_nav_1_1.tga value="b048faf3-60ce-c3a2-d034-36613449d377"/>
+  <UIImgBtnLeftInUUID   file_name="move_turn_left_in.tga" preload="true"/>
-        <oi_hud_nav_1_0.tga value="0ad45106-3b26-6448-0b90-feae8bd46c38"/>
+  <UIImgBtnRightOutUUID file_name="move_turn_right_out.tga" preload="true"/>
-        <oi_hud_mov_4_5.tga value="7c4a45c2-37dd-312c-c6ab-20896dd0a5a6"/>
+  <UIImgBtnRightInUUID  file_name="move_turn_right_in.tga" preload="true"/>
-        <oi_hud_mov_4_3.tga value="8a88da1c-3735-c71e-d48a-016df0798de4"/>
+  <UIImgBtnSlideRightOutUUID file_name="move_right_out.tga" preload="true"/>
-        <oi_hud_mov_4_2.tga value="f55ae4d3-7d6a-e6ac-4cf7-03014ce14390"/>
+  <UIImgBtnSlideRightInUUID file_name="move_right_in.tga" preload="true"/>
-        <oi_hud_mov_4_1.tga value="1cc3fcf1-35c0-e222-27d2-6905cf5c4cee"/>
+  <UIImgBtnMoveUpInUUID file_name="move_up_in.tga" preload="true"/>
-        <oi_hud_mov_4_0.tga value="1ae592dc-46f4-616e-b7c6-0dff3e6f40e5"/>
+  <UIImgBtnMoveUpOutUUID file_name="move_up_out.tga" preload="true"/>
-        <oi_hud_mov_3_4.tga value="831b39be-99fc-45bd-ba85-708f9dc93bfd"/>
+  <UIImgBtnMoveDownInUUID file_name="move_down_in.tga" preload="true"/>
-        <oi_hud_mov_3_2.tga value="9f7e7373-92a9-d66a-ad5a-afb55ca6ac1f"/>
+  <UIImgBtnMoveDownOutUUID file_name="move_down_out.tga" preload="true"/>
-        <oi_hud_mov_3_1.tga value="ab37ed0d-7e66-1f77-3acf-b0fe4b74dbe8"/>
-        <oi_hud_mov_3_0.tga value="f5ff1f08-4c92-8606-1854-cc5b9d3e445c"/>
+  <UIImgBtnScrollUpOutUUID file_name="scrollbutton_up_out_blue.tga"/>
-        <oi_hud_mov_1_2.tga value="1e3abeed-e893-c44e-1f9d-5ecc76d21e5d"/>
+  <UIImgBtnScrollUpInUUID file_name="scrollbutton_up_in_blue.tga"/>
-        <oi_hud_mov_1_0.tga value="e300fc95-aa94-8e31-c501-ce903cac8b7c"/>
+  <UIImgBtnScrollDownOutUUID file_name="scrollbutton_down_out_blue.tga"/>
-        <eng_lng_1_0.jpg value="5fcaac05-0677-b208-e715-983ebf01d16f"/>
+  <UIImgBtnScrollDownInUUID file_name="scrollbutton_down_in_blue.tga"/>
-        <circle.tga     value="0498c309-5306-43cd-82a2-ae31d096cdef"/>
+  <UIImgBtnScrollLeftOutUUID file_name="scrollbutton_left_out_blue.tga"/>
-        <mute_icon.tga value="37c8e000-6aa2-41ef-8f86-e0c2e60bfa42"/>
+  <UIImgBtnScrollLeftInUUID file_name="scrollbutton_left_in_blue.tga"/>
-        <active_speakers.tga value="c97bdfb5-b0da-4741-877c-7c1553957d30"/>
+  <UIImgBtnScrollRightOutUUID file_name="scrollbutton_right_out_blue.tga"/>
-        <active_voice_tab.tga value="33281629-74b3-4b0e-98e7-a6383eb277fa"/>
+  <UIImgBtnScrollRightInUUID file_name="scrollbutton_right_in_blue.tga"/>
-        <music_icon.tga value="9de3ef3d-ab90-4963-be15-ae77a122a484"/>
-        <media_icon.tga value="9724ad2b-b0ec-4b8c-9558-73f36661db26"/>
+  <UIImgBtnJumpLeftOutUUID    file_name="3c18c87e-5f50-14e2-e744-f44734aa365f.tga"/>
-        <icn_active-speakers-dot-lvl0.tga value="73577b7b-19c3-4050-a19d-36bc2408aa79"/>
+    <UIImgBtnJumpLeftInUUID    file_name="9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga"/>
-        <icn_active-speakers-dot-lvl1.tga value="8f761ce3-5939-4d3a-8991-00064fdfacf9"/>
+  <UIImgBtnJumpRightOutUUID file_name="ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga"/>
-        <icn_active-speakers-dot-lvl2.tga value="0e82d24e-ed45-41bc-b090-94c97c1caab2"/>
+  <UIImgBtnJumpRightInUUID    file_name="7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga"/>
-        <icn_active-speakers-typing1.tga value="f9bbb2fe-584b-4c01-86fc-599c69534c1b"/>
-        <icn_active-speakers-typing2.tga value="e3369e02-93e1-43dc-b9c0-4533db0963d0"/>
+  <UIImgBtnSpinUpOutUUID        file_name="spin_up_out_blue.tga"/>
-        <icn_active-speakers-typing3.tga value="13dd1d96-6836-461e-8a4c-36003065c59b"/>
+  <UIImgBtnSpinUpInUUID         file_name="spin_up_in_blue.tga"/>
-        <icn_voice_ptt-off.tga value="ce19b99f-bd2d-4324-88ab-975c357f9e4e"/>
+  <UIImgBtnSpinDownOutUUID      file_name="spin_down_out_blue.tga"/>
-        <icn_voice_ptt-on.tga value="67f672e1-576f-42ee-973f-c796cc8eefb1"/>
+  <UIImgBtnSpinDownInUUID       file_name="spin_down_in_blue.tga"/>
-        <icn_voice_ptt-on-lvl1.tga value="24ebff50-ced7-4d52-8b74-77a5a901e701"/>
-        <icn_voice_ptt-on-lvl2.tga value="1a803501-0da7-4b80-80db-1f79a7842368"/>
+  <UIImgRadioActiveUUID         file_name="radio_active_false.tga"/>
-        <icn_voice_ptt-on-lvl3.tga value="3342bfc4-0bd9-4c89-8e87-e5980aee00e5"/>
+  <UIImgRadioActiveSelectedUUID file_name="radio_active_true.tga"/>
-        <lag_status_good.tga value="e9f77149-a493-4a30-8a61-20428a580a46"/>
+  <UIImgRadioInactiveUUID       file_name="radio_inactive_false.tga"/>
-        <lag_status_warning.tga value="197caaa6-30b1-4d9b-8bfa-65484346d322"/>
+  <UIImgRadioInactiveSelectedUUID file_name="radio_inactive_true.tga"/>
-        <lag_status_critical.tga value="e2c74120-e896-4952-bf9f-d70696e712a7"/>
-        <icn_voice-call-end.tga value="4e098514-89bb-4247-89c3-3ec86b9816d0"/>
+  <UIImgCheckboxActiveUUID      file_name="checkbox_enabled_false.tga"/>
-        <icn_voice-call-start.tga value="4ae2166c-8558-497d-b221-b45513ed8adf"/>
+  <UIImgCheckboxActiveSelectedUUID file_name="checkbox_enabled_true.tga"/>
-        <icn-overlay_volume-panel.tga value="43f0a590-f3d3-48b5-b460-f5b3e6e03626"/>
+  <UIImgCheckboxInactiveUUID file_name="checkbox_disabled_false.tga"/>
-        <icn_slide-groove_dark.tga value="1e753359-d202-49a7-9d19-833683e0120c"/>
+  <UIImgCheckboxInactiveSelectedUUID file_name="checkbox_disabled_true.tga"/>
-        <icn_slide-highlight.tga value="71d6fb98-2167-4d53-a419-0c534488064d"/>
-        <icn_slide-thumb_dark.tga value="d27de39d-7c2d-4c8a-b1a5-520208f1abdf"/>
+  <UIImgBtnTabTopOutUUID        file_name="tab_top_blue.tga"/>
-        <icn_speaker-muted_dark.tga value="26231899-b12b-45c6-9638-f460ea507a7c"/>
+  <UIImgBtnTabTopInUUID         file_name="tab_top_selected_blue.tga"/>
-        <icn_speaker_dark.tga value="138403da-2622-4728-893b-8f6cb1eda176"/>
+  <UIImgBtnTabBottomOutUUID file_name="tab_bottom_blue.tga"/>
-  <icn_voice-localchat.tga value="0bcfbf8a-f366-4459-b0f6-9bc42977c2df"/>
+  <UIImgBtnTabBottomInUUID      file_name="tab_bottom_selected_blue.tga"/>
-  <icn_voice-groupfocus.tga value="157d8dea-d5b9-457a-8f0e-af840029d9ea"/>
-  <icn_voice-pvtfocus.tga value="745c2927-ea6d-4e70-ba66-3c125ed08d9b"/>
+  <UIImgGrabUUID                        file_name="c63f124c-6340-4fbf-b59e-0869a44adb64.tga"/>
-  <icn_media-pause_active.tga value="c972e319-803b-421c-9f64-e33e67bbbe38"/>
+  <UIImgGrabSelectedUUID        file_name="c1e21504-f136-451d-b8e9-929037812f1d.tga"/>
-  <icn_media-pause_disabled.tga value="c50debb7-1543-4bde-b1b5-9e5de1863a91"/>
-  <icn_media-pause_enabled.tga value="080fbe76-b155-432a-acbe-7ebb0accf4b6"/>
+  <!--<UIImgScaleUUID                   file_name="88a90fef-b448-4883-9344-ecf378a60433.tga"/>-->
-  <icn_media-play_active.tga value="ae08235b-cd86-4615-aa32-19e2d152b8df"/>
-  <icn_media-play_disabled.tga value="52392317-1608-4525-9216-020d4ae71e73"/>
+  <UIImgFaceUUID                        file_name="ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga"/>
-  <icn_media-play_enabled.tga value="0245bea4-7db4-422a-8a85-7b1b83630f1a"/>
+  <UIImgFaceSelectedUUID        file_name="b4870163-6208-42a9-9801-93133bf9a6cd.tga"/>
-  <icn_media-stop_active.tga value="5750810e-9e14-448c-b196-6b0bec30f088"/>
-  <icn_media-stop_disabled.tga value="da351b9f-e1cd-49ee-871c-866c11c8d3c5"/>
+  <UIImgCreateUUID                      file_name="7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga"/>
-  <icn_media-stop_enabled.tga value="e216379e-48ca-4149-afd1-abcc8642ec91"/>
+  <UIImgCreateSelectedUUID      file_name="0098b015-3daf-4cfe-a72f-915369ea97c2.tga"/>
-  <icn_media.tga value="558ea4a7-1eff-4897-83ac-bd3081561109"/>
+  
-  <icn_music.tga value="4de02b4c-8e16-47b1-9865-311ea58ae106"/>
+  <UIImgBtnCloseInactiveUUID file_name="close_inactive_blue.tga"/>
-  <icn_media_web.tga value="63d12b74-2c40-4dda-b7da-9a7fe0f87a8a"/>
+  <UIImgBtnCloseActiveUUID      file_name="closebox.tga"/>
-        <icn_chatbar.tga value="e307dc85-9908-4b07-a639-60af8cf78739" />
+  <UIImgBtnClosePressedUUID file_name="close_in_blue.tga"/>
-        <btn_chatbar.tga value="e6b15e8e-04c7-447f-aa66-f45c42c3bbc0" />
+  <icn_clear_lineeditor.tga />
-        <btn_chatbar_selected.tga value="dafd367e-290a-4f55-a555-fbfffb191598" />
+  <icn_scrollbar_thumb.tga    preload="true">
-        <arrow_down.tga value="82125c62-ee7a-4854-872e-cf6e3e0107b8" />
+        <scale_rect top="7" left="4" bottom="8" right="4" />
-        <arrow_up.tga value="2cb924dc-4adb-4a09-87e1-ab47e50a9bc0" />
+</icn_scrollbar_thumb.tga>
-        <icn_rounded-text-field.tga value="1d5c38e5-1a3d-4e99-9349-196546f0f075" />
+  <icn_scrollbar_bg.tga    preload="true">
-        <flyout_btn_right_selected.tga value="9e23d9e1-82c0-4483-995f-edbb4b87ce21" />
+        <scale_rect top="7" left="4" bottom="8
-        <flyout_btn_right.tga value="8f2b1112-b2fd-4589-9e69-7cf8634d75a7" />
+        " right="4" />
-        <flyout_btn_left_selected.tga value="bcab2966-50c8-4142-8077-00ea9e400f22" />
+</icn_scrollbar_bg.tga>
-        <flyout_btn_left.tga value="cae5d9a7-4bf0-4d47-8633-751e9a8f7539" />
+  <UIImgBtnMinimizeInactiveUUID file_name="minimize_inactive.tga"/>
+  <UIImgBtnMinimizeActiveUUID file_name="minimize.tga"/>
+  <UIImgBtnMinimizePressedUUID file_name="minimize_pressed.tga"/>
+  <UIImgBtnRestoreInactiveUUID file_name="restore_inactive.tga"/>
+  <UIImgBtnRestoreActiveUUID file_name="restore.tga"/>
+  <UIImgBtnRestorePressedUUID file_name="restore_pressed.tga"/>
+  <UIImgBtnTearOffInactiveUUID file_name="tearoffbox.tga"/>
+  <UIImgBtnTearOffActiveUUID file_name="tearoffbox.tga"/>
+  <UIImgBtnTearOffPressedUUID file_name="tearoff_pressed.tga"/>
+  <UIImgCrosshairsUUID file_name="crosshairs.tga"/>
+  <icn_label_music.tga/>
+  <icn_label_media.tga/>
 </textures>
diff --git a/linden/indra/newview/skins/xui/de/floater_about_land.xml b/linden/indra/newview/skins/xui/de/floater_about_land.xml
index 62664c7..7ce63ec 100644
--- a/linden/indra/newview/skins/xui/de/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/de/floater_about_land.xml
@@ -551,9 +551,12 @@ ersetzen:
                        </text>
                        <button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_allowed" />
                        <button label="Entfernen" label_selected="Entfernen" name="remove_allowed" />
-                        <check_box label="Verbannen" name="AccessCheck">
+                        <check_box label="Verbannen" name="BanCheck">
                                Verbannte Einwohner
                        </check_box>
+                        <check_box label="Zulassen" name="AccessCheck">
+                                Zulässige Einwohner
+                        </check_box>
                        <name_list name="AccessList" tool_tip="([LISTED] angezeigt, max. [MAX])">
                                <column label="Allowed Residents" name="name" />
                        </name_list>
diff --git a/linden/indra/newview/skins/xui/de/floater_critical.xml b/linden/indra/newview/skins/xui/de/floater_critical.xml
index 0b14792..a5589e7 100644
--- a/linden/indra/newview/skins/xui/de/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/de/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">
        <button label="Weiter" label_selected="Weiter" name="Continue" />
        <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
-        <text name="tos_title">
-                Kritische Nachricht
-        </text>
        <text name="tos_heading">
                Lesen Sie folgenden Text bitte sorgfältig durch.
        </text>
diff --git a/linden/indra/newview/skins/xui/de/floater_friends.xml b/linden/indra/newview/skins/xui/de/floater_friends.xml
deleted file mode 100644
index fc03e38..0000000
--- a/linden/indra/newview/skins/xui/de/floater_friends.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="friends" title="Freunde">
-        <scroll_list name="friend_list"
-             tool_tip="Hold shift or control while clicking to select multiple friends">
-                <column label="Name" name="friend_name" />
-        </scroll_list>
-        <panel name="rights_container">
-                <text name="friend_name_label">
-                        Wählen Sie den/die Freund(e) aus, dessen/deren Rechte Sie ändern möchten...
-                </text>
-                <check_box label="Kann meinen Online-Status sehen" name="online_status_cb"
-                     tool_tip="Festlegen, ob dieser Freund meinen Online-Status auf seiner Freundesliste oder Visitenkarte einsehen kann" />
-                <check_box label="Kann mich auf der Karte sehen" name="map_status_cb"
-                     tool_tip="Festlegen, ob dieser Freund auf seiner Karte meinen Standort sehen kann" />
-                <check_box label="Kann meine Objekte verändern" name="modify_status_cb"
-                     tool_tip="Festlegen, ob dieser Freund meine Objekte verändern kann" />
-                <text name="process_rights_label">
-                        Rechte werden geändert...
-                </text>
-        </panel>
-        <button label="IM/Anruf" name="im_btn" tool_tip="Beginnt eine Instant Message-Sitzung" />
-        <button label="Teleport..." name="offer_teleport_btn"
-             tool_tip="Bieten Sie diesem Freund einen Teleport an Ihre Position an" />
-        <button label="Hinzufügen..." name="add_btn"
-             tool_tip="Bieten Sie einem Einwohner die Freundschaft an" />
-        <button label="Profil" name="profile_btn"
-             tool_tip="Bilder, Gruppen und andere Informationen anzeigen" />
-        <button label="Zahlen..." name="pay_btn"
-             tool_tip="Diesem Freund Linden-Dollar (L$) geben" />
-        <button label="Entfernen..." name="remove_btn"
-             tool_tip="Diese Person von Ihrer Freundesliste entfernen" />
-        <text name="Multiple">
-                Mehrere Freunde...
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_groups.xml b/linden/indra/newview/skins/xui/de/floater_groups.xml
deleted file mode 100644
index 70c7d4f..0000000
--- a/linden/indra/newview/skins/xui/de/floater_groups.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="Gruppen">
-        <text type="string" length="1" name="groupdesc">
-                Die derzeit aktive Gruppe ist fett hervorgehoben.
-        </text>
-        <scroll_list name="group list">
-                <column label="" name="name" />
-        </scroll_list>
-        <text type="string" length="1" name="groupcount">
-                Sie sind Mitglied bei [COUNT] Gruppen (von max. [MAX]).
-        </text>
-        <button label="IM/Anruf" name="IM" tool_tip="Beginnt eine Instant Message-Sitzung" />
-        <button label="Aktivieren" label_selected="Aktivieren" name="Activate" />
-        <button label="Info" label_selected="Info" name="Info" />
-        <button label="Verlassen" label_selected="Verlassen" name="Leave" />
-        <button label="Erstellen..." label_selected="Erstellen" name="Create" />
-        <button label="Suchen..." label_selected="Suchen..." name="Search..." />
-        <button label="Schließen" label_selected="Schließen" name="Close" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
index 02ed913..4b0719c 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/de/floater_instant_message_ad_hoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(unbekannt)" name="im_floater" title="(unbekannt)">
-        <layout_stack name="">
+        <layout_stack name="panels">
                <layout_panel name="im_contents_panel">
                        <button label="Anrufen" name="start_call_btn" />
                        <button label="Anruf beenden" name="end_call_btn" />
diff --git a/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
index 8379644..118276e 100644
--- a/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/de/floater_instant_message_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(unbekannt)" name="im_floater" title="(unbekannt)">
-        <layout_stack name="">
+        <layout_stack name="panels">
                <layout_panel name="im_contents_panel">
                        <button label="Gruppeninfo..." name="group_info_btn" />
                        <button label="Gespräch beitreten" name="start_call_btn" />
diff --git a/linden/indra/newview/skins/xui/de/floater_joystick.xml b/linden/indra/newview/skins/xui/de/floater_joystick.xml
index f1404ba..8b4b7a5 100644
--- a/linden/indra/newview/skins/xui/de/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/de/floater_joystick.xml
@@ -1,54 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater label="Direkt-Zoom" name="build options floater" title="Flycam-Optionen">
+<floater name="Joystick">
-        <text name="x-axis">
-                X-Achse
-        </text>
-        <text name="y-axis">
-                Y-Achse
-        </text>
-        <text name="z-axis">
-                Z-Achse
-        </text>
-        <spinner label="Textur" name="FlycamAxis1" />
-        <spinner label="Textur" name="FlycamAxis2" />
-        <spinner label="Textur" name="FlycamAxis0" />
-        <spinner label="Skalieren" name="FlycamAxisScale1" />
-        <spinner label="Skalieren" name="FlycamAxisScale2" />
-        <spinner label="Skalieren" name="FlycamAxisScale0" />
-        <spinner label="Tote Zone" name="FlycamAxisDeadZone1" />
-        <spinner label="Tote Zone" name="FlycamAxisDeadZone2" />
-        <spinner label="Tote Zone" name="FlycamAxisDeadZone0" />
-        <text name="yaw">
-                Gieren
-        </text>
-        <text name="pitch">
-                Neigen
-        </text>
-        <text name="roll">
-                Rollen
-        </text>
-        <spinner label="Textur" name="FlycamAxis5" />
-        <spinner label="Textur" name="FlycamAxis4" />
-        <spinner label="Textur" name="FlycamAxis3" />
-        <spinner label="Skalieren" name="FlycamAxisScale5" />
-        <spinner label="Skalieren" name="FlycamAxisScale4" />
-        <spinner label="Skalieren" name="FlycamAxisScale3" />
-        <spinner label="Tote Zone" name="FlycamAxisDeadZone5" />
-        <spinner label="Tote Zone" name="FlycamAxisDeadZone4" />
-        <spinner label="Tote Zone" name="FlycamAxisDeadZone3" />
-        <text name="ZoomLabel">
-                Zoom
-        </text>
-        <spinner label="Textur" name="FlycamAxis6" />
-        <spinner label="Skalieren" name="FlycamAxisScale6" />
-        <spinner label="Tote Zone" name="FlycamAxisDeadZone6" />
-        <slider label="Auslaufen" name="FlycamFeathering" />
-        <check_box label="Automatisch ausrichten" name="FlycamAutoLeveling" />
-        <check_box label="3D-Cursor" name="FlycamAbsolute" />
-        <text name="JoystickMonitor">
-                Joystick-Monitor
-        </text>
-        <text name="Axis">
-                Achse [NUM]
-        </text>
 </floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/de/floater_preview_new_landmark.xml
deleted file mode 100644
index 9294508..0000000
--- a/linden/indra/newview/skins/xui/de/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="landmark_preview">
-        <button label="Teleportieren" label_selected="" name="Teleport btn" />
-        <button label="Auf Karte" label_selected="" name="Show on Map btn" />
-        <button label="Verwerfen" label_selected="" name="Discard btn" />
-        <text type="string" length="1" name="desc txt">
-                Beschreibung:
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/de/floater_rate.xml b/linden/indra/newview/skins/xui/de/floater_rate.xml
deleted file mode 100644
index 1e57993..0000000
--- a/linden/indra/newview/skins/xui/de/floater_rate.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="rate" title="Ihre Bewertung für Jeska Linden">
-        <radio_group name="behavior">
-                <radio_item type="string" length="1" name="Positive">
-                        Positiv
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        Keine Einstufung
-                </radio_item>
-        </radio_group>
-        <radio_group name="appearance">
-                <radio_item type="string" length="1" name="Positive">
-                        Positiv
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        Keine Einstufung
-                </radio_item>
-        </radio_group>
-        <radio_group name="building">
-                <radio_item type="string" length="1" name="Positive">
-                        Positiv
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        Keine Einstufung
-                </radio_item>
-        </radio_group>
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
-        <text type="string" length="1" name="Overall behavior:">
-                Gesamtverhalten:
-        </text>
-        <text type="string" length="1" name="Skill at appearance (clothing and attachments):">
-                Fähigkeit in Aussehen (Kleider und Anhänge):
-        </text>
-        <text type="string" length="1" name="Skill at building:">
-                Fähigkeit in Bauen:
-        </text>
-        <text type="string" length="1" name="Message:">
-                Nachricht:
-        </text>
-        <text type="string" length="1" name="cost">
-                Kosten: [COST] L$ für jede Einstufung.  Summe: [TOTAL] L$.
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/de/menu_viewer.xml b/linden/indra/newview/skins/xui/de/menu_viewer.xml
index 1e20642..d72e7b7 100644
--- a/linden/indra/newview/skins/xui/de/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/de/menu_viewer.xml
@@ -15,7 +15,6 @@
                <menu_item_call label="Foto machen" name="Take Snapshot" />
                <menu_item_call label="Foto auf Datenträger" name="Snapshot to Disk" />
                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Film auf Datenträger starten/stoppen" name="Start/Stop Movie to Disk" />
                <menu label="Fenstergröße einstellen" name="Set Window Size">
                        <menu_item_call label="320x240" name="320x240" />
                        <menu_item_call label="640x480" name="640x480" />
@@ -141,6 +140,7 @@
                <menu_item_separator label="-----------" name="separator3" />
                <menu_item_call label="Als abwesend anzeigen" name="Set Away" />
                <menu_item_call label="Als beschäftigt anzeigen" name="Set Busy" />
+                <menu_item_call label="Alle Animationen stoppen" name="Stop All Animations" />
                <menu_item_separator label="-----------" name="separator4" />
                <menu_item_call label="Kontostatistik..." name="Account History..." />
                <menu_item_call label="Mein Konto verwalten..." name="Manage My Account..." />
@@ -195,7 +195,6 @@
                <menu_item_call label="Verknüpfung" name="Link" />
                <menu_item_call label="Verknüpfung aufheben" name="Unlink" />
                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Alle Animationen stoppen" name="Stop All Animations" />
                <menu_item_separator label="-----------" name="separator5" />
                <menu_item_call label="Fokus auf Auswahl" name="Focus on Selection" />
                <menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection" />
@@ -253,6 +252,15 @@
                <menu_item_call label="Rempler, Stöße und Schläge..." name="Bumps, Pushes &amp;amp; Hits..." />
                <menu_item_call label="Lag-Anzeige" name="Lag Meter" />
                <menu_item_separator label="-----------" name="separator5" />
+                <menu label="Fehlermeldungen" name="Bug Reporting">
+                        <menu_item_call label="Allgemeiner Probleme-Tracker..." name="Public Issue Tracker..." />
+                        <menu_item_call label="Hilfe zum Allgemeinen Probleme-Tracker..."
+                             name="Publc Issue Tracker Help..." />
+                        <menu_item_call label="Fehlermeldungs-1x1..." name="Bug Reporing 101..." />
+                        <menu_item_call label="Sicherheitsfragen..." name="Security Issues..." />
+                        <menu_item_call label="QA-Wiki..." name="QA Wiki..." />
+                        <menu_item_call label="Fehler melden..." name="Report Bug..." />
+                </menu>
                <menu_item_call label="Versionshinweise..." name="Release Notes..." />
                <menu_item_separator label="-----------" name="separator6" />
                <menu_item_call label="Über Second Life..." name="About Second Life..." />
diff --git a/linden/indra/newview/skins/xui/de/panel_friends.xml b/linden/indra/newview/skins/xui/de/panel_friends.xml
index 6e55ba3..771e0cf 100644
--- a/linden/indra/newview/skins/xui/de/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/de/panel_friends.xml
@@ -32,7 +32,8 @@
             tool_tip="Bilder, Gruppen und andere Informationen anzeigen" />
        <button label="Teleport" name="offer_teleport_btn"
             tool_tip="Bieten Sie diesem Freund einen Teleport an Ihre Position an" />
-        <button label="Zahlen" name="pay_btn" tool_tip="Diesem Freund Linden-Dollar (L$) geben" />
+        <button label="Zahlen" name="pay_btn"
+             tool_tip="Diesem Freund Linden-Dollar (L$) geben" />
        <button label="Entfernen" name="remove_btn"
             tool_tip="Diese Person von Ihrer Freundesliste entfernen" />
        <button label="Hinzufügen" name="add_btn"
diff --git a/linden/indra/newview/skins/xui/de/panel_music_remote.xml b/linden/indra/newview/skins/xui/de/panel_music_remote.xml
deleted file mode 100644
index 7755b83..0000000
--- a/linden/indra/newview/skins/xui/de/panel_music_remote.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="music_remote">
-        <text type="string" length="6" name="text">
-                Musik
-        </text>
-        <volume_slider name="volume_slider" tool_tip="Ändern Sie die Lautstärke mit dem Regler" />
-        <button label="" label_selected="" name="stop_btn" tool_tip="Medienwiedergabe anhalten" />
-        <button label="" label_selected="" name="play_btn"
-             tool_tip="Gibt den Medienstream wieder" />
-        <button label="" label_selected="" name="pause_btn"
-             tool_tip="Pausiert den Medienstream" />
-        <button name="music_stop" tool_tip="Medienwiedergabe anhalten" />
-        <button name="music_play" tool_tip="Gibt den Medienstream wieder" />
-        <button name="music_pause" tool_tip="Pausiert den Medienstream" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml b/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
index a899bd1..3559f82 100644
--- a/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_overlaybar.xml
@@ -11,8 +11,8 @@
        <button label="Aufstehen" label_selected="Aufstehen" name="Stand Up"
             tool_tip="Klicken Sie hier, um aufzustehen." />
        <layout_stack name="overlay_layout_panel">
-                <layout_panel name="">
+                <layout_panel name="main_panel">
-                        <layout_stack name="">
+                        <layout_stack name="chatbar_and_buttons">
                                <layout_panel name="state_buttons">
                                        <button label="IM erhalten" label_selected="IM erhalten" name="IM Received"
                                             tool_tip="Sie haben eine unbeantwortete Instant Message. Klicken Sie, um IMs anzuzeigen." />
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/de/panel_preferences_graphics2.xml
deleted file mode 100644
index fbe56b6..0000000
--- a/linden/indra/newview/skins/xui/de/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Grafikdetails" name="Display panel 3">
-        <text type="string" length="1" name="text">
-                Shader:
-        </text>
-        <check_box label="Vertex-Shader aktivieren" name="shaders"
-             tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht." />
-        <check_box label="Bumpmapping und Glanz aktivieren" name="bumpshiny" />
-        <check_box label="Wellen auf Wasser aktivieren" name="ripple" />
-        <check_box label="Avatar Vertexprogramm" name="avatarvp" />
-        <text type="string" length="1" name="Avatar Rendering:">
-                Avatar-Darstellung:
-        </text>
-        <radio_group name="Avatar Appearance">
-                <radio_item type="string" length="1" name="Normal">
-                        Normal
-                </radio_item>
-                <radio_item type="string" length="1" name="Bump">
-                        Mit Bumpmap
-                </radio_item>
-                <radio_item type="string" length="1" name="Cloth">
-                        Mit Bumpmap &amp; Stoff
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Lighting Detail:">
-                Beleuchtungsdetails:
-        </text>
-        <radio_group name="lighting detail radio">
-                <radio_item type="string" length="1" name="SunMoon">
-                        Nur Sonne und Mond
-                </radio_item>
-                <radio_item type="string" length="1" name="LocalLights">
-                        Lokale Lichtquellen
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Terrain Detail:">
-                Terraindetails:
-        </text>
-        <radio_group name="terrain detail radio">
-                <radio_item type="string" length="1" name="0">
-                        Niedrig
-                </radio_item>
-                <radio_item type="string" length="1" name="2">
-                        Hoch
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Object Mesh Detail:">
-                Objekt-Gitterdetails:
-        </text>
-        <text type="string" length="1" name="Flexible Mesh Detail:">
-                Flexible-Gitterdetails:
-        </text>
-        <text type="string" length="1" name="Tree Mesh Detail:">
-                Baum-Gitterdetails:
-        </text>
-        <text type="string" length="1" name="Avatar Mesh Detail:">
-                Avatar-Gitterdetails:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/de/panel_preferences_graphics3.xml
deleted file mode 100644
index 5e55598..0000000
--- a/linden/indra/newview/skins/xui/de/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Erw. Grafikdetails" name="Display panel 2">
-        <text type="string" length="1" name="Filtering:">
-                Filtern:
-        </text>
-        <check_box label="Anisotropische Filterung (langsamer, wenn aktiviert)" name="ani" />
-        <spinner label="Gamma:" name="gamma" />
-        <text type="string" length="1" name="(brightness, lower is brighter)">
-                (Helligkeit, niedriger ist heller, 0=Standard)
-        </text>
-        <spinner label="Helligkeit bei Nacht:" name="nighttime_brightness" />
-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)">
-                (höher ist heller, 1.0 = Standard)
-        </text>
-        <text type="string" length="1" name="Enable VBO:">
-                VBO aktivieren:
-        </text>
-        <check_box label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo"
-             tool_tip="Bei einigen OpenGL-Treibern kann diese Option zum Absturz führen." />
-        <text type="string" length="1" name="Graphics Card Memory:">
-                Grafikkartenspeicher:
-        </text>
-        <radio_group name="video card memory radio">
-                <radio_item type="string" length="1" name="radio">
-                        16 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        32 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        64 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4">
-                        128 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio5">
-                        256 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio6">
-                        512 MB
-                </radio_item>
-        </radio_group>
-        <spinner label="Nebeldistanzverhältnis:" name="fog" />
-        <spinner label="Max. Partikelzahl:" name="particles" />
-        <spinner label="Outfit-Grenzwert:" name="comp limit"
-             tool_tip="Anzahl der kürzlich geänderten Outfits für Anzeige" />
-        <text type="string" length="1" name="(lower is faster)">
-                (niedriger ist schneller)
-        </text>
-        <spinner label="Beacon-Breite:" name="debug beacon line width" />
-        <check_box label="Grafikhardware beim nächsten Start automatisch erkennen"
-             name="probe_hardware_checkbox"
-             tool_tip="Second Life konfiguriert einige Grafikeinstellungen automatisch auf Basis Ihrer Hardware.  Wenn Sie neue Hardware installieren, sollten Sie diese von Second Life neu erkennen lassen." />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_settings_chat.xml b/linden/indra/newview/skins/xui/de/panel_settings_chat.xml
deleted file mode 100644
index d8661f8..0000000
--- a/linden/indra/newview/skins/xui/de/panel_settings_chat.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat" title="Unterhaltung">
-        <text>
-                Chat-Schriftgröße:
-        </text>
-        <radio_group name="chat font size">
-                <radio_item>
-                        Klein
-                </radio_item>
-                <radio_item>
-                        Mittel
-                </radio_item>
-                <radio_item>
-                        Groß
-                </radio_item>
-        </radio_group>
-        <text>
-                Chat-Farbe:
-        </text>
-        <color_swatch label="System" name="system" />
-        <color_swatch label="Benutzer" name="users" />
-        <color_swatch label="Objekte" name="objects" />
-        <color_swatch label="Blase" name="background" />
-        <text>
-                Chat-Konsole:
-        </text>
-        <spinner label="Chat ausblenden nach" name="fade_chat_time" />
-        <text>
-                (Sekunden)
-        </text>
-        <spinner label="" name="max_chat_count" />
-        <text>
-                (# Zeilen)
-        </text>
-        <slider label="Deckkraft" name="console_opacity" />
-        <text>
-                Chat-Optionen:
-        </text>
-        <check_box label="Chat verwendet volle Bildbreite (nach Neustart)"
-             name="chat_full_width_check" />
-        <check_box label="Chat nach Drücken der Eingabetaste schließen"
-             name="close_chat_on_return_check" />
-        <check_box label="Pfeiltasten bewegen Avatar beim Chatten"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="Zeitstempel in Chat anzeigen" name="show_timestamps_check" />
-        <text>
-                Blasen-Chat:
-        </text>
-        <check_box label="Chat-Blasen anzeigen" name="bubble_text_chat" />
-        <slider label="Deckkraft" name="bubble_chat_opacity" />
-        <text>
-                Skriptfehler:
-        </text>
-        <check_box label="Skriptfehler und Warnungen als normalen Chat anzeigen"
-             name="script_errors_as_chat" />
-        <color_swatch label="Farbe" name="script_error" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_settings_im.xml b/linden/indra/newview/skins/xui/de/panel_settings_im.xml
deleted file mode 100644
index 844362f..0000000
--- a/linden/indra/newview/skins/xui/de/panel_settings_im.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="im" title="IM">
-        <text>
-                IM-Optionen:
-        </text>
-        <check_box label="IM an E-Mail senden" name="send_im_to_email"
-             tool_tip="Ändern Sie Ihre E-Mail-Adresse auf secondlife.com" />
-        <check_box label="IM in Chat-Verlauf einschließen" name="include_im_in_chat_history" />
-        <check_box label="Zeitstempel in IM anzeigen" name="show_timestamps_check" />
-        <text>
-                Beschäftigt-Modus-Antwort:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/de/panel_settings_msgbox.xml
deleted file mode 100644
index fe5a592..0000000
--- a/linden/indra/newview/skins/xui/de/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Popups" name="popups" title="Popups">
-        <text>
-                Popups nicht anzeigen:
-        </text>
-        <button label="Dieses Popup aktivieren" name="enable_popup" />
-        <text>
-                Popups anzeigen:
-        </text>
-        <button label="&apos;Nächstes Mal zeigen&apos;-Dialoge zurücksetzen..."
-             name="reset_dialogs_btn" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_settings_network.xml b/linden/indra/newview/skins/xui/de/panel_settings_network.xml
deleted file mode 100644
index bc8b335..0000000
--- a/linden/indra/newview/skins/xui/de/panel_settings_network.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="network" title="Netzwerk">
-        <text>
-                Maximale Bandbreite:
-        </text>
-        <slider label="" name="max_bandwidth" />
-        <text>
-                kbit/s (Kilobit pro Sekunde)
-        </text>
-        <text>
-                Größe Festplatten-Cache:
-        </text>
-        <radio_group name="disk cache">
-                <radio_item>
-                        50 MB
-                </radio_item>
-                <radio_item>
-                        200 MB
-                </radio_item>
-                <radio_item>
-                        500 MB
-                </radio_item>
-                <radio_item>
-                        1000 MB
-                </radio_item>
-        </radio_group>
-        <button label="Cache löschen/leeren" name="clear_cache" />
-        <text>
-                Proxy-Konfiguration:
-        </text>
-        <check_box label="Proxy verwenden" name="proxy_enabled" tool_tip="Proxy konfigurieren" />
-        <text>
-                Proxy:
-        </text>
-        <line_editor name="proxy_address" tool_tip="Name oder IP-Adresse des Proxys" />
-        <text>
-                Port:
-        </text>
-        <line_editor name="proxy_port" tool_tip="Die Port-Nummer des Proxys" />
-        <text>
-                Socken:
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                Kein Proxy:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="Namen oder IP-Adressen, für die kein Proxy verwendet werden soll" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_settings_web.xml b/linden/indra/newview/skins/xui/de/panel_settings_web.xml
deleted file mode 100644
index 626085b..0000000
--- a/linden/indra/newview/skins/xui/de/panel_settings_web.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="web" title="Web">
-        <check_box label="Externen Browser verwenden (Firefox, Safari, Internet Explorer)"
-             name="external_browser_check"
-             tool_tip="Externen Webbrowser für Hilfe, Weblinks usw. verwenden.\nIm Vollbildmodus nicht empfohlen." />
-        <text>
-                Browser-Homepage:
-        </text>
-        <line_editor name="home_page"
-             tool_tip="Die Webseite, die beim erstmaligen Öffnen des Second Life Webbrowsers geöffnet wird" />
-        <text>
-                Proxy-Konfiguration:
-        </text>
-        <check_box label="Proxy für internen Browser verwenden" name="proxy_enabled"
-             tool_tip="Proxy für internen Webbrowser konfigurieren" />
-        <text>
-                Proxy:
-        </text>
-        <line_editor name="proxy_address" tool_tip="Name oder IP-Adresse des Proxys" />
-        <text>
-                Port:
-        </text>
-        <line_editor name="proxy_port" tool_tip="Die Port-Nummer des Proxys" />
-        <text>
-                Socken:
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                Kein Proxy für:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="Namen oder IP-Adressen, für die kein Proxy verwendet werden soll" />
-        <check_box label="Webseiten auf Objekten anzeigen (im Test, erfordert Neustart)"
-             name="web_pages_on_prims_check" />
-        <text>
-                Vertrauenswürdige Sites:
-(zur Ansicht anmelden)
-        </text>
-        <button label="Hinzufügen" name="add_trusted" />
-        <line_editor name="trusted_site_entry"
-             tool_tip="Die Site, die zur Liste der vertrauenswürdigen Sites hinzugefügt werden soll" />
-        <button label="Entfernen" name="rem_trusted" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml
index 74e9286..4ab944f 100644
--- a/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/xui/de/panel_speaker_controls.xml
@@ -3,10 +3,12 @@
        <string name="moderator_label">
                (Moderator)
        </string>
-        <layout_stack name="">
+        <layout_stack name="panels">
                <layout_panel name="moderation_mode_panel">
                        <combo_box name="moderation_mode">
-                                Moderiertes Voice
+                                <combo_item name="ModeratedVoice">
+                                  Moderiertes Voice
+                                </combo_item>
                        </combo_box>
                </layout_panel>
                <layout_panel name="moderate_chat_panel">
diff --git a/linden/indra/newview/skins/xui/de/panel_toolbar.xml b/linden/indra/newview/skins/xui/de/panel_toolbar.xml
index 37282ae..7aaaedf 100644
--- a/linden/indra/newview/skins/xui/de/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/de/panel_toolbar.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="toolbar">
+        <string name="Redock Windows">Fenster andocken</string>
+        <layout_stack name="toolbar_stack">
        <button label="IM" name="im_btn" tool_tip="Instant Message an Ihre Freunde." />
-        <string name="Redock Windows">
-                Fenster andocken
-        </string>
        <button label="Unterhalten" name="communicate_btn"
             tool_tip="Unterhalten Sie sich mit Freunden und in Gruppen." />
        <button label="" name="chat_btn" tool_tip="Chat-Leiste anzeigen. (Eingabe)" />
@@ -20,4 +19,5 @@
             tool_tip="Die Umgebungskarte. (Strg-Umschalt-M)" />
        <button label="Karte" name="map_btn" tool_tip="Die Weltkarte. (Strg-M)" />
        <button label="Inventar" name="inventory_btn" tool_tip="Ihre Habseligkeiten. (Strg-I)" />
+  </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index a39c213..d0ee7f0 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -23,11 +23,14 @@
                <option name="OK">
                        OK
                </option>
-        </alert>
+        </alert>        
-        <alert modal="false" name="MOTD" title="Message of the Day">
+        <alert modal="true" name="TutorialNotFound">
                <message name="message">
-                        [MOTD]
+                        No tutorial is currently available.
                </message>
+                <option name="OK">
+                        OK
+                </option>
        </alert>
        <alert modal="true" name="GenericAlert">
                <message name="message">
@@ -138,9 +141,9 @@ Visit the Webpage Studio exhibit to see it.
        </alert>
        <alert modal="true" name="GrantModifyRights">
                <message name="message">
-                        Granting modify rights to another resident allows them to change 
+                        Granting modify rights to another resident allows them to change,
-ANY objects you may have in-world. Be VERY careful when handing 
+delete or take ANY objects you may have in-world. Be VERY careful
-out this permission.
+when handing out this permission.
 Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
                </message>
                <option name="Yes">
@@ -1339,6 +1342,22 @@ chat, or interact with the world.
                        Cancel
                </option>
        </alert>
+        <alert modal="true" name="FreezeAvatarFullname">
+                <message name="message">
+                        Freeze [AVATAR_NAME]?
+He or she will temporarily be unable to move,
+chat, or interact with the world.
+                </message>
+                <option name="Freeze">
+                        Freeze
+                </option>
+                <option name="Unfreeze">
+                        Unfreeze
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
        <alert modal="true" name="EjectAvatar">
                <message name="message">
                        Eject this avatar from your land?
@@ -1353,6 +1372,20 @@ chat, or interact with the world.
                        Cancel
                </option>
        </alert>
+        <alert modal="true" name="EjectAvatarFullname">
+                <message name="message">
+                        Eject [AVATAR_NAME] from your land?
+                </message>
+                <option name="Eject">
+                        Eject
+                </option>
+                <option name="EjectandBan">
+                        Eject and Ban
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
        <alert modal="true" name="InvalidUUID">
                <message name="message">
                        Not a valid UUID.
@@ -1727,7 +1760,13 @@ No parcel selected.
        <alert modal="true" name="CannotBuyLandNoRegion">
                <message name="message">
                        Unable to buy land:
-Cannot find the region this land is in.
+                        Cannot find the region this land is in.
+                </message>
+        </alert>
+        <alert modal="true" name="CannotCloseFloaterBuyLand">
+                <message name="message">
+                        You cannot close the Buy Land window until Second Life
+estimates the price of this transaction.
                </message>
        </alert>
        <alert modal="true" name="CannotDeedLandNothingSelected">
@@ -1762,22 +1801,6 @@ Try selecting a single parcel.
                        Region Not Found
                </message>
        </alert>
-        <alert modal="true" name="ParcelCanPlayMusic">
-                <message name="message">
-                        This location can play streaming music. 
-Music requires a fast Internet connection.
-Play music when available?
-(You can change this option later under 
-Preferences &gt; Audio &amp; Video.)
-                </message>
-                <option name="PlayMusic">
-                        Play Music
-                </option>
-                <option name="Disable">
-                        Disable
-                </option>
-        </alert>
        <alert modal="true" name="ParcelCanPlayMedia">
                <message name="message">
                        This location can play streaming media. 
@@ -2615,6 +2638,18 @@ and the default for the &apos;Revert&apos; tool?
                        You can only have [MAX_AGENTS] Allowed Residents.
                </message>
        </alert>
+        <alert modal="true" name="MaxBannedAgentsOnRegion">
+                <message name="message">
+                        You can only have [MAX_BANNED] Banned Residents.
+                </message>
+        </alert>
+        <alert modal="true" name="MaxAgentOnRegionBatch">
+                <message name="message">
+                        Failure while attempting to add [NUM_ADDED] agents:
+Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].
+                </message>
+        </alert>
        <alert modal="true" name="MaxAllowedGroupsOnRegion">
                <message name="message">
                        You can only have [MAX_GROUPS] Allowed Groups.
@@ -2626,11 +2661,6 @@ and the default for the &apos;Revert&apos; tool?
                        Cancel
                </option>
        </alert>
-        <alert modal="true" name="MaxBannedAgentsOnRegion">
-                <message name="message">
-                        You can only have [MAX_BANNED] Banned Residents.
-                </message>
-        </alert>
        <alert modal="true" name="MaxManagersOnRegion">
                <message name="message">
                        You can only have [MAX_MANAGER] Estate Managers.
@@ -2763,6 +2793,20 @@ Download to your Applications folder?
                        Cancel
                </option>
        </alert>
+        <alert modal="true" name="WebLaunchExternalTarget">
+                <message name="message">
+                        Open your system Web browser to view this content?
+                </message>
+                <ignore name="ignore">
+                        When opening your system browser to view a Web page
+                </ignore>
+                <option name="Open">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
        <alert modal="true" name="WebLaunchJoinNow">
                <message name="message">
                        Go to www.secondlife.com to manage your account?
@@ -3444,6 +3488,11 @@ spaceserver hiccup.
                        Problems adding a new estate manager.  One or more estates may have a full manager list.
                </message>
        </alert>
+        <alert modal="true" name="ProblemAddingEstateGeneric">
+                <message name="message">
+                        Problems adding to this estate list.  One or more estates may have a full list.
+                </message>
+        </alert>
        <alert modal="true" name="UnableToLoadNotecard">
                <message name="message">
                        Unable to load notecard&apos;s asset at this time.
@@ -3547,8 +3596,7 @@ parcel. The range allowed is 1 to 10. Set at &apos;1&apos;, each 512m2 parcel
 is allowed 117 objects. Set at &apos;2&apos;, each 512m2 parcel is
 allowed 234, or twice as many, and so on. The max number of objects
 allowed per region remains 15,000 no matter what the
-Object Bonus is. once set, be aware that lowering the Object Bonus may cause
+Object Bonus is. Once set, be aware that lowering the Object Bonus may cause objects to be returned or deleted. 
-objects to be returned or deleted. 
 
 Default: 1.0
                </message>
@@ -4311,7 +4359,7 @@ Linden Lab
                        There is already an object attached to this point on your body.
 Do you want to replace it with the selected object?
                </message>
-                <ignore save_option="true">
+                <ignore name="ignore" save_option="true">
                        When replacing existing attachments
                </ignore>
                <option ignore="Replace Automatically" name="Yes">
@@ -4330,7 +4378,7 @@ this payment.
 Would you like to leave Busy Mode before
 completing this transaction?
                </message>
-                <ignore save_option="true">
+                <ignore name="ignore" save_option="true">
                        When paying a person or object in busy mode
                </ignore>
                <option ignore="Always leave Busy Mode" name="Yes">
@@ -4357,8 +4405,7 @@ the contents of your Trash folder?
        </alert>
        <alert modal="true" name="ConfirmClearBrowserCache">
                <message name="message">
-                        Are you sure you want to clear your
+                        Are you sure you want to clear your browser cache?
-browser cache?
                </message>
                <option default="true" name="Yes">
                        Yes
@@ -4890,3 +4937,4 @@ Would you like to visit the Second Life website to set this up?
                </url>
        </alert>
 </alerts>
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 e9253ff..e5f963a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about.xml
@@ -3,41 +3,40 @@
     can_resize="false" height="440" min_height="100" min_width="100"
     name="floater_about" rect_control="FloaterAboutRect"
     title="About Second Life" width="470">
-        <text_editor bg_readonly_color="0, 0, 0, 0" bottom="-434" embedded_items="false"
+        <text_editor bottom="-434" embedded_items="false"
             follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
-             max_length="65536" mouse_opaque="true" name="credits_editor"
+  max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
-             text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458"
+  word_wrap="true">
-             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, Tofu, 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, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
-                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, Tofu, 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, Jill, Yool, Jane, Yuki, Yoz, Matthew, Arthur, Jennifer, Karl, Brian, Ben, Janine, Christopher, Madhavi, Everett, Anthony, Joon, Jake, sean, Adreanne, Stephany, KellyJo, Jeremy, Pramod, Joshua, Sean, Christopher, Amy, Ceren, Katherine, jon, Sudheendra, James, Stephan, Kari, Kartic, Todd, Thomas, Joki, Rebecca, Belinda, Bert, Roger, Bridie, Kristi, Brian, Maria, John, Aric, Nathanel, Melinda, Darrell, Jennifer, Sandy, Greg, Rob, Brad, Chris, Eric, Palmer, Asi, Katja, Lisa, Minda, Jen, Aaron, Bryan, Mark, Jonathan, Jamie, Laurel, William, Matthew, Steve, David, Remy, James, Tim, Lee, Brian, Ashlei, Sam, Mike, Ethan, Austin, Wanda, Paul, Brian, Rachel, Valentyn, Emma Williams, Autum, Steven, Laley, Charles, Jessica, Sue, Gillian, CG, Kip, Kristen, Shamiran, Blake, Brett, Erica, Kent, Joel, Plexus, Twilight, Joppa, Enus, Kraft, Naveen, Simon, Q, Ronp, Laurap, Ram, KyleJM, Marty, Kend, Daveh, Prospero, Melissa, Nat, Hamilton, Green, Seraph, Ekim, Miz, Jimmy, Kosmo, Rome, Doris, JT, Benoc, Whump, Mango, Trinity, Patch, TJ, Christy, Bao, Joohwan, Kate, Oreh, Angela, Johan, Cheah, Lan, Matias, Brandy, Cogsworth, Aleks,  Mitchell, Space, Einstein, Bambers, Colton, Malbers, Maggie, Umesh, Santosh, Rose, Stash, Rothman, Winnie, Stella, Niall and many others.
-Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
+  Thank you to the following residents for helping to ensure that this is the best version yet: aaron23 decuir, Abelv Vollmar, Abyssin Otoro, ActingIll Igaly, Adamas Carter, Addy Broome, Adelia Menges, Alexandra Rucker, Alexandrea Fride, Alissa Sabre, Alyx Jonson, Ann Otoole, Anton Fargis, Aradia Dielli, Araina jewell, Arcane Clawtooth, arcangelo vantelli, Are Sperber, Argent Stonecutter, arkady yost, Ashcroft Burnham, Ashen Arida, Auron Forcella, Azadine Umarov, Azildin Furst, Balp Allen, Balpien Hammerer, Barney Boomslang, Barrett Slade, becky pippen, Beeflin Grut, Beer Dailey, Behemoth Greenwood, bigmanu greene, bitova loon, Bonca Chikuwa, Bonnie Bechir, Brandon Catteneo, buttonpusher jones, Carina Raymaker, Ceera Murakami, Celierra Darling, ChatNoir Moonsoo, Cheetah Hammerer, chet neurocam, Cinthya Loveless, Cold Spitteler, Coral Quinnell, Crash Pointe, CrazyTB Oh, Creem Pye, Crom Chaffe, ctrl althouse, dade carver, Dael Ra, dakota schwade, Dale Innis, Damian McLeod, Danger Lytton, danielluh ashton, DanOfWA Flanagan, Davec Horsforth, Davidius Morigi, davie zinner, Day Oh, DBDigital Epsilon, Deany Fall, deBruce Munro, Decaf Coffey, Dedric Mauriac, Deeso Saeed, Dekka Raymaker, dexter eberhart, Dildo Spitz, Dizzy Banjo, djcabello klaar, Dnali Anabuki, Domchi Underwood, Doran Zemlja, Drew Dwi, Duckless Vandyke, Duncan Stenvaag, Dylan Rickenbacker, dzogchen Moody, Dzonatas Sol, Eddy Stryker, Edward Griffith, Edward Pearse, ein duesenburg, Elle Pollack, Elle74 Zaftig, Emileigh Starbrook, Emma Nowhere, ener bing, Erdrick Balbozar, eric domela, Evangeline Biedermann, Excalibur Longstaff, Fake Fitzgerald, Feldspar Millgrove, Feynt Mistral, Fluf Fredriksson, Forbid Utorid, Fortyniner Beck, Francesco Despres, Francisco Koolhoven, Franta Burt, Fury Rosewood, garde Burrel, Garmin Kawaguichi, Gavin Ichigo, Gellan Glenelg, Genie Demina, Gennifer Meredith, Gigs Taggart, Goldie Katsu, Gwyneth Llewelyn, Haravikk Mistral, Harleen Gretzky, Haruki Watanabe, Heather Manatiso, Henri Beauchamp, Honey Fairweather, Hypatia Callisto, Ice Brodie, icktoofay Kamachi, IntLibber Brautigan, Janise Dreamscape, Jay Shinobu, Jenni Ryba, Jeremy Ondricek, JetZep Zabelin, Jims Smythe, Jini Hammerer, Jopy Weber, JustOneMore Loon, Kaluura Boa, Kara Markova, Kevin Susenko, Khyra Ares, Kii Lilliehook, Kitty Barnett, Kris Kuttelwascher, Lanita Wingtips, Laura18 Streeter, Lee Ludd, Lettrius Jewell, Liberty Tesla, LilyAnna Carter, Lindal Kidd, Lisa Lowe, Lisa McConnell, Lola Machin, luca peck, Lupus Clawtooth, M1sha Dallin, Macsima Dagostino, Mana Janus, Mani Canning, Manjusri Binder, marceledward edman, march Korda, marchino villota, Marcus Llewellyn, MartinRJ Fayray, Matthew Dowd, Max Kleiber, mazzy fastback, McCabe Maxsted, Mckailen Kohnke, Meghan Dench, Melvin Starbrook, Mercia Mcmahon, Miakoda Carnell, Michelle2 Zenovka, Michi Lumin, mick parnall, Milla Michinaga, Millie Thompson, miranda Ashby, Mircea Lobo, MIssSara Beck, mouse mimistrobell, Myria Boa, Nanci Barthelmess, Nargus Asturias, Natalya Debevec, Nedrae Messmer, Nexeus Fatale, Niky Zenovka, Nimrod Szondi, Ninane Yoshikawa, Noch Tripsa, nokithecat writer, Nyko Merlin, Onyx Halberd, oryx tempel, Osprey Therian, Pac Hyun, Panagea McMillan, Patrick Ferrentino, PattehPh0x Katsu, ponk bing, Poppy Linden, Prajna Vella, Precious Rhiano, Prokofy Neva, Randall Lovenkraft, Rascal Ratelle, Raydon Writer, Rhaorth Antonelli, Rock Hayek, Ron Crimson, Ron Khondji, Ronald Richez, Rui Clary, Ruud Lathrop, Sakkano Imako, Sam Reinard, Sascha Vandyke, Scrippy Scofield, Sean18 McCarey, Sedona Mills, Sekonda Huet, Seraph Nephilim, Sergei Milos, Shadowquine Maltz, shai khalifa, sheilah flatley, Sheri Underwood, Shuggy Husky, Sierra Janus, Sigma Avro, Simil Miles, simon kline, Simon Nolan, Sindy Tsure, Sparks Keynes, Squirrel Wood, Stahi Columbia, StarSong Bright, Summer Seale, Sunn Thunders, Susan Koltai, Syler Zhora, Synack Fitzgerald, Tayra Dagostino, Tee Cramer, Teravus Ousley, Thomas Shikami, Tia Araw, Tillie Ariantho, Topher Brooks, Torley Linden, Twosteppin Jewell, tx Oh, urantia jewell, vaguegirl Petty, VeC Merlin, venus petrov, vv33d Beck, vynka dean, zann canto, zeebster colasanti, Zi Ree, Zion Tristan, Zorin Frobozz, Zyzzy Zarf
-APR Copyright (C) 2000-2004 The Apache Software Foundation
+  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+  APR Copyright (C) 2000-2004 The Apache Software Foundation
-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-GL Copyright (C) 1999-2004 Brian Paul.
+  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+  GL Copyright (C) 1999-2004 Brian Paul.
-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-ogg/vorbis Copyright (C) 2001, Xiphophorus
+  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+  ogg/vorbis Copyright (C) 2001, Xiphophorus
-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-All rights reserved.  See licenses.txt for details.
+  All rights reserved.  See licenses.txt for details.
-Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-Happiness is a warm puppy. -- Charles M. Schulz
+  Happiness is a warm puppy. -- Charles M. Schulz</text_editor>
-        </text_editor>
-        <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="174" embedded_items="false"
+        <text_editor bottom_delta="174" embedded_items="false"
             follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
-             max_length="65536" mouse_opaque="true" name="support_editor"
+             max_length="65536" mouse_opaque="true" name="support_editor" width="458"
-             text_color="1, 1, 1, 1" text_readonly_color="1, 1, 1, 1" width="458"
             word_wrap="true" />
        <string name="you_are_at">
                You are at [POSITION]
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
index 8b21736..1d32b97 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-554" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" can_tear_off="true" enabled="true" height="420"
+     can_resize="false" can_tear_off="false" enabled="true" height="420"
     left="367" min_height="420" min_width="460" mouse_opaque="true"
     name="floaterland" rect_control="FloaterLandRect5" title="About Land"
     width="460">
-        <tab_container bottom="-390" enabled="true" follows="left|top|right|bottom" height="370"
+        <tab_container bottom="-420" enabled="true" follows="left|top|right|bottom" height="400"
-             left="0" mouse_opaque="false" name="landtab" tab_position="top" width="460">
+             left="1" mouse_opaque="false" name="landtab" tab_position="top" width="459">
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                     height="333" label="General" left="1" mouse_opaque="true"
                     name="land_general_panel" width="458">
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -17,9 +17,9 @@
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-20"
                             enabled="true" follows="left|top|right" font="SansSerifSmall"
-                             handle_edit_keys_directly="false" height="16" left="78" max_length="63"
+                             handle_edit_keys_directly="false" height="16" left="78"
-                             mouse_opaque="true" name="Name" select_all_on_focus_received="false"
+                             max_length="63" mouse_opaque="true" name="Name"
-                             select_on_focus="false" text_readonly_color="0.576471 0.662745 0.835294 1"
+                             select_all_on_focus_received="false" select_on_focus="false"
                             width="368" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -32,8 +32,7 @@
                             font="SansSerifSmall" handle_edit_keys_directly="false" height="52"
                             left="76" max_length="255" mouse_opaque="true" name="Description"
                             select_all_on_focus_received="false" select_on_focus="false"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" width="370"
+                             width="370" word_wrap="true" />
-                             word_wrap="true" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-100" drop_shadow_visible="true" enabled="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
@@ -229,8 +228,8 @@
                                (Sale Pending)
                        </string>
                </panel>
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
-                     height="333" label="Covenant" left="1" mouse_opaque="true"
+                     height="333" label="Covenant" left="0" mouse_opaque="true"
                     name="land_covenant_panel" width="458">
                        <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"
@@ -289,7 +288,7 @@
                        <text_editor type="string" length="1" bottom="-325" embedded_items="false" enabled="false"
                             follows="left|top|right|bottom" font="SansSerifSmall" height="200"
                             left="15" max_length="65535" mouse_opaque="true" name="covenant_editor"
-                             text_readonly_color="1 1 1 1" width="420" word_wrap="true">
+                             width="420" word_wrap="true">
                                There is no Covenant provided for this Estate.
                        </text_editor>
                        <string name="can_resell">
@@ -305,7 +304,7 @@
                                Purchased land in this region may not be joined or subdivided.
                        </string>
                </panel>
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                     height="333" label="Objects" left="1" mouse_opaque="true"
                     name="land_objects_panel" width="458">
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -457,18 +456,16 @@
                             name="Return objects..." width="164" />
                        <name_list allow_calling_card_drop="false" background_visible="false" bottom="-329"
                             column_padding="0" draw_border="true" draw_heading="true"
-                             draw_stripes="true" enabled="true" fg_disable_color="1 1 1 1"
+                             draw_stripes="true" enabled="true" 
-                             fg_selected_color="1 1 1 1" fg_unselected_color="1 1 1 1"
                             follows="left|top|right|bottom" height="117" left="4" mouse_opaque="true"
                             multi_select="false" name="owner list" name_column_index="2" width="450">
-                                <column label="Type" sort="online_status" width="24" />
+                                <column name="type" label="Type" sort="online_status" width="24" />
                                <column name="online_status" width="-1" />
-                                <column dynamicwidth="true" label="Name" />
+                                <column name="name" dynamicwidth="true" label="Name" />
-                                <column label="Count" width="70" />
+                                <column name="count" label="Count" width="70" />
                        </name_list>
-                        /&gt;
                </panel>
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                     height="333" label="Options" left="1" mouse_opaque="true"
                     name="land_options_panel" width="458">
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -654,23 +651,11 @@
                                Restrict Pushing (Region Override)
                        </string>
                </panel>
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                     height="363" label="Media" left="1" mouse_opaque="true"
                     name="land_media_panel" width="458">
-                        <text type="string" length="1" bottom="-25" follows="left|top" font="SansSerifSmall" halign="left"
+                        <text type="string" length="1" bottom="-25" follows="left|top" font="SansSerifSmall" halign="left" height="16"
-                             height="16" left="10" name="at URL:" width="65">
+                             left="10" mouse_opaque="true" name="with media:" width="65">
-                                Media URL:
-                        </text>
-                        <line_editor bottom_delta="0" follows="left|top|right" font="SansSerifSmall"
-                 height="16" left="150"
-                             name="media_url" right="-15"
-                             select_all_on_focus_received="true" select_on_focus="true"
-                             text_readonly_color="0.576471 0.662745 0.835294 1" />
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="16" label="Set..." label_selected="Set..." mouse_opaque="true"
-                             name="set_media_url" left="80" scale_image="true" width="60" />
-                        <text type="string" length="1" bottom_delta="-25" follows="left|top" font="SansSerifSmall" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="with media:" width="67">
                                Media Type:
                        </text>
                        <combo_box allow_text_entry="false" bottom_delta="0" follows="left|top" height="18"
@@ -680,14 +665,24 @@
                        <text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                             left_delta="130" name="mime_type" width="200" />
                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
-                             height="16" left="10" name="Description:" width="65">
+                             height="16" left="10" name="at URL:" width="65">
+                                Media URL:
+                        </text>
+                        <line_editor bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" left="80"
+                             max_length="255" name="media_url" right="-80"
+                             select_all_on_focus_received="true" select_on_focus="true"
+                             text_readonly_color="0.576471 0.662745 0.835294 1" />
+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+                             height="16" label="Set..." label_selected="Set..." mouse_opaque="true"
+                             name="set_media_url" right="-12" scale_image="true" width="60" />
+                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
+                             height="16" left="10" name="Description:" width="364">
                                Description:
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             follows="left|top|right" font="SansSerifSmall" height="16" left="80"
+                             follows="left|top" font="SansSerifSmall" height="16" left="80"
-                             max_length="255" name="url_description" right="-15"
+                             max_length="255" name="url_description" right="-80"
                             select_all_on_focus_received="true" select_on_focus="true"
-                             text_readonly_color="0.576471 0.662745 0.835294 1"
                             tool_tip="Text displayed next to play/load button" />
                        <text type="string" length="1" bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="left"
                             height="16" left="10" name="Media texture:" width="364">
@@ -753,11 +748,10 @@ Options:
                                Music URL:
                        </text>
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-                             enabled="true" follows="left|top|right" font="SansSerifSmall"
+                             enabled="true" follows="left|top" font="SansSerifSmall"
                             handle_edit_keys_directly="false" height="16" left="80" max_length="255"
                             mouse_opaque="true" name="music_url" right="-15"
-                             select_all_on_focus_received="true" select_on_focus="true"
+                             select_all_on_focus_received="true" select_on_focus="true"/>
-                             text_readonly_color="0.576471 0.662745 0.835294 1" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-40" drop_shadow_visible="true" enabled="true"
                             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
@@ -778,7 +772,7 @@ Options:
                        </text>
                        <radio_group bottom_delta="-40" draw_border="true" enabled="true" follows="left|top"
                             height="54" left="80" mouse_opaque="true" name="parcel_voice_channel"
-                             tab_stop="true" width="363">
+                             tab_stop="true" width="219">
                                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="3"
                                     mouse_opaque="true" name="Estate" width="463">
                                        Use the Estate spatial channel
@@ -793,7 +787,7 @@ Options:
                                </radio_item>
                        </radio_group>
                </panel>
-                <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom"
+                <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
                     height="333" label="Access" left="1" mouse_opaque="true"
                     name="land_access_panel" width="458">
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -857,35 +851,36 @@ Options:
                             mouse_opaque="true" name="AllowedText" radio_style="false" width="195">
                                Allowed Residents
                        </text>
-                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-320"
+                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-304"
                             column_padding="0" draw_border="true" draw_heading="false" enabled="true"
-                             follows="left|top|bottom" heading_font="SansSerifSmall" heading_height="14"
+                             follows="top|bottom" heading_font="SansSerifSmall" heading_height="14"
-                             height="100" left="20" mouse_opaque="true" multi_select="true"
+                             height="80" left="20" mouse_opaque="true" multi_select="true"
                             name="AccessList" tool_tip="([LISTED] listed, [MAX] max)" width="195" />
-                        <button bottom_delta="-20" enabled="true" follows="left|bottom" font="SansSerifSmall"
+                        <button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
                             halign="center" height="16" label="Add..." label_selected="Add..."
                             left_delta="5" mouse_opaque="true" name="add_allowed" scale_image="true"
                             width="80" />
-                        <button bottom_delta="0" enabled="true" follows="left|bottom" font="SansSerifSmall"
+                        <button bottom_delta="0" enabled="true" follows="bottom" font="SansSerifSmall"
                             halign="center" height="16" label="Remove" label_selected="Remove"
                             left_delta="100" mouse_opaque="true" name="remove_allowed"
                             scale_image="true" width="80" />
                        <text bottom="-220" enabled="true" follows="left|right|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Ban" left="240"
+                             height="16" initial_value="false"
-                             mouse_opaque="true" name="BannedText" radio_style="false" width="195">
+                             label="Ban" left="240" mouse_opaque="true"
-                                Banned Residents
+                             name="BanCheck" radio_style="false" width="195">
+                          Banned Residents
                        </text>
-                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-320"
+                        <name_list allow_calling_card_drop="false" background_visible="true" bottom="-304"
                             column_padding="0" draw_border="true" draw_heading="false" enabled="true"
-                             follows="left|right|top|bottom" heading_font="SansSerifSmall"
+                             follows="top|bottom" heading_font="SansSerifSmall"
-                             heading_height="14" height="100" left_delta="0" mouse_opaque="true"
+                             heading_height="14" height="80" left_delta="0" mouse_opaque="true"
                             multi_select="true" name="BannedList"
                             tool_tip="([LISTED] listed, [MAX] max)" width="195" />
-                        <button bottom_delta="-20" enabled="true" follows="right|bottom" font="SansSerifSmall"
+                        <button bottom_delta="-20" enabled="true" follows="bottom" font="SansSerifSmall"
                             halign="center" height="16" label="Add..." label_selected="Add..."
                             left_delta="5" mouse_opaque="true" name="add_banned" scale_image="true"
                             width="80" />
-                        <button bottom_delta="0" enabled="false" follows="right|bottom" font="SansSerifSmall"
+                        <button bottom_delta="0" enabled="false" follows="bottom" font="SansSerifSmall"
                             halign="center" height="16" label="Remove" label_selected="Remove"
                             left_delta="100" mouse_opaque="true" name="remove_banned"
                             scale_image="true" width="80" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml b/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml
index 8ad36af..a404dc2 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_avatar_textures.xml
@@ -2,10 +2,10 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
     can_resize="false" height="800" name="avatar_texture_debug"
     title="Avatar Textures" width="960">
-        <text bottom="-40" height="16" left="10" name="" width="80">
+        <text bottom="-40" height="16" left="10" name="baked_label" width="80">
                Baked Textures
        </text>
-        <text bottom="-40" height="16" left="150" name="" width="120">
+        <text bottom="-40" height="16" left="150" name="composite_label" width="120">
                Composite Textures
        </text>
        <texture_picker bottom_delta="-150" height="143" label="Head" left="10" name="baked_head"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
index 929df7d..a9acccb 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_contents.xml
@@ -8,9 +8,8 @@
             mouse_opaque="true" name="contains_text" v_pad="0" width="281">
                [NAME] contains:
        </text>
-        <scroll_list background_visible="false" bottom_delta="-152" column_padding="5"
+        <scroll_list background_visible="true" bottom_delta="-152" column_padding="5"
-             draw_border="true" fg_disable_color="1, 1, 1, 1"
+             draw_border="true" 
-             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
             follows="left|top|right|bottom" height="148" left="15" mouse_opaque="true"
             multi_select="false" name="item_list" width="281">
                <column name="icon" width="16" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml
index e2e7fc7..f592d44 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_currency.xml
@@ -3,41 +3,41 @@
     can_resize="false" height="270" min_height="270" min_width="350"
     name="buy currency" title="Buy Currency" width="350">
        <text bottom_delta="-48" follows="top|left" font="SansSerifHuge" height="24"
-             left="16" name="info_buying" right="-20" text_color="white">
+             left="16" name="info_buying" right="-20" >
                Buying Currency:
        </text>
        <text bottom_delta="0" follows="top|left" font="SansSerifHuge" height="24" left="16"
-             name="info_cannot_buy" right="-20" text_color="white">
+             name="info_cannot_buy" right="-20" >
                Cannot buy now:
        </text>
        <text bottom_delta="0" follows="top|left" font="SansSerifHuge" height="24" left="16"
-             name="info_need_more" right="-20" text_color="white">
+             name="info_need_more" right="-20" >
                You need more currency:
        </text>
-        <icon bottom="-112" follows="top|left" height="64" image_name="badge_note.tga"
+        <icon bottom="-112" follows="top|left" height="64" image_name="badge_note.j2c"
             left="0" name="step_error" width="64" />
        <text bottom_delta="-96" follows="top|left" height="140" left="72"
-             name="error_message" right="-20" text_color="white">
+             name="error_message" right="-20" >
                Something ain&apos;t right.
        </text>
        <button bottom_delta="-4" follows="bottom|left" height="20" label="Go to website"
             left="72" name="error_web" width="120" />
-        <icon bottom="-112" follows="top|left" height="64" image_name="badge_note.tga"
+        <icon bottom="-112" follows="top|left" height="64" image_name="badge_note.j2c"
             left="0" name="step_1" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72" name="contacting"
-             right="-20" text_color="white">
+             right="-20" >
                Contacting LindeX...
        </text>
        <text bottom_delta="0" follows="top|left" height="16" left="72"
-             name="buy_action_unknown" right="-20" text_color="white">
+             name="buy_action_unknown" right="-20" >
                Buy L$ on the LindeX currency exchange
        </text>
        <text bottom_delta="0" follows="top|left" height="16" left="72" name="buy_action"
-             right="-20" text_color="white">
+             right="-20" >
                [NAME] L$ [PRICE]
        </text>
        <text bottom_delta="-20" follows="top|left" height="16" left="72"
-             name="currency_action" text_color="white" width="40">
+             name="currency_action"  width="40">
                Buy L$
        </text>
        <line_editor bottom_delta="0" follows="top|right" height="16" left_delta="45"
@@ -45,11 +45,11 @@
                1234
        </line_editor>
        <text bottom_delta="0" follows="top|right" height="16" left_delta="85"
-             name="currency_est" text_color="white" width="180">
+             name="currency_est"  width="180">
                for approx. US$ [USD]
        </text>
        <text bottom_delta="0" follows="top|right" height="16" left_delta="5"
-             name="getting_data" text_color="white" width="180">
+             name="getting_data" width="180">
                Getting data...
        </text>
        <text bottom_delta="-32" follows="top|left" height="16" left="80"
@@ -77,12 +77,12 @@
                L$ [AMT]
        </text>
        <text bottom_delta="-48" follows="top|left" height="32" left="72"
-             name="purchase_warning_repurchase" right="-20" text_color="white">
+             name="purchase_warning_repurchase" right="-20" >
                Confirming this purchase only buys the currency.
 You&apos;ll need to try the operation again.
        </text>
        <text bottom_delta="0" follows="top|left" height="32" left="72"
-             name="purchase_warning_notenough" right="-20" text_color="white">
+             name="purchase_warning_notenough" right="-20" >
                You aren&apos;t buying enough currency
 Increase the amount to buy.
        </text>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
index cadcf31..fe76e10 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_land.xml
@@ -2,62 +2,62 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
     can_resize="false" height="484" min_height="484" min_width="440"
     name="buy land" title="Buy Land" width="740">
-        <text bg_readonly_color="clear" bottom_delta="-35" follows="left|top"
+        <text bottom_delta="-35" follows="left|top"
             font="SansSerifSmall" height="14" left="440" name="region_name_label"
-             right="725" text_readonly_color="white" width="60" word_wrap="true">
+             right="725" width="60" word_wrap="true">
                Region:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
             font="SansSerifSmall" height="14" left="550" name="region_name_text"
-             text_readonly_color="white" width="130">
+             width="130">
                (unknown)
        </text>
-        <text bg_readonly_color="clear" follows="left|top" font="SansSerifSmall" height="14"
+        <text follows="left|top" font="SansSerifSmall" height="14"
-             left="440" name="estate_name_label" right="725" text_readonly_color="white"
+             left="440" name="estate_name_label" right="725" 
             width="60" word_wrap="true">
                Estate:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
             font="SansSerifSmall" height="14" left="550" name="estate_name_text"
-             text_readonly_color="white" width="130">
+             width="130">
                (unknown)
        </text>
-        <text bg_readonly_color="clear" follows="left|top" font="SansSerifSmall" height="20"
+        <text follows="left|top" font="SansSerifSmall" height="20"
             left="440" name="estate_owner_label" right="550"
-             text_readonly_color="white" width="100" word_wrap="true">
+             width="100" word_wrap="true">
                Estate Owner:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
             font="SansSerifSmall" height="20" left="550" name="estate_owner_text"
-             text_readonly_color="white" width="130">
+             width="130">
                (unknown)
        </text>
-        <text bg_readonly_color="clear" follows="left|top" font="SansSerif" height="16"
+        <text follows="left|top" font="SansSerif" height="16"
             left="440" name="resellable_changeable_label" right="725"
-             text_readonly_color="white" width="260" word_wrap="true">
+             width="260" word_wrap="true">
                Purchased land in this region:
        </text>
-        <text bg_readonly_color="clear" follows="left|top" font="SansSerifSmall" height="16"
+        <text follows="left|top" font="SansSerifSmall" height="16"
-             left="470" name="resellable_clause" right="725" text_readonly_color="white"
+             left="470" name="resellable_clause" right="725" 
             width="260" word_wrap="true">
                Purchased land in this region may or may not be resold.
        </text>
-        <text bg_readonly_color="clear" follows="left|top" font="SansSerifSmall" height="16"
+        <text follows="left|top" font="SansSerifSmall" height="16"
-             left="470" name="changeable_clause" right="725" text_readonly_color="white"
+             left="470" name="changeable_clause" right="725" 
             width="260" word_wrap="true">
                may or may not be joined or subdivided.
        </text>
        <text follows="" height="16" left="440" name="covenant_text" right="725"
-             text_color="white" width="260">
+             width="260">
                You must agree to the Estate Covenant:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="-12" follows="left|top"
+        <text bottom_delta="-12" follows="left|top"
             font="SansSerifSmall" height="12" left="515" name="covenant_timestamp_text"
-             right="725" text_readonly_color="white" width="260" word_wrap="true" />
+             right="725" width="260" word_wrap="true" />
-        <text_editor bg_readonly_color="clear" bottom_delta="-260" enabled="false"
+        <text_editor bottom_delta="-260" enabled="false"
             follows="top|right" font="SansSerifSmall" height="255" left="440"
             max_length="65535" name="covenant_editor" right="725"
-             text_readonly_color="white" width="275" word_wrap="true">
+             width="275" word_wrap="true">
                Loading...
        </text_editor>
        <check_box follows="left|top" height="20" label="I Agree to the Covenant Defined Above."
@@ -65,47 +65,47 @@
        <texture_picker bottom_delta="290" enabled="false" follows="top|left" height="135" left="16"
             name="info_image" width="180" />
        <text bottom_delta="119" follows="top|left" font="SansSerifSmall" left="204"
-             name="info_parcel_label" text_color="white" width="48">
+             name="info_parcel_label" width="48">
                Parcel:
        </text>
-        <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16"
+        <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left_delta="50"
-             left_delta="50" name="info_parcel" right="400" text_color="white">
+             name="info_parcel" right="400" >
                Scotopteryx 138,204
        </text>
        <text follows="top|left" font="SansSerifSmall" left="204" name="info_size_label"
-             text_color="white" width="48">
+             width="48">
                Size:
        </text>
-        <text bottom_delta="-21" follows="top|left" font="SansSerif" height="32"
+        <text bottom_delta="-21" follows="top|left" font="SansSerif" height="32" left_delta="50"
-             left_delta="50" name="info_size" right="400" text_color="white">
+             name="info_size" right="400" >
                1024 sq. m.
        </text>
        <text follows="top|left" font="SansSerifSmall" left="204" name="info_price_label"
-             text_color="white" width="48">
+             width="48">
                Price:
        </text>
-        <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16"
+        <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left_delta="50"
-             left_delta="50" name="info_price" right="400" text_color="white">
+             name="info_price" right="400" >
                L$ 1500, objects included
        </text>
        <text bottom="-180" follows="top|left" font="SansSerifHuge" height="24" left="16"
-             name="info_action" text_color="white" width="200">
+             name="info_action" width="200">
                Buying this land will:
        </text>
        <pad height="10" />
-        <icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
+        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_error" width="64" />
        <text bottom_delta="-110" follows="top|left" height="160" left="72"
-             name="error_message" right="400" text_color="white" width="180">
+             name="error_message" right="400" width="180">
                Something ain&apos;t right.
        </text>
        <button bottom_delta="-4" follows="bottom|left" height="20" label="Go to website"
             left="72" name="error_web" width="120" />
        <pad height="-200" />
-        <icon follows="top|left" height="64" image_name="badge_ok.tga" left="0" name="step_1"
+        <icon follows="top|left" height="64" image_name="badge_ok.j2c" left="0" name="step_1"
             width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="account_action" right="400" text_color="white" width="180">
+             name="account_action" right="400" width="180" font="SansSerifBig" >
                Upgrade you to premium membership.
        </text>
        <text follows="top|left" height="16" left="72" name="account_reason" right="400"
@@ -124,29 +124,29 @@
                </combo_item>
        </combo_box>
        <pad height="10" />
-        <icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
+        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_2" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="land_use_action" right="400" text_color="white" width="180">
+             name="land_use_action" right="400" width="180" font="SansSerifBig" >
                Increase your monthly land use fees to US$ 40/month.
        </text>
        <text follows="top|left" height="32" left="72" name="land_use_reason" right="400"
             width="180">
-                You hold 1,309 square meters of land.
+                You hold 1,309 square meters of land. 
 This parcel is 512 square meters of land.
        </text>
        <pad height="10" />
-        <icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
+        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_3" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="purchase_action" right="400" text_color="white">
+             name="purchase_action" right="400" font="SansSerifBig" >
                Pay Joe Resident L$4000 for the land
        </text>
        <text follows="top|left" height="16" left="72" name="currency_reason" right="400">
                You have L$2,100.
        </text>
        <text bottom_delta="-25" follows="top|left" height="16" left="74"
-             name="currency_action" text_color="white" width="90">
+             name="currency_action" width="90">
                Buy additional L$
        </text>
        <pad height="0" width="8" />
@@ -156,7 +156,7 @@ This parcel is 512 square meters of land.
        </line_editor>
        <pad height="0" width="8" />
        <text bottom_delta="3" follows="top|right" height="16" left="260" name="currency_est"
-             text_color="white" width="180">
+             width="180">
                for approx. US$ [AMOUNT2]
        </text>
        <text follows="top|left" height="16" left="72" name="currency_balance" right="400">
@@ -188,7 +188,7 @@ This parcel is 512 square meters of land.
                No land selected.
        </string>
        <string name="multiple_parcels_selected">
-                Multiple different parcels selected.
+                Multiple different parcels selected. 
 Try selecting a smaller area.
        </string>
        <string name="no_permission">
@@ -210,15 +210,15 @@ Try selecting a smaller area.
                The selected area has no public land.
        </string>
        <string name="not_owned_by_you">
-                Land owned by another user is selected.
+                Land owned by another user is selected. 
 Try selecting a smaller area.
        </string>
        <string name="for_first_time_group">
-                This land is reserved for first time buyers.
+                This land is reserved for first time buyers. 
 You cannot buy it for a group.
        </string>
        <string name="for_first_time">
-                This land is reserved for first time buyers.
+                This land is reserved for first time buyers. 
 You already own land.
        </string>
        <string name="processing">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml b/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml
index 1c0f9fb..3d30171 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_buy_object.xml
@@ -2,9 +2,8 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
     height="250" min_height="175" min_width="154" name="contents"
     rect_control="FloaterBuyRect" title="Buy Copy of Object" width="300">
-        <scroll_list background_visible="false" bottom="-60" column_padding="5" draw_border="true"
+        <scroll_list background_visible="true" bottom="-60" column_padding="5" draw_border="true"
-             fg_disable_color="1, 1, 1, 1" fg_selected_color="1, 1, 1, 1"
+             follows="left|top|right" height="36"
-             fg_unselected_color="1, 1, 1, 1" follows="left|top|right" height="36"
             left="15" mouse_opaque="true" multi_select="false" name="object_list"
             width="281">
                <column name="icon" width="16" />
@@ -16,9 +15,8 @@
             mouse_opaque="true" name="contents_text" v_pad="0" width="281">
                and its contents:
        </text>
-        <scroll_list background_visible="false" bottom_delta="-112" column_padding="5"
+        <scroll_list background_visible="true" bottom_delta="-112" column_padding="5"
-             draw_border="true" fg_disable_color="1, 1, 1, 1"
+             draw_border="true" 
-             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
             follows="left|top|right|bottom" height="108" left="15" mouse_opaque="true"
             multi_select="false" name="item_list" width="281">
                <column name="icon" width="16" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_camera.xml b/linden/indra/newview/skins/xui/en-us/floater_camera.xml
new file mode 100644
index 0000000..44e12ef
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_camera.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true"
+        can_drag_on_left="false"
+        can_minimize="false"
+    can_resize="false"
+        can_tear_off="true" 
+        follows="top"
+        min_height="100"
+        min_width="100"
+    mouse_opaque="true"
+        name="move floater"
+        rect_control="FloaterCameraRect3"
+    title=""
+        >
+        <!-- Icons are custom buttons in the code -->
+        <string name="rotate_tooltip">Rotate Camera Around Focus</string>
+        <string name="zoom_tooltip">Zoom Camera Towards Focus</string>
+        <string name="move_tooltip">Move Camera Up and Down, Left and Right</string>
+</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
index a887c54..91f3bdb 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
@@ -18,11 +18,17 @@
        <string name="voice_icon">
                icn_voice-localchat.tga
        </string>
+        <string name="IM_logging_string">
+                -- Instant message logging enabled --
+        </string>
+        <string name="IM_end_log_string">
+                -- End of Log --
+        </string>
        <layout_stack border="false" bottom="2" follows="left|top|right|bottom" height="250" left="2"
-             orientation="horizontal" width="430">
+             orientation="horizontal" width="430" name="panels">
                <layout_panel border="false" bottom="0" default_tab_group="1" height="130" left="0"
                     min_width="275" name="im_contents_panel" width="305">
-                        <combo_box follows="left|top" height="20" label="Gestures" left="4" name="Gesture"
+                        <combo_box follows="left|top" height="20" label="Gestures" left="5" name="Gesture"
                             width="120">
                                <combo_item name="Gestures">
                                        Gestures
@@ -32,29 +38,31 @@
                             height="20" initial_value="false" label="Show Muted Text" left_delta="125"
                             name="show mutes" radio_style="false" width="116" />
                        <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
-                             label_selected="&gt; &gt;" left="270" name="toggle_active_speakers_btn"
+                             label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn"
-                             right="303"
+                             right="305"
                             tool_tip="Click here to show list of active participants in this IM session."
-                             visible="true" width="70" />
+                             width="70" />
-                        <text_editor type="string" length="1" bottom="28" embedded_items="false" enabled="false"
+                        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-                             follows="left|top|right|bottom" font="SansSerif" height="70" left="6"
+                             bottom="28" embedded_items="false" enabled="false"
+                             follows="left|top|right|bottom" font="SansSerif" height="74" left="5"
                             max_length="2147483647" mouse_opaque="true" name="Chat History Editor"
-                             text_color="1 1 1 1" text_readonly_color="1 1 1 1" width="300"
+                             text_color="ChatHistoryTextColor"
-                             word_wrap="true" />
+                             text_readonly_color="ChatHistoryTextColor" width="299" word_wrap="true" />
-                        <text_editor type="string" length="1" bottom="28" embedded_items="false" enabled="false"
+                        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-                             follows="left|top|right|bottom" font="SansSerif" height="70" left="6"
+                             bottom="28" embedded_items="false" enabled="false"
+                             follows="left|top|right|bottom" font="SansSerif" height="74" left="5"
                             max_length="2147483647" mouse_opaque="true"
-                             name="Chat History Editor with mute" text_color="1 1 1 1"
+                             name="Chat History Editor with mute" text_color="ChatHistoryTextColor"
-                             text_readonly_color="1 1 1 1" width="300" word_wrap="true" />
+                             text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true" />
-                        <panel bottom="3" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
+                        <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
                             tab_group="1" top="25">
                                <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
                                     enabled="true" follows="left|right|bottom" font="SansSerif"
                                     handle_edit_keys_directly="false" height="20" label="Click here to chat."
                                     left="0" max_length="254" mouse_opaque="true" name="Chat Editor"
-                                     right="-90" select_all_on_focus_received="false" select_on_focus="false"
+                                     right="-70" select_all_on_focus_received="false" select_on_focus="false"
                                     tab_group="1" />
-                                <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-80"
+                                <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
                                     list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
                                     width="70">
                                        <flyout_button_item value="shout">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml b/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
index b836893..83059f2 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_chatterbox.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="390" min_height="340" min_width="400" name="floater_chatterbox"
+     height="390" name="floater_chatterbox"
     rect_control="ChatterboxRect" title="Communicate" width="392">
-        <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"
+<icon enabled="false" image_name="tabarea.tga"
+             bg_alpha_color="blue" color="DefaultShadowLight" border="false"
+             bottom="-389" follows="left|right|bottom" height="17" left="1" scale_image="true"
+             mouse_opaque="false" name="chatterbox_tab_container" width="391"></icon>
+    <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"
             name="chatterbox_tabs" tab_position="bottom" tab_width="80" width="395" />
 </multi_floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_critical.xml b/linden/indra/newview/skins/xui/en-us/floater_critical.xml
index 58c8c16..126a8ac 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_critical.xml
@@ -8,22 +8,13 @@
        <button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
             label_selected="Cancel" left_delta="108" mouse_opaque="true" name="Cancel"
             width="100" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-31" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="15" left="16" mouse_opaque="true" name="tos_title" v_pad="0" width="568">
-             bottom="-31" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+    Critical Message
-             h_pad="0" halign="left" height="15" left="16" mouse_opaque="true"
+  </text>
-             name="tos_title" v_pad="0" width="568">
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-77" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="30" left="32" mouse_opaque="true" name="tos_heading" v_pad="0" width="552">
-                Critical Message
-        </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-77" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-             h_pad="0" halign="left" height="30" left="32" mouse_opaque="true"
-             name="tos_heading" v_pad="0" width="552">
                Please read the following message carefully.
        </text>
-        <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
+        <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif" height="283" left="16" max_length="65536" mouse_opaque="true" text_readonly_color="255,255,255,255" bg_readonly_color="0, 30, 80, 200" name="tos_text" width="568" word_wrap="true">
-             height="283" left="16" max_length="65536" mouse_opaque="true"
-             name="tos_text" text_readonly_color="1, 1, 1, 1" width="568"
-             word_wrap="true">
                TOS_TEXT
        </text_editor>
-</floater>
+</floater>
+\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/xui/en-us/floater_customize.xml
index 1123355..e7a7a7b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_customize.xml
@@ -7,7 +7,7 @@
        <tab_container bottom="-507" height="483" left="0" mouse_opaque="false"
             name="customize tab container" tab_min_width="96" tab_position="left"
             width="492">
-                <panel label="Body Parts" placeholder="true" />
+                <panel label="Body Parts" placeholder="true" name="body_parts_placeholder" />
                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
                     label="Shape" left="102" mouse_opaque="true" name="Shape" width="389">
                        <icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
@@ -370,7 +370,7 @@ scratch and wear it.
                             height="20" label="Revert" label_selected="Revert" left="299"
                             mouse_opaque="true" name="Revert" scale_image="true" width="82" />
                </panel>
-                <panel label="Clothes" placeholder="true" />
+                <panel label="Clothes" placeholder="true" name="clothes_placeholder" />
                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="481"
                     label="Shirt" left="102" mouse_opaque="true" name="Shirt" width="389">
                        <icon bottom="-21" color="1 1 1 1" follows="top|right" height="16"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml b/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
index c1a4261..84812b9 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_day_cycle_options.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="275" hidden="false" left="50" min_height="180"
+     can_resize="false" height="275" left="50" min_height="180"
     min_width="400" mouse_opaque="true" name="Day Cycle Floater"
     rect_control="FloaterDayCycleRect" title="Day Cycle Editor" width="646">
-        <tab_container bottom="-275" follows="left|top" height="255" hidden="false" left="0"
+        <tab_container bottom="-275" follows="left|top" height="255" left="0"
             mouse_opaque="false" name="Day Cycle Tabs" tab_position="top" width="644">
                <panel border="true" bottom="-255" follows="left|top|right|bottom" height="255"
-                     hidden="false" label="Day Cycle" left="1" mouse_opaque="false"
+                     label="Day Cycle" left="1" mouse_opaque="false"
                     name="Day Cycle" width="642">
                        <button bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="15"
                             label="?" left="612" name="WLDayCycleHelp" width="18" />
@@ -24,146 +24,146 @@
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom="-80" control_name="WL12am" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left="8" mouse_opaque="true" name="WL12am"
+                             height="6" left="8" mouse_opaque="true" name="WL12am"
                             v_pad="0" width="55">
                                12am
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL3am" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL3am"
+                             height="6" left_delta="65" mouse_opaque="true" name="WL3am"
                             v_pad="0" width="55">
                                3am
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL6am" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL6am"
+                             height="6" left_delta="65" mouse_opaque="true" name="WL6am"
                             v_pad="0" width="55">
                                6am
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL9am" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="6" left_delta="65" mouse_opaque="true"
                             name="WL9amHash" v_pad="0" width="55">
                                9am
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL12pm" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="6" left_delta="65" mouse_opaque="true"
                             name="WL12pmHash" v_pad="0" width="55">
                                12pm
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL3pm" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL3pm"
+                             height="6" left_delta="65" mouse_opaque="true" name="WL3pm"
                             v_pad="0" width="55">
                                3pm
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL6pm" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL6pm"
+                             height="6" left_delta="65" mouse_opaque="true" name="WL6pm"
                             v_pad="0" width="55">
                                6pm
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL9pm" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true" name="WL9pm"
+                             height="6" left_delta="65" mouse_opaque="true" name="WL9pm"
                             v_pad="0" width="55">
                                9pm
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL12am2" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left"
-                             height="6" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="6" left_delta="65" mouse_opaque="true"
                             name="WL12am2" v_pad="0" width="55">
                                12am
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom="-68" control_name="WL12amHash" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="14" hidden="false" left="20" mouse_opaque="true" name="WL12amHash"
+                             height="14" left="20" mouse_opaque="true" name="WL12amHash"
                             v_pad="0" width="4">
                                |
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL3amHash" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="11" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="11" left_delta="65" mouse_opaque="true"
                             name="WL3amHash" v_pad="0" width="4">
                                I
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL6amHash" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="14" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="14" left_delta="65" mouse_opaque="true"
                             name="WL6amHash" v_pad="0" width="4">
                                |
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL9amHash" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="11" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="11" left_delta="65" mouse_opaque="true"
                             name="WL9amHash2" v_pad="0" width="4">
                                I
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL12pmHash" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="14" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="14" left_delta="65" mouse_opaque="true"
                             name="WL12pmHash2" v_pad="0" width="4">
                                |
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL3pmHash" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="11" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="11" left_delta="65" mouse_opaque="true"
                             name="WL3pmHash" v_pad="0" width="4">
                                I
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL6pmHash" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="14" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="14" left_delta="65" mouse_opaque="true"
                             name="WL6pmHash" v_pad="0" width="4">
                                |
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL9pmHash" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="11" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="11" left_delta="65" mouse_opaque="true"
                             name="WL9pmHash" v_pad="0" width="4">
                                I
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="0" control_name="WL12amHash2" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="14" hidden="false" left_delta="65" mouse_opaque="true"
+                             height="14" left_delta="65" mouse_opaque="true"
                             name="WL12amHash2" v_pad="0" width="4">
                                |
                        </text>
                        <button bottom="-40" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Add Key" label_selected="Add Key" left="550"
+                             label="Add Key" label_selected="Add Key" left="550"
                             mouse_opaque="true" name="WLAddKey" scale_image="true" width="80" />
                        <button bottom="-65" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Delete Key" label_selected="Delete Key" left="550"
+                             label="Delete Key" label_selected="Delete Key" left="550"
                             mouse_opaque="true" name="WLDeleteKey" scale_image="true" width="80" />
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom="-120" control_name="DayCycleText" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="16" hidden="false" left="20" mouse_opaque="true"
+                             height="16" left="20" mouse_opaque="true"
                             name="WLCurKeyFrameText" v_pad="0" width="150">
                                Key Frame Settings:
                        </text>
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom="-140" control_name="DayCycleText" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="16" hidden="false" left="30" mouse_opaque="true"
+                             height="16" left="30" mouse_opaque="true"
                             name="WLCurKeyTimeText" v_pad="0" width="100">
                                Key Time:
                        </text>
@@ -179,7 +179,7 @@
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom_delta="-25" control_name="WLCurKeyTimeText"
                             drop_shadow_visible="true" follows="left|top|right" font="SansSerif"
-                             h_pad="0" halign="left" height="16" hidden="false" left="30"
+                             h_pad="0" halign="left" height="16" left="30"
                             mouse_opaque="true" name="WLCurKeyTimeText2" v_pad="0" width="120">
                                Key Preset:
                        </text>
@@ -191,7 +191,7 @@
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom="-130" control_name="DayCycleText" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="16" hidden="false" left="220" mouse_opaque="true"
+                             height="16" left="220" mouse_opaque="true"
                             name="DayCycleText" v_pad="0" width="120">
                                Snap:
                        </text>
@@ -201,7 +201,7 @@
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom="-180" control_name="DayCycleText" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="16" hidden="false" left="220" mouse_opaque="true"
+                             height="16" left="220" mouse_opaque="true"
                             name="DayCycleText2" v_pad="0" width="120">
                                Length of Cycle:
                        </text>
@@ -223,26 +223,26 @@
                        <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true"
                             bottom="-130" control_name="DayCycleText" drop_shadow_visible="true"
                             follows="left|top|right" font="SansSerif" h_pad="0" halign="left"
-                             height="16" hidden="false" left="310" mouse_opaque="true"
+                             height="16" left="310" mouse_opaque="true"
                             name="DayCycleText3" v_pad="0" width="120">
                                Preview:
                        </text>
                        <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Play" label_selected="Play" left="310"
+                             label="Play" label_selected="Play" left="310"
                             mouse_opaque="true" name="WLAnimSky" scale_image="true" width="50" />
                        <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Stop!" label_selected="Stop" left_delta="55"
+                             label="Stop!" label_selected="Stop" left_delta="55"
                             mouse_opaque="true" name="WLStopAnimSky" scale_image="true" width="50" />
                        <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Use Estate Time" label_selected="Go to Estate Time"
+                             label="Use Estate Time" label_selected="Go to Estate Time"
                             left_delta="55" mouse_opaque="true" name="WLUseLindenTime"
                             scale_image="true" width="140" />
                        <button bottom="-195" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Save Test Day" label_selected="Save Test Day"
+                             label="Save Test Day" label_selected="Save Test Day"
                             left="480" mouse_opaque="true" name="WLSaveDayCycle" scale_image="true"
                             width="150" />
                        <button bottom="-220" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="Load Test Day" label_selected="Load Test Day"
+                             label="Load Test Day" label_selected="Load Test Day"
                             left="480" mouse_opaque="true" name="WLLoadDayCycle" scale_image="true"
                             width="150" />
                </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index aff0db9..7714d67 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -139,10 +139,7 @@
                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                             height="20" label="Delete" label_selected="Delete" left="80"
                             mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true"                       follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                             multi_select="false" name="results" search_column="2" width="339">
                                <column label="" name="icon" width="24" />
                                <column label="" name="type" width="-1" />
@@ -180,7 +177,7 @@
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-36" drop_shadow_visible="true" follows="left|top" font="SansSerif"
                             h_pad="0" halign="center" height="14" left_delta="40" mouse_opaque="true"
-                             name="date_text" text_color="1, 1, 1, 1" v_pad="0" width="48">
+                             name="date_text" v_pad="0" width="48">
                                6/6
                        </text>
                        <button bottom="-40" follows="left|top" font="SansSerif" halign="center" height="20"
@@ -253,9 +250,7 @@
                        <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                             height="20" label="Delete" label_selected="Delete" left="80"
                             mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                             multi_select="false" name="results" search_column="2" width="339">
                                <column label="" name="icon" width="24" />
@@ -308,9 +303,7 @@
                                These are the most popular places in the world, as measured by traffic,
 the amount of time people spend there.
                        </text>
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                             multi_select="false" name="results" search_column="2" width="339">
                                <column label="" name="icon" width="24" />
@@ -389,9 +382,7 @@ the amount of time people spend there.
                                Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
 To buy direct, visit the land and click on the place name in the title bar.
                        </text>
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                             multi_select="false" name="results" search_column="2" width="387">
                                <column label="" name="icon" width="24" />
@@ -479,10 +470,8 @@ To buy direct, visit the land and click on the place name in the title bar.
                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                             label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
                             name="Search" width="70" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
+                             draw_heading="true" follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
-                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                             multi_select="false" name="results" search_column="2" width="339">
                                <column label="" name="icon" width="24" />
                                <column label="" name="type" width="-1" />
@@ -521,9 +510,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                        <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
                             label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
                             name="Search" width="70" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                             multi_select="false" name="results" search_column="2" width="326">
                                <column label="" name="icon" width="24" />
@@ -566,9 +553,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                             font="SansSerifSmall" height="16" initial_value="false"
                             label="Include Mature groups" left="42" mouse_opaque="true"
                             name="incmature" width="204" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="true" 
-                             draw_heading="true" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                             multi_select="false" name="results" search_column="2" width="339">
                                <column label="" name="icon" sort="score" sort_ascending="false" width="24" />
@@ -613,9 +598,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                             font="SansSerifSmall" height="16" initial_value="false"
                             label="Include Mature content" left_delta="78" mouse_opaque="true"
                             name="incmature" width="156" />
-                        <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true" draw_heading="false" 
-                             draw_heading="false" fg_disable_color="1, 1, 1, 1"
-                             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
                             follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
                             multi_select="false" name="results" search_column="1" width="339">
                                <column label="" name="icon" width="24" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml
index 31feeb4..e2bafbf 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_env_settings.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-130" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="150" hidden="false" left="50" min_height="150"
+     can_resize="false" height="150" left="50" min_height="150"
     min_width="600" mouse_opaque="true" name="Environment Editor Floater"
     rect_control="FloaterEnvRect" title="Environment Editor" width="600">
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-48" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16" 
             left="10" mouse_opaque="true" name="EnvTimeText" v_pad="0" width="140">
                Time of Day
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-30" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" 
             left="15" mouse_opaque="true" name="EnvTimeText2" v_pad="0" width="140">
                12:00 PM
        </text>
@@ -24,7 +24,7 @@
             width="200" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16" 
             left="10" mouse_opaque="true" name="EnvCloudText" v_pad="0" width="140">
                Cloud Cover
        </text>
@@ -35,18 +35,18 @@
             width="210" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-55" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16" 
             left="310" mouse_opaque="true" name="EnvWaterColorText" v_pad="0"
             width="140">
                Water Color
        </text>
        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-             height="50" hidden="false" label="" left="390" mouse_opaque="true"
+             height="50" label="" left="390" mouse_opaque="true"
             name="EnvWaterColor" tool_tip="Click to open Color Picker" width="40" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16" 
             left="310" mouse_opaque="true" name="EnvWaterFogText" v_pad="0" width="140">
                Water Fog
        </text>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_friends.xml b/linden/indra/newview/skins/xui/en-us/floater_friends.xml
deleted file mode 100644
index 540b066..0000000
--- a/linden/indra/newview/skins/xui/en-us/floater_friends.xml
+++ /dev/null
@@ -1,65 +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"
-     min_height="300" min_width="350" name="friends"
-     rect_control="FloaterFriendsRect" title="Friends">
-        <scroll_list bottom="90" can_resize="true" column_padding="0" draw_heading="true"
-             follows="left|top|bottom|right" left="10" multi_select="true"
-             name="friend_list" right="-100" search_column="1"
-             tool_tip="Hold shift or control while clicking to select multiple friends"
-             top="-20">
-                <column image="ff_online_status_button.tga" name="icon_online_status" width="20" />
-                <column dynamicwidth="true" label="Name" name="friend_name" />
-                <column image="ff_visible_online_button.tga" name="icon_visible_online" width="20" />
-                <column image="ff_visible_map_button.tga" name="icon_visible_map" width="20" />
-                <column image="ff_edit_mine_button.tga" name="icon_edit_mine" width="20" />
-                <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" width="20" />
-        </scroll_list>
-        <panel background_opaque="true" background_visible="true" bevel_style="in"
-             bg_alpha_color="blue" bg_opaque_color="0,0,0,0.3" border="true" bottom="10"
-             can_resize="false" follows="left|right|bottom" height="70" left="10"
-             mouse_opaque="true" name="rights_container" right="-100">
-                <text bottom_delta="-11" follows="top|left" font="SansSerifSmall" left="10"
-                     name="friend_name_label">
-                        Select friend(s) to change rights...
-                </text>
-                <check_box bottom_delta="-21" enabled="false" follows="bottom|left" font="SansSerifSmall"
-                     height="16" initial_value="false" label="Can see my online status"
-                     left="10" mouse_opaque="true" name="online_status_cb" radio_style="false"
-                     tool_tip="Set whether this friend see my online status in their friends list or calling cards"
-                     width="200" />
-                <check_box bottom_delta="-18" enabled="false" follows="bottom|left" font="SansSerifSmall"
-                     height="16" initial_value="false" label="Can see me on the map" left="25"
-                     mouse_opaque="true" name="map_status_cb" radio_style="false"
-                     tool_tip="Set whether this friend see my location on their map" width="200" />
-                <check_box bottom_delta="-18" enabled="false" follows="bottom|left" font="SansSerifSmall"
-                     height="16" initial_value="false" label="Can modify my objects" left="10"
-                     mouse_opaque="true" name="modify_status_cb" radio_style="false"
-                     tool_tip="Set whether this friend can modify my objects" width="200" />
-                <text bottom_delta="25" follows="top|left" font="SansSerif" left="10"
-                     name="process_rights_label">
-                        Processing rights change...
-                </text>
-        </panel>
-        <pad bottom="-17" height="0" left="-90" width="1" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Profile" left_delta="0" name="profile_btn"
-             tool_tip="Show picture, groups, and other information" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="IM/Call" left_delta="0" name="im_btn"
-             tool_tip="Open Instant Message session" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Teleport..." left_delta="0" name="offer_teleport_btn"
-             tool_tip="Offer this friend a teleport to your current location" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Pay..." left_delta="0" name="pay_btn"
-             tool_tip="Give Linden dollars (L$) to this friend" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Remove..." left_delta="0" name="remove_btn"
-             tool_tip="Remove this person from your friends list" width="80" />
-        <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
-             label="Add..." left_delta="0" name="add_btn"
-             tool_tip="Offer friendship to a resident" width="80" />
-        <string name="Multiple">
-                Multiple friends...
-        </string>
-</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_gesture.xml b/linden/indra/newview/skins/xui/en-us/floater_gesture.xml
index 62d8dd2..b8a7174 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_gesture.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_gesture.xml
@@ -1,23 +1,25 @@
 <?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="465" min_height="200" min_width="375" name="gestures"
+     height="465" min_height="200" min_width="350" name="gestures"
-     title="Active Gestures" width="375">
+     title="Active Gestures" width="350">
        <text bottom="-30" follows="top|left" font="SansSerifSmall" left="15"
             name="help_label">
-                Click a gesture or press a key to play animations and sounds.
+                Double-click a gesture to play animations and sounds.
        </text>
-        <scroll_list bottom_delta="-380" draw_border="true" draw_heading="true"
+        <scroll_list bottom_delta="-390" draw_border="true" draw_heading="true"
-             follows="top|left|bottom|right" height="370" left="15" multi_select="false"
+             follows="top|left|bottom|right" height="380" left="15" multi_select="false"
-             name="gesture_list" width="345">
+             name="gesture_list" right="-15">
                <column label="Trigger" name="trigger" width="70" />
                <column label="Key" name="shortcut" width="70" />
                <column label="" name="key" width="-1" />
                <column label="Name" name="name" width="160" />
        </scroll_list>
-        <button bottom_delta="-30" follows="bottom|right" height="20" label="New" left="-365"
+        <button bottom_delta="-30" follows="bottom|right" height="20" label="New" left="15"
             name="new_gesture_btn" width="83" />
+        <!--
        <button bottom_delta="0" follows="bottom|right" height="20" label="Inventory"
             left_delta="89" name="inventory_btn" width="83" />
+        -->
        <button bottom_delta="0" follows="bottom|right" height="20" label="Edit"
             left_delta="89" name="edit_btn" width="83" />
        <button bottom_delta="0" follows="bottom|right" height="20" label="Play"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_groups.xml b/linden/indra/newview/skins/xui/en-us/floater_groups.xml
deleted file mode 100644
index ceeefd9..0000000
--- a/linden/indra/newview/skins/xui/en-us/floater_groups.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-371" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" can_tear_off="false" enabled="true" follows="left|top"
-     height="300" left="280" min_height="250" min_width="350"
-     mouse_opaque="true" name="groups" title="Groups" width="350">
-        <scroll_list background_visible="true" bottom="45" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true"
-             follows="left|top|right|bottom" left="10" mouse_opaque="true"
-             multi_select="false" name="group list" tab_stop="true" top="-20"
-             width="240">
-                <column label="" name="name" width="248" />
-        </scroll_list>
-        <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|bottom"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-             mouse_opaque="false" name="groupdesc" v_pad="0" width="248">
-                Your currently active group is displayed in bold.
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-             mouse_opaque="false" name="groupcount" v_pad="0" width="248">
-                You belong to [COUNT] groups (of [MAX] maximum).
-        </text>
-        <pad bottom="-17" height="0" left="-90" width="1" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Info" name="Info" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="IM/Call" left_delta="0" name="IM"
-             tool_tip="Open Instant Message session" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Activate" name="Activate" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Leave" name="Leave" width="80" />
-        <button bottom_delta="-35" follows="top|right" font="SansSerif" height="22"
-             label="Create..." name="Create" width="80" />
-        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-             label="Search..." name="Search..." width="80" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml b/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml
index 64a3c6b..5773142 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_hardware_settings.xml
@@ -1,53 +1,82 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-400" can_close="true" can_drag_on_left="false" can_minimize="true"
+<floater bottom="-400" can_close="true" can_drag_on_left="false" 
-     can_resize="false" height="205" hidden="false" left="50" min_height="200"
+        can_minimize="true" can_resize="false" height="224"
-     min_width="600" mouse_opaque="true" name="Hardware Settings Floater"
+        left="50" min_height="200" min_width="600" mouse_opaque="true" 
-     title="Hardware Settings" width="500">
+        name="Hardware Settings Floater" title="Hardware Settings" width="500">
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-42" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="10" mouse_opaque="true" name="Filtering:" v_pad="0" width="128">
                Filtering:
        </text>
        <check_box bottom="-46" control_name="RenderAnisotropic" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+             font="SansSerifSmall" height="16" initial_value="false"
             label="Anisotropic Filtering (slower when enabled)" left="148"
             mouse_opaque="true" name="ani" radio_style="false" width="256" />
-        <spinner bottom="-65" control_name="RenderGamma" decimal_digits="2" enabled="true"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             follows="left|top" height="16" hidden="false" increment="0.01"
+                bottom="-61" drop_shadow_visible="true" enabled="true" follows="left|top"
+                font="SansSerifSmall" h_pad="0" halign="left" height="12"
+                left="10" mouse_opaque="true" name="Antialiasing:" v_pad="0" width="128">
+    Antialiasing:
+  </text>
+  <combo_box bottom="-65" control_name="RenderFSAASamples" enabled="true" follows="left|top"
+                font="SansSerifSmall" height="16" initial_value="false"
+                label="Antialiasing" left="148"
+                mouse_opaque="true" name="fsaa" width="64">
+    <combo_item name="FSAADisabled" value="0">
+      Disabled
+    </combo_item>
+    <combo_item name="2x" value="2">
+      2x
+    </combo_item>
+    <combo_item name="4x" value="4">
+      4x
+    </combo_item>
+    <combo_item name="8x" value="8">
+      8x
+    </combo_item>
+    <combo_item name="16x" value="16">
+      16x
+    </combo_item>
+  </combo_box>
+        <spinner bottom_delta="-21" control_name="RenderGamma" decimal_digits="2" enabled="true"
+             follows="left|top" height="16" increment="0.01"
             initial_val="1" label="Gamma:" label_width="138" left="10" max_val="2"
             min_val="0.0" mouse_opaque="true" name="gamma" width="202" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-61" drop_shadow_visible="true" enabled="true" follows="left|top"
+                bottom_delta="2" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+                font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="222" mouse_opaque="true" name="(brightness, lower is brighter)"
+                left="222" mouse_opaque="true" name="(brightness, lower is brighter)"
-             v_pad="0" width="315">
+                v_pad="0" width="315">
                (brightness, lower is brighter, 0=use default)
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-104" drop_shadow_visible="true" enabled="true" follows="left|top"
+                bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+                font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="10" mouse_opaque="true" name="Enable VBO:" v_pad="0" width="128">
+                left="10" mouse_opaque="true" name="Enable VBO:" v_pad="0"
+                width="128">
                Enable VBO:
        </text>
-        <check_box bottom="-108" control_name="RenderVBOEnable" enabled="true" follows="left|top"
+        <check_box bottom_delta="-5" control_name="RenderVBOEnable" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="true"
+                font="SansSerifSmall" height="16" initial_value="true"
-             label="Enable OpenGL Vertex Buffer Objects" left="148" mouse_opaque="true"
+                label="Enable OpenGL Vertex Buffer Objects" left="148"
-             name="vbo" radio_style="false"
+                mouse_opaque="true" name="vbo" radio_style="false"
-             tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
+                tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
-             width="315" />
+                width="315" />
-        <slider bottom="-133" can_edit_text="false" control_name="TextureMemory"
-             decimal_digits="0" enabled="true" follows="left|top" height="16"
+        <slider bottom_delta="-21" can_edit_text="false" control_name="TextureMemory" 
-             hidden="false" increment="16" initial_val="32" label="Texture Memory (MB):"
+                decimal_digits="0" enabled="true"
-             label_width="135" left="10" max_val="4096" min_val="0" mouse_opaque="true"
+                follows="left|top" height="16" increment="16"
-             name="GrapicsCardTextureMemory"
+                initial_val="32" label="Texture Memory (MB):" label_width="135" left="10"
-             tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry."
+                max_val="4096" min_val="0" mouse_opaque="true" name="GrapicsCardTextureMemory"
-             width="300" />
+                tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry."
-        <spinner bottom="-157" control_name="RenderFogRatio" decimal_digits="1" enabled="true"
+                width="300" />
-             follows="left|top" height="16" hidden="false" increment="0.1"
+        <spinner bottom_delta="-24" control_name="RenderFogRatio" decimal_digits="1" enabled="true"
+             follows="left|top" height="16" increment="0.1"
             initial_val="4" label="Fog Distance Ratio:" label_width="138" left="10"
             max_val="10" min_val="0.5" mouse_opaque="true" name="fog" width="202" />
        <button bottom="10" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="OK" label_selected="OK"
+             halign="center" height="20" label="OK" label_selected="OK"
             left="-110" mouse_opaque="true" name="OK" scale_image="true" width="90" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_html.xml b/linden/indra/newview/skins/xui/en-us/floater_html.xml
index 6edeec2..227e41b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_html.xml
@@ -11,12 +11,12 @@
        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
             label="Forward" left_delta="73" name="forward_btn" width="70" />
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-             follows="top|left|right" font="SansSerifSmall" height="20" left_delta="85"
+             follows="top|left|right" font="SansSerifSmall" height="20" left_delta="85" 
-             max_length="256" mouse_opaque="true" name="url_edit"
+             max_length="256" mouse_opaque="true" name="url_edit" 
             select_all_on_focus_received="true" width="435" />
        <button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
             label="Go" left_delta="440" name="go_btn" width="70" />
        <string name="home_page_url">
-                http://www.secondlife.com
+                http://www.secondlife.com
        </string>
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_hud.xml b/linden/indra/newview/skins/xui/en-us/floater_hud.xml
new file mode 100644
index 0000000..6a72920
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/floater_hud.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false"
+     height="272" min_height="272" width="342" min_width="342" name="floater_hud"
+     title="Tutorial">
+        <web_browser border_visible="false" left="0" bottom="0" right="-1" top="-16" caret_color="1 1 1 1" follows="top|left|bottom|right"
+             name="floater_hud_browser"
+             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3E%0D%0A%0D%0ALoading...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E"
+        />
+</floater>
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 66a6768..cb27be6 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
@@ -31,36 +31,36 @@
        <string name="default_text_label">
                Click here to instant message.
        </string>
-        <button bottom="-40" follows="left|top" height="20" label="Profile..." left="4"
+        <button bottom="-40" follows="left|top" height="20" label="Profile..." left="5"
             name="profile_callee_btn" width="80" />
        <button bottom="-40" follows="left|top" halign="center" height="20"
             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-             label="Call" left_delta="85" name="start_call_btn" width="90" />
+             label="Call" left_delta="85" name="start_call_btn" width="100" />
-        <button bottom="-40" follows="left|top" halign="right" height="20"
+        <button bottom="-40" follows="left|top" halign="center" height="20"
             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
             label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
-             visible="false" width="90" />
+             visible="false" width="100" />
-        <panel border="false" bottom="-40" follows="left|top|right" height="20"
+        <panel border="false" bottom="-37" follows="left|top|right" height="20"
-             left_delta="77" name="speaker_controls" width="344">
+             left_delta="96" name="speaker_controls" width="100">
                <volume_slider bottom="0" follows="left|bottom" height="15" increment="0.05" initial_val="0.5"
-                     left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="80" />
+                     left_delta="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="56" />
                <button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
-                     image_unselected="icn_speaker_dark.tga" label="" left_delta="85"
+                     image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
                     name="mute_btn" tool_tip="Mute voice" width="25" />
        </panel>
        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-             bottom="28" embedded_items="false" enabled="false"
+             bottom="30" embedded_items="false" enabled="false"
-             follows="left|top|right|bottom" font="SansSerif" height="225" left="4"
+             follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
             max_length="2147483647" mouse_opaque="true" name="im_history"
             text_color="ChatHistoryTextColor"
-             text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
+             text_readonly_color="ChatHistoryTextColor" width="487" word_wrap="true" />
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5"
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
             follows="left|right|bottom" font="SansSerif" height="20"
-             label="Click here to instant message" left="6" max_length="1022"
+             label="Click here to instant message" left="5" max_length="1022"
             mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
-             select_on_focus="false" tab_group="1" width="421" />
+             select_on_focus="false" tab_group="1" width="423" />
-        <button bottom="4" follows="right|bottom" font="SansSerif" halign="center" height="20"
+        <button bottom="7" follows="right|bottom" font="SansSerif" halign="center" height="20"
-             label="Send" left="432" mouse_opaque="true" name="send_btn"
+             label="Send" left="433" mouse_opaque="true" name="send_btn"
             scale_image="true" width="60" />
        <string name="live_help_dialog">
                *** Welcome to Help Request *** 
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
index 6eb4f9b..b47c788 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message_ad_hoc.xml
@@ -28,36 +28,36 @@
        <string name="default_text_label">
                Click here to instant message.
        </string>
-        <layout_stack border="false" bottom="1" follows="left|top|right|bottom" height="277" left="2"
+        <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="277" left="2"
-             orientation="horizontal" tab_group="1" width="495">
+             orientation="horizontal" tab_group="1" width="495" name="panels">
                <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
                     height="295" left="0" min_width="115" name="im_contents_panel" width="495">
-                        <button bottom="-24" enabled="false" follows="left|top" halign="center" height="20"
+                        <button bottom="-20" enabled="false" follows="left|top" halign="center" height="20"
                             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-                             label="Call" left="4" name="start_call_btn" width="80" />
+                             label="Call" left="5" name="start_call_btn" width="80" />
-                        <button bottom_delta="0" follows="left|top" halign="right" height="20"
+                        <button bottom_delta="0" follows="left|top" halign="center" height="20"
                             image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
                             label="End Call" left_delta="0" name="end_call_btn" visible="false"
                             width="80" />
                        <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
-                             label_selected="&gt; &gt;" left="460" name="toggle_active_speakers_btn"
+                             label_selected="&gt; &gt;" left="463" name="toggle_active_speakers_btn"
-                             right="493"
+                             right="496"
                             tool_tip="Click here to toggle list of active partipants in this IM session."
                             visible="true" width="80" />
                        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-                             bottom="-268" embedded_items="false" enabled="false"
+                             bottom="-265" embedded_items="false" enabled="false"
-                             follows="left|top|right|bottom" font="SansSerif" height="240" left="4"
+                             follows="left|top|right|bottom" font="SansSerif" height="239" left="5"
                             max_length="2147483647" mouse_opaque="true" name="im_history"
                             text_color="ChatHistoryTextColor"
                             text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="4"
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
                             enabled="true" follows="left|right|bottom" font="SansSerif"
                             handle_edit_keys_directly="false" height="20"
-                             label="Click here to instant message" left="4" max_length="1022"
+                             label="Click here to instant message" left="5" max_length="1022"
                             mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
-                             select_on_focus="false" tab_group="1" width="425" />
+                             select_on_focus="false" tab_group="1" width="426" />
-                        <button bottom_delta="-1" enabled="true" follows="right|bottom" font="SansSerif"
+                        <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif"
-                             halign="center" height="20" label="Send" left="433" mouse_opaque="true"
+                             halign="center" height="20" label="Send" left="436" mouse_opaque="true"
                             name="send_btn" scale_image="true" width="60" />
                </layout_panel>
                <layout_panel auto_resize="false" bottom="0" can_resize="true"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
index 131ec66..9ccfedb 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_instant_message_group.xml
@@ -40,11 +40,11 @@
        <string name="muted_text_label">
                Text chat has been disabled by a Group Moderator.
        </string>
-        <layout_stack border="false" bottom="1" follows="left|top|right|bottom" height="276" left="2"
+        <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"
-             orientation="horizontal" tab_group="1" width="495">
+             orientation="horizontal" tab_group="1" width="495" name="panels">
                <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
                     height="130" left="0" min_width="210" name="im_contents_panel" width="175">
-                        <button follows="left|top" height="20" label="Group Info" left="4"
+                        <button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
                             name="group_info_btn" tab_group="0" width="80" />
                        <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
                             image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
@@ -55,24 +55,24 @@
                             label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
                             visible="false" width="80" />
                        <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
-                             label_selected="&gt; &gt;" left="140" name="toggle_active_speakers_btn"
+                             label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
-                             right="173"
+                             right="176"
                             tool_tip="Click here to toggle list of active partipants in this IM session."
-                             visible="true" width="70" />
+                             visible="true" width="30" />
                        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-                             bottom="27" embedded_items="false" enabled="false"
+                             bottom="30" embedded_items="false" enabled="false"
                             follows="left|top|right|bottom" font="SansSerif" left="4"
                             max_length="2147483647" mouse_opaque="true" name="im_history"
                             text_color="ChatHistoryTextColor"
-                             text_readonly_color="ChatHistoryTextColor" top="102" width="170"
+                             text_readonly_color="ChatHistoryTextColor" top="104" width="170"
                             word_wrap="true" />
-                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="4"
+                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
                             enabled="true" follows="left|right|bottom" font="SansSerif" height="20"
-                             left="4" max_length="1022" mouse_opaque="true" name="chat_editor"
+                             left="5" max_length="1022" mouse_opaque="true" name="chat_editor"
                             select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-                             width="105" />
+                             width="106" />
-                        <button bottom="3" enabled="true" follows="right|bottom" font="SansSerif"
+                        <button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"
-                             halign="center" height="20" label="Send" left="113" mouse_opaque="true"
+                             halign="right" height="20" label="Send" left="116" mouse_opaque="true"
                             name="send_btn" scale_image="true" width="60" />
                </layout_panel>
                <layout_panel auto_resize="false" bottom="0" can_resize="true"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
index 68b1e36..1cb1da0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
@@ -19,7 +19,7 @@
        </tab_container>
        <menu_bar bottom="-34" drop_shadow="false" follows="left|top|right" height="18" left="2"
             mouse_opaque="false" name="Inventory Menu" opaque="false" width="461">
-                <menu bottom_delta="16" color="0, 0, 0, 1" drop_shadow="true" height="101"
+                <menu bottom_delta="16" drop_shadow="true" height="101"
                     label="File" left="0" mouse_opaque="false" name="File" opaque="true"
                     tear_off="true" width="128">
                        <menu_item_call bottom_delta="-18" height="18" label="Open" left="0" mouse_opaque="true"
@@ -53,7 +53,7 @@
                                <on_click filter="" function="Inventory.EmptyTrash" userdata="" />
                        </menu_item_call>
                </menu>
-                <menu bottom_delta="80" color="0, 0, 0, 1" drop_shadow="true" height="121"
+                <menu bottom_delta="80" drop_shadow="true" height="121"
                     label="Create" left="0" mouse_opaque="false" name="Create" opaque="true"
                     tear_off="true" width="121">
                        <menu_item_call bottom_delta="-18" height="18" label="New Folder" left="0" mouse_opaque="true"
@@ -72,7 +72,7 @@
                             name="New Gesture" width="121">
                                <on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
                        </menu_item_call>
-                        <menu bottom_delta="-689" color="0, 0, 0, 1" drop_shadow="true" height="175" left="0"
+                        <menu bottom_delta="-689" drop_shadow="true" height="175" left="0"
                             mouse_opaque="false" name="New Clothes" opaque="true" width="125">
                                <menu_item_call bottom_delta="-18" height="18" label="New Shirt" left="0" mouse_opaque="true"
                                     name="New Shirt" width="125">
@@ -111,7 +111,7 @@
                                        <on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
                                </menu_item_call>
                        </menu>
-                        <menu bottom_delta="-599" color="0, 0, 0, 1" drop_shadow="true" height="85" left="0"
+                        <menu bottom_delta="-599" drop_shadow="true" height="85" left="0"
                             mouse_opaque="false" name="New Body Parts" opaque="true" width="118">
                                <menu_item_call bottom_delta="-18" height="18" label="New Shape" left="0" mouse_opaque="true"
                                     name="New Shape" width="118">
@@ -131,7 +131,7 @@
                                </menu_item_call>
                        </menu>
                </menu>
-                <menu bottom_delta="64" color="0, 0, 0, 1" drop_shadow="true" height="49"
+                <menu bottom_delta="64" drop_shadow="true" height="49"
                     label="Sort" left="0" mouse_opaque="false" name="Sort" opaque="true"
                     tear_off="true" width="118">
                        <menu_item_check bottom_delta="-18" control_name="Inventory.SortByName" height="18"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml b/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
index 8d94ae1..18f39dd 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_joystick.xml
@@ -1,106 +1,121 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-297" can_close="true" can_drag_on_left="false" can_minimize="true"
+<floater bottom="0" can_minimize="true" can_resize="false" height="500" left="0"
-     can_resize="false" follows="right" height="580" left="298" min_height="151"
+     name="Joystick" title="Joystick Configuration" width="550">
-     min_width="240" mouse_opaque="true" name="build options floater"
-     rect_control="FloaterJoystickRect" title="Flycam Options" width="400">
+        <check_box name="enable_joystick" bottom="-38" left="14" width="60" halign="left" border_drop_shadow_visible="true" control_name="JoystickEnabled">Enable Joystick:</check_box>
-        <text bottom="-40" left="14" name="x-axis">
+        <text name="joystick_type" bottom="-32" left="120" width="380" halign="left"></text>
-                X-Axis
+        <spinner bottom="-48" left="20" width="140" label_width="100" control_name="JoystickAxis1" name="JoystickAxis1" label="X Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <spinner bottom="-48" left="190" width="140" label_width="100" control_name="JoystickAxis2" name="JoystickAxis2" label="Y Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <spinner bottom="-48" left="360" width="140" label_width="100" control_name="JoystickAxis0" name="JoystickAxis0" label="Z Axis Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <spinner bottom="-68" left="20" width="140" label_width="100" control_name="JoystickAxis4" name="JoystickAxis4" label="Pitch Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <spinner bottom="-68" left="190" width="140" label_width="100" control_name="JoystickAxis5" name="JoystickAxis5" label="Yaw Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <spinner bottom="-68" left="360" width="140" label_width="100" control_name="JoystickAxis3" name="JoystickAxis3" label="Roll Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <spinner bottom="-88" left="20" width="140" label_width="100" control_name="JoystickAxis6" name="JoystickAxis6" label="Zoom Mapping" decimal_digits="0" increment="1" min_val="-1" max_val="5"/>
+        <check_box bottom="-96" left="185" control_name="ZoomDirect" label="Direct Zoom" name="ZoomDirect" />
+        <check_box bottom="-96" left="310" control_name="Cursor3D" label="3D Cursor" name="Cursor3D" />
+        <check_box bottom="-96" left="420" control_name="AutoLeveling" label="Auto Level" name="AutoLeveling" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-120" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="right" height="10" hidden="false"
+             left="12" mouse_opaque="false" v_pad="0" width="102" name="Control Modes:">
+                Control Modes:
        </text>
-        <text bottom="-40" left="142" name="y-axis">
-                Y-Axis
+        <check_box bottom="-127" left="125" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickAvatarEnabled" name="JoystickAvatarEnabled">Avatar</check_box>
-        </text>
+        <check_box bottom="-127" left="194" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickBuildEnabled" name="JoystickBuildEnabled">Build</check_box>
-        <text bottom="-40" left="270" name="z-axis">
+        <check_box bottom="-127" left="262" width="60" halign="center" border_drop_shadow_visible="true" control_name="JoystickFlycamEnabled" name="JoystickFlycamEnabled">Flycam</check_box>
-                Z-Axis
-        </text>
+        <text bottom="-144" left="20" width="94" halign="right" name="XScale">X Scale</text>
-        <spinner bottom="-61" control_name="FlycamAxis1" decimal_digits="0" increment="1"
+        <spinner bottom="-144" left="125" width="56" label_width="0" control_name="AvatarAxisScale1" name="AvatarAxisScale1" decimal_digits="2" increment="1" min_val="-1" max_val="1"/>
-             label="Mapping" label_width="64" left="14" max_val="7" min_val="-1"
+        <spinner bottom="-144" left="195" width="56" label_width="0" control_name="BuildAxisScale1" name="BuildAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-             name="FlycamAxis1" width="120" />
+        <spinner bottom="-144" left="265" width="56" label_width="0" control_name="FlycamAxisScale1" name="FlycamAxisScale1" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-        <spinner bottom="-61" control_name="FlycamAxis2" decimal_digits="0" increment="1"
-             label="Mapping" label_width="64" left="142" max_val="7" min_val="-1"
+        <text bottom="-164" left="20" width="94" halign="right" name="YScale">Y Scale</text>
-             name="FlycamAxis2" width="120" />
+        <spinner bottom="-164" left="125" width="56" label_width="0" control_name="AvatarAxisScale2" name="AvatarAxisScale2" decimal_digits="2" increment="1" min_val="-1" max_val="1"/>
-        <spinner bottom="-61" control_name="FlycamAxis0" decimal_digits="0" increment="1"
+        <spinner bottom="-164" left="195" width="56" label_width="0" control_name="BuildAxisScale2" name="BuildAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-             label="Mapping" label_width="64" left="270" max_val="7" min_val="-1"
+        <spinner bottom="-164" left="265" width="56" label_width="0" control_name="FlycamAxisScale2" name="FlycamAxisScale2" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-             name="FlycamAxis0" width="120" />
-        <spinner bottom="-82" control_name="FlycamAxisScale1" decimal_digits="2" increment="0.1"
+        <text bottom="-184" left="20" width="94" halign="right" name="ZScale">Z Scale</text>
-             label="Scale" label_width="64" left="14" max_val="1024" min_val="-1024"
+        <spinner bottom="-184" left="125" width="56" label_width="0" control_name="AvatarAxisScale0" name="AvatarAxisScale0" decimal_digits="2" increment="1" min_val="-1" max_val="1"/>
-             name="FlycamAxisScale1" width="120" />
+        <spinner bottom="-184" left="195" width="56" label_width="0" control_name="BuildAxisScale0" name="BuildAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-        <spinner bottom="-82" control_name="FlycamAxisScale2" decimal_digits="2" increment="0.1"
+        <spinner bottom="-184" left="265" width="56" label_width="0" control_name="FlycamAxisScale0" name="FlycamAxisScale0" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-             label="Scale" label_width="64" left="142" max_val="1024" min_val="-1024"
-             name="FlycamAxisScale2" width="120" />
+        <text bottom="-204" left="20" width="94" halign="right" name="PitchScale">Pitch Scale</text>
-        <spinner bottom="-82" control_name="FlycamAxisScale0" decimal_digits="2" increment="0.1"
+        <spinner bottom="-204" left="125" width="56" label_width="0" control_name="AvatarAxisScale4" name="AvatarAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-             label="Scale" label_width="64" left="270" max_val="1024" min_val="-1024"
+        <spinner bottom="-204" left="195" width="56" label_width="0" control_name="BuildAxisScale4" name="BuildAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-             name="FlycamAxisScale0" width="120" />
+        <spinner bottom="-204" left="265" width="56" label_width="0" control_name="FlycamAxisScale4" name="FlycamAxisScale4" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-        <spinner bottom="-103" control_name="FlycamAxisDeadZone1" decimal_digits="2"
-             increment="0.01" label="Dead Zone" label_width="64" left="14" max_val="1"
+        <text bottom="-224" left="20" width="94" halign="right" name="YawScale">Yaw Scale</text>
-             min_val="0" name="FlycamAxisDeadZone1" width="120" />
+        <spinner bottom="-224" left="125" width="56" label_width="0" control_name="AvatarAxisScale5" name="AvatarAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-        <spinner bottom="-103" control_name="FlycamAxisDeadZone2" decimal_digits="2"
+        <spinner bottom="-224" left="195" width="56" label_width="0" control_name="BuildAxisScale5" name="BuildAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-             increment="0.01" label="Dead Zone" label_width="64" left="142" max_val="1"
+        <spinner bottom="-224" left="265" width="56" label_width="0" control_name="FlycamAxisScale5" name="FlycamAxisScale5" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-             min_val="0" name="FlycamAxisDeadZone2" width="120" />
-        <spinner bottom="-103" control_name="FlycamAxisDeadZone0" decimal_digits="2"
+        <text bottom="-244" left="20" width="94" halign="right" name="RollScale">Roll Scale</text>
-             increment="0.01" label="Dead Zone" label_width="64" left="270" max_val="1"
+        <spinner bottom="-244" left="195" width="56" label_width="0" control_name="BuildAxisScale3" name="BuildAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-             min_val="0" name="FlycamAxisDeadZone0" width="120" />
+        <spinner bottom="-244" left="265" width="56" label_width="0" control_name="FlycamAxisScale3" name="FlycamAxisScale3" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-        <text bottom="-132" left="14" name="yaw">
-                Yaw
-        </text>
+        <text bottom="-274" left="20" width="94" halign="right" name="XDeadZone">X Dead Zone</text>
-        <text bottom="-132" left="142" name="pitch">
+        <spinner bottom="-274" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone1" name="AvatarAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-                Pitch
+        <spinner bottom="-274" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone1" name="BuildAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-        </text>
+        <spinner bottom="-274" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone1" name="FlycamAxisDeadZone1" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-        <text bottom="-132" left="270" name="roll">
-                Roll
+        <text bottom="-294" left="20" width="94" halign="right" name="YDeadZone">Y Dead Zone</text>
-        </text>
+        <spinner bottom="-294" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone2" name="AvatarAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-        <spinner bottom="-153" control_name="FlycamAxis5" decimal_digits="0" increment="1"
+        <spinner bottom="-294" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone2" name="BuildAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-             label="Mapping" label_width="64" left="14" max_val="7" min_val="-1"
+        <spinner bottom="-294" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone2" ame="FlycamAxisDeadZone2" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-             name="FlycamAxis5" width="120" />
-        <spinner bottom="-153" control_name="FlycamAxis4" decimal_digits="0" increment="1"
+        <text bottom="-314" left="20" width="94" halign="right" name="ZDeadZone">Z Dead Zone</text>
-             label="Mapping" label_width="64" left="142" max_val="7" min_val="-1"
+        <spinner bottom="-314" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone0" name="AvatarAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-             name="FlycamAxis4" width="120" />
+        <spinner bottom="-314" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone0" name="BuildAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-        <spinner bottom="-153" control_name="FlycamAxis3" decimal_digits="0" increment="1"
+        <spinner bottom="-314" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone0" name="FlycamAxisDeadZone0" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-             label="Mapping" label_width="64" left="270" max_val="7" min_val="-1"
-             name="FlycamAxis3" width="120" />
+        <text bottom="-334" left="20" width="94" halign="right" name="PitchDeadZone">Pitch Dead Zone</text>
-        <spinner bottom="-174" control_name="FlycamAxisScale5" decimal_digits="2"
+        <spinner bottom="-334" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone4" name="AvatarAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-             increment="0.1" label="Scale" label_width="64" left="14" max_val="1024"
+        <spinner bottom="-334" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone4" name="BuildAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-             min_val="-1024" name="FlycamAxisScale5" width="120" />
+        <spinner bottom="-334" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone4" name="FlycamAxisDeadZone4" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-        <spinner bottom="-174" control_name="FlycamAxisScale4" decimal_digits="2"
-             increment="0.1" label="Scale" label_width="64" left="142" max_val="1024"
+        <text bottom="-354" left="20" width="94" halign="right" name="YawDeadZone">Yaw Dead Zone</text>
-             min_val="-1024" name="FlycamAxisScale4" width="120" />
+        <spinner bottom="-354" left="125" width="56" label_width="0" control_name="AvatarAxisDeadZone5" name="AvatarAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-        <spinner bottom="-174" control_name="FlycamAxisScale3" decimal_digits="2"
+        <spinner bottom="-354" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone5" name="BuildAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-             increment="0.1" label="Scale" label_width="64" left="270" max_val="1024"
+        <spinner bottom="-354" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone5" name="FlycamAxisDeadZone5" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-             min_val="-1024" name="FlycamAxisScale3" width="120" />
-        <spinner bottom="-195" control_name="FlycamAxisDeadZone5" decimal_digits="2"
+        <text bottom="-374" left="20" width="94" halign="right" name="RollDeadZone">Roll Dead Zone</text>
-             increment="0.01" label="Dead Zone" label_width="64" left="14" max_val="1"
+        <spinner bottom="-374" left="195" width="56" label_width="0" control_name="BuildAxisDeadZone3" name="BuildAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-             min_val="0" name="FlycamAxisDeadZone5" width="120" />
+        <spinner bottom="-374" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone3" name="FlycamAxisDeadZone3" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-        <spinner bottom="-195" control_name="FlycamAxisDeadZone4" decimal_digits="2"
-             increment="0.01" label="Dead Zone" label_width="64" left="142" max_val="1"
+        <text bottom="-402" left="20" width="94" halign="right" name="Feathering">Feathering</text>
-             min_val="0" name="FlycamAxisDeadZone4" width="120" />
+        <slider bottom="-408" left="116" can_edit_text="false" control_name="AvatarFeathering"
-        <spinner bottom="-195" control_name="FlycamAxisDeadZone3" decimal_digits="2"
+            decimal_digits="0" follows="left|top" height="16" increment="1"
-             increment="0.01" label="Dead Zone" label_width="64" left="270" max_val="1"
+            initial_val="0.7" label="" max_val="32" min_val="1"
-             min_val="0" name="FlycamAxisDeadZone3" width="120" />
+            mouse_opaque="true" name="AvatarFeathering" show_text="false" value="0.7"
-        <text bottom="-224" left="14" name="ZoomLabel">
+            width="73" />
-                Zoom
+        <slider bottom="-408" left="186" can_edit_text="false" control_name="BuildFeathering"
-        </text>
+            decimal_digits="0" follows="left|top" height="16" increment="1"
-        <spinner bottom="-245" control_name="FlycamAxis6" decimal_digits="0" increment="1"
+            initial_val="0.7" label="" max_val="32" min_val="1"
-             label="Mapping" label_width="64" left="14" max_val="7" min_val="-1"
+            mouse_opaque="true" name="BuildFeathering" show_text="false" value="0.7"
-             name="FlycamAxis6" width="120" />
+            width="73" />
-        <spinner bottom="-266" control_name="FlycamAxisScale6" decimal_digits="2"
+        <slider bottom="-408" left="256" can_edit_text="false" control_name="FlycamFeathering"
-             increment="0.1" label="Scale" label_width="64" left="14" max_val="1024"
+            decimal_digits="0" follows="left|top" height="16" increment="1"
-             min_val="-1024" name="FlycamAxisScale6" width="120" />
+            initial_val="0.7" label="" max_val="32" min_val="1"
-        <spinner bottom="-287" control_name="FlycamAxisDeadZone6" decimal_digits="2"
+            mouse_opaque="true" name="FlycamFeathering" show_text="false" value="0.7"
-             increment="0.01" label="Dead Zone" label_width="64" left="14" max_val="1"
+            width="73" />
-             min_val="0" name="FlycamAxisDeadZone6" width="120" />
-        <check_box bottom_delta="-21" control_name="FlycamZoomDirect" label="Direct Zoom" />
+        <text bottom="-430" left="20" width="94" halign="right" name="ZoomScale2">Zoom Scale</text>
-        <slider bottom_delta="-29" can_edit_text="false" control_name="FlycamFeathering"
+        <spinner bottom="-430" left="265" width="56" label_width="0" control_name="FlycamAxisScale6" name="FlycamAxisScale6" label="" decimal_digits="2" increment="0.1" min_val="-1024" max_val="1024"/>
-             decimal_digits="0" follows="left" height="16" increment="1"
+        <text bottom="-450" left="20" width="94" halign="right" name="ZoomDeadZone">Zoom Dead Zone</text>
-             initial_val="0.7" label="Feathering" left="14" max_val="32" min_val="1"
+        <spinner bottom="-450" left="265" width="56" label_width="0" control_name="FlycamAxisDeadZone6" name="FlycamAxisDeadZone6" label="" decimal_digits="2" increment="0.01" min_val="0" max_val="1"/>
-             mouse_opaque="true" name="FlycamFeathering" show_text="false" value="0.7"
-             width="128" />
+        <button bottom="-451" left="336" enabled="true" follows="left|top" font="SansSerif"
-        <check_box bottom_delta="-21" control_name="FlycamAutoLeveling" label="Auto Level"
+             halign="center" height="22" hidden="false"
-             name="FlycamAutoLeveling" />
+             label="SpaceNavigator Defaults" mouse_opaque="true"
-        <check_box bottom_delta="-21" control_name="FlycamAbsolute" label="3D Cursor"
+             name="SpaceNavigatorDefaults" scale_image="true" width="200" />
-             name="FlycamAbsolute" />
-        <string name="JoystickMonitor">
+        <string name="JoystickMonitor">Joystick Monitor</string>
-                Joystick Monitor
+        <string name="Axis">Axis [NUM]</string>
-        </string>
+        <string name="NoDevice">no device detected</string>
-        <string name="Axis">
+</floater>
+\ No newline at end of file
-                Axis [NUM]
-        </string>
-</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
index 905d795..4fa24dd 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_lagmeter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
     can_resize="false" height="150" name="floater_lagmeter"
-     rect_control="FloaterLagMeter" title="Lag Meter" width="370">
+     rect_control="FloaterLagMeter" title="Lag Meter" width="350">
        <button bottom="-40" enabled="true" follows="top|left" font="SansSerif" halign="center"
             height="16" image_selected="lag_status_good.tga"
             image_unselected="lag_status_good.tga" label="" label_selected="" left="8"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml b/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml
index 330c3aa..62cf350 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_live_lsleditor.xml
@@ -9,8 +9,8 @@
        <check_box bottom="-545" enabled="false" follows="left|bottom" font="SansSerif"
             height="18" initial_value="true" label="Running" left="12"
             mouse_opaque="true" name="running" radio_style="false" width="100" />
-        <panel bottom="-527" enabled="true" follows="left|top|right|bottom" height="506"
+        <panel bottom="-524" enabled="true" follows="left|top|right|bottom" height="506"
-             left="1" name="script ed panel" width="498" />
+             left="1" name="script ed panel" width="497" />
        <string name="not_allowed">
                You are not allowed to view this script.
        </string>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_moveview.xml b/linden/indra/newview/skins/xui/en-us/floater_moveview.xml
index e87c1e7..7add633 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_moveview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_moveview.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-976" can_close="true" can_drag_on_left="false" can_minimize="false"
     can_resize="false" can_tear_off="true" enabled="true" follows="bottom"
-     height="58" left="521" min_height="100" min_width="100" mouse_opaque="true"
+     height="58"  left="521" min_height="100" min_width="100"
-     name="move floater" rect_control="FloaterMoveRect" title="" width="185">
+     mouse_opaque="true" name="move floater" rect_control="FloaterMoveRect2"
+     title="" width="135">
        <button bottom="-54" enabled="true" follows="left|bottom" font="SansSerif"
             halign="center" height="25" image_disabled="UIImgBtnLeftOutUUID"
             image_disabled_selected="UIImgBtnLeftInUUID"
@@ -30,10 +31,12 @@
             image_unselected="UIImgBtnMoveDownOutUUID" label="" label_selected=""
             left="91" mouse_opaque="true" name="move down btn" scale_image="false"
             tool_tip="Crouch or Fly Down" width="25" />
+        <!--
        <button bottom="-54" control_name="FlyBtnState" enabled="true" follows="left|bottom"
             font="SansSerif" halign="center" height="20" label="Fly"
             label_selected="Fly" left="116" mouse_opaque="true" name="fly btn"
             scale_image="true" tool_tip="Start or stop flying" width="65" />
+        -->
        <joystick_slide bottom="-29" enabled="true" follows="left|bottom" halign="center" height="25"
             image_selected="UIImgBtnSlideLeftInUUID"
             image_unselected="UIImgBtnSlideLeftOutUUID" left="20" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute.xml b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
index 338d391..b1ab115 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
@@ -4,10 +4,9 @@
     min_height="140" min_width="220" mouse_opaque="true" name="mute floater"
     rect_control="FloaterMuteRect3" short_title="Mute List"
     title="Muted Residents &amp; Objects" width="300">
-        <scroll_list background_visible="false" bottom="-220" column_padding="5" draw_border="true"
+        <scroll_list background_visible="true" bottom="-220" column_padding="5" draw_border="true"
             draw_heading="false" draw_stripes="true" enabled="true"
-             fg_disable_color="1 1 1 1" fg_selected_color="1 1 1 1"
+             follows="left|top|right|bottom" height="200"
-             fg_unselected_color="1 1 1 1" follows="left|top|right|bottom" height="200"
             left="4" mouse_opaque="true" multi_select="false" name="mutes"
             tool_tip="List of currently muted residents" width="292" />
        <button bottom="-244" enabled="true" follows="left|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml b/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
index 2c277e7..4033058 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute_object.xml
@@ -3,7 +3,7 @@
     can_resize="false" height="140" min_height="140" min_width="375"
     name="mute by name" title="Mute object by name" width="375">
        <text bottom_delta="-50" follows="top|left" font="SansSerif" height="16" left="20"
-             left_delta="25" name="message" right="380" text_color="white">
+             left_delta="25" name="message" right="380">
                Mute by name only affects object chat and IM, not sounds.
 You must type the object&apos;s name exactly.
        </text>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
index 1d5bf90..181c7de 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_my_friends.xml
@@ -3,8 +3,8 @@
     can_resize="true" can_tear_off="true" height="390" min_height="240"
     min_width="365" name="floater_my_friends"
     rect_control="FloaterContactsRect" title="Contacts" width="395">
-        <tab_container bottom="10" follows="left|right|top|bottom" height="360" left="0"
+        <tab_container bottom="6" follows="left|right|top|bottom" height="364" left="4"
-             name="friends_and_groups" tab_position="top" tab_width="80" width="388">
+             name="friends_and_groups" tab_position="top" tab_width="80" width="383">
                <panel bottom="0" filename="panel_friends.xml" label="Friends" left="0"
                     name="friends_panel" width="370" />
                <panel bottom="0" filename="panel_groups.xml" label="Groups" left="0"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_post_process.xml b/linden/indra/newview/skins/xui/en-us/floater_post_process.xml
index 0eb8150..31691a8 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_post_process.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_post_process.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-350" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="400" hidden="false" left="50" min_height="400"
+     can_resize="false" height="400" left="50" min_height="400"
     min_width="300" mouse_opaque="true" name="Post-Process Floater"
     title="Post-Process Settings" width="400">
-        <tab_container bottom="-400" follows="left|top" height="400" hidden="false" left="0"
+        <tab_container bottom="-400" follows="left|top" height="400" left="0"
             mouse_opaque="false" name="Post-Process Tabs" tab_position="top"
             width="400">
                <panel border="true" bottom="-400" follows="left|top|right|bottom" height="400"
-                     hidden="false" label="Color Filter" left="1" mouse_opaque="false"
+                     label="Color Filter" left="1" mouse_opaque="false"
                     name="wmiColorFilterPanel" width="398">
                        <check_box bottom="-20" control_name="wmiColorFilterToggle" follows="left|top"
                             font="SansSerifSmall" height="16" initial_value="false" label="Enable"
                             left="14" mouse_opaque="true" name="wmiColorFilterToggle" width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                             left="10" mouse_opaque="true" name="wmiColorFilterBrightnessText" v_pad="0"
                             width="355">
                                Brightness
@@ -26,7 +26,7 @@
                             show_text="true" value="1.0" width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                             left="10" mouse_opaque="true" name="wmiColorFilterSaturationText" v_pad="0"
                             width="355">
                                Saturation
@@ -38,7 +38,7 @@
                             name="wmiColorFilterSaturation" show_text="true" value="1.0" width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                             left="10" mouse_opaque="true" name="wmiColorFilterContrastText" v_pad="0"
                             width="355">
                                Contrast
@@ -50,7 +50,7 @@
                             value="1.0" width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                             left="10" mouse_opaque="true" name="wmiColorFilterBaseText" v_pad="0"
                             width="355">
                                Contrast Base Color
@@ -77,14 +77,14 @@
                             width="200" />
                </panel>
                <panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-                     hidden="false" label="Night Vision" left="1" mouse_opaque="false"
+                     label="Night Vision" left="1" mouse_opaque="false"
                     name="wmiNightVisionPanel" width="398">
                        <check_box bottom="-20" control_name="wmiNightVisionToggle" follows="left|top"
                             font="SansSerifSmall" height="16" initial_value="false" label="Enable"
                             left="14" mouse_opaque="true" name="wmiNightVisionToggle" width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                             left="10" mouse_opaque="true" name="wmiNightVisionBrightMultText" v_pad="0"
                             width="355">
                                Light Amplification Multiple
@@ -96,7 +96,7 @@
                             name="wmiNightVisionBrightMult" show_text="true" value="0.7" width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                             left="10" mouse_opaque="true" name="wmiNightVisionNoiseSizeText" v_pad="0"
                             width="355">
                                Noise Size
@@ -108,7 +108,7 @@
                             value="1.0" width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                             left="10" mouse_opaque="true" name="wmiNightVisionNoiseStrengthText"
                             v_pad="0" width="355">
                                Noise Strength
@@ -120,14 +120,14 @@
                             name="wmiNightVisionNoiseStrength" show_text="true" value="1.0" width="200" />
                </panel>
                <panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-                     hidden="false" label="Bloom" left="1" mouse_opaque="true"
+                     label="Bloom" left="1" mouse_opaque="true"
                     name="wmiBloomPanel" width="398">
                        <check_box bottom="-20" control_name="wmiBloomToggle" follows="left|top"
                             font="SansSerifSmall" height="16" initial_value="false" label="Enable"
                             left="14" mouse_opaque="true" name="wmiBloomToggle" width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                             left="10" mouse_opaque="true" name="wmiBloomExtractText" v_pad="0"
                             width="355">
                                Luminosity Extraction
@@ -139,7 +139,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                             left="10" mouse_opaque="true" name="wmiBloomSizeText" v_pad="0" width="355">
                                Bloom Size
                        </text>
@@ -150,7 +150,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16" 
                             left="10" mouse_opaque="true" name="wmiBloomStrengthText" v_pad="0"
                             width="355">
                                Bloom Strength
@@ -162,20 +162,20 @@
                             width="200" />
                </panel>
                <panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-                     hidden="false" label="Extras" left="1" mouse_opaque="false" name="Extras"
+                     label="Extras" left="1" mouse_opaque="false" name="Extras"
                     width="398">
                        <button bottom="-33" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="LoadEffect" label_selected="LoadEffect" left="15"
+                              label="LoadEffect" label_selected="LoadEffect" left="15"
                             mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
                        <button bottom="-60" enabled="true" font="SansSerif" halign="center" height="20"
-                             hidden="false" label="SaveEffect" label_selected="SaveEffect" left="15"
+                              label="SaveEffect" label_selected="SaveEffect" left="15"
                             mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
                        <combo_box allow_text_entry="false" bottom="-33" follows="left|top" height="18"
                             left_delta="120" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
                             width="150" />
                        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-75"
                             enabled="true" follows="left|right|bottom" font="SansSerif"
-                             handle_edit_keys_directly="false" height="20" hidden="false"
+                             handle_edit_keys_directly="false" height="20"
                             label="Effect Name" left="135" max_length="40" mouse_opaque="true"
                             name="PPEffectNameEditor" select_all_on_focus_received="false"
                             select_on_focus="false" tab_group="1" width="150" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
index ef4da1d..25121ff 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_gesture.xml
@@ -43,10 +43,10 @@
             name="modifier_combo" width="50" />
        <combo_box bottom_delta="0" follows="left|top" height="20" label="None" left_delta="60"
             name="key_combo" width="45" />
-        <text bottom_delta="-23" follows="top|left" font="SansSerif" left="16">
+        <text bottom_delta="-23" follows="top|left" font="SansSerif" left="16" name="library_label">
                Library:
        </text>
-        <text bottom_delta="0" follows="top|left" font="SansSerif" left="220">
+        <text bottom_delta="0" follows="top|left" font="SansSerif" left="220" name="steps_label">
                Steps:
        </text>
        <scroll_list bottom_delta="-120" draw_border="true" follows="top|left" height="110"
@@ -82,11 +82,11 @@ unless you add wait steps.
        <radio_group bottom_delta="-20" draw_border="false" follows="top|left" height="40"
             left="340" name="animation_trigger_type" width="80">
                <radio_item bottom_delta="-5" follows="left|top" height="16" left="3" mouse_opaque="true"
-                     width="80">
+                     width="80" name="start">
                        Start
                </radio_item>
                <radio_item bottom_delta="-10" follows="left|top" height="16" left="3" mouse_opaque="true"
-                     width="80">
+                     width="80" name="stop">
                        Stop
                </radio_item>
        </radio_group>
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
deleted file mode 100644
index 7b3316e..0000000
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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" left="201" 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"
-             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" label="Show on Map" label_selected=""
-             left="126" mouse_opaque="true" name="Show on Map btn" width="100" />
-        <button bottom="-77" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" label="Discard" label_selected="" left="239"
-             mouse_opaque="true" name="Discard btn" width="100" />
-        <icon bottom="-21" color="1 1 1 1" enabled="true" follows="left|top" height="16"
-             image_name="inv_item_landmark_visited.tga" left="5" mouse_opaque="true"
-             name="icon_landmark" width="16" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-             mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-                Description:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-             enabled="true" follows="left|top|right" font="SansSerif"
-             handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-             mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-             select_on_focus="false" width="264" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml
index a26f1c2..32af593 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_preview_notecard_keep_discard.xml
@@ -2,7 +2,7 @@
 <floater bottom="-484" can_close="true" can_drag_on_left="false" can_minimize="true"
     can_resize="true" enabled="true" height="400" left="138" min_height="243"
     min_width="234" mouse_opaque="true" name="preview_notecard" width="400">
-        <text_editor type="string" length="1" bg_readonly_color="0.392157 0.392157 0.392157 1" bottom="-366"
+        <text_editor type="string" length="1" bottom="-366"
             embedded_items="true" enabled="true" follows="left|top|right|bottom"
             font="SansSerif" height="320" ignore_tab="false" left="4"
             max_length="65536" mouse_opaque="true" name="Notecard Editor" width="392"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_rate.xml b/linden/indra/newview/skins/xui/en-us/floater_rate.xml
deleted file mode 100644
index 8467e6d..0000000
--- a/linden/indra/newview/skins/xui/en-us/floater_rate.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-576" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="400" left="380" min_height="100"
-     min_width="100" mouse_opaque="true" name="rate"
-     title="Your Rating of Jeska Linden" width="310">
-        <radio_group bottom="-96" draw_border="false" enabled="true" follows="left|top" height="54"
-             left="32" mouse_opaque="true" name="behavior" width="110">
-                <radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="Positive" width="100">
-                        Positive
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="No Rating" width="100">
-                        No Rating
-                </radio_item>
-        </radio_group>
-        <radio_group bottom="-186" draw_border="false" enabled="true" follows="left|top" height="54"
-             left="32" mouse_opaque="true" name="appearance" width="110">
-                <radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="Positive" width="100">
-                        Positive
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="No Rating" width="100">
-                        No Rating
-                </radio_item>
-        </radio_group>
-        <radio_group bottom="-276" draw_border="false" enabled="true" follows="left|top" height="54"
-             left="32" mouse_opaque="true" name="building" width="110">
-                <radio_item type="string" length="1" bottom="-16" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="Positive" width="100">
-                        Positive
-                </radio_item>
-                <radio_item type="string" length="1" bottom="-34" enabled="true" follows="left|top" height="16" left="0"
-                     mouse_opaque="true" name="No Rating" width="100">
-                        No Rating
-                </radio_item>
-        </radio_group>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-328"
-             enabled="true" follows="left|top" font="SansSerifSmall"
-             handle_edit_keys_directly="false" height="16" left="16" max_length="254"
-             mouse_opaque="true" name="mesg editor" select_all_on_focus_received="false"
-             select_on_focus="false" width="278" />
-        <button bottom="-392" enabled="false" font="SansSerif" halign="center" height="20"
-             label="OK" label_selected="OK" left="134" mouse_opaque="true" name="OK"
-             scale_image="true" width="72" />
-        <button bottom="-392" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Cancel" label_selected="Cancel" left="222" mouse_opaque="true"
-             name="Cancel" scale_image="true" width="72" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="Overall behavior:" v_pad="0" width="278">
-                Overall behavior:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="Skill at appearance (clothing and attachments):"
-             v_pad="0" width="278">
-                Skill at appearance (clothing and attachments):
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="Skill at building:" v_pad="0" width="278">
-                Skill at building:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-310" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="Message:" v_pad="0" width="278">
-                Message:
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-362" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-             mouse_opaque="true" name="cost" v_pad="0" width="278">
-                Cost: L$[COST] to change each rating.  Total charge: L$[TOTAL].
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
index 61aa835..5055885 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_report_abuse.xml
@@ -116,11 +116,11 @@
             mouse_opaque="true" name="abuser_name_title" v_pad="0" width="180">
                Abuser name:
        </text>
-        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+        <line_editor bevel_style="in" border_style="line"
             border_thickness="1" bottom_delta="-18" follows="left|top"
             font="SansSerifSmall" height="16" left="16" max_length="32"
             mouse_opaque="true" name="abuser_name_edit"
-             text_readonly_color="1, 1, 1, 1" width="180" />
+             width="180" />
        <button bottom_delta="-2" font="SansSerif" halign="center" height="20"
             label="Choose Resident" label_selected="" left_delta="190"
             mouse_opaque="true" name="select_abuser"
@@ -131,21 +131,21 @@
             mouse_opaque="true" name="abuser_name_title2" v_pad="0" width="180">
                Location of Abuse:
        </text>
-        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+        <line_editor bevel_style="in" border_style="line"
             border_thickness="1" bottom_delta="-18" follows="left|top"
             font="SansSerifSmall" height="16" left="16" max_length="256"
             mouse_opaque="true" name="abuse_location_edit"
-             text_readonly_color="1, 1, 1, 1" width="356" />
+             width="356" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
             mouse_opaque="true" name="sum_title" v_pad="0" width="180">
                Summary:
        </text>
-        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+        <line_editor bevel_style="in" border_style="line"
             border_thickness="1" bottom_delta="-18" follows="left|top"
             font="SansSerifSmall" height="16" left="16" max_length="64"
-             mouse_opaque="true" name="summary_edit" text_readonly_color="1, 1, 1, 1"
+             mouse_opaque="true" name="summary_edit" 
             width="356" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
@@ -161,10 +161,10 @@
 abuse, relevant chat/IM text, and select the object
 if possible.
        </text>
-        <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="-152" embedded_items="false"
+        <text_editor bottom_delta="-152" embedded_items="false"
             follows="left|top" font="SansSerifSmall" height="146" left="16"
             max_length="800" mouse_opaque="false" name="details_edit"
-             text_readonly_color="1, 1, 1, 1" width="356" word_wrap="true" />
+             width="356" word_wrap="true" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml b/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
index 4583137..9499690 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_report_bug.xml
@@ -137,10 +137,10 @@
             mouse_opaque="true" name="sum_title" v_pad="0" width="180">
                Summary:
        </text>
-        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+        <line_editor bevel_style="in" border_style="line"
             border_thickness="1" bottom_delta="-16" follows="left|top"
             font="SansSerifSmall" height="16" left="16" max_length="64"
-             mouse_opaque="true" name="summary_edit" text_readonly_color="1, 1, 1, 1"
+             mouse_opaque="true" name="summary_edit" 
             width="356" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
@@ -148,10 +148,10 @@
             mouse_opaque="true" name="dscr_title" v_pad="0" width="342">
                Details: (Please provide as much information as possible)
        </text>
-        <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="-112" embedded_items="false"
+        <text_editor bottom_delta="-112" embedded_items="false"
             follows="left|top" font="SansSerifSmall" height="112" left="16"
             max_length="900" mouse_opaque="false" name="details_edit"
-             text_readonly_color="1, 1, 1, 1" width="356" word_wrap="true">
+             width="356" word_wrap="true">
                Steps to reproduce the bug:
 Observed results:
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml
index 1e020eb..6bc26b9 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_script_ed_panel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
     left="0" mouse_opaque="true" name="script panel" width="500">
-        <text_editor type="string" length="1" bg_readonly_color="0.392157 0.392157 0.392157 1" bottom="-393"
+        <text_editor type="string" length="1" bottom="-393"
             embedded_items="false" enabled="true" follows="left|top|right|bottom"
             font="Monospace" height="376" ignore_tab="false" left="4"
             max_length="65536" mouse_opaque="true" name="Script Editor" width="492"
@@ -26,7 +26,7 @@
        <menu_bar bottom="-15" drop_shadow="false" enabled="true" follows="left|top|right"
             height="18" left="8" mouse_opaque="false" name="script_menu" opaque="false"
             tear_off="false" width="476">
-                <menu bottom="0" color="0 0 0 1" drop_shadow="true" enabled="true" height="62"
+                <menu bottom="0" drop_shadow="true" enabled="true" height="62"
                     left="0" mouse_opaque="false" name="File" opaque="true" tear_off="false"
                     width="138">
                        <menu_item_call bottom_delta="-30" height="20" label="Save" left="0" mouse_opaque="true"
@@ -36,7 +36,7 @@
                        <menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
                             mouse_opaque="true" name="Revert All Changes" width="138" />
                </menu>
-                <menu bottom="665" color="0 0 0 1" drop_shadow="true" enabled="true" height="198"
+                <menu bottom="665" drop_shadow="true" enabled="true" height="198"
                     left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
                     width="139">
                        <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
@@ -62,7 +62,7 @@
                        <menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
                             left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
                </menu>
-                <menu bottom="-18" color="0 0 0 1" drop_shadow="true" enabled="true" height="34"
+                <menu bottom="-18" drop_shadow="true" enabled="true" height="34"
                     left="0" mouse_opaque="false" name="Help" opaque="true" tear_off="false"
                     width="112">
                        <menu_item_call bottom="-30" enabled="true" height="20" label="Help..." left="0"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml b/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml
index 4118438..167aeb7 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_script_preview.xml
@@ -5,7 +5,7 @@
     rect_control="PreviewScriptRect" title="Script: Rotation Script"
     width="500">
        <panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
-             left="0" mouse_opaque="true" name="script panel" width="500" />
+             left="0" mouse_opaque="true" name="script panel" width="497" />
        <icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
             image_name="icon_lock.tga" left="444" mouse_opaque="true" name="lock"
             width="16" />
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
index 82ed992..c549e29 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
@@ -5,29 +5,29 @@
        <texture_picker bottom_delta="-155" enabled="false" follows="top|left" height="135" left="244"
             name="info_image" right="424" width="180" />
        <text bottom_delta="119" follows="top|left" font="SansSerifSmall" left="16"
-             name="info_parcel_label" text_color="white" width="48">
+             name="info_parcel_label"  width="48">
                Parcel:
        </text>
        <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left="56"
-             name="info_parcel" right="-20" text_color="white">
+             name="info_parcel" right="-20" >
                PARCEL NAME
        </text>
        <text follows="top|left" font="SansSerifSmall" left="16" name="info_size_label"
-             text_color="white" width="48">
+              width="48">
                Size:
        </text>
        <text bottom_delta="-21" follows="top|left" font="SansSerif" height="32" left="56"
-             name="info_size" right="-20" text_color="white">
+             name="info_size" right="-20" >
                [AREA] sq. m.
        </text>
        <text bottom_delta="-64" follows="top|left" font="SansSerifHuge" height="24"
             left="16" name="info_action" text_color="white" width="200">
                To sell this parcel:
        </text>
-        <icon bottom_delta="-96" follows="top|left" height="64" image_name="badge_note.tga"
+        <icon bottom_delta="-96" follows="top|left" height="64" image_name="badge_note.j2c"
             left="0" name="step_price" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label"
-             right="-20" text_color="white">
+             right="-20" font="SansSerifBig" >
                Set a price:
        </text>
        <text follows="top|left" height="16" left="72" name="price_text" right="-20">
@@ -41,10 +41,10 @@
        <text bottom_delta="0" height="16" left_delta="110" name="price_per_m" width="200">
                (L$[PER_METER] per square meter)
        </text>
-        <icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
+        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_sell_to" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72" name="sell_to_label"
-             right="-20" text_color="white">
+             right="-20" font="SansSerifBig" >
                Sell the land to:
        </text>
        <text follows="top|left" height="16" left="72" name="sell_to_text" right="-20">
@@ -63,13 +63,13 @@
                </combo_item>
        </combo_box>
        <line_editor bottom_delta="-20" enabled="false" follows="top|right" height="16"
-             name="sell_to_agent" text_color="white" width="150" />
+             name="sell_to_agent"  width="150" />
        <button bottom_delta="0" height="16" label="Select..." left_delta="155"
             name="sell_to_select_agent" width="60" />
-        <icon follows="top|left" height="64" image_name="badge_note.tga" left="0"
+        <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
             name="step_sell_objects" width="64" />
        <text bottom_delta="38" follows="top|left" height="16" left="72"
-             name="sell_objects_label" right="-20" text_color="white">
+             name="sell_objects_label" right="-20" font="SansSerifBig" >
                Sell the objects with the land?
        </text>
        <text bottom_delta="-20" follows="top|left" height="16" left="72"
@@ -89,7 +89,7 @@
        <button bottom_delta="4" height="16" label="Show Objects" name="show_objects"
             right="414" width="110" />
        <text bottom_delta="-35" follows="top|left" height="16" left="72"
-             name="nag_message_label" right="-20" text_color="white">
+             name="nag_message_label" right="-20" font="SansSerifBig" >
                REMEMBER: All sales are final.
        </text>
        <button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale"
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 ed31742..a8c0840 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
@@ -4,7 +4,7 @@
     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" />
-        <text_editor bottom_delta="-75" enabled="false" height="60" hide_scrollbar="true"
+        <text_editor bottom_delta="-75" enabled="false" height="60" width="320" hide_scrollbar="true"
             name="comment_text" word_wrap="true" />
        <combo_box bottom_delta="-30" follows="top|left" font="SansSerifSmall" height="20"
             left="15" name="boolean_combo" visible="false">
diff --git a/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
index 2199db9..3966ac6 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_snapshot.xml
@@ -33,11 +33,11 @@
        <button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120"
             name="discard_btn" width="85" />
        <button bottom="-290" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" hidden="false" label="More &gt;&gt;" left="10"
+             height="20" label="More &gt;&gt;" left="10"
             mouse_opaque="true" name="more_btn" scale_image="TRUE"
             tool_tip="Advanced Options" width="80" />
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" hidden="false" label="&lt;&lt; Less" left_delta="0"
+             height="20" label="&lt;&lt; Less" left_delta="0"
             mouse_opaque="true" name="less_btn" scale_image="TRUE"
             tool_tip="Advanced Options" width="80" />
        <text bottom_delta="-20" follows="top|left" height="15" left="10" name="type_label2"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
index 969a89c..5531090 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tools.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="550" left="308"
+     can_resize="false" follows="left|top" height="550" 
-     min_height="100" min_width="100" mouse_opaque="true" name="toolbox floater"
+     left="308" min_height="100" min_width="100" mouse_opaque="true"
-     rect_control="ToolboxRect" sound_flags="0" title="" width="272">
+     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
+     width="272">
+<!-- Main floater tabs -->
        <button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
             image_disabled="tool_zoom.tga"
             image_disabled_selected="tool_zoom_active.tga"
@@ -33,6 +37,9 @@
             image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"
             label="" label_selected="" left="148" mouse_opaque="true"
             name="button land" tool_tip="Land" width="32" />
+<!-- Focus panel -->
        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
             initial_value="false" label="Zoom" left="4" mouse_opaque="true"
             name="radio zoom" radio_style="true" width="114" />
@@ -43,8 +50,11 @@
             initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"
             name="radio orbit" radio_style="true" width="114" />
        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Pan (Ctrl-Shift)" left="4" mouse_opaque="true"
+             initial_value="false" label="Pan (Ctrl-Shift)" left="4"
-             name="radio pan" radio_style="true" width="114" />
+             mouse_opaque="true" name="radio pan" radio_style="true" width="114" />
+<!-- Move panel -->
        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
             initial_value="false" label="Move" left="4" mouse_opaque="true"
             name="radio move" radio_style="true" width="114" />
@@ -54,6 +64,9 @@
        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
             initial_value="false" label="Spin (Ctrl-Shift)" left="4"
             mouse_opaque="true" name="radio spin" radio_style="true" width="114" />
+<!-- Edit panel -->
        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
             initial_value="false" label="Position" left="4" mouse_opaque="true"
             name="radio position" radio_style="true" width="114" />
@@ -103,112 +116,118 @@
        <button bottom_delta="-14" follows="left|top" font="SansSerifSmall" halign="center"
             height="16" label="Options..." label_selected="Options..." left_delta="20"
             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+<!-- Help text -->
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-52" drop_shadow_visible="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
             mouse_opaque="true" name="text status" v_pad="0" width="264">
                Drag to move, shift-drag to copy
        </text>
-        <button bottom="-75" follows="left|top" font="SansSerif" halign="center" height="24"
+<!-- Create panel -->
+        <button bottom="-78" follows="left|top" font="SansSerif" halign="center" height="30"
             image_disabled="object_cube.tga"
             image_disabled_selected="object_cube_active.tga"
             image_selected="object_cube_active.tga" image_unselected="object_cube.tga"
             label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"
-             scale_image="TRUE" width="24" />
+             scale_image="TRUE" width="30" tool_tip="Cube"/>
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_prism.tga"
+             height="30" image_disabled="object_prism.tga"
             image_disabled_selected="object_prism_active.tga"
             image_selected="object_prism_active.tga"
             image_unselected="object_prism.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
+             left_delta="28" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
-             width="24" />
+        tool_tip="Prism" width="30" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_pyramid.tga"
+             height="30" image_disabled="object_pyramid.tga"
             image_disabled_selected="object_pyramid_active.tga"
             image_selected="object_pyramid_active.tga"
             image_unselected="object_pyramid.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
+             left_delta="28" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
-             width="24" />
+ tool_tip="Pyramid" width="30" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="24" image_disabled="object_tetrahedron.tga"
+             height="30" image_disabled="object_tetrahedron.tga"
             image_disabled_selected="object_tetrahedron_active.tga"
             image_selected="object_tetrahedron_active.tga"
             image_unselected="object_tetrahedron.tga" label="" label_selected=""
             left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
-             scale_image="TRUE" width="24" />
+             scale_image="TRUE" tool_tip="Tetrahedron" width="30" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="24" image_disabled="object_cylinder.tga"
             image_disabled_selected="object_cylinder_active.tga"
             image_selected="object_cylinder_active.tga"
             image_unselected="object_cylinder.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolCylinder" scale_image="TRUE"
+             left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"
-             width="24" />
+             width="30" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="24" image_disabled="object_hemi_cylinder.tga"
             image_disabled_selected="object_hemi_cylinder_active.tga"
             image_selected="object_hemi_cylinder_active.tga"
             image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
             left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
-             scale_image="TRUE" width="24" />
+             scale_image="TRUE" tool_tip="Hemicylinder" width="30" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="24" image_disabled="object_cone.tga"
             image_disabled_selected="object_cone_active.tga"
             image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolCone" scale_image="TRUE" width="24" />
+             name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="30" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="24" image_disabled="object_hemi_cone.tga"
             image_disabled_selected="object_hemi_cone_active.tga"
             image_selected="object_hemi_cone_active.tga"
             image_unselected="object_hemi_cone.tga" label="" label_selected=""
             left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
-             width="24" />
+      tool_tip="Hemicone" width="30" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="24" image_disabled="object_sphere.tga"
             image_disabled_selected="object_sphere_active.tga"
             image_selected="object_sphere_active.tga"
             image_unselected="object_sphere.tga" label="" label_selected=""
             left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
-             width="24" />
+             width="30" tool_tip="Sphere" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="24" image_disabled="object_hemi_sphere.tga"
             image_disabled_selected="object_hemi_sphere_active.tga"
             image_selected="object_hemi_sphere_active.tga"
             image_unselected="object_hemi_sphere.tga" label="" label_selected=""
             left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
-             scale_image="TRUE" width="24" />
+             scale_image="TRUE" tool_tip="Hemisphere" width="30" />
        <button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
             height="24" image_disabled="object_torus.tga"
             image_disabled_selected="object_torus_active.tga"
             image_selected="object_torus_active.tga"
             image_unselected="object_torus.tga" label="" label_selected="" left="4"
-             mouse_opaque="true" name="ToolTorus" scale_image="TRUE" width="24" />
+             mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="30" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="24" image_disabled="object_tube.tga"
             image_disabled_selected="object_tube_active.tga"
             image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolTube" scale_image="TRUE" width="24" />
+             name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="30" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="24" image_disabled="object_ring.tga"
             image_disabled_selected="object_ring_active.tga"
             image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolRing" scale_image="TRUE" width="24" />
+             name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="30" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="24" image_disabled="object_tree.tga"
             image_disabled_selected="object_tree_active.tga"
             image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
             label="" label_selected="" left_delta="23" mouse_opaque="true"
-             name="ToolTree" scale_image="TRUE" width="24" />
+             name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="30" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="24" image_disabled="object_grass.tga"
             image_disabled_selected="object_grass_active.tga"
             image_selected="object_grass_active.tga"
             image_unselected="object_grass.tga" label="" label_selected=""
-             left_delta="23" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
+             left_delta="28" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
-             width="24" />
+             tool_tip="Grass" width="30" />
-        <check_box bottom="-117" control_name="CreateToolKeepSelected" follows="left|top"
+        <check_box bottom="-120" control_name="CreateToolKeepSelected" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
             label="Keep Tool Selected" left="4" mouse_opaque="true"
             name="checkbox sticky" width="128" />
@@ -223,6 +242,9 @@
        <check_box bottom_delta="-15" control_name="CreateToolCopyRotates" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false" label="Rotate Copy"
             left_delta="0" mouse_opaque="true" name="checkbox copy rotates" width="134" />
+<!-- Land panel -->
        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
             initial_value="false" label="Select Land" left="4" mouse_opaque="true"
             name="radio select land" radio_style="true" width="114" />
@@ -271,8 +293,11 @@
             height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
             name="button less" scale_image="TRUE" tool_tip="Advanced Options"
             width="80" />
+<!-- Sub-tabs -->
        <tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
-             name="Object Info Tabs" tab_max_width="52" tab_min_width="60"
+             name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
             tab_position="top" width="272">
                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                     label="General" left="1" mouse_opaque="false" name="General" width="270">
@@ -437,6 +462,8 @@
                        </text>
                        <combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
                             left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
+                             <!-- Do not reorder these items, the index numbers are
+                                        used internally. JC -->
                                <combo_item name="Touch/grab(default)" value="Touch/grab (default)">
                                        Touch/grab (default)
                                </combo_item>
@@ -511,6 +538,9 @@
                                Must select entire object to set permissions.
                        </string>
                </panel>
+<!-- Object sub-tab -->
                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                     label="Object" left="1" mouse_opaque="false" name="Object" width="270">
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -552,15 +582,15 @@
                        <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
                             increment="0.01" initial_val="0" label="X" label_width="10" left="10"
                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
-                             text_enabled_color="1, 0.25, 0, 1" width="87" />
+                             text_enabled_color="110, 15, 15, 255" width="87" />
                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                             increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
                             max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
-                             text_enabled_color="0, 1, 0, 1" width="87" />
+                             text_enabled_color="0, 100, 40, 255" width="87" />
                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                             increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
-                             max_val="768" min_val="0" mouse_opaque="true" name="Pos Z"
+                             max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
-                             text_enabled_color="0, 0.5, 1, 1" width="87" />
+                             text_enabled_color="0, 67, 132, 255" width="87" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
@@ -840,6 +870,9 @@
                                </combo_item>
                        </combo_box>
                </panel>
+<!-- Features sub-tab -->
                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                     label="Features" left="1" mouse_opaque="false" name="Features" width="270">
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -916,6 +949,9 @@
                             left_delta="0" max_val="2" min_val="0" mouse_opaque="true"
                             name="Light Falloff" width="128" />
                </panel>
+<!-- Texture sub-tab -->
                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                     label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
                        <texture_picker allow_no_texture="false" bottom="-90" can_apply_immediately="true"
@@ -937,12 +973,12 @@
                             mouse_opaque="true" name="ColorTrans" width="80" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10"
                             left="180" mouse_opaque="true" name="glow label" v_pad="0" width="80">
                                Glow
                        </text>
                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             hidden="false" increment="0.1" initial_val="0" left="180" max_val="1"
+                             increment="0.1" initial_val="0" left="180" max_val="1"
                             min_val="0" mouse_opaque="true" name="glow" width="80" />
                        <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
@@ -1121,12 +1157,16 @@
                <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
                        <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="New Script..." label_selected="New Script..." left="10"
+                              label="New Script..." label_selected="New Script..."
-                             mouse_opaque="true" name="button new script" scale_image="TRUE" width="130" />
+                             left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
-                        <panel bottom_delta="-330" follows="left|top" height="325" left="10"
+                             width="130" />
+                        <panel bottom_delta="-330" follows="left|top" height="325"  left="10"
                             mouse_opaque="true" name="ContentsInventory" width="252" />
                </panel>
        </tab_container>
+<!-- Land Info sub-tab -->
        <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
             name="land info panel" width="272">
                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml b/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml
index a46671f..2003548 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_top_objects.xml
@@ -18,27 +18,27 @@
             left="10" name="id_text" width="100">
                Object ID:
        </text>
-        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false"
+        <line_editor bottom_delta="3" enabled="false"
             follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-             name="id_editor" text_readonly_color="white" width="250" />
+             name="id_editor" width="250" />
        <button bottom_delta="0" follows="bottom|right" height="20" label="Show Beacon"
             name="show_beacon_btn" right="-10" width="100" />
        <text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
             left="10" name="obj_name_text" width="100">
                Object Name:
        </text>
-        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="true"
+        <line_editor bottom_delta="3" enabled="true"
             follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-             name="object_name_editor" text_readonly_color="white" width="250" />
+             name="object_name_editor" width="250" />
        <button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
             name="filter_object_btn" right="-10" width="100" />
        <text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
             left="10" name="owner_name_text" width="100">
                Owner Name:
        </text>
-        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="true"
+        <line_editor bottom_delta="3" enabled="true"
             follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-             name="owner_name_editor" text_readonly_color="white" width="250" />
+             name="owner_name_editor" width="250" />
        <button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
             name="filter_owner_btn" right="-10" width="100" />
        <button bottom="35" follows="bottom|left" height="20" label="Return Selected" left="10"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_tos.xml b/linden/indra/newview/skins/xui/en-us/floater_tos.xml
index 4f0a4da..68ddae0 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_tos.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_tos.xml
@@ -34,15 +34,15 @@ you must accept the agreement.
        </text>
        <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
             height="283" left="16" max_length="65536" mouse_opaque="true"
-             name="tos_text" text_readonly_color="1, 1, 1, 1" width="568"
+             name="tos_text" width="568"
             word_wrap="true">
                TOS_TEXT
        </text_editor>
        <web_browser bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
             height="283" left="16" max_length="65536" mouse_opaque="true"
             name="tos_html"
-             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#ffffff%22 text=%22000000%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
+             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
-             text_readonly_color="1, 1, 1, 1" width="568" word_wrap="true" />
+             width="568" word_wrap="true" />
        <string name="real_url">
                http://secondlife.com/app/tos/
        </string>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_water.xml b/linden/indra/newview/skins/xui/en-us/floater_water.xml
index bd63105..5b65837 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_water.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="240" hidden="false" left="50" min_height="200"
+     can_resize="false" height="240" left="50" min_height="200"
     min_width="400" mouse_opaque="true" name="Water Floater"
     rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor"
     width="700">
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16"
             left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
             width="110">
                Water Presets:
@@ -15,22 +15,22 @@
             left_delta="110" max_chars="20" mouse_opaque="true"
             name="WaterPresetsCombo" width="150" />
        <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="New" label_selected="New" left_delta="170"
+             label="New" label_selected="New" left_delta="170"
             mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="70" />
        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Save" label_selected="Save" left_delta="80"
+             label="Save" label_selected="Save" left_delta="80"
             mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="70" />
        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Delete" label_selected="Delete" left_delta="80"
+             label="Delete" label_selected="Delete" left_delta="80"
             mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="70" />
-        <tab_container bottom="-240" follows="left|top" height="180" hidden="false" left="0"
+        <tab_container bottom="-240" follows="left|top" height="180" left="0"
             mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-                     hidden="false" label="Settings" left="1" mouse_opaque="false"
+                     label="Settings" left="1" mouse_opaque="false"
                     name="Settings" width="698">
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
                                Water Fog Color
                        </text>
@@ -38,11 +38,11 @@
                             left="160" name="WaterFogColorHelp" width="18" />
                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
                             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-                             height="50" hidden="false" label="" left="40" mouse_opaque="true"
+                             height="50" label="" left="40" mouse_opaque="true"
                             name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-90" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355">
                                Fog Density Exponent
                        </text>
@@ -55,7 +55,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-130" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0"
                             width="355">
                                Underwater Fog Modifier
@@ -68,7 +68,7 @@
                             name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
                                Reflection Wavelet Scale
                        </text>
@@ -76,19 +76,19 @@
                             left="395" name="WaterNormalScaleHelp" width="18" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
                                1
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
                                2
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
                                3
                        </text>
@@ -109,7 +109,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-80" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
                                Fresnel Scale
                        </text>
@@ -122,7 +122,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-115" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0"
                             width="355">
                                Fresnel Offset
@@ -136,7 +136,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
                                Refract Scale Above
                        </text>
@@ -149,7 +149,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0"
                             width="355">
                                Refract Scale Below
@@ -163,7 +163,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
                                Blur Multiplier
                        </text>
@@ -176,11 +176,11 @@
                             width="200" />
                </panel>
                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-                     hidden="false" label="Image" left="1" mouse_opaque="false" name="Waves"
+                     label="Image" left="1" mouse_opaque="false" name="Waves"
                     width="698">
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
                                Big Wave Direction
                        </text>
@@ -188,14 +188,14 @@
                             left="155" name="WaterWave1Help" width="18" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0"
                             width="10">
                                X
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0"
                             width="10">
                                Y
@@ -212,7 +212,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-70" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355">
                                Little Wave Direction
                        </text>
@@ -220,14 +220,14 @@
                             left="155" name="WaterWave2Help" width="18" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0"
                             width="10">
                                X
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0"
                             width="10">
                                Y
@@ -244,7 +244,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355">
                                Normal Map
                        </text>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
index ff51de0..11859cc 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_windlight_options.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="220" hidden="false" left="50" min_height="180"
+     can_resize="false" height="220" left="50" min_height="180"
     min_width="400" mouse_opaque="true" name="WindLight floater"
     rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
     width="700">
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16"
             left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
             width="110">
                Sky Presets:
@@ -15,26 +15,26 @@
             left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
             width="150" />
        <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="New" label_selected="New" left_delta="170"
+             label="New" label_selected="New" left_delta="170"
             mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Save" label_selected="Save" left_delta="80"
+             label="Save" label_selected="Save" left_delta="80"
             mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Delete" label_selected="Delete" left_delta="80"
+             label="Delete" label_selected="Delete" left_delta="80"
             mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Day Cycle Editor" label_selected="Day Cycle Editor"
+             label="Day Cycle Editor" label_selected="Day Cycle Editor"
             left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
             scale_image="true" width="120" />
-        <tab_container bottom="-220" follows="left|top" height="160" hidden="false" left="0"
+        <tab_container bottom="-220" follows="left|top" height="160" left="0"
             mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
                <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
-                     hidden="false" label="Atmosphere" left="1" mouse_opaque="false"
+                     label="Atmosphere" left="1" mouse_opaque="false"
                     name="Atmosphere" width="698">
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
                                Blue Horizon
                        </text>
@@ -42,25 +42,25 @@
                             left="160" name="WLBlueHorizonHelp" width="18" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
                                R
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
                                G
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
                                B
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
                                I
                        </text>
@@ -86,7 +86,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
                                Haze Horizon
                        </text>
@@ -99,7 +99,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="BDensText2" v_pad="0" width="355">
                                Blue Density
                        </text>
@@ -107,25 +107,25 @@
                             left="395" name="WLBlueDensityHelp" width="18" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="245" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
                                R
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
                                G
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
                                B
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
                                I
                        </text>
@@ -151,7 +151,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
                                Haze Density
                        </text>
@@ -164,7 +164,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
                                Density Multiplier
                        </text>
@@ -177,7 +177,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="WLDistanceMultText" v_pad="0"
                             width="355">
                                Distance Multiplier
@@ -191,7 +191,7 @@
                             width="207" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
                                Max Altitude
                        </text>
@@ -204,11 +204,11 @@
                             width="205" />
                </panel>
                <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-                     hidden="false" label="Lighting" left="1" mouse_opaque="true"
+                     label="Lighting" left="1" mouse_opaque="true"
                     name="Lighting" width="698">
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="SLCText" v_pad="0" width="355">
                                Sun/Moon Color
                        </text>
@@ -216,25 +216,25 @@
                             left="160" name="WLSunlightColorHelp" width="18" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
                                R
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
                                G
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
                                B
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
                                I
                        </text>
@@ -260,7 +260,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="TODText" v_pad="0" width="355">
                                Sun/Moon Position
                        </text>
@@ -275,7 +275,7 @@
                             width="204" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="WLAmbientText" v_pad="0" width="355">
                                Ambient
                        </text>
@@ -283,25 +283,25 @@
                             left="395" name="WLAmbientHelp" width="18" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="245" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
                                R
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
                                G
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
                                B
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
                                I
                        </text>
@@ -326,7 +326,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="WLEastAngleText" v_pad="0" width="355">
                                East Angle
                        </text>
@@ -339,7 +339,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="SunGlowText" v_pad="0" width="355">
                                Sun Glow
                        </text>
@@ -355,7 +355,7 @@
                             mouse_opaque="true" name="WLGlowR" show_text="true" value="1.0" width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-67" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="SceneGammaText" v_pad="0" width="200">
                                Scene Gamma
                        </text>
@@ -367,7 +367,7 @@
                             mouse_opaque="true" name="WLGamma" show_text="true" value="2.0" width="207" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="WLStarText" v_pad="0" width="355">
                                Star Brightness
                        </text>
@@ -380,11 +380,11 @@
                             width="200" />
                </panel>
                <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-                     hidden="false" label="Clouds" left="1" mouse_opaque="false" name="Clouds"
+                     label="Clouds" left="1" mouse_opaque="false" name="Clouds"
                     width="698">
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="WLCloudColorText" v_pad="0" width="355">
                                Cloud Color
                        </text>
@@ -392,25 +392,25 @@
                             left="160" name="WLCloudColorHelp" width="18" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
                                R
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
                                G
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
                                B
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
                                I
                        </text>
@@ -436,7 +436,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="10" mouse_opaque="true" name="WLCloudColorText2" v_pad="0"
                             width="355">
                                Cloud XY/Density
@@ -445,19 +445,19 @@
                             left="160" name="WLCloudDensityHelp" width="18" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="10" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
                                X
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
                                Y
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
                                D
                        </text>
@@ -477,7 +477,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="WLCloudCoverageText" v_pad="0"
                             width="355">
                                Cloud Coverage
@@ -491,7 +491,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-55" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="WLCloudScaleText" v_pad="0"
                             width="355">
                                Cloud Scale
@@ -505,7 +505,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="245" mouse_opaque="true" name="WLCloudDetailText" v_pad="0"
                             width="355">
                                Cloud Detail (XY/Density)
@@ -514,19 +514,19 @@
                             left="395" name="WLCloudDetailHelp" width="18" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left="245" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
                                X
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
                                Y
                        </text>
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" hidden="false"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
                             left_delta="0" mouse_opaque="true" name="BHText10" v_pad="0" width="10">
                                D
                        </text>
@@ -547,7 +547,7 @@
                             value="1.0" width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="WLCloudScrollXText" v_pad="0"
                             width="355">
                                Cloud Scroll X
@@ -564,7 +564,7 @@
                             width="200" />
                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-60" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+                             font="SansSerif" h_pad="0" halign="left" height="16"
                             left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0"
                             width="355">
                                Cloud Scroll Y
diff --git a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
index bd74b05..b8341f2 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
@@ -180,9 +180,8 @@
             mouse_opaque="true" name="search_label" v_pad="0" width="222">
                Search Results:
        </text>
-        <scroll_list background_visible="false" bottom_delta="-306" draw_border="true"
+        <scroll_list background_visible="true" bottom_delta="-306" draw_border="true"
-             draw_stripes="false" fg_disable_color="1, 1, 1, 1"
+             draw_stripes="false" 
-             fg_selected_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
             follows="top|right|bottom" height="300" left="1013" multi_select="false"
             name="search_results" width="222">
                <column label="" name="icon" width="16" />
@@ -203,7 +202,7 @@
             mouse_opaque="true" name="spin y"
             tool_tip="Y coordinate of location to show on map" width="66" />
        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
-             increment="1" initial_val="0" left_delta="68" max_val="768" min_val="0"
+             increment="1" initial_val="0" left_delta="68" max_val="4096" min_val="0"
             mouse_opaque="true" name="spin z"
             tool_tip="Z coordinate of location to show on map" width="66" />
        <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"
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 925c2a4..31288ac 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu bottom="100" color="0, 0, 0, 1" drop_shadow="true" height="101" left="100"
+<menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
     mouse_opaque="false" name="Popup" opaque="true" width="128">
        <menu_item_call bottom_delta="-18" height="18" label="Buy" left="0" mouse_opaque="true"
             name="Task Buy" width="128">
@@ -49,7 +49,7 @@
             name="New Gesture" width="128">
                <on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
        </menu_item_call>
-        <menu bottom_delta="0" color="0, 0, 0, 1" drop_shadow="true" height="175" left="0"
+        <menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
             mouse_opaque="false" name="New Clothes" opaque="true" tear_off="false"
             width="125">
                <menu_item_call bottom_delta="-18" height="18" label="New Shirt" left="0" mouse_opaque="true"
@@ -89,7 +89,7 @@
                        <on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
                </menu_item_call>
        </menu>
-        <menu bottom_delta="0" color="0, 0, 0, 1" drop_shadow="true" height="175" left="0"
+        <menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
             mouse_opaque="false" name="New Body Parts" opaque="true" tear_off="false"
             width="125">
                <menu_item_call bottom_delta="-18" height="18" label="New Shape" left="0" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/xui/en-us/menu_login.xml b/linden/indra/newview/skins/xui/en-us/menu_login.xml
index 92170ae..d7ff80b 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_login.xml
@@ -20,7 +20,7 @@
        </menu>
        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
             height="317" label="Help" left="80" mouse_opaque="false" name="Help"
-             opaque="true" tear_off="falsoe" width="166">
+             opaque="true" tear_off="false" width="166">
                <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"
                     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
                        <on_click function="ShowFloater" userdata="help f1" />
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 2d07c98..cdba314 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
-     height="18" left="0" mouse_opaque="true" name="Main Menu" opaque="true"
+     height="18" left="0" mouse_opaque="true" name="Main Menu" opaque="false"
     tear_off="false" width="802">
        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
             height="263" label="File" left="0" mouse_opaque="false" name="File"
@@ -62,11 +62,6 @@
                </menu_item_call>
                <menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0"
                     mouse_opaque="true" name="separator4" width="243" />
-                <menu_item_call bottom="-213" enabled="true" height="19" label="Start/Stop Movie to Disk"
-                     left="0" mouse_opaque="true" name="Start/Stop Movie to Disk"
-                     shortcut="control|shift|A" width="243">
-                        <on_click function="File.SaveMovie" userdata="" />
-                </menu_item_call>
                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
                     height="117" label="Set Window Size" left="0" mouse_opaque="false"
                     name="Set Window Size" opaque="true" tear_off="true" width="125">
@@ -270,6 +265,12 @@
                        <on_click function="View.BuildMode" userdata="" />
                        <on_check function="View.CheckBuildMode" />
                </menu_item_check>
+                <menu_item_check bottom="-48" enabled="true" height="19" label="Joystick Flycam" left="0"
+                     mouse_opaque="true" name="Joystick Flycam" shortcut="alt|shift|F"
+                     width="211">
+                        <on_click function="View.JoystickFlycam" userdata="" />
+                        <on_check function="View.CheckJoystickFlycam" />
+                </menu_item_check>
                <menu_item_call bottom="-67" enabled="true" height="19" label="Reset View" left="0"
                     mouse_opaque="true" name="Reset View" shortcut="Esc" width="211">
                        <on_click function="View.ResetView" userdata="" />
@@ -437,26 +438,26 @@
                                <on_click function="View.ToggleRenderType" userdata="hideparticles" />
                                <on_check function="View.CheckRenderType" userdata="hideparticles" />
                        </menu_item_check>
-                        <menu_item_separator bottom="-186" enabled="true" height="8" hidden="false" label="-----------"
+                        <menu_item_separator bottom="-186" enabled="true" height="8" label="-----------" left="0"
-                             left="0" mouse_opaque="true" name="separator3" width="129" />
+                             mouse_opaque="true" name="separator3" width="129" />
                        <menu bottom="-205" color="0 0 0 1" create_jump_keys="true" drop_shadow="true"
-                             enabled="true" height="117" hidden="false" label="Beacon Width" left="0"
+                             enabled="true" height="117" label="Beacon Width" left="0"
                             mouse_opaque="false" name="Beacon Width" opaque="true" tear_off="true"
                             width="129">
-                                <menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="1" left="0"
+                                <menu_item_call bottom="-19" enabled="true" height="19" label="1" left="0" mouse_opaque="true"
-                                     mouse_opaque="true" name="Beacon Width 1" width="188">
+                                     name="Beacon Width 1" width="188">
                                        <on_click function="View.BeaconWidth" userdata="1" />
                                </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="4" left="0"
+                                <menu_item_call bottom="-19" enabled="true" height="19" label="4" left="0" mouse_opaque="true"
-                                     mouse_opaque="true" name="Beacon Width 4" width="188">
+                                     name="Beacon Width 4" width="188">
                                        <on_click function="View.BeaconWidth" userdata="4" />
                                </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="16" left="0"
+                                <menu_item_call bottom="-19" enabled="true" height="19" label="16" left="0" mouse_opaque="true"
-                                     mouse_opaque="true" name="Beacon Width 16" width="188">
+                                     name="Beacon Width 16" width="188">
                                        <on_click function="View.BeaconWidth" userdata="16" />
                                </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" hidden="false" label="32" left="0"
+                                <menu_item_call bottom="-19" enabled="true" height="19" label="32" left="0" mouse_opaque="true"
-                                     mouse_opaque="true" name="Beacon Width 32" width="188">
+                                     name="Beacon Width 32" width="188">
                                        <on_click function="View.BeaconWidth" userdata="32" />
                                </menu_item_call>
                        </menu>
@@ -500,10 +501,6 @@
                     mouse_opaque="true" name="Chat" shortcut="" width="185">
                        <on_click function="World.Chat" userdata="" />
                </menu_item_call>
-                <menu_item_call bottom="-48" enabled="true" height="19" label="Start Gesture" left="0"
-                     mouse_opaque="true" name="Start Gesture" shortcut="/" width="185">
-                        <on_click function="World.StartGesture" userdata="" />
-                </menu_item_call>
                <menu_item_check bottom="-67" enabled="true" height="19" label="Always Run" left="0"
                     mouse_opaque="true" name="Always Run" shortcut="control|R" width="185">
                        <on_click function="World.AlwaysRun" userdata="" />
@@ -544,6 +541,10 @@
                     mouse_opaque="true" name="Set Busy" width="185">
                        <on_click function="World.SetBusy" userdata="" />
                </menu_item_call>
+                <menu_item_call bottom="-281" enabled="false" height="19" label="Stop All Animations" left="0"
+                     mouse_opaque="true" name="Stop All Animations" width="250">
+                        <on_click function="Tools.StopAllAnimations" userdata="" />
+                </menu_item_call>
                <menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
                     mouse_opaque="true" name="separator4" width="185" />
                <menu_item_call bottom="-232" enabled="true" height="19" label="Account History..." left="0"
@@ -604,18 +605,17 @@
                             left="0" mouse_opaque="true" name="Revert to Region Default" width="169">
                                <on_click function="World.EnvSettings" userdata="default" />
                        </menu_item_call>
-                        <menu_item_separator bottom="-113" enabled="true" height="8" hidden="false" label="-----------"
+                        <menu_item_separator bottom="-113" enabled="true" height="8" label="-----------" left="0"
-                             left="0" mouse_opaque="true" name="separator" width="169" />
+                             mouse_opaque="true" name="separator" width="169" />
-                        <menu_item_call bottom="-132" enabled="false" height="19" hidden="false"
+                        <menu_item_call bottom="-132" enabled="false" height="19" label="Environment Editor" left="0"
-                             label="Environment Editor" left="0" mouse_opaque="true"
+                             mouse_opaque="true" name="Environment Editor" width="169">
-                             name="Environment Editor" width="169">
                                <on_click function="World.EnvSettings" userdata="editor" />
                        </menu_item_call>
                </menu>
        </menu>
        <menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
             height="510" label="Tools" left="0" mouse_opaque="false" name="Tools"
-             opaque="true" tear_off="true" width="250">
+             opaque="true" tear_off="true" visible="false" width="250">
                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
                     height="109" label="Select Tool" left="0" mouse_opaque="false"
                     name="Select Tool" opaque="true" tear_off="true" width="118">
@@ -720,12 +720,6 @@
                </menu_item_call>
                <menu_item_separator bottom="-289" enabled="true" height="8" label="-----------" left="0"
                     mouse_opaque="true" name="separator4" width="250" />
-                <menu_item_call bottom="-281" enabled="false" height="19" label="Stop All Animations" left="0"
-                     mouse_opaque="true" name="Stop All Animations" width="250">
-                        <on_click function="Tools.StopAllAnimations" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-289" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator5" width="250" />
                <menu_item_call bottom="-308" enabled="false" height="19" label="Focus on Selection" left="0"
                     mouse_opaque="true" name="Focus on Selection" shortcut="H" width="250">
                        <on_click function="Tools.LookAtSelection" userdata="focus" />
@@ -789,46 +783,6 @@
                        <on_click function="Tools.SelectedScriptAction" userdata="stop" />
                        <on_enable function="EditableSelected" />
                </menu_item_call>
-                <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator7" width="250" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="109" label="Bug Reporting" left="0" mouse_opaque="false"
-                     name="Bug Reporting" opaque="true" tear_off="true" width="118">
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker..."
-                             left="0" mouse_opaque="true" name="Public Issue Tracker..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker Help..."
-                             left="0" mouse_opaque="true" name="Publc Issue Tracker Help..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
-                        </menu_item_call>
-                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator7" width="250" />
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting 101..." left="0"
-                             mouse_opaque="true" name="Bug Reporing 101..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Security Issues..." left="0"
-                             mouse_opaque="true" name="Security Issues..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="QA Wiki..." left="0"
-                             mouse_opaque="true" name="QA Wiki..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
-                        </menu_item_call>
-                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator72" width="250" />
-                        <menu_item_call bottom="-240" enabled="true" height="19" label="Report Bug..." left="0"
-                             mouse_opaque="true" name="Report Bug..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-                        </menu_item_call>
-                </menu>
        </menu>
        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
             height="317" label="Help" left="227" mouse_opaque="false" name="Help"
@@ -837,6 +791,10 @@
                     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
                        <on_click function="ShowFloater" userdata="help f1" />
                </menu_item_call>
+                <menu_item_call bottom="-48" enabled="true" height="19" label="Tutorial" left="0"
+                     mouse_opaque="true" name="Tutorial" width="166">
+                        <on_click function="ShowFloater" userdata="help tutorial" />
+                </menu_item_call>
                <menu_item_separator bottom="-75" enabled="true" height="8" label="-----------" left="0"
                     mouse_opaque="true" name="separator" width="166" />
                <menu_item_call bottom="-94" enabled="true" height="19" label="Official Linden Blog..."
@@ -857,12 +815,6 @@
                </menu_item_call>
                <menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
                     mouse_opaque="true" name="separator3" width="166" />
-                <menu_item_call bottom="-167" enabled="true" height="19" label="Message of the Day..." left="0"
-                     mouse_opaque="true" name="Message of the Day..." width="166">
-                        <on_click function="Help.MOTD" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-175" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="166" />
                <menu_item_call bottom="-194" enabled="true" height="19" label="Report Abuse..." left="0"
                     mouse_opaque="true" name="Report Abuse..." width="166">
                        <on_click function="ShowFloater" userdata="complaint reporter" />
@@ -875,6 +827,46 @@
                <menu_item_call label="Lag Meter" name="Lag Meter">
                        <on_click function="ShowFloater" userdata="lag meter" />
                </menu_item_call>
+                <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
+                     mouse_opaque="true" name="separator7" width="250" />
+                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
+                     height="109" label="Bug Reporting" left="0" mouse_opaque="false"
+                     name="Bug Reporting" opaque="true" tear_off="true" width="118">
+                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker..."
+                             left="0" mouse_opaque="true" name="Public Issue Tracker..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker Help..."
+                             left="0" mouse_opaque="true" name="Publc Issue Tracker Help..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
+                        </menu_item_call>
+                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
+                             mouse_opaque="true" name="separator7" width="250" />
+                        <menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting 101..." left="0"
+                             mouse_opaque="true" name="Bug Reporing 101..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" label="Security Issues..." left="0"
+                             mouse_opaque="true" name="Security Issues..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" label="QA Wiki..." left="0"
+                             mouse_opaque="true" name="QA Wiki..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
+                        </menu_item_call>
+                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
+                             mouse_opaque="true" name="separator9" width="250" />
+                        <menu_item_call bottom="-240" enabled="true" height="19" label="Report Bug..." left="0"
+                             mouse_opaque="true" name="Report Bug..." width="166">
+                                <on_click function="PromptShowURL"
+                                     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
+                        </menu_item_call>
+                </menu>
                <menu_item_separator bottom="-221" enabled="true" height="8" label="-----------" left="0"
                     mouse_opaque="true" name="separator5" width="166" />
                <menu_item_call bottom="-121" enabled="true" height="19" label="Release Notes..." left="0"
diff --git a/linden/indra/newview/skins/xui/en-us/mime_types.xml b/linden/indra/newview/skins/xui/en-us/mime_types.xml
index 0427727..a0ac9d8 100644
--- a/linden/indra/newview/skins/xui/en-us/mime_types.xml
+++ b/linden/indra/newview/skins/xui/en-us/mime_types.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<mimetypes>
+<mimetypes name="default">
        <defaultlabel>
                (Unknown)
        </defaultlabel>
@@ -40,7 +40,7 @@
                        video/*
                </default_type>
                <icon>
-                        icn_media.tga
+                        icn_media_movie.tga
                </icon>
                <tooltip>
                        There is a movie to play here
@@ -130,7 +130,7 @@
                        movie
                </widgettype>
        </scheme>
-        <mimetype name="">
+        <mimetype name="blank">
                <label>
                        - None -
                </label>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
index 13200e8..b9877c8 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_audio.xml
@@ -4,7 +4,7 @@
        <slider bottom_delta="-20" control_name="AudioLevelMaster" follows="left|top|right"
             height="15" increment="0.05" initial_val="0.5" label="Master"
             label_width="55" left="10" max_val="1" min_val="0" mouse_opaque="true"
-             name="System Volume" show_text="false" volume="true" width="200" />
+             name="System Volume" show_text="false" volume="true" width="180" />
        <button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16"
             image_selected="icn_speaker-muted_dark.tga"
             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
@@ -12,7 +12,7 @@
        <slider bottom_delta="-30" control_name="AudioLevelMusic" follows="left|top|right"
             height="15" increment="0.05" initial_val="0.5" label="Music"
             label_width="55" left="10" max_val="1" min_val="0" name="Music Volume"
-             show_text="false" volume="true" width="200" />
+             show_text="false" volume="true" width="180" />
        <button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16"
             image_selected="icn_speaker-muted_dark.tga"
             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
@@ -20,7 +20,7 @@
        <slider bottom_delta="-20" control_name="AudioLevelMedia" follows="left|top|right"
             height="15" increment="0.05" initial_val="0.5" label="Media"
             label_width="55" left="10" max_val="1" min_val="0" name="Media Volume"
-             show_text="false" volume="true" width="200" />
+             show_text="false" volume="true" width="180" />
        <button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16"
             image_selected="icn_speaker-muted_dark.tga"
             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
@@ -28,7 +28,7 @@
        <slider bottom_delta="-20" control_name="AudioLevelVoice" follows="left|top|right"
             height="15" increment="0.05" initial_val="0.5" label="Voice"
             label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume"
-             show_text="false" volume="true" width="200" />
+             show_text="false" volume="true" width="180" />
        <button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16"
             image_selected="icn_speaker-muted_dark.tga"
             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
@@ -36,7 +36,7 @@
        <slider bottom_delta="-20" control_name="AudioLevelSFX" follows="left|top|right"
             height="15" increment="0.05" initial_val="0.5" label="Sounds"
             label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume"
-             show_text="false" volume="true" width="200" />
+             show_text="false" volume="true" width="180" />
        <button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16"
             image_selected="icn_speaker-muted_dark.tga"
             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
@@ -44,7 +44,7 @@
        <slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="left|top|right"
             height="15" increment="0.05" initial_val="0.5" label="Ambient"
             label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume"
-             show_text="false" volume="true" width="200" />
+             show_text="false" volume="true" width="180" />
        <button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16"
             image_selected="icn_speaker-muted_dark.tga"
             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
@@ -52,7 +52,7 @@
        <slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
             height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55"
             left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
-             volume="true" width="200" />
+             volume="true" width="180" />
        <button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16"
             image_selected="icn_speaker-muted_dark.tga"
             image_unselected="icn_speaker_dark.tga" label="" label_width="55"
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 53d25c0..78884cd 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -1,7 +1,7 @@
 <?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">
+             tab_min_width="50" tab_position="top" width="419">
                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                     label="2nd Life" left="1" mouse_opaque="true" name="2nd Life" width="418">
                        <string name="CaptionTextAcctInfo">
@@ -42,11 +42,11 @@
                             mouse_opaque="true" name="Name:" v_pad="0" width="70">
                                Name:
                        </text>
-                        <name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <name_editor bevel_style="in" border_style="line"
                             border_thickness="1" bottom="-24" enabled="false" follows="left|top"
                             font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
                             max_length="254" mouse_opaque="false" name="name"
-                             text_readonly_color="1, 1, 1, 1" width="180" />
+                             width="180" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-24" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left="279"
@@ -59,11 +59,11 @@
                             mouse_opaque="true" name="label" v_pad="0" width="121">
                                Born:
                        </text>
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                             border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
                             max_length="254" mouse_opaque="false" name="born"
-                             text_readonly_color="1, 1, 1, 1" width="121" />
+                             width="121" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
@@ -72,10 +72,10 @@
                        </text>
                        <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
                             mouse_opaque="false" name="acct_border" width="121" />
-                        <text bg_color="0, 0, 0, 0" bg_visible="false" border_drop_shadow_visible="false"
+                        <text bg_visible="false" border_drop_shadow_visible="false"
                             border_visible="true" bottom_delta="0" drop_shadow_visible="true"
                             follows="left|top" font="SansSerifSmall" height="48" left="279"
-                             mouse_opaque="false" name="acct" text_color="1, 1, 1, 1" width="121" />
+                             mouse_opaque="false" name="acct" width="121" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
@@ -84,18 +84,17 @@
                             v_pad="0" width="130">
                                Partner:
                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+                        <button bottom_delta="2" follows="left|top" font="SansSerif" halign="center"
-                             height="18" label="i" label_selected="i" left_delta="44"
+                             height="16" label="i" label_selected="i" left_delta="44"
                             mouse_opaque="true" name="partner_info"
                             tool_tip="Click to open partner&apos;s profile" width="18" />
                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-                             height="18" label="?" label_selected="?" left_delta="24"
+                             height="16" label="?" label_selected="?" left_delta="24"
                             mouse_opaque="true" name="partner_help" width="18" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                             border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
                             max_length="254" mouse_opaque="false" name="partner_edit"
-                             text_readonly_color="1, 1, 1, 1"
                             tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
                             width="121">
                                [FIRST] [LAST]
@@ -116,8 +115,7 @@
                             mouse_opaque="true" name="Groups:" v_pad="0" width="70">
                                Groups:
                        </text>
-                        <scroll_list background_visible="false" bottom="-258" column_padding="5" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-258" column_padding="5" draw_border="true"
-                             fg_disable_color="1, 1, 1, 1" fg_unselected_color="1, 1, 1, 1"
                             follows="left|top" height="90" left="79" mouse_opaque="false"
                             multi_select="false" name="groups" width="321" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -132,10 +130,10 @@
                             mouse_opaque="true" name="(500 chars)" v_pad="0" width="70">
                                (500 chars)
                        </text>
-                        <text_editor bg_readonly_color="0, 0, 0, 0" bottom="-375" embedded_items="false"
+                        <text_editor bottom="-375" embedded_items="false"
                             enabled="true" follows="left|top" font="SansSerifSmall" height="110"
                             is_unicode="false" left="79" max_length="511" mouse_opaque="true"
-                             name="about" text_readonly_color="1, 1, 1, 1" width="321" word_wrap="true" />
+                             name="about" width="321" word_wrap="true" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom="-403" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
@@ -189,7 +187,7 @@
                             height="18" label="Home" label_selected="Home" left="10"
                             mouse_opaque="true" name="home" width="55" />
                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="18" label="Load" label_selected="Load" left_delta="0"
+                             height="18" label="Load" label_selected="Load" left_delta="60"
                             mouse_opaque="true" name="load"
                             tool_tip="Load this profile page with embedded web browser." width="60" />
                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
@@ -202,14 +200,14 @@
                             mouse_opaque="true" name="web_profile_help" width="18" />
                        <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Automatically load web profiles"
-                             left_delta="90" mouse_opaque="true" name="auto_load"
+                             left_delta="30" mouse_opaque="true" name="auto_load"
                             tool_tip="Automatically load ALL profile webpages without asking first."
                             width="127" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                             border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
                             font="SansSerifSmall" height="16" is_unicode="false" left="10"
                             max_length="254" mouse_opaque="true" name="url_edit"
-                             text_readonly_color="1, 1, 1, 1" width="400" />
+                             width="400" />
                        <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
                             ignore_ui_scale="false" left="10" name="profile_html" start_url=""
                             width="400" />
@@ -248,11 +246,11 @@
                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
                             name="chk7" width="92" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
                             max_length="254" mouse_opaque="true" name="want_to_edit"
-                             text_readonly_color="1, 1, 1, 1" width="330" />
+                             width="330" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
@@ -277,22 +275,22 @@
                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Custom Characters" left_delta="170"
                             mouse_opaque="true" name="schk5" width="127" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
                             max_length="254" mouse_opaque="true" name="skills_edit"
-                             text_readonly_color="1, 1, 1, 1" width="330" />
+                             width="330" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                             bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
                             mouse_opaque="true" name="Languages:" v_pad="0" width="70">
                                Languages:
                        </text>
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                        <line_editor bevel_style="in" border_style="line"
                             border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
                             max_length="254" mouse_opaque="true" name="languages_edit"
-                             text_readonly_color="1, 1, 1, 1" width="330" />
+                             width="330" />
                </panel>
                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                     label="Picks" left="1" mouse_opaque="true" name="Picks" width="418">
@@ -369,10 +367,10 @@
                             mouse_opaque="true" name="(250 chars)" v_pad="0" width="65">
                                (250 chars)
                        </text>
-                        <text_editor bg_readonly_color="0, 0, 0, 0" bottom="-347" embedded_items="false"
+                        <text_editor bottom="-347" embedded_items="false"
                             enabled="true" follows="left|top" font="SansSerifSmall" height="160"
                             is_unicode="false" left="70" max_length="254" mouse_opaque="false"
-                             name="about" text_readonly_color="1, 1, 1, 1" width="330" word_wrap="true" />
+                             name="about" width="330" word_wrap="true" />
                </panel>
                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                     label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">
@@ -393,12 +391,12 @@ notes.  This person cannot see them, nor can other people.
                             word_wrap="false" />
                </panel>
        </tab_container>
-        <button bottom="-482" font="SansSerif" halign="center" height="20" label="OK"
+        <button bottom="-483" font="SansSerif" halign="center" height="20" label="OK"
-             label_selected="OK" left="34" mouse_opaque="true" name="OK" width="100" />
+             label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" />
        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"
-             label_selected="Cancel" left_delta="264" mouse_opaque="true" name="Cancel"
+             label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
             width="100" />
-        <button bottom_delta="135" font="SansSerif" halign="center" height="20" label="Kick"
+        <button bottom_delta="132" font="SansSerif" halign="center" height="20" label="Kick"
             label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Freeze"
             label_selected="Freeze" left="4" mouse_opaque="true" name="Freeze"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
index 7cc1a60..001d6d6 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
@@ -3,17 +3,15 @@
     name="Classified" title="Classified" width="350">
        <texture_picker bottom="-165" follows="left|top" height="155" left="10" name="snapshot_ctrl"
             width="207" />
-        <line_editor bg_readonly_color="clear" bottom_delta="-8" enabled="false" follows="left|top"
+        <line_editor bottom_delta="-8" enabled="false" follows="left|top"
             font="SansSerif" height="20" left="10" name="given_name_editor"
-             text_readonly_color="white"
             tool_tip="Name must begin with a letter or number, not punctuation."
             width="280" />
-        <text_editor bg_readonly_color="clear" enabled="false" follows="left|top"
+        <text_editor enabled="false" follows="left|top"
             font="SansSerifSmall" height="70" left="10" max_length="1023"
-             name="desc_editor" text_readonly_color="white" width="280" word_wrap="true" />
+             name="desc_editor" width="280" word_wrap="true" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top"
+        <line_editor enabled="false" follows="left|top"
             font="SansSerifSmall" height="20" left="10" name="location_editor"
-             text_readonly_color="white"
             tool_tip="Set the location for this classified to your current position."
             width="280" />
        <button bottom_delta="-27" follows="left|top" height="20" label="Set Location"
@@ -26,16 +24,14 @@
             name="classified_category_combo" right="150" />
        <check_box bottom_delta="-1" follows="left|top" height="20" label="Mature" left="160"
             name="classified_mature_check" width="80" />
-        <text bg_readonly_color="clear" bottom_delta="-25" follows="left|top"
+        <text bottom_delta="-25" follows="left|top"
             font="SansSerifSmall" height="18" left="10" name="classified_info_text"
-             text_readonly_color="white"
             tool_tip="The more you choose to pay for your ad, the higher in the list it appears."
             width="300">
                Ad placed: Not yet published
        </text>
-        <text bg_readonly_color="clear" bottom_delta="-18" follows="left|top"
+        <text bottom_delta="-18" follows="left|top"
             font="SansSerifSmall" height="18" left="10" name="click_through_text"
-             text_readonly_color="white"
             tool_tip="Total number of clicks on each button since this classified was placed."
             width="300">
                Clicks:
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar_pick.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar_pick.xml
index 3f8a9e4..af8b58c 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar_pick.xml
@@ -3,15 +3,15 @@
     title="Pick" width="350">
        <texture_picker bottom="-190" follows="left|top" height="180" left="10" name="snapshot_ctrl"
             width="290" />
-        <line_editor bg_readonly_color="clear" bottom_delta="-8" enabled="false" follows="left|top"
+        <line_editor bottom_delta="-8" enabled="false" follows="left|top"
             font="SansSerif" height="20" left="10" name="given_name_editor"
-             text_readonly_color="white" width="290" />
+             width="290" />
-        <text_editor bg_readonly_color="clear" enabled="false" follows="left|top"
+        <text_editor enabled="false" follows="left|top"
             font="SansSerifSmall" height="100" left="10" max_length="1023"
-             name="desc_editor" text_readonly_color="white" width="290" word_wrap="true" />
+             name="desc_editor" width="290" word_wrap="true" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top"
+        <line_editor enabled="false" follows="left|top"
             font="SansSerifSmall" height="20" left="10" name="location_editor"
-             text_readonly_color="white" width="290" />
+             width="290" />
        <button bottom_delta="-27" follows="left|top" height="20" label="Set Location"
             left="180" name="set_location_btn" width="120" />
        <button bottom_delta="0" follows="left|top" height="20" label="Teleport" left="10"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml b/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
index def7a87..4da6be0 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_bg_tab.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="20"
+<panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="21"
     left="0" name="bg_tab" use_bounding_rect="true" width="100">
-        <icon bottom="-36" color="DefaultShadowDark" follows="left|right|top|bottom"
+  <icon bottom="-24" color="255,255,255,245" scale_image="true"
-             height="38" image_name="rounded_square.tga" left="1" width="100" />
+         follows="left|right|top|bottom" height="26" image_name="toolbar_tab.tga"
-        <icon bottom="-36" color="DefaultHighlightLight" follows="left|right|top|bottom"
+         left="1" width="100" />
-             height="38" image_name="rounded_square.tga" left="0" width="98" />
-        <icon bottom="-36" color="FocusBackgroundColor" follows="left|right|top|bottom"
-             height="37" image_name="rounded_square.tga" left="1" width="99" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_bg_toolbar.xml b/linden/indra/newview/skins/xui/en-us/panel_bg_toolbar.xml
new file mode 100644
index 0000000..af91e4e
--- /dev/null
+++ b/linden/indra/newview/skins/xui/en-us/panel_bg_toolbar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bottom="0" default_tab_group="1" follows="left|bottom|right|top" height="21"
+     left="0" name="bg_toolbar" use_bounding_rect="true" width="100">
+  <icon bottom="-24" color="255,255,255,255" scale_image="true"
+         follows="left|right|top|bottom" height="26" image_name="toolbar_bg.tga"
+         left="0" width="100" />
+</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
index c4c6c12..20a63db 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_chat_bar.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" default_tab_group="1" follows="left|bottom|right" height="23"
+<panel bottom="-1" default_tab_group="1" follows="left|bottom|right" height="25"
     left="0" name="chat_bar" width="395">
-        <panel bottom="0" follows="left|right|bottom" height="23" left="-397"
+        <panel bottom="1" follows="left|right|bottom" height="23" left="0"
-             use_bounding_rect="true" width="397">
+             use_bounding_rect="true" width="397" bg_visible="false" border="false" border_visible="false">
-                <panel bottom="0" filename="panel_bg_tab.xml" height="23" left="0" width="397" />
+                <panel bottom="0" filename="panel_bg_tab.xml" height="22" left="-398" width="396" />
        </panel>
-        <button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="22"
+        <button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="20"
-             label="Local Chat" left="1" name="History"
+             label="Local Chat" left="7" name="History"
-             tool_tip="Click here to see what has been said" width="100" />
+             tool_tip="Click here to see what has been said" width="93" />
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
             follows="left|right|bottom" font="SansSerif"
-             handle_edit_keys_directly="false" height="19" label="Click here to chat."
+             handle_edit_keys_directly="false" height="20" label="Click here to chat."
             left="107" max_length="254" name="Chat Editor"
             select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
             tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" />
-        <flyout_button bottom="-23" follows="right|bottom" height="22" label="Say" left_delta="110"
+        <flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="110"
             list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
             width="80">
                <flyout_button_item value="say">
@@ -24,8 +24,8 @@
                        Shout
                </flyout_button_item>
        </flyout_button>
-        <combo_box allow_text_entry="false" bottom="-22" follows="right|bottom" height="19"
+        <combo_box allow_text_entry="false" bottom="-23" follows="right|bottom" height="20"
-             label="Gestures" left_delta="85" max_chars="20" name="Gesture" width="80">
+             label="Gestures" left_delta="85" max_chars="20" name="Gesture" width="90">
                <combo_item name="Gestures">
                        Gestures
                </combo_item>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_classified.xml b/linden/indra/newview/skins/xui/en-us/panel_classified.xml
index 5ff802a..bc7a4d1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_classified.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_classified.xml
@@ -3,16 +3,15 @@
     name="Classified" title="Classified" width="450">
        <texture_picker bottom="-315" follows="left|top" height="300" left="20" name="snapshot_ctrl"
             width="400" />
-        <line_editor bg_readonly_color="clear" bottom_delta="-8" enabled="false" follows="left|top"
+        <line_editor bottom_delta="-8" enabled="false" follows="left|top"
             font="SansSerif" height="20" left="20" name="given_name_editor"
-             text_readonly_color="white"
             tool_tip="Name must begin with a letter or number, not punctuation."
             width="400" />
-        <text_editor bg_readonly_color="clear" enabled="false" follows="left|top"
+        <text_editor enabled="false" follows="left|top"
             font="SansSerifSmall" height="90" left="20" max_length="1023"
-             name="desc_editor" text_readonly_color="white" width="400" word_wrap="true" />
+             name="desc_editor"  width="400" word_wrap="true" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
+        <line_editor enabled="false" follows="left|top" font="SansSerif"
-             height="20" left="20" name="location_editor" text_readonly_color="white"
+             height="20" left="20" name="location_editor" 
             tool_tip="Set the location for this classified to your current position."
             width="400" />
        <button bottom_delta="0" follows="left|top" height="20" label="Set" left="380"
@@ -24,10 +23,9 @@
        <button bottom_delta="0" follows="left|top" height="20" label="Profile" left="230"
             name="classified_profile_btn" width="100" />
        <check_box bottom="422" follows="left|top" height="20" label="Mature" left="30"
-             name="classified_mature_check" text_readonly_color="white" width="80" />
+             name="classified_mature_check"  width="80" />
-        <combo_box bg_readonly_color="grey" bottom="445" follows="left|top" height="18" label=""
+        <combo_box bottom="445" follows="left|top" height="18" label=""
-             left="20" name="classified_category_combo" right="150"
+             left="20" name="classified_category_combo" right="150" />
-             text_readonly_color="white" />
        <button bottom="400" follows="left|top" height="20" label="Update" left="30"
             name="classified_update_btn" width="70" />
        <string name="ad_placed_paid">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/xui/en-us/panel_friends.xml
index 7bb08d2..f6eacb1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_friends.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_friends.xml
@@ -16,7 +16,7 @@
                <column image="ff_visible_map_button.tga" name="icon_visible_map"
                     tool_tip="Friend can locate you on the map" width="20" />
                <column image="ff_edit_mine_button.tga" name="icon_edit_mine"
-                     tool_tip="Friend can edit your objects" width="20" />
+                     tool_tip="Friend can edit, delete or take objects" width="20" />
                <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
                     tool_tip="You can edit this friend&apos;s objects" width="20" />
                <column name="friend_last_update_generation" width="0" />
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 67cdbb8..775c7b9 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group.xml
@@ -9,7 +9,7 @@
                Do you want to apply these changes?
        </string>
        <tab_container border="false" bottom="27" follows="all" height="483" left="0"
-             name="group_tab_container" tab_position="top" width="420">
+             name="group_tab_container" tab_position="top" width="419">
                <panel filename="panel_group_general.xml" name="general_tab" />
                <panel filename="panel_group_roles.xml" name="roles_tab" />
                <panel filename="panel_group_notices.xml" name="notices_tab" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
index 9825cb1..7332cdf 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_general.xml
@@ -39,14 +39,14 @@ Hover your mouse over the options for more help.
                Group Charter
        </text>
        <texture_picker bottom_delta="-129" follows="left|top" height="144"
-             image_name="icon_groupnotice.tga" label="Group Insignia" left="7"
+              label="Group Insignia" left="7"
             mouse_opaque="true" name="insignia" tool_tip="Click to choose a picture"
             width="128" />
        <text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-30" drop_shadow_visible="false" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="160"
             hide_scrollbar="true" max_length="511" mouse_opaque="true" name="charter"
-             right="410" text_readonly_color="0.57647, 0.66275, 0.83529" v_pad="0"
+             right="410" v_pad="0"
             width="265" word_wrap="true">
                Group Charter
        </text_editor>
@@ -75,31 +75,28 @@ Hover your mouse over the options for more help.
        <text bottom_delta="-18" font="SansSerif" name="text_group_preferences">
                Group Preferences
        </text>
-        <panel background_opaque="true" background_visible="true" bevel_style="in"
+        <panel background_opaque="true" background_visible="false" bevel_style="in"
-             bg_alpha_color="blue" bg_opaque_color="0,0,0,0.3" border="true"
+             border="true"
             bottom_delta="-104" follows="left|top" height="96" left_delta="0"
             mouse_opaque="true" name="preferences_container" width="404">
                <check_box bottom="-20" follows="left|top" font="SansSerifSmall" height="16"
                     initial_value="true" label="Show in search" left="4" mouse_opaque="true"
                     name="show_in_group_list" radio_style="false"
-                     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                     tool_tip="Let people see this group in search results." width="95" />
                <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
                     initial_value="false" label="Mature group" left_delta="0"
                     mouse_opaque="true" name="mature" radio_style="false"
-                     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                     tool_tip="Sets whether your group information is considered mature."
                     visible="true" width="95" />
                <check_box bottom_delta="-18" follows="right|top" font="SansSerifSmall" height="16"
                     initial_value="false" label="Open enrollment" left="4" mouse_opaque="true"
                     name="open_enrollement" radio_style="false"
-                     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                     tool_tip="Sets whether this group allows new members to join   without being invited."
                     width="95" />
                <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
                     initial_value="false" label="Enrollment fee: L$" left_delta="16"
                     max_length="5" mouse_opaque="true" name="check_enrollment_fee"
-                     radio_style="false" text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
+                     radio_style="false" 
                     tool_tip="Sets whether to require an enrollment fee to join the group."
                     width="95" />
                <spinner bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -107,7 +104,6 @@ Hover your mouse over the options for more help.
                     follows="left|top" font="SansSerif" h_pad="0" halign="left" height="16"
                     increment="1" label_width="10" left_delta="116" max_val="99999" min_val="0"
                     mouse_opaque="true" name="spin_enrollment_fee" right_delta="170"
-                     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
                     tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked."
                     v_pad="0" width="65" />
                <panel background_opaque="false" border="false" bottom="-31" height="32" left="225"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml b/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
index e11c6f6..8c5cbb5 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_invite.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" bottom="0" height="380" label="Invite a Member" left="0"
     name="invite_panel" select="false" width="210">
-        <text bottom_delta="-78" height="54" left="7" width="200">
+        <text bottom_delta="-78" height="54" left="7" width="200" name="help_text">
                You can select multiple residents to 
 invite to your group. Click &apos;Open 
 Person Chooser&apos; to start.
@@ -10,27 +10,31 @@ Person Chooser&apos; to start.
             label="Open Person Chooser" left="5" name="add_button" tool_tip=""
             width="200" />
        <name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-178"
-             column_padding="0" draw_border="true" fg_disable_color="grey"
+             column_padding="0" draw_border="true" height="174" left="5"
-             fg_selected_color="black" fg_unselected_color="black" height="174" left="5"
             multi_select="true" name="invitee_list"
-             tool_tip="Hold the Ctrl key and click resident names  to multi-select."
+             tool_tip="Hold the Ctrl key and click resident names to multi-select."
             width="200" />
        <button bottom_delta="-24" font="SansSerifSmall" halign="center" height="20"
             label="Remove Selected from List" left_delta="0" name="remove_button"
             tool_tip="Removes residents selected above from the invite list."
             width="200" />
-        <text bottom_delta="-21" height="16" left="9" width="200">
+        <text bottom_delta="-21" height="16" left="9" width="200" name="role_text">
                Choose what Role to assign them to:
        </text>
        <combo_box bottom_delta="-16" follows="left|top" height="16" left_delta="0"
             name="role_name"
-             tool_tip="Choose from the list of Roles you  are allowed to assign members to."
+             tool_tip="Choose from the list of Roles you are allowed to assign members to."
             width="196" />
        <button bottom="4" font="SansSerifSmall" halign="center" height="20"
             label="Send Invitations" left="4" name="ok_button" width="130" />
        <button bottom_delta="0" font="SansSerifSmall" halign="center" height="20"
             label="Cancel" left_delta="132" name="cancel_button" width="70" />
-        <string name="loading">
+        <string name="confirm_invite_owner_str">
-                (loading...)
+                Are you sure you want to invite new owner(s)? This action is permanent!
        </string>
+        <!--button bottom="25" font="SansSerifSmall" halign="center" height="20"
+             label="Send Invitations" left="65" name="ok_button" width="140" />
+        <button bottom_delta="-22" font="SansSerifSmall" halign="center" height="20"
+             label="Cancel" left_delta="0" name="cancel_button" width="140" /-->
+        <string name="loading">(loading...)</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
index f93e9ad..f6b8838 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_land_money.xml
@@ -26,7 +26,7 @@ provide information about the group&apos;s finances.
             mouse_opaque="true" name="group_land_heading" v_pad="0" width="150">
                Group Owned Land
        </text>
-        <scroll_list background_visible="true" bottom_delta="-124" column_padding="5"
+        <scroll_list background_visible="true" bottom_delta="-126" column_padding="5"
             draw_border="true" draw_heading="true" follows="top" font="SansSerifSmall"
             heading_font="SansSerifSmall" heading_height="14" height="120" left="7"
             mouse_opaque="true" multi_select="false" name="group_parcel_list"
@@ -99,10 +99,10 @@ provide information about the group&apos;s finances.
                sq. meters ([AMOUNT] max)
        </text>
        <icon bottom_delta="-27" height="16" image_name="smicon_warn.tga" left="9"
-             name="group_over_limit_icon" width="16" />
+             name="group_over_limit_icon" width="16" visible="false"/>
        <text border_drop_shadow_visible="false" border_visible="false" bottom_delta="-1"
             drop_shadow_visible="false" h_pad="0" height="16" left_delta="21"
-             name="group_over_limit_text" text_color="1.00000, 0.81961, 0.00000"
+             name="group_over_limit_text" text_color="GroupOverTierColor"
             v_pad="0" width="400">
                Group members must contribute more land credits to support land in use.
        </text>
@@ -117,9 +117,7 @@ provide information about the group&apos;s finances.
                <panel border="true" bottom_delta="-260" follows="left|top|right|bottom" height="255"
                     label="Planning" left="1" mouse_opaque="true"
                     name="group_money_planning_tab" width="398">
-                        <icon bottom="1" height="161" image_name="darkgray.tga" left="1" name="sub_tab_bg"
+                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="8" 
-                             width="402" />
-                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom_delta="7"
                             embedded_items="false" follows="left|top|right|bottom" font="Monospace"
                             height="239" is_unicode="false" left="8" max_length="4096"
                             mouse_opaque="true" name="group_money_planning_text" width="382"
@@ -130,8 +128,6 @@ provide information about the group&apos;s finances.
                <panel border="true" bottom_delta="-250" follows="left|top|right|bottom" height="250"
                     label="Details" left="1" mouse_opaque="true" name="group_money_details_tab"
                     width="398">
-                        <icon bottom="1" height="161" image_name="darkgray.tga" left="1" name="sub_tab_bg"
-                             width="402" />
                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="26"
                             embedded_items="false" follows="left|top|right|bottom" font="Monospace"
                             height="216" is_unicode="false" left="8" max_length="4096"
@@ -151,9 +147,7 @@ provide information about the group&apos;s finances.
                <panel border="true" bottom_delta="-250" follows="left|top|right|bottom" height="250"
                     label="Sales" left="1" mouse_opaque="true" name="group_money_sales_tab"
                     width="398">
-                        <icon bottom="1" height="161" image_name="darkgray.tga" left="1" name="sub_tab_bg"
+                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom="26"
-                             width="402" />
-                        <text_editor bg_readonly_color="0.784314, 0.819608, 0.8, 1" bottom_delta="25"
                             embedded_items="false" follows="left|top|right|bottom" font="Monospace"
                             height="216" is_unicode="false" left="8" max_length="4096"
                             mouse_opaque="true" name="group_money_sales_text" width="382"
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 4e00c66..7f0c0f7 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
@@ -27,9 +27,9 @@ the General tab.
                Notices are kept for 30 days. Click the notice below you wish to view.
 Click the &apos;Refresh&apos; button to check if new notices have been received.
        </text>
-        <scroll_list background_visible="false" bottom_delta="-137" column_padding="0"
+        <scroll_list background_visible="true" bottom_delta="-137" column_padding="0"
             draw_border="true" draw_heading="true" enabled="true"
-             fg_unselected_color="200,200,200,255" heading_font="SansSerifSmall"
+             heading_font="SansSerifSmall"
             heading_height="14" height="109" left="7" mouse_opaque="true"
             multi_select="false" name="notice_list" width="404">
                <column label="" name="icon" width="16" />
@@ -70,7 +70,7 @@ and you can&apos;t send a folder.
                     name="lbl3" v_pad="0" width="55">
                        Subject:
                </text>
-                <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                <line_editor bevel_style="in" border_style="line"
                     border_thickness="1" bottom_delta="0" font="SansSerifSmall" height="16"
                     is_unicode="false" left_delta="58" max_length="63" mouse_opaque="true"
                     name="create_subject" prevalidate="printable_not_pipe" width="264" />
@@ -80,7 +80,7 @@ and you can&apos;t send a folder.
                     name="lbl4" v_pad="0" width="55">
                        Message:
                </text>
-                <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="-106" embedded_items="false"
+                <text_editor bottom_delta="-106" embedded_items="false"
                     font="SansSerifSmall" height="120" hide_scrollbar="true" is_unicode="false"
                     left_delta="58" max_length="511" mouse_opaque="true" name="create_message"
                     width="346" word_wrap="true" />
@@ -93,7 +93,7 @@ and you can&apos;t send a folder.
                <line_editor bg_visible="false" border_visible="false" bottom_delta="-2" enabled="false"
                     font="SansSerifSmall" height="16" is_unicode="false" left_delta="59"
                     max_length="63" mouse_opaque="false" name="create_inventory_name"
-                     text_readonly_color="0.784, 0.819, 0.8, 1" width="211" />
+                     width="211" />
                <icon bottom_delta="0" height="16" left_delta="0" mouse_opaque="false"
                     name="create_inv_icon" width="16" />
                <button bottom_delta="0" font="SansSerif" halign="center" height="20"
@@ -130,21 +130,21 @@ and you can&apos;t send a folder.
                     name="lbl3" v_pad="0" visible="false" width="55">
                        Subject:
                </text>
-                <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+                <line_editor bevel_style="in" border_style="line"
                     border_thickness="1" bottom_delta="0" enabled="false" font="SansSerifSmall"
                     height="16" is_unicode="false" left_delta="58" max_length="63"
                     mouse_opaque="true" name="view_subject"
-                     text_readonly_color="200,200,200, 255" visible="false" width="346" />
+                     visible="false" width="346" />
                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                     bottom_delta="-18" drop_shadow_visible="true" font="SansSerifSmall"
                     h_pad="0" halign="right" height="16" left="7" mouse_opaque="true"
                     name="lbl4" v_pad="0" visible="false" width="55">
                        Message:
                </text>
-                <text_editor bg_readonly_color="0, 0, 0, 0" bottom_delta="-148" embedded_items="false"
+                <text_editor 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"
+                     name="view_message" width="404"
                     word_wrap="true" />
                <button bottom_delta="-24" font="SansSerif" halign="center" height="20"
                     label="Open Attachment" label_selected="Open Attachment" left="7"
@@ -152,7 +152,7 @@ and you can&apos;t send a folder.
                <line_editor bg_visible="false" border_visible="false" bottom_delta="3" enabled="false"
                     font="SansSerifSmall" height="16" is_unicode="false" left="120"
                     max_length="63" mouse_opaque="false" name="view_inventory_name"
-                     text_readonly_color="0.784, 0.819, 0.8, 1" width="264" />
+                     width="264" />
                <icon bottom_delta="0" height="16" left_delta="0" mouse_opaque="false"
                     name="view_inv_icon" width="16" />
        </panel>
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 925d224..bea5dc4 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
@@ -61,9 +61,7 @@ execute the Ability.
             name="roles_tab_container" tab_position="top" width="406">
                <panel border="true" bottom="0" height="164" label="Members" left="1"
                     name="members_sub_tab" select="true" tool_tip="Members" width="406">
-                        <icon bottom="1" height="162" image_name="darkgray.tga" left="1" name="sub_tab_bg"
+                        <line_editor bevel_style="in" border_style="line"
-                             width="402" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                             border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
                             height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
                             name="search_text" width="100" />
@@ -74,8 +72,7 @@ execute the Ability.
                             width="80" />
                        <name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-121"
                             column_padding="0" draw_border="true" draw_heading="true"
-                             fg_disable_color="grey" fg_selected_color="black"
+                             heading_font="SansSerifSmall"
-                             fg_unselected_color="black" heading_font="SansSerifSmall"
                             heading_height="14" height="120" left="4" multi_select="true"
                             name="member_list" width="396">
                                <column label="Member Name" name="name" width="136" />
@@ -91,13 +88,11 @@ execute the Ability.
 Select multiple Members by holding the Ctrl key and
 clicking on their names.
                        </string>
-                        <icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" />
+                        <icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" width="16" height="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
                </panel>
                <panel background_visible="true" border="true" bottom="0" height="164" label="Roles"
                     left="1" name="roles_sub_tab" width="398">
-                        <icon bottom="1" height="162" image_name="darkgray.tga" left="1" name="sub_tab_bg"
+                        <line_editor bevel_style="in" border_style="line"
-                             width="402" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                             border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
                             height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
                             name="search_text" width="100" />
@@ -108,8 +103,7 @@ clicking on their names.
                             width="80" />
                        <scroll_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-120"
                             column_padding="0" draw_border="true" draw_heading="true" enabled="true"
-                             fg_disable_color="grey" fg_selected_color="black"
+                             follows="left|top"
-                             fg_unselected_color="black" follows="left|top"
                             heading_font="SansSerifSmall" heading_height="14" height="120" left="4"
                             mouse_opaque="true" multi_select="false" name="role_list" width="396">
                                <column label="Role Name" name="name" width="126" />
@@ -129,18 +123,16 @@ including the Everyone and Owner Roles.
                        <string name="cant_delete_role">
                                The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and cannot be deleted.
                        </string>
-                        <icon height="0" image_name="inv_folder_plain_closed.tga" name="power_folder_icon"
+                        <icon height="16" image_name="inv_folder_plain_closed.tga" name="power_folder_icon"
-                             width="0" />
+                             width="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
-                        <icon height="0" image_name="checkbox_enabled_true.tga" name="power_all_have_icon"
+                        <icon height="16" image_name="checkbox_enabled_true.tga" name="power_all_have_icon"
-                             width="0" />
+                             width="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
-                        <icon height="0" image_name="checkbox_enabled_false.tga" name="power_partial_icon"
+                        <icon height="16" image_name="checkbox_enabled_false.tga" name="power_partial_icon"
-                             width="0" />
+                             width="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
                </panel>
                <panel background_visible="true" bg_alpha_color="red" border="true" bottom="0"
                     height="164" label="Abilities" left="1" name="actions_sub_tab" width="398">
-                        <icon bottom="1" height="162" image_name="darkgray.tga" left="1" name="sub_tab_bg"
+                        <line_editor bevel_style="in" border_style="line"
-                             width="402" />
-                        <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
                             border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
                             height="16" is_unicode="false" left="6" max_length="63" mouse_opaque="true"
                             name="search_text" width="100" />
@@ -151,8 +143,8 @@ including the Everyone and Owner Roles.
                             width="80" />
                        <scroll_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-134"
                             column_padding="0" draw_border="true" draw_heading="false"
-                             draw_stripes="false" fg_disable_color="grey" fg_selected_color="black"
+                             draw_stripes="false"
-                             fg_unselected_color="black" follows="left|top" height="134" left="6"
+                             follows="left|top" height="134" left="6"
                             mouse_opaque="true" multi_select="true" name="action_list"
                             search_column="1" tool_tip="Select an Ability to view more details."
                             width="392">
@@ -163,7 +155,7 @@ including the Everyone and Owner Roles.
                                Abilities allow Members in Roles to do specific
 things in this group. There&apos;s a broad variety of Abilities.
                        </string>
-                        <icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" />
+                        <icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" width="16" height="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
                </panel>
        </tab_container>
        <panel border="false" bottom_delta="-235" height="215" left="7" name="members_footer"
@@ -200,15 +192,15 @@ things in this group. There&apos;s a broad variety of Abilities.
                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                     bottom_delta="0" drop_shadow_visible="false" font="SansSerif" halign="left"
                     height="16" left="150" name="static2"
-                     text_readonly_color="0.57647, 0.66275, 0.83529" width="100">
+                     width="100">
                        Description
                </text>
-                <line_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" bg_visible="false"
+                <line_editor bevel_style="in" bg_visible="false"
                     border_drop_shadow_visible="false" border_style="line" border_thickness="1"
                     border_visible="false" bottom_delta="-16" drop_shadow_visible="false"
                     follows="left|top" font="SansSerifSmall" height="16" is_unicode="false"
                     left="0" max_length="20" mouse_opaque="true" name="role_name"
-                     text_readonly_color="0.57647, 0.66275, 0.83529" width="145">
+                     width="145">
                        Employees
                </line_editor>
                <text bottom_delta="-16" font="SansSerif" halign="left" height="16" left="0"
@@ -220,14 +212,14 @@ things in this group. There&apos;s a broad variety of Abilities.
                     bottom_delta="-16" drop_shadow_visible="false" follows="left|top"
                     font="SansSerifSmall" height="16" is_unicode="false" left="0"
                     max_length="20" mouse_opaque="true" name="role_title"
-                     text_readonly_color="0.57647, 0.66275, 0.83529" width="145">
+                     width="145">
                        (waiting)
                </line_editor>
                <text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                     bottom_delta="0" drop_shadow_visible="false" font="SansSerifSmall"
                     h_pad="0" halign="left" height="48" hide_scrollbar="true" left="150"
                     max_length="254" name="role_description"
-                     text_readonly_color="0.57647, 0.66275, 0.83529" v_pad="0" width="254"
+                     v_pad="0" width="254"
                     word_wrap="true">
                        (waiting)
                </text_editor>
@@ -265,10 +257,10 @@ things in this group. There&apos;s a broad variety of Abilities.
                     name="static" width="100">
                        Description
                </text>
-                <text_editor bevel_style="in" bg_readonly_color="0,0,0,0.3" bottom_delta="-48"
+                <text_editor bevel_style="in" bottom_delta="-48"
                     enabled="false" font="SansSerifSmall" h_pad="0" halign="left" height="48"
                     hide_scrollbar="true" left="0" max_length="512" name="action_description"
-                     text_readonly_color="white" v_pad="0" width="404" word_wrap="true">
+                     v_pad="0" width="404" word_wrap="true">
                        This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
                </text_editor>
                <text bottom_delta="-26" font="SansSerif" halign="left" height="16" left="0"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
index 1ab0ca9..e044f34 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_group_voting.xml
@@ -9,11 +9,11 @@ the proper powers, you can create proposals,
 vote on open proposals, and view old proposals.
        </string>
        <panel background_opaque="true" background_visible="true" bevel_style="in"
-             bg_alpha_color="blue" bg_opaque_color="0,0,0,0.3" border="true"
+             bg_alpha_color="blue" border="true"
-             bottom_delta="-210" follows="left|top" height="170" left="7"
+             bottom_delta="-225" follows="left|top" height="170" left="7"
             mouse_opaque="false" name="open_proposals_container" width="404" />
        <panel background_opaque="true" background_visible="true" bevel_style="in"
-             bg_alpha_color="blue" bg_opaque_color="0,0,0,0.3" border="true" bottom="7"
+             bg_alpha_color="blue" border="true" bottom="7"
             follows="left|top" height="175" left="7" mouse_opaque="false"
             name="voting_history_container" width="404" />
        <button bottom="-24" font="SansSerif" halign="center" height="16" label="?" left="391"
@@ -57,8 +57,7 @@ vote on open proposals, and view old proposals.
             border_visible="false" bottom="300" drop_shadow_visible="false"
             embedded_items="false" follows="left|top" font="SansSerif" height="90"
             is_unicode="false" left="11" max_length="254" mouse_opaque="true"
-             name="proposal_text" text_readonly_color="0.57647, 0.66275, 0.83529"
+             name="proposal_text" width="289" word_wrap="true" />
-             width="289" word_wrap="true" />
        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
             height="20" label="View List" label_selected="View List" left="304"
             mouse_opaque="true" name="btn_view_proposal_list" width="101" />
@@ -180,7 +179,7 @@ vote on open proposals, and view old proposals.
             follows="left|top" font="SansSerif" h_pad="0" height="126"
             hide_scrollbar="true" is_unicode="false" left="10" max_length="1024"
             mouse_opaque="true" name="vote_text"
-             text_readonly_color="0.57647, 0.66275, 0.83529" text_wrap="true" v_pad="0"
+             text_wrap="true" v_pad="0"
             width="396" word_wrap="false" />
        <button bottom_delta="-25" follows="top" font="SansSerif" halign="center" height="20"
             label="View List" label_selected="View List" left="287" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml b/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml
index f2e36d3..3d5ee66 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_land_covenant.xml
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="0" follows="top|left" height="220" left="0"
     name="Covenant" title="Covenant" width="480">
-        <text bg_readonly_color="clear" bottom_delta="-5" follows="left|top"
+        <text bottom_delta="-5" follows="left|top"
             font="SansSerifSmall" height="20" left="180" name="covenant_timestamp_text"
-             text_readonly_color="white" width="250" />
+             width="250" />
        <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
             left="10" name="region_name_lbl" width="100">
                Region:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
             font="SansSerifSmall" height="20" left="120" name="region_name_text"
-             text_readonly_color="white" width="150">
+             width="150">
                (unknown)
        </text>
        <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
             left="10" name="estate_name_lbl" width="100">
                Estate:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
             font="SansSerifSmall" height="20" left="120" name="estate_name_text"
-             text_readonly_color="white" width="150">
+             width="150">
                (unknown)
        </text>
        <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
             left="10" name="estate_owner_lbl" width="100">
                Estate Owner:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="0" follows="left|top"
+        <text bottom_delta="0" follows="left|top"
             font="SansSerifSmall" height="20" left="120" name="estate_owner_text"
-             text_readonly_color="white" width="150">
+             width="150">
                (unknown)
        </text>
-        <text bg_readonly_color="clear" bottom_delta="-20" follows="left|top"
+        <text bottom_delta="-20" follows="left|top"
             font="SansSerif" height="20" left="60" name="resellable_clause"
-             text_readonly_color="white" width="300">
+             width="300">
                Purchased land in this region may or may not be resold.
        </text>
-        <text bg_readonly_color="clear" bottom_delta="-20" follows="left|top"
+        <text bottom_delta="-20" follows="left|top"
             font="SansSerif" height="20" left="60" name="changeable_clause"
-             text_readonly_color="white" width="375">
+             width="375">
                Purchased land in this region may or may not be joined or subdivided.
        </text>
-        <text_editor bg_readonly_color="clear" bottom_delta="-200" enabled="false"
+        <text_editor bottom_delta="-200" enabled="false"
             follows="left|top" font="SansSerifSmall" height="200" left="15"
-             max_length="65535" name="covenant_editor" text_readonly_color="white"
+             max_length="65535" name="covenant_editor" 
             width="425" word_wrap="true" />
        <string name="can_resell">
                string land in this region may be resold.
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 8d2a658..b5f276d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml
@@ -13,43 +13,43 @@
        </string>
        <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="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16"
             left="32" mouse_opaque="true" name="first_name_text" v_pad="0" width="120">
                First Name:
        </text>
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" hidden="false" left="32" max_length="31" mouse_opaque="true"
+             height="20" left="32" max_length="31" mouse_opaque="true"
             name="first_name_edit" select_all_on_focus_received="true" width="120" />
        <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="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16"
             left="164" mouse_opaque="true" name="last_name_text" v_pad="0" width="120">
                Last Name:
        </text>
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" hidden="false" left="164" max_length="31" mouse_opaque="true"
+             height="20" left="164" max_length="31" mouse_opaque="true"
             name="last_name_edit" select_all_on_focus_received="true" width="120" />
        <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="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16"
             left="296" mouse_opaque="true" name="password_text" v_pad="0" width="120">
                Password:
        </text>
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" hidden="false" left="296" max_length="16" mouse_opaque="true"
+             height="20" left="296" max_length="16" mouse_opaque="true"
             name="password_edit" select_all_on_focus_received="true" width="120" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="10" drop_shadow_visible="true" follows="left|bottom"
-             font="SansSerif" h_pad="0" halign="left" height="16" hidden="false"
+             font="SansSerif" h_pad="0" halign="left" height="16"
             left="32" mouse_opaque="true" name="start_location_text" v_pad="0"
             width="95">
                Start Location:
        </text>
        <combo_box allow_text_entry="true" bottom="8" follows="left|bottom" height="18"
-             hidden="false" left_delta="97" max_chars="128" mouse_opaque="true"
+             left_delta="97" max_chars="128" mouse_opaque="true"
             name="start_location_combo" width="155">
                <combo_item name="MyHome" value="My Home">
                        My Home
@@ -62,36 +62,37 @@
                </combo_item>
        </combo_box>
        <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
-             hidden="false" initial_value="false" label="Remember password"
+             initial_value="false" label="Remember password"
             left_delta="165" mouse_opaque="true" name="remember_check" width="138" />
-        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center" height="24"
+        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
-             hidden="false" label="Connect" label_selected="Connect" left="440"
+             height="24" label="Connect" label_selected="Connect"
-             mouse_opaque="true" name="connect_btn" scale_image="TRUE" width="120" />
+             left="440" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
-        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center" height="24"
+             width="120" />
-             hidden="false" label="Quit" label_selected="Quit" left="572"
+        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
+             height="24" label="Quit" label_selected="Quit" left="572"
             mouse_opaque="true" name="quit_btn" scale_image="TRUE" width="120" />
        <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
-             hidden="false" left_delta="135" max_chars="20" mouse_opaque="true"
+             left_delta="135" max_chars="20" mouse_opaque="true"
             name="server_combo" width="120" />
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="30" drop_shadow_visible="true" follows="right|bottom"
+             bottom="42" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12"
-             hover="true" left="-202" mouse_opaque="true" name="channel_text" v_pad="0"
+             left="-210" mouse_opaque="true" name="channel_text" v_pad="0" width="200"
-             width="200">
+             hover="true">
                [Viewer Channel Name]
        </text>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="18" drop_shadow_visible="true" follows="right|bottom"
+             bottom="30" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12"
-             hover="true" left="-102" mouse_opaque="true" name="version_text" v_pad="0"
+             left="-110" mouse_opaque="true" name="version_text" v_pad="0" width="100"
-             width="100">
+             hover="true">
                1.23.4 (5)
        </text>
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="2" drop_shadow_visible="true" follows="right|bottom"
+             bottom="10" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="right" height="12"
-             hover="true" left="-172" mouse_opaque="true" name="forgot_password_text"
+             left="-180" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="170"
-             v_pad="0" width="170">
+             hover="true">
                Forgot your password?
        </text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml b/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
index 80ef984..27bace7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_master_volume.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="-34"
     name="master_volume">
-        <button bottom="-22" height="22" image_overlay="icn-overlay_volume-panel.tga" label=""
+        <button bottom="-22" height="22" label=""
             left="2" name="volume" toggle="true"
             tool_tip="Master Volume Control, click for volume settings" width="28" />
        <volume_slider bottom="-20" control_name="AudioLevelMaster" height="17" increment="0.05"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
index 9a39f0e..fe392a6 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_controls.xml
@@ -1,62 +1,76 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="2"
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"
     enabled="true" follows="right|bottom" height="20" left="0"
-     name="media_controls" width="250">
+     name="media_controls" width="220">
-        <icon bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"
+        <icon bottom="-18" enabled="true" follows="left|top" height="14"
-             image_name="icn_music.tga" label="" left_delta="2" mouse_opaque="true"
+             image_name="icn_label_music.tga" label="" left_delta="6" mouse_opaque="true"
             name="music_icon" scale_image="true" tool_tip="Play/pause streaming music"
-             width="20" />
+             width="14" />
-        <button bottom="-22" enabled="true" follows="left|top" height="22"
+        <button bottom="-21" enabled="true" follows="left|top" height="20"
-             image_disabled="icn_media-play_disabled.tga"
+          image_overlay="icn_play.tga"
-             image_selected="icn_media-play_active.tga"
+          image_unselected="flyout_btn_left.tga"
-             image_unselected="icn_media-play_enabled.tga" label="" left_delta="22"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+              label="" left_delta="16"
             mouse_opaque="true" name="music_play" scale_image="true" toggle="false"
             tool_tip="Play/pause streaming music" width="20" />
-        <button bottom="-22" enabled="false" follows="left|top" height="22" hidden="false"
+  <button bottom="-21" enabled="false" follows="left|top" height="20"
-             image_disabled="icn_media-pause_disabled.tga"
+             image_overlay="icn_pause.tga"
-             image_selected="icn_media-pause_active.tga"
+             image_unselected="flyout_btn_left.tga"
-             image_unselected="icn_media-pause_enabled.tga" label="" left_delta="0"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+             label="" left_delta="0"
             mouse_opaque="true" name="music_pause" scale_image="true" toggle="false"
             tool_tip="Pause streaming music" width="20" />
-        <button bottom="-22" enabled="true" follows="left|top" height="22"
+  <button bottom="-21" enabled="true" follows="left|top" height="20"
-             image_disabled="icn_media-stop_disabled.tga"
+             image_overlay="icn_stop.tga"
-             image_selected="icn_media-stop_active.tga"
+             image_unselected="flyout_btn_right.tga"
-             image_unselected="icn_media-stop_enabled.tga" label="" left_delta="20"
+             image_selected="flyout_btn_right_selected.tga"
+             image_disabled="flyout_btn_right_disabled.tga"
+             label="" left_delta="20"
             mouse_opaque="true" name="music_stop" scale_image="true" toggle="false"
             tool_tip="Stop streaming music" width="20" />
-        <icon bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"
+  <icon bottom="-18" enabled="true" follows="left|top" height="14"
-             image_name="icn_media.tga" label="" left_delta="22" mouse_opaque="true"
+             image_name="icn_label_media.tga"
+             label="" left_delta="22" mouse_opaque="true"
             name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"
-             width="20" />
+             width="17" />
-        <button bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"
+  <button bottom="-21" enabled="true" follows="left|top" height="20"
-             image_disabled="icn_media-play_disabled.tga"
+             image_overlay="icn_play.tga"
-             image_selected="icn_media-play_active.tga"
+             image_unselected="flyout_btn_left.tga"
-             image_unselected="icn_media-play_enabled.tga" label="" left_delta="22"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+             label="" left_delta="19"
             mouse_opaque="true" name="media_play" scale_image="true" toggle="false"
             tool_tip="Play/pause streaming music" width="20" />
-        <button bottom="-22" enabled="false" follows="left|top" height="22" hidden="false"
+  <button bottom="-21" enabled="false" follows="left|top" height="20"
-             image_disabled="icn_media-pause_disabled.tga"
+             image_overlay="icn_pause.tga"
-             image_selected="icn_media-pause_active.tga"
+                          image_unselected="flyout_btn_left.tga"
-             image_unselected="icn_media-pause_enabled.tga" label="" left_delta="0"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+             label="" left_delta="0"
             mouse_opaque="true" name="media_pause" scale_image="true" toggle="false"
             tool_tip="Pause streaming media" width="20" />
-        <button bottom="-22" enabled="true" follows="left|top" height="22" hidden="false"
+        <button bottom="-21" enabled="true" follows="left|top" height="20"
-             image_disabled="icn_media-stop_disabled.tga"
+             image_overlay="icn_stop.tga"
-             image_selected="icn_media-stop_active.tga"
+                          image_unselected="flyout_btn_right.tga"
-             image_unselected="icn_media-stop_enabled.tga" label="" left_delta="20"
+             image_selected="flyout_btn_right_selected.tga"
+             image_disabled="flyout_btn_right_disabled.tga"
+             label="" left_delta="20"
             mouse_opaque="true" name="media_stop" scale_image="true" toggle="false"
             tool_tip="Stop streaming media" width="20" />
-        <volume_slider bottom="-20" control_name="AudioLevelMaster" height="22" increment="0.05"
+        <volume_slider bottom="-23" control_name="AudioLevelMaster" height="22" increment="0.05"
             initial_val="0.5" left_delta="20" max_val="1" min_val="0"
             mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"
-             width="60" />
+             width="56" />
-        <button bottom="-20" control_name="MuteAudio" height="20"
+        <button bottom="-19" control_name="MuteAudio" height="20"
             image_selected="icn_speaker-muted_dark.tga"
-             image_unselected="icn_speaker_dark.tga" label="" left_delta="60"
+             image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
             name="mute_master" toggle="true" tool_tip="Master Mute" width="25" />
-        <button bottom="-22" control_name="ShowVolumeSettingsPopup" height="22" label=""
+        <button bottom="-21" control_name="ShowVolumeSettingsPopup" height="20" label=""
-             left_delta="25" name="expand" scale_image="true" toggle="true"
+             left_delta="19" name="expand" scale_image="true" toggle="true"
-             tool_tip="Adjust individual volume levels" width="22" />
+             tool_tip="Adjust individual volume levels" width="20" />
+        
        <string name="play_label">
                Play
        </string>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
index 8f37b89..86c977d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_remote.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
     enabled="true" follows="right|bottom" height="20" left="0"
-     name="media_remote" use_bounding_rect="true" width="250">
+     name="media_remote" use_bounding_rect="true" width="220">
-        <panel bottom="0" filename="panel_bg_tab.xml" height="22" left="0" width="250" />
+        <panel bottom="1" filename="panel_bg_tab.xml" height="22" left="0" width="220" />
-        <panel bottom="0" filename="panel_media_controls.xml" height="20" left="0" width="250" />
+        <panel bottom="3" filename="panel_media_controls.xml" height="20" left="0" width="220" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml b/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml
index 147497c..3c3f8b1 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_media_remote_expanded.xml
@@ -1,9 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="1"
     follows="right|bottom" height="185" left="0" name="media_remote"
-     use_bounding_rect="true" width="250">
+     use_bounding_rect="true" width="220">
-        <panel bottom="0" filename="panel_bg_tab.xml" height="187" left="0" width="250" />
+        <panel bottom="0" filename="panel_bg_tab.xml" height="187" left="0" width="220" />
-        <panel border="false" bottom="20" filename="panel_audio.xml" height="160"
+        <panel border="false" bottom="22" filename="panel_audio.xml" height="160"
-             label="Audio &amp; Video" name="Volume Panel" width="250" />
+             label="Audio &amp; Video" name="Volume Panel" width="220" />
        <panel bottom_delta="-10" filename="panel_media_controls.xml" left="0" />
+                <string name="play_label">
+                Play
+        </string>
+        <string name="stop_label">
+                Stop
+        </string>
+        <string name="pause_label">
+                Pause
+        </string>
+        <string name="default_tooltip_label">
+                No Media Specified
+        </string>
+        <string name="media_hidden_label">
+                (URL hidden by parcel owner)
+        </string>
+        <string name="media_icon_tooltip_web">
+                This location displays content from the World Wide Web. Click the Play button to display Web content.
+        </string>
+        <string name="media_icon_tooltip_movie">
+                This location displays Video content. Click the Play button to play the video.
+        </string>
+        <string name="media_play_tooltip">
+                Display Web content at this location.
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml
deleted file mode 100644
index 6f8f3db..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_music_remote.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="-34"
-     enabled="true" follows="left|top" mouse_opaque="true" name="music_remote">
-        <icon bottom="-19" height="16" image_name="music_icon.tga" left="5" name="music_icon"
-             width="16" />
-        <button bottom="-20" enabled="false" follows="left|top" font="SansSerif"
-             halign="center" height="17" image_selected="button_anim_stop_selected.tga"
-             image_unselected="button_anim_stop.tga" label="" label_selected=""
-             left_delta="25" mouse_opaque="true" name="music_stop" scale_image="true"
-             tool_tip="Stop media" width="17" />
-        <button bottom="-20" enabled="true" follows="left|top" font="SansSerif" halign="center"
-             height="17" image_selected="button_anim_play_selected.tga"
-             image_unselected="button_anim_play.tga" label="" label_selected=""
-             left_delta="17" mouse_opaque="true" name="music_play" scale_image="true"
-             tool_tip="Play media stream" width="17" />
-        <button bottom="-20" enabled="false" follows="left|top" font="SansSerif"
-             halign="center" height="17" image_disabled="button_disabled_32x128.tga"
-             image_disabled_selected="button_disabled_32x128.tga"
-             image_selected="button_anim_pause_selected.tga"
-             image_unselected="button_anim_pause.tga" label="" label_selected=""
-             left_delta="0" mouse_opaque="true" name="music_pause" scale_image="true"
-             tool_tip="Pause media stream" width="17" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
index defefde..bcd7bbc 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_overlaybar.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel follows="left|right|bottom|top" height="200" left="-1" mouse_opaque="false"
     name="overlay" use_bounding_rect="true" width="728">
-        <layout_stack bottom="0" follows="left|right|bottom" height="200" left="1"
+        <layout_stack bottom="0" follows="left|right|bottom" height="200" left="0"
             mouse_opaque="false" name="overlay_layout_panel" orientation="horizontal"
             right="-1" use_bounding_rect="true">
                <layout_panel auto_resize="true" bottom="0" left="0" min_width="420" mouse_opaque="false"
-                     use_bounding_rect="true" user_resize="false" width="420">
+                     use_bounding_rect="true" user_resize="false" width="420" name="main_panel">
-                        <layout_stack bottom="0" follows="left|right|bottom|top" height="50" left="1"
+                        <layout_stack bottom="0" follows="left|right|bottom|top" height="50" left="0"
                             mouse_opaque="false" name="chatbar_and_buttons" orientation="vertical"
                             right="420" use_bounding_rect="true">
                                <layout_panel auto_resize="true" bottom="0" follows="left|bottom|right|top" height="0"
@@ -42,19 +42,19 @@
                                </layout_panel>
                                <layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
                                     filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
-                                     min_height="23" mouse_opaque="false" name="chat_bar"
+                                     min_height="24" mouse_opaque="false" name="chat_bar"
                                     use_bounding_rect="true" width="395" />
                        </layout_stack>
                </layout_panel>
-                <layout_panel auto_resize="false" bottom="0" left="0" min_width="250" mouse_opaque="false"
+                <layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false"
                     name="media_remote_container" use_bounding_rect="true" user_resize="false"
-                     width="250">
+                     width="220">
-                        <panel background_visible="false" border="false" bottom="1" name="media_remote" />
+                        <panel background_visible="false" border="false" bottom="0" name="media_remote" />
                </layout_panel>
-                <layout_panel auto_resize="false" bottom="0" left="0" min_width="128" mouse_opaque="false"
+                <layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false"
                     name="voice_remote_container" use_bounding_rect="true" user_resize="false"
                     width="128">
-                        <panel background_visible="false" border="false" bottom="1" name="voice_remote" />
+                        <panel background_visible="false" border="false" bottom="0" name="voice_remote" />
                </layout_panel>
        </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place.xml b/linden/indra/newview/skins/xui/en-us/panel_place.xml
index 5d3e40b..d960a1a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_place.xml
@@ -4,27 +4,27 @@
     name="Place" title="Place" width="450">
        <texture_picker bottom="95" follows="left|top" height="300" left="20" name="snapshot_ctrl"
             width="400" />
-        <text bottom_delta="-10" follows="left|top" font="SansSerif" height="20" left="20">
+        <text bottom_delta="-10" follows="left|top" font="SansSerif" height="20" left="20" name="name_label">
                Name:
        </text>
        <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-             name="name_editor" text_color="white" width="361" />
+             name="name_editor" width="361" />
-        <text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20">
+        <text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="description_label">
                Description:
        </text>
-        <text_editor bg_readonly_color="clear" bottom_delta="-68" enabled="false" follows="left|top"
+        <text_editor bottom_delta="-68" enabled="false" follows="left|top"
             font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
-             text_readonly_color="white" width="400" word_wrap="true" />
+             width="400" word_wrap="true" />
-        <text bottom_delta="-25" follows="left|top" font="SansSerif" height="20" left="20">
+        <text bottom_delta="-25" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
                Information:
        </text>
        <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-             name="info_editor" text_color="white" width="328" />
+             name="info_editor" width="328" />
-        <text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20">
+        <text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="location_label">
                Location:
        </text>
        <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-             name="location_editor" text_color="white" width="342" />
+             name="location_editor" width="342" />
        <button bottom_delta="-20" follows="left|top" height="20" label="Teleport" left="20"
             name="teleport_btn" width="100" />
        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
index e237bb9..1020a0a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
@@ -4,27 +4,27 @@
     name="Place" title="Place" width="450">
        <texture_picker bottom="-274" follows="left|top" height="270" left="20" name="snapshot_ctrl"
             width="360" />
-        <text bottom_delta="-12" follows="left|top" font="SansSerif" height="20" left="20">
+        <text bottom_delta="-12" follows="left|top" font="SansSerif" height="20" left="20" name="name_label">
                Name:
        </text>
        <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-             name="name_editor" text_color="white" width="320" />
+             name="name_editor" width="320" />
-        <text bottom_delta="-24" follows="left|top" font="SansSerif" height="20" left="20">
+        <text bottom_delta="-24" follows="left|top" font="SansSerif" height="20" left="20" name="description_label">
                Description:
        </text>
        <text_editor bg_readonly_color="clear" bottom_delta="-68" enabled="false" follows="left|top"
             font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
-             text_readonly_color="white" width="360" word_wrap="true" />
+             width="360" word_wrap="true" />
-        <text bottom_delta="-30" follows="left|top" font="SansSerif" height="20" left="20">
+        <text bottom_delta="-30" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
                Information:
        </text>
        <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-             name="info_editor" text_color="white" width="328" />
+             name="info_editor" width="328" />
-        <text bottom_delta="-30" follows="left|top" font="SansSerif" height="20" left="20">
+        <text bottom_delta="-30" follows="left|top" font="SansSerif" height="20" left="20" name="location_label">
                Location:
        </text>
        <text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-             name="location_editor" text_color="white" width="342" />
+             name="location_editor" width="342" />
        <button bottom_delta="-25" follows="left|top" height="20" label="Teleport" left="20"
             name="teleport_btn" width="100" />
        <button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
index 377e9a4..92978ab 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_audio.xml
@@ -34,7 +34,7 @@
             left="142" mouse_opaque="true" name="streaming_video" radio_style="false"
             width="338" />
        <check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             follows="left|top" font="SansSerifSmall" height="16"
             initial_value="true" label="Automatically play media" left="162"
             mouse_opaque="true" name="auto_streaming_video" radio_style="false"
             width="338" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
index 4ac9ddd..27ec29a 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_chat.xml
@@ -31,33 +31,37 @@
                Chat Color:
        </text>
        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+             can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
+             enabled="true" follows="left|top" height="56" label="Chat" left="148"
+             mouse_opaque="true" name="users" width="44" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
+             can_apply_immediately="true" color="0.6 0.6 1 1" control_name="IMChatColor"
+             enabled="true" follows="left|top" height="56" label="IM" left_delta="48"
+             mouse_opaque="true" name="im" width="44" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
             can_apply_immediately="true" color="0.8 1 1 1"
             control_name="SystemChatColor" enabled="true" follows="left|top"
-             height="56" label="System" left="148" mouse_opaque="true" name="system"
+             height="56" label="System" left_delta="48" mouse_opaque="true"
-             width="48" />
+             name="system" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
-             can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
-             enabled="true" follows="left|top" height="56" label="Users" left_delta="54"
-             mouse_opaque="true" name="users" width="48" />
        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
             can_apply_immediately="true" color="0.7 0.9 0.7 1"
             control_name="ObjectChatColor" enabled="true" follows="left|top"
-             height="56" label="Objects" left_delta="54" mouse_opaque="true"
+             height="56" label="Objects" left_delta="48" mouse_opaque="true"
-             name="objects" width="48" />
+             name="objects" width="44" />
        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
             can_apply_immediately="true" color="0.7 0.9 0.7 1"
             control_name="llOwnerSayChatColor" enabled="true" follows="left|top"
-             height="56" label="Owner" left_delta="54" mouse_opaque="true" name="owner"
+             height="56" label="Owner" left_delta="48" mouse_opaque="true" name="owner"
-             width="48" />
+             width="44" />
        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
             can_apply_immediately="true" color="0 0 0 1"
             control_name="BackgroundChatColor" enabled="true" follows="left|top"
-             height="56" label="Bubble" left_delta="54" mouse_opaque="true"
+             height="56" label="Bubble" left_delta="48" mouse_opaque="true"
-             name="background" width="48" />
+             name="background" width="44" />
        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-140"
             can_apply_immediately="true" color="0.6 0.6 1 1"
             control_name="HTMLLinkColor" enabled="true" follows="left|top" height="56"
-             label="URLs" left_delta="54" mouse_opaque="true" name="links" width="48" />
+             label="URLs" left_delta="48" mouse_opaque="true" name="links" width="44" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
index bca8cf9..e679537 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
@@ -16,57 +16,62 @@
             font="SansSerifSmall" height="16" initial_value="true"
             label="Show Start Location on Login Screen" left="151" mouse_opaque="true"
             name="show_location_checkbox" radio_style="false" width="256" />
-        <radio_group bottom="-108" control_name="RenderName" draw_border="true" enabled="true"
+        <combo_box bottom_delta="-25" follows="left|top" height="18" left="155"
-             follows="left|top" height="54" left="155" mouse_opaque="true"
+             mouse_opaque="true" name="fade_out_combobox" width="146">
-             name="fade_out_radio" width="128">
+                <combo_item name="Never" value="Never">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" left="6"
-                     mouse_opaque="true" name="Never" width="463">
                        Never
-                </radio_item>
+                </combo_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" left="6"
+                <combo_item name="Show Temporarily" value="Show Temporarily">
-                     mouse_opaque="true" name="Temporarily" width="463">
                        Show Temporarily
-                </radio_item>
+                </combo_item>
-                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" left="6"
+                <combo_item name="Always" value="Always">
-                     mouse_opaque="true" name="Always" width="463">
                        Always
-                </radio_item>
+                </combo_item>
-        </radio_group>
+        </combo_box>
-        <check_box bottom="-134" control_name="RenderNameHideSelf" enabled="true"
+        <check_box bottom_delta="-25" control_name="SmallAvatarNames" follows="left|top"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Hide My Name On My Screen" left="151" mouse_opaque="true"
-             name="show_my_name_checkbox" radio_style="false" width="256" />
-        <check_box bottom="-152" control_name="RenderHideGroupTitle" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Hide My Group Title" left="151" mouse_opaque="true"
-             name="show_my_title_checkbox" radio_style="false" width="256" />
-        <check_box bottom="-170" control_name="SmallAvatarNames" enabled="true" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="true"
-             label="Small Avatar Names" left="151" mouse_opaque="true"
+             label="Small Avatar Names" left="151" name="small_avatar_names_checkbox"
-             name="small_avatar_names_checkbox" radio_style="false" width="256" />
+             width="200" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-214"
+        <check_box bottom_delta="-18" control_name="RenderNameHideSelf" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Hide My Name On My Screen" left="151" name="show_my_name_checkbox"
+             width="200" />
+        <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
+             halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
+             width="394">
+                Group Titles:
+        </text>
+        <check_box bottom_delta="0" control_name="RenderHideGroupTitleAll" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Hide All Group Titles" left="151" mouse_opaque="true"
+             name="show_all_title_checkbox" radio_style="false" width="256" />
+        <check_box bottom_delta="-18" control_name="RenderHideGroupTitle" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Hide My Group Title" left="151" name="show_my_title_checkbox"
+             radio_style="false" width="256" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
             can_apply_immediately="false" color="1 1 1 1" control_name="EffectColor"
-             enabled="true" follows="left|top" height="36" label="" left="153"
+             enabled="true" follows="left|top" height="48" label="" left="153"
             mouse_opaque="true" name="effect_color_swatch"
-             tool_tip="Click to open Color Picker" width="20" />
+             tool_tip="Click to open Color Picker" width="32" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             left="10" mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
+             mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
                UI Size:
        </text>
        <slider bottom="-217" can_edit_text="true" control_name="UIScaleFactor"
-             decimal_digits="3" enabled="true" height="16" hidden="false"
+             decimal_digits="3" enabled="true" height="16" increment="0.025"
-             increment="0.025" initial_val="1" left="148" max_val="1.4" min_val="0.75"
+             initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
-             mouse_opaque="true" name="UI Scale" show_text="true" value="1" width="256" />
+             name="UI Scale" show_text="true" value="1" width="256" />
        <check_box bottom="-236" control_name="UIAutoScale" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+             font="SansSerifSmall" height="16" initial_value="false"
-             label="Use resolution independent scale" left="148" mouse_opaque="true"
+             label="Use resolution independent scale" left="151" mouse_opaque="true"
             name="ui_auto_scale" radio_style="false" width="256" />
-        <spinner bottom="-260" control_name="AFKTimeout" enabled="true" follows="left|top"
+        <spinner bottom="-260" control_name="AFKTimeout" decimal_digits="0" enabled="true"
-             height="16" increment="1" initial_val="300" label="Away Timeout:"
+             follows="left|top" height="16" increment="1" initial_val="300"
-             label_width="141" left="10" max_val="600" min_val="30" mouse_opaque="true"
+             label="Away Timeout:" label_width="141" left="10" max_val="600"
-             name="afk_timeout_spinner" width="202" />
+             min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
        <check_box bottom="-286" control_name="ChatOnlineNotification" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
             label="Show Online Friend Notifications" left="151" mouse_opaque="true"
@@ -87,7 +92,7 @@
             tool_tip="Use the default system color picker instead of the one built into Second Life."
             width="256" />
        <check_box bottom="-358" control_name="ShowSearchBar" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+             font="SansSerifSmall" height="16" initial_value="false"
             label="Show search panel in overlay bar" left="151" mouse_opaque="true"
             name="show_search_panel" radio_style="false"
             tool_tip="Display the embedded search panel." width="256" />
@@ -104,7 +109,7 @@
                Show Names:
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-184" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
             mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
                Color For My Effects:
@@ -150,7 +155,7 @@
                        Never send
                </combo_item>
        </combo_box>
-        <combo_box allow_text_entry="true" bottom="-402" control_name="Language" enabled="true"
+        <combo_box allow_text_entry="true" bottom="-400" control_name="Language" enabled="true"
             follows="left|bottom" height="16" left="153" max_chars="135"
             mouse_opaque="true" name="language_combobox" width="146">
                <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
index 71ba4bf..fbcb773 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics1.xml
@@ -5,12 +5,12 @@
        <button bottom="-22" follows="left|top" font="SansSerif" height="18" label="?"
             left="470" name="GraphicsPreferencesHelpButton" width="22" />
        <check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall"
-             height="16" hidden="false" initial_value="false"
+             height="16" initial_value="false"
             label="Run Second Life in a window" left="10" mouse_opaque="true"
             name="windowed mode" radio_style="false" width="100" />
        <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
             embedded_items="false" enabled="false" follows="left|top"
-             font="SansSerifSmall" height="20" hidden="false" hide_border="true"
+             font="SansSerifSmall" height="20" hide_border="true"
             hide_scrollbar="true" left="10" max_length="65535" mouse_opaque="true"
             name="FullScreenInfo" tab_stop="false" width="350" word_wrap="true">
                If unchecked, viewer will display full-screen when logged in.
@@ -26,7 +26,7 @@
             name="fullscreen combo" width="150" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="10" mouse_opaque="true" name="AspectRatioLabel1"
             tool_tip="width / height" v_pad="0" width="160">
                Aspect Ratio:
@@ -53,60 +53,60 @@
             name="aspect_auto_detect" radio_style="false" width="256" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="10" mouse_opaque="true" name="HigherText" v_pad="0" width="80">
                Quality and
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
             name="QualityText" v_pad="0" width="95">
                Performance:
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-86" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="115" mouse_opaque="true" name="FasterText" v_pad="0" width="80">
                Faster
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-105" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="158" mouse_opaque="true" name="ShadersPrefText" v_pad="0" width="40">
                Low
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="0" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="47" mouse_opaque="true"
             name="ShadersPrefText2" v_pad="0" width="40">
                Mid
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="0" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="47" mouse_opaque="true"
             name="ShadersPrefText3" v_pad="0" width="40">
                High
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="0" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="47" mouse_opaque="true"
+             height="12" left_delta="47" mouse_opaque="true"
             name="ShadersPrefText4" v_pad="0" width="40">
                Ultra
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-80" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="334" mouse_opaque="true" name="HigherText2" v_pad="0" width="80">
                Higher
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
             name="QualityText2" v_pad="0" width="95">
                Quality
        </text>
@@ -124,64 +124,64 @@
             width="2" />
        <slider bottom="-90" can_edit_text="false" control_name="RenderQualityPerformance"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="1" initial_val="0" label="" label_width="0"
+             increment="1" initial_val="0" label="" label_width="0"
             left="165" max_val="3" min_val="0" mouse_opaque="true"
             name="QualityPerformanceSelection" show_text="false" width="150" />
        <check_box bottom="-91" control_name="RenderCustomSettings" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             follows="left|top" font="SansSerifSmall" height="16"
             initial_value="true" label="Custom" left="385" mouse_opaque="true"
             name="CustomSettings" radio_style="false" width="256" />
        <view_border bevel_style="none" border_thickness="1" bottom="-375" follows="top|left"
             height="260" left="5" name="GraphicsBorder" width="485" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="10" mouse_opaque="true" name="ShadersText" v_pad="0" width="128">
                Shaders:
        </text>
        <check_box bottom="-153" control_name="RenderObjectBump" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" hidden="false" initial_value="true"
+             font="SansSerifSmall" height="16" initial_value="true"
             label="Bump Mapping and Shiny" left="10" mouse_opaque="true"
             name="BumpShiny" radio_style="false" width="256" />
        <check_box bottom_delta="-17" control_name="VertexShaderEnable" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             follows="left|top" font="SansSerifSmall" height="16"
             initial_value="true" label="Basic Shaders" left_delta="0"
             mouse_opaque="true" name="BasicShaders" radio_style="false"
             tool_tip="Disabling this option may prevent some graphics card drivers from crashing."
             width="315" />
        <check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             follows="left|top" font="SansSerifSmall" height="16"
             initial_value="true" label="Atmospheric Shaders" left_delta="0"
             mouse_opaque="true" name="WindLightUseAtmosShaders" radio_style="false"
             width="256" />
        <check_box bottom_delta="-17" control_name="RenderWaterReflections" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             follows="left|top" font="SansSerifSmall" height="16"
             initial_value="true" label="Water Reflections" left_delta="0"
             mouse_opaque="true" name="Reflections" radio_style="false" width="256" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-223" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="10" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
             width="128">
                Reflection Detail:
        </text>
        <radio_group bottom_delta="-73" control_name="RenderReflectionDetail" draw_border="false"
-             enabled="true" follows="left|top" height="70" hidden="false"
+             enabled="true" follows="left|top" height="70"
             left_delta="-2" mouse_opaque="true" name="ReflectionDetailRadio"
             width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
                     left="3" mouse_opaque="true" name="0" width="315">
                        Terrain and Trees
                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
                     left="3" mouse_opaque="true" name="1" width="315">
                        All Static Objects
                </radio_item>
-                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-51" enabled="true" follows="left|top" height="16"
                     left="3" mouse_opaque="true" name="2" width="315">
                        All Avatars and Objects
                </radio_item>
-                <radio_item type="string" length="1" bottom="-67" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-67" enabled="true" follows="left|top" height="16"
                     left="3" mouse_opaque="true" name="3" width="315">
                        Everything
                </radio_item>
@@ -206,32 +206,32 @@
             radio_style="false" width="256" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="457" mouse_opaque="true" name="DrawDistanceMeterText1" v_pad="0"
             width="128">
                m
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="463" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
             width="128">
                m
        </text>
        <slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="8" initial_val="160" label="Draw Distance:"
+             increment="8" initial_val="160" label="Draw Distance:"
             label_width="140" left="215" max_val="512" min_val="64" mouse_opaque="true"
             name="DrawDistance" show_text="true" width="255" />
        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="256" initial_val="4096"
+             increment="256" initial_val="4096"
             label="Max. Particle Count:" label_width="140" left_delta="0"
             max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
             show_text="true" width="262" />
        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderGlowResolutionPow"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="1" initial_val="8" label="Post Process Quality:"
+             increment="1" initial_val="8" label="Post Process Quality:"
             label_width="140" left_delta="0" max_val="9" min_val="8"
             mouse_opaque="true" name="RenderPostProcess" show_text="false" width="223" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -243,43 +243,43 @@
        </text>
        <slider bottom_delta="-22" can_edit_text="false" control_name="RenderVolumeLODFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="0.125" initial_val="160" label="  Objects:"
+             increment="0.125" initial_val="160" label="  Objects:"
             label_width="140" left_delta="0" max_val="2" min_val="0"
             mouse_opaque="true" name="ObjectMeshDetail" show_text="false" width="223" />
        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderFlexTimeFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="0.1" initial_val="160" label="  Flexiprims:"
+             increment="0.1" initial_val="160" label="  Flexiprims:"
             label_width="140" left_delta="0" max_val="1" min_val="0"
             mouse_opaque="true" name="FlexibleMeshDetail" show_text="false" width="223" />
        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderTreeLODFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="0.125" initial_val="160" label="  Trees:"
+             increment="0.125" initial_val="160" label="  Trees:"
             label_width="140" left_delta="0" max_val="1" min_val="0"
             mouse_opaque="true" name="TreeMeshDetail" show_text="false" width="223" />
        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarLODFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="0.125" initial_val="160" label="  Avatars:"
+             increment="0.125" initial_val="160" label="  Avatars:"
             label_width="140" left_delta="0" max_val="1" min_val="0"
             mouse_opaque="true" name="AvatarMeshDetail" show_text="false" width="223" />
        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderTerrainLODFactor"
             decimal_digits="3" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="0.125" initial_val="160" label="  Terrain:"
+             increment="0.125" initial_val="160" label="  Terrain:"
             label_width="140" left_delta="0" max_val="2" min_val="1"
             mouse_opaque="true" name="TerrainMeshDetail" show_text="false" width="223" />
        <slider bottom_delta="-20" can_edit_text="false" control_name="WLSkyDetail"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
-             hidden="false" increment="8" initial_val="160" label="  Sky:"
+             increment="8" initial_val="160" label="  Sky:"
             label_width="140" left_delta="0" max_val="128" min_val="16"
             mouse_opaque="true" name="SkyMeshDetail" show_text="false" width="223" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-172" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="444" mouse_opaque="true" name="PostProcessText" v_pad="0" width="128">
                Low
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-210" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="444" mouse_opaque="true" name="ObjectMeshDetailText" v_pad="0"
             width="128">
                Low
@@ -287,53 +287,53 @@
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
             name="FlexibleMeshDetailText" v_pad="0" width="128">
                Low
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
             name="TreeMeshDetailText" v_pad="0" width="128">
                Low
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
             name="AvatarMeshDetailText" v_pad="0" width="128">
                Low
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
             name="TerrainMeshDetailText" v_pad="0" width="128">
                Low
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-20" drop_shadow_visible="true" enabled="true"
             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" hidden="false" left_delta="0" mouse_opaque="true"
+             height="12" left_delta="0" mouse_opaque="true"
             name="SkyMeshDetailText" v_pad="0" width="128">
                Low
        </text>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-331" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
             left="210" mouse_opaque="true" name="LightingDetailText" v_pad="0"
             width="128">
                Lighting Detail:
        </text>
        <radio_group bottom_delta="-43" control_name="RenderLightingDetail" draw_border="false"
-             enabled="true" follows="left|top" height="38" hidden="false" left_delta="0"
+             enabled="true" follows="left|top" height="38" left_delta="0"
             mouse_opaque="true" name="LightingDetailRadio" width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
                     left="3" mouse_opaque="true" name="SunMoon" width="156">
                        Sun and moon only
                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
                     left="3" mouse_opaque="true" name="LocalLights" width="156">
                        Nearby local lights
                </radio_item>
@@ -345,22 +345,22 @@
                Terrain Detail:
        </text>
        <radio_group bottom_delta="-43" control_name="RenderTerrainDetail" draw_border="false"
-             enabled="true" follows="left|top" height="38" hidden="false" left_delta="0"
+             enabled="true" follows="left|top" height="38" left_delta="0"
             mouse_opaque="true" name="TerrainDetailRadio" width="321">
-                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-19" enabled="true" follows="left|top" height="16"
                     left="3" mouse_opaque="true" name="0" width="315">
                        Low
                </radio_item>
-                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16" hidden="false"
+                <radio_item type="string" length="1" bottom="-35" enabled="true" follows="left|top" height="16"
                     left="3" mouse_opaque="true" name="2" width="315">
                        High
                </radio_item>
        </radio_group>
        <button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Recommended Settings" left="130" mouse_opaque="true"
+             label="Recommended Settings" left="130" mouse_opaque="true"
             name="Defaults" scale_image="true" width="170" />
        <button bottom="-400" enabled="true" font="SansSerif" halign="center" height="20"
-             hidden="false" label="Hardware Options" label_selected="Hardware Options"
+             label="Hardware Options" label_selected="Hardware Options"
             left="310" mouse_opaque="true" name="GraphicsHardwareButton"
             scale_image="true" width="170" />
        <string name="resolution_format">
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml
index 982775b..85aab95 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_input.xml
@@ -39,33 +39,57 @@
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-110" drop_shadow_visible="true" enabled="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
-             mouse_opaque="true" name="Camera Springiness:" v_pad="0" width="128">
+             mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
-                Camera Springiness:
+                Camera Follow Distance:
        </text>
        <slider bottom="-116" can_edit_text="true" control_name="DynamicCameraStrength"
             decimal_digits="0" enabled="true" follows="left|top" height="16"
             increment="1" initial_val="2" left="276" max_val="10" min_val="0"
-             mouse_opaque="true" name="dynamic camera" show_text="true" value="2"
+             mouse_opaque="true" name="DynamicCameraStrength" show_text="true" value="2"
             width="128" />
-        <check_box bottom="-134" control_name="EditCameraMovement" enabled="true"
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-134" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             mouse_opaque="true" name="Camera Transition Time:" v_pad="0" width="128">
+                Camera Transition Time:
+        </text>
+        <slider bottom="-140" can_edit_text="true" control_name="ZoomTime" decimal_digits="1"
+             enabled="true" follows="left|top" height="16" increment="0.1"
+             initial_val="0.4" left="276" max_val="4" min_val="0" mouse_opaque="true"
+             name="ZoomTime" show_text="true" value="2" width="128" />
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-158" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             mouse_opaque="true" name="Camera Smoothing:" v_pad="0" width="128">
+                Camera Smoothing:
+        </text>
+        <slider bottom="-164" can_edit_text="true" control_name="CameraPositionSmoothing"
+             decimal_digits="1" enabled="true" follows="left|top" height="16"
+             increment="0.1" initial_val="1" left="276" max_val="9" min_val="0"
+             mouse_opaque="true" name="CameraPositionSmoothing" show_text="true" value="2"
+             width="128" />
+        <check_box bottom="-188" control_name="EditCameraMovement" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
             label="Automatic Edit Camera Movement" left="148" mouse_opaque="true"
             name="edit camera movement" radio_style="false"
             tool_tip="Use automatic camera positioning when entering and exiting edit mode"
             width="201" />
-        <check_box bottom="-152" control_name="AppearanceCameraMovement" enabled="true"
+        <check_box bottom="-206" control_name="AppearanceCameraMovement" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
             label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true"
             name="appearance camera movement" radio_style="false"
             tool_tip="Use automatic camera positioning while in edit mode" width="242" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-186" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-228" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             left="10" mouse_opaque="true" name="text2" v_pad="0" width="128">
+             mouse_opaque="true" name="text2" v_pad="0" width="128">
                Avatar Display Options:
        </text>
-        <check_box bottom="-190" control_name="FirstPersonAvatarVisible" enabled="true"
+        <check_box bottom="-232" control_name="FirstPersonAvatarVisible" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             initial_value="false" label="Show Avatar in Mouselook" left="148"
+             label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="avfp"
-             mouse_opaque="true" name="avfp" radio_style="false" width="256" />
+             radio_style="false" width="256" />
+        <button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
+             label="Joystick Setup" left_delta="0" mouse_opaque="true"
+             name="joystic_setup_button" width="155" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
index 8563ad0..5e8f871 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_popups.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="0" height="500" label="Popups" left="0" name="popups"
     title="Popups" width="400">
-        <text bottom="-20" follows="top|left" left="15" width="300">
+        <text bottom="-20" follows="top|left" left="15" width="300" name="dont_show_label">
                Do not show popups:
        </text>
        <scroll_list follows="top|left" height="88" left="15" name="disabled_popups" width="480" />
        <button follows="top|left" height="20" label="Enable this popup" left="15"
             name="enable_popup" width="150" />
-        <text follows="top|left" left="15" width="128">
+        <text follows="top|left" left="15" width="128" name="show_label">
                Show popups:
        </text>
        <scroll_list follows="top|left" height="88" left="15" name="enabled_popups" width="480" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
index 1314971..62fb7b7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
@@ -78,12 +78,9 @@
             font="SansSerifSmall" height="35" hide_border="true" hide_scrollbar="true"
             left_delta="-20" max_length="65535" mouse_opaque="true"
             name="device_settings_text" tab_stop="false" width="450" word_wrap="true">
-                NOTE: Running the Device Settings or Voice Chat Setup will temporarily disconnect you from Voice Chat.
+                NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat.
        </text_editor>
        <button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
             label="Device Settings" left_delta="0" mouse_opaque="true"
             name="device_settings_btn" width="155" />
-        <button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
-             label="Voice Chat Setup" left_delta="0" mouse_opaque="true"
-             name="launch_voice_wizard_button" width="155" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
index 1c49932..9bb7d90 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_covenant.xml
@@ -9,46 +9,46 @@
             left="10" name="region_name_lbl" width="75">
                Region:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="-14" follows="left|top"
+        <text bottom_delta="-14" follows="left|top"
             font="SansSerifSmall" height="20" left_delta="0" name="region_name_text"
-             text_readonly_color="white" width="130">
+             width="130">
                (unknown)
        </text>
        <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
             left="10" name="estate_name_lbl" width="75">
                Estate:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="-14" follows="left|top"
+        <text bottom_delta="-14" follows="left|top"
             font="SansSerifSmall" height="20" left_delta="0" name="estate_name_text"
-             text_readonly_color="white" width="130">
+             width="130">
                (unknown)
        </text>
        <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
             left="10" name="estate_owner_lbl" width="300">
                Estate Owner:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="-14" follows="left|top"
+        <text bottom_delta="-14" follows="left|top"
             font="SansSerifSmall" height="20" left_delta="0" name="estate_owner_text"
-             text_readonly_color="white" width="120">
+             width="120">
                (unknown)
        </text>
-        <text bg_readonly_color="clear" bottom_delta="-28" follows="left|top"
+        <text bottom_delta="-28" follows="left|top"
             font="SansSerif" height="20" left_delta="0" name="resellable_clause"
-             text_readonly_color="white" width="465">
+             width="465">
                Purchased land in this region may or may not be resold.
        </text>
-        <text bg_readonly_color="clear" bottom_delta="-18" follows="left|top"
+        <text bottom_delta="-18" follows="left|top"
             font="SansSerif" height="20" left_delta="0" name="changeable_clause"
-             text_readonly_color="white" width="465">
+             width="465">
                Purchased land in this region may or may not be joined or subdivided.
        </text>
        <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16"
             left_delta="0" name="covenent_instructions" width="465">
                Drag and drop a notecard to change the Covenant for this Estate.
        </text>
-        <text_editor bg_readonly_color="clear" bottom_delta="-242" enabled="false"
+        <text_editor bottom_delta="-242" enabled="false"
             follows="left|top" font="SansSerifSmall" height="238" left_delta="0"
-             max_length="65535" name="covenant_editor" text_readonly_color="white"
+             max_length="65535" name="covenant_editor" 
             width="460" word_wrap="true">
                Loading...
        </text_editor>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
index 4392888..b1c2bb7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_debug.xml
@@ -30,17 +30,17 @@
             left="10" name="choose_avatar_btn" width="150" />
        <text bottom_delta="0" follows="left|top" height="20" left="170"
             name="target_avatar_name" width="150" />
-        <button bottom_delta="-20" follows="left|top" height="20"
+        <button bottom_delta="-23" follows="left|top" height="20"
             label="Return avatar&apos;s scripted objects on other people&apos;s land"
             left="50" name="return_scripted_other_land_btn" width="350" />
-        <button bottom_delta="-20" follows="left|top" height="20"
+        <button bottom_delta="-23" follows="left|top" height="20"
             label="Return ALL of avatar&apos;s scripted objects" left="50"
             name="return_scripted_all_btn" width="350" />
        <button bottom_delta="-50" follows="left|top" height="20" label="Get Top Colliders..."
             left="10" name="top_colliders_btn"
             tool_tip="List of objects experiencing the most potential collisions"
             width="150" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        <button bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
             left="170" name="top_colliders_help" width="18" />
        <button bottom_delta="-20" follows="left|top" height="20" label="Get Top Scripts..."
             left="10" name="top_scripts_btn"
@@ -51,7 +51,7 @@
        <button bottom_delta="-50" follows="left|top" height="20" label="Restart Region"
             left="10" name="restart_btn"
             tool_tip="Give 2 minute countdown and restart region" width="130" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        <button bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
             left="150" name="restart_help" width="18" />
        <button bottom_delta="-20" follows="left|top" height="20" label="Delay Restart"
             left="10" name="cancel_restart_btn"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
index 6132489..393ce42 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml
@@ -10,18 +10,18 @@ regions in the estate.
             name="estate_text" width="80">
                Estate:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="-16" follows="left|top"
+        <text bottom_delta="-16" follows="left|top"
             font="SansSerif" height="20" left_delta="0" name="estate_name"
-             text_readonly_color="white" width="150">
+             width="150">
                (unknown)
        </text>
        <text bottom_delta="-22" follows="left|top" font="SansSerif" height="20" left="10"
             name="owner_text" width="80">
                Owner:
        </text>
-        <text bg_readonly_color="clear" bottom_delta="-16" follows="left|top"
+        <text bottom_delta="-16" follows="left|top"
             font="SansSerif" height="20" left_delta="0" name="estate_owner"
-             text_readonly_color="white" width="150">
+             width="150">
                (unknown)
        </text>
        <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295"
@@ -93,7 +93,7 @@ regions in the estate.
             name="estate_manager_help" right="470" width="18" />
        <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
             right="470" width="200" />
-        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
+        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
             name="estate_manager_name_list" width="200" />
        <button bottom_delta="-26" enabled="true" follows="left|top" height="20"
             label="Remove..." name="remove_estate_manager_btn" right="470" width="90" />
@@ -107,7 +107,7 @@ regions in the estate.
             name="allow_resident_help" right="470" width="18" />
        <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
             height="60" right="470" width="200" />
-        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
+        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
             name="allowed_avatar_name_list" width="200" />
        <button bottom_delta="-26" enabled="true" follows="left|top" height="20"
             label="Remove..." name="remove_allowed_avatar_btn" right="470" width="90" />
@@ -121,7 +121,7 @@ regions in the estate.
             name="allow_group_help" right="470" width="18" />
        <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
             height="60" right="470" width="200" />
-        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
+        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
             name="allowed_group_name_list" width="200" />
        <button bottom_delta="-26" enabled="true" follows="left|top" height="20"
             label="Remove..." name="remove_allowed_group_btn" right="470" width="90" />
@@ -135,7 +135,7 @@ regions in the estate.
             name="ban_resident_help" right="470" width="18" />
        <view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
             height="60" right="470" width="200" />
-        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0"
+        <name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true" 
             name="banned_avatar_name_list" width="200" />
        <button bottom_delta="-26" enabled="true" follows="left|top" height="20"
             label="Remove..." name="remove_banned_avatar_btn" right="470" width="90" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml b/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
index f3074b8..fa12fca 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
@@ -42,7 +42,7 @@
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
             left="205" name="parcel_search_help" width="18" />
        <spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
-             label="Agent Limit" label_width="97" left="10" max_val="100" min_val="0"
+             label="Agent Limit" label_width="97" left="10" max_val="100" min_val="1"
             name="agent_limit_spin" width="170" />
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
             left="205" name="agent_limit_help" width="18" />
@@ -57,10 +57,10 @@
        </text>
        <combo_box bottom_delta="0" follows="left|top" height="20" label="Mature" left="110"
             name="access_combo" width="85">
-                <combo_item name="PG">
+                <combo_item name="PG" value="PG">
                        PG
                </combo_item>
-                <combo_item name="Mature">
+                <combo_item name="Mature" value="Mature">
                        Mature
                </combo_item>
        </combo_box>
@@ -70,9 +70,8 @@
             left="108" name="apply_btn" width="100" />
        <button bottom_delta="-80" follows="left|top" height="20"
             label="Teleport Home One User..." left="10" name="kick_btn" width="250" />
-        <button bottom_delta="-20" follows="left|top" height="20"
+        <button bottom_delta="-23" follows="left|top" height="20"
-             label="Teleport Home All Users..." left="10" name="kick_all_btn"
+             label="Teleport Home All Users..." left="10" name="kick_all_btn" width="250" />
-             width="250" />
        <button bottom_delta="-40" follows="left|top" height="20"
             label="Send Message To Region..." left="10" name="im_btn" width="200" />
        <button bottom="-50" follows="left|top" height="20" label="Manage Telehub..."
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml b/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml
index 30f5f6b..e93e87c 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_terrain.xml
@@ -46,7 +46,7 @@
             tool_tip="Available only to estate owners, not managers" width="170" />
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
             left="190" name="download_raw_help" width="18" />
-        <button bottom_delta="-20" follows="left|top" height="20" label="Upload RAW terrain..."
+        <button bottom_delta="-23" follows="left|top" height="20" label="Upload RAW terrain..."
             left="10" name="upload_raw_btn"
             tool_tip="Available only to estate owners, not managers" width="170" />
        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_settings_chat.xml b/linden/indra/newview/skins/xui/en-us/panel_settings_chat.xml
deleted file mode 100644
index 1c7aff7..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_settings_chat.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" left="0" name="chat" title="Conversation"
-     width="400">
-        <text bottom="-20" follows="top|left" left="12" width="128">
-                Chat Font Size:
-        </text>
-        <radio_group bottom="-72" follows="top|left" height="60" left="148" name="chat font size"
-             width="128">
-                <radio_item>
-                        Small
-                </radio_item>
-                <radio_item>
-                        Medium
-                </radio_item>
-                <radio_item>
-                        Large
-                </radio_item>
-        </radio_group>
-        <text bottom="-95" follows="top|left" left="12" width="128">
-                Chat Color:
-        </text>
-        <color_swatch bottom="-140" follows="top|left" height="56" label="System" left="148"
-             name="system" width="40" />
-        <color_swatch bottom="-140" follows="top|left" height="56" label="Users" left="210"
-             name="users" width="40" />
-        <color_swatch bottom="-140" follows="top|left" height="56" label="Objects" left="272"
-             name="objects" width="40" />
-        <color_swatch bottom="-140" follows="top|left" height="56" label="Bubble" left="334"
-             name="background" width="40" />
-        <text bottom="-167" follows="top|left" left="12" width="128">
-                Chat Console:
-        </text>
-        <spinner bottom="-173" decimal_digits="0" follows="top|left" increment="1"
-             initial_val="10" label="Fade chat after" label_width="80" left="148"
-             max_val="60" min_val="2" name="fade_chat_time" width="130" />
-        <text bottom="-167" follows="top|left" left="282" width="80">
-                (seconds)
-        </text>
-        <spinner bottom="-170" decimal_digits="0" follows="top|left" increment="1"
-             initial_val="10" label="" label_width="0" left="340" max_val="50"
-             min_val="1" name="max_chat_count" width="60" />
-        <text bottom="-167" follows="top|left" left="405" width="60">
-                (# lines)
-        </text>
-        <slider bottom="-192" follows="top|left" height="12" increment="0.05" initial_val="1"
-             label="Opacity" left="148" name="console_opacity" width="200" />
-        <text bottom_delta="-20" follows="top|left" left="12" width="128">
-                Chat Options:
-        </text>
-        <check_box bottom_delta="-7" follows="top|left"
-             label="Chat uses full screen width (after restart)" left="148"
-             name="chat_full_width_check" />
-        <check_box bottom_delta="-20" follows="top|left" label="Close chat after hitting return"
-             left="148" name="close_chat_on_return_check" />
-        <check_box bottom_delta="-20" follows="top|left"
-             label="Arrow keys move avatar when chatting" left="148"
-             name="arrow_keys_move_avatar_check" />
-        <check_box bottom_delta="-20" follows="top|left" label="Show timestamps in chat"
-             left="148" name="show_timestamps_check" />
-        <text bottom_delta="-20" follows="top|left" left="12" width="128">
-                Bubble Chat:
-        </text>
-        <check_box bottom_delta="-7" follows="top|left" label="Show chat bubbles" left="148"
-             name="bubble_text_chat" />
-        <slider bottom_delta="-20" follows="top|left" height="12" increment="0.05"
-             initial_val="1" label="Opacity" left="148" name="bubble_chat_opacity"
-             width="200" />
-        <text bottom_delta="-20" follows="top|left" left="12" width="128">
-                Script Errors:
-        </text>
-        <check_box bottom_delta="-7" follows="top|left"
-             label="Show script errors and warnings as regular chat" left="148"
-             name="script_errors_as_chat" />
-        <color_swatch bottom_delta="-60" follows="top|left" height="56" label="Color" left="148"
-             name="script_error" width="40" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_settings_im.xml b/linden/indra/newview/skins/xui/en-us/panel_settings_im.xml
deleted file mode 100644
index 3a497fa..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_settings_im.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" left="0" name="im" title="IM" width="400">
-        <text bottom="-20" left="12" width="128">
-                IM Options:
-        </text>
-        <check_box bottom_delta="-5" follows="top|left" label="Send IM to e-mail" left="148"
-             name="send_im_to_email"
-             tool_tip="Change your email address at secondlife.com" />
-        <check_box bottom_delta="-20" follows="top|left" label="Include IM in Chat History"
-             left="148" name="include_im_in_chat_history" />
-        <check_box bottom_delta="-20" follows="top|left" label="Show timestamps in IM" left="148"
-             name="show_timestamps_check" />
-        <text bottom_delta="-20" follows="top|left" left="12" width="128">
-                Busy Mode Response:
-        </text>
-        <text_editor bottom_delta="-60" follows="top|left" font="SansSerifSmall" height="70"
-             left="148" name="busy_response" width="330" word_wrap="true" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_settings_network.xml b/linden/indra/newview/skins/xui/en-us/panel_settings_network.xml
deleted file mode 100644
index 866634c..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_settings_network.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" left="0" name="network" title="Network"
-     width="400">
-        <text bottom="-20" follows="top|left" left="12" width="128">
-                Maximum Bandwidth:
-        </text>
-        <slider bottom_delta="-5" can_edit_text="true" decimal_digits="0" follows="top|left"
-             height="15" increment="10" initial_val="50" label="" left="148"
-             max_val="1000" min_val="50" name="max_bandwidth" width="200" />
-        <text bottom="-20" follows="top|left" left="350" width="140">
-                kbps (kilobits per second)
-        </text>
-        <text bottom_delta="-25" follows="top|left" left="12" width="128">
-                Disk Cache Size:
-        </text>
-        <radio_group bottom_delta="-70" follows="top|left" height="80" left="148" name="disk cache"
-             width="128">
-                <radio_item>
-                        50 MB
-                </radio_item>
-                <radio_item>
-                        200 MB
-                </radio_item>
-                <radio_item>
-                        500 MB
-                </radio_item>
-                <radio_item>
-                        1000 MB
-                </radio_item>
-        </radio_group>
-        <button bottom_delta="-120" follows="left|bottom" height="20" label="Clear Cache"
-             left="148" name="clear_cache" width="128" />
-        <text bottom="-180" follows="top|left" left="12" width="128">
-                Proxy configuration:
-        </text>
-        <check_box bottom_delta="-5" follows="top|left" label="Use proxy" left="148"
-             name="proxy_enabled" tool_tip="Specify the proxy configuration" />
-        <text bottom_delta="-22" follows="top|left" left="148" width="140">
-                Proxy:
-        </text>
-        <line_editor bottom_delta="-8" follows="top|left" font="SansSerifSmall" height="20"
-             left="205" name="proxy_address"
-             tool_tip="The name or IP address of the proxy you would like to use"
-             width="205" word_wrap="false" />
-        <text bottom="-300" follows="left" left="428" width="75">
-                Port:
-        </text>
-        <line_editor bottom_delta="-7" follows="left" font="SansSerifSmall" height="20" left="460"
-             name="proxy_port"
-             tool_tip="The port number of the proxy you would like to use" width="35"
-             word_wrap="false" />
-        <text bottom="-330" follows="left" left="148" width="75">
-                Socks:
-        </text>
-        <radio_group bottom="-265" follows="top|left" height="40" left="205" name="socks_4_5"
-             width="205">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text bottom_delta="-23" follows="top|left" left="148" width="140">
-                No proxy:
-        </text>
-        <line_editor bottom_delta="-5" follows="top|left" font="SansSerifSmall" height="20"
-             left="205" name="proxy_exclusions"
-             tool_tip="The names or IP addresses you don&apos;t want to use the proxy for"
-             width="205" word_wrap="false" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_settings_web.xml b/linden/indra/newview/skins/xui/en-us/panel_settings_web.xml
deleted file mode 100644
index 2df660f..0000000
--- a/linden/indra/newview/skins/xui/en-us/panel_settings_web.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" height="500" left="0" name="web" title="Web"
-     width="400">
-        <check_box follows="top|left"
-             label="Use external web browser (Firefox, Safari, Internet Explorer)"
-             left="150" name="external_browser_check"
-             tool_tip="Use outside web browser for help, web links, etc.\nNot recommended if running full screen."
-             width="480" />
-        <text bottom="-65" follows="top|left" left="15" width="128">
-                Browser home page:
-        </text>
-        <line_editor bottom_delta="-5" follows="top|left" font="SansSerifSmall" height="20"
-             left="150" name="home_page"
-             tool_tip="Web page to visit the first time you use the open the Second Life browser"
-             width="345" word_wrap="false" />
-        <text bottom="-95" follows="top|left" left="15" width="128">
-                Proxy configuration:
-        </text>
-        <check_box bottom_delta="-5" follows="top|left" label="Use proxy for internal Web browser"
-             left="148" name="proxy_enabled"
-             tool_tip="Specify the proxy configuration for the internal Web Browser" />
-        <text bottom_delta="-22" follows="top|left" left="180" width="140">
-                Proxy:
-        </text>
-        <line_editor bottom_delta="-5" follows="top|left" font="SansSerifSmall" height="20"
-             left="260" name="proxy_address"
-             tool_tip="The name or IP address of the proxy you would like to use"
-             width="165" word_wrap="false" />
-        <text bottom="285" follows="left" left="432" width="75">
-                Port:
-        </text>
-        <line_editor bottom="280" follows="left" font="SansSerifSmall" height="20" left="460"
-             name="proxy_port"
-             tool_tip="The port number of the proxy you would like to use" width="35"
-             word_wrap="false" />
-        <text bottom_delta="-15" follows="left" left="180" width="75">
-                Socks:
-        </text>
-        <radio_group bottom="325" follows="top|left" height="40" left="260" name="socks_4_5"
-             width="235">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text bottom_delta="-23" follows="top|left" left="180" width="140">
-                No proxy for:
-        </text>
-        <line_editor bottom_delta="-5" follows="top|left" font="SansSerifSmall" height="20"
-             left="260" name="proxy_exclusions"
-             tool_tip="The names or IP addresses you don&apos;t want to use the proxy for"
-             width="235" word_wrap="false" />
-        <check_box bottom_delta="-30" follows="top|left"
-             label="Show web pages on objects (experimental, requires restart)"
-             left="150" name="web_pages_on_prims_check" width="480" />
-        <text bottom_delta="-16" follows="top|left" left="15" width="140">
-                Trusted sites:
-(log in to view)
-        </text>
-        <scroll_list bottom_delta="-95" follows="top|left" height="100" left="155"
-             name="trusted_sites_list" width="340" />
-        <button bottom_delta="-25" follows="top|left" height="20" label="Add" left="150"
-             name="add_trusted" width="100" />
-        <line_editor bottom_delta="-1" follows="top|left" font="SansSerifSmall" height="20"
-             left="260" name="trusted_site_entry"
-             tool_tip="The site to add to the trusted list" width="235"
-             word_wrap="false" />
-        <button bottom_delta="-25" follows="top|left" height="20" label="Remove" left="150"
-             name="rem_trusted" width="100" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
index ec55c55..1a9b6a8 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_speaker_controls.xml
@@ -4,8 +4,8 @@
        <string name="moderator_label">
                (Moderator)
        </string>
-        <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="120" left="0"
+        <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="123" left="0"
-             orientation="vertical" tab_group="1" width="140">
+             orientation="vertical" tab_group="1" width="140" name="panels">
                <layout_panel auto_resize="false" bottom="0" can_resize="false" height="25" left="0"
                     min_height="25" name="moderation_mode_panel" top_delta="0"
                     user_resize="false" visible="false" width="140">
@@ -33,21 +33,21 @@
                        <panel border="false" bottom="0" can_resize="false" follows="left|bottom|right"
                             height="77" left="0" mouse_opaque="true" name="speaker_controls"
                             width="140">
-                                <button bottom="-28" enabled="false" follows="left|top" height="24"
+                                <button bottom="-28" enabled="false" follows="left|top" height="20"
-                                     image_overlay="icon_avatar_offline.tga" label="" left="0"
+                                     image_overlay="icon_avatar_offline.tga" label="" left="4"
-                                     name="profile_btn" right="30" />
+                                     name="profile_btn" right="34" scale_image="true"/>
                                <text bottom_delta="9" follows="left|top|right" font="SansSerif" left_delta="34"
                                     name="resident_name" valign="center" width="140">
                                        Rumplstiltskin Califragilistic
                                </text>
                                <volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05"
-                                     initial_val="0.5" left="5" max_val="1.0" min_val="0.0"
+                                     initial_val="0.5" left="0" max_val="1.0" min_val="0.0"
                                     name="speaker_volume" width="110" />
                                <button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
                                     image_unselected="icn_speaker_dark.tga" label="" left_delta="110"
                                     name="mute_btn" tool_tip="Mute voice for this resident" width="25" />
                                <check_box bottom_delta="-25" enabled="false" follows="left|top" height="25"
-                                     label="Mute Text" left="4" name="mute_text_btn" width="50" />
+                                     label="Mute Text" left="3" name="mute_text_btn" width="50" />
                        </panel>
                </layout_panel>
                <layout_panel auto_resize="false" bottom="0" can_resize="false" height="60" left="0"
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 9f39fd6..1def3fb 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
@@ -7,30 +7,30 @@
             bottom="-22" drop_shadow_visible="true" enabled="true"
             follows="left|right|bottom" font="SansSerifSmall" h_pad="0" halign="left"
             height="18" hover="true" left="561" mouse_opaque="true"
-             name="ParcelNameText"
+             name="ParcelNameText" text_color="ParcelTextColor" hover_color="ParcelHoverColor"
             tool_tip="Name of land parcel on which you are standing. Click for About Land."
             v_pad="2" width="1039">
                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"
+             bottom="-20" disabled_color="BalanceTextColor" drop_shadow_visible="true"
             enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
             halign="right" height="18" left="-210" mouse_opaque="true"
-             name="BalanceText" text_color="0 1 0 1" tool_tip="Account Balance"
+             name="BalanceText" text_color="BalanceTextColor" tool_tip="Account Balance"
             v_pad="2" width="76">
                Loading...
        </text>
-        <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
+        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerif"
             halign="center" height="16"
             image_selected="status_buy_currency_pressed.tga"
             image_unselected="status_buy_currency.tga" label="" label_selected=""
             left="-210" mouse_opaque="true" name="buycurrency" scale_image="true"
             tool_tip="Buy currency" width="16" />
        <text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-20" disabled_color="1 1 1 1" drop_shadow_visible="true"
+             bottom="-20" disabled_color="TimeTextColor" drop_shadow_visible="true"
             enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
             halign="right" height="18" left="-300" mouse_opaque="true" name="TimeText"
-             text_color="1 1 1 1" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
+             text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
                12:00 AM
        </text>
        <string name="StatBarDaysOfWeek">
@@ -50,10 +50,10 @@
             mouse_opaque="true" name="health" scale_image="false" tool_tip="Health"
             visible="false" width="24" />
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-18" disabled_color="1 1 1 1" drop_shadow_visible="true"
+             bottom="-18" disabled_color="HealthTextColor" drop_shadow_visible="true"
             enabled="true" follows="rsight|bottom" font="SansSerifSmall" h_pad="0"
             halign="left" height="18" left="418" mouse_opaque="true" name="HealthText"
-             text_color="1 1 1 1" tool_tip="Health" v_pad="2" visible="false" width="31">
+             text_color="HealthTextColor" tool_tip="Health" v_pad="2" visible="false" width="31">
                100%
        </text>
        <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
@@ -81,27 +81,38 @@
             image_unselected="status_no_voice.tga" label="" label_selected=""
             left="545" mouse_opaque="true" name="status_no_voice" scale_image="false"
             tool_tip="Voice not available here" visible="false" width="24" />
-        <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
+        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerif"
             halign="center" height="16" image_selected="status_buy_land_pressed.tga"
             image_unselected="status_buy_land.tga" label="" label_selected=""
-             left="569" mouse_opaque="true" name="buyland" scale_image="true"
+             left="576" mouse_opaque="true" name="buyland" scale_image="true"
             tool_tip="Buy this parcel" visible="false" width="16" />
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-18"
+  <!-- Totally unsexy button hack to get a sexy bevel for sexy search bevel -brent -->
+  <button bottom="-17" height="16" left="-97" width="96" 
+          image_unselected="sm_rounded_corners_simple.tga"
+          image_selected="sm_rounded_corners_simple.tga"
+          image_hover_selected="sm_rounded_corners_simple.tga"
+          image_hover_unselected="sm_rounded_corners_simple.tga"
+          image_disabled_selected="sm_rounded_corners_simple.tga"
+          image_disabled="sm_rounded_corners_simple.tga"
+          label="" scale_image="true" enabled="true" mouse_opaque="false" name="menubar_search_bevel_bg" />
+  <line_editor bevel_style="none" border_style="line" border_thickness="0" bottom="-16"
             commit_on_focus_lost="false" enabled="true" follows="right|bottom"
-             font="SansSerif" handle_edit_keys_directly="false" height="20"
+             font="SansSerifSmall" handle_edit_keys_directly="false" height="13"
-             label="Search" left="-125" max_length="254" mouse_opaque="true"
+             label="Search" left="-95" max_length="254" mouse_opaque="true"
             name="search_editor" select_all_on_focus_received="false"
             select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
-             width="104" />
+             width="80" />
-        <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
+        <button bottom="-16" enabled="true" follows="right|bottom" font="SansSerifSmall"
-             halign="center" height="20" image_disabled="status_search.tga"
+             halign="center" height="12" image_disabled="status_search.tga"
             image_disabled_selected="status_search.tga"
             image_selected="status_search.tga" image_unselected="status_search.tga"
-             label="" label_selected="" left="-20" mouse_opaque="true" name="search_btn"
+             label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
-             tool_tip="Search Second Life" width="20" />
+             tool_tip="Search Second Life" width="12" scale_image="true"/>
        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-17" enabled="false" follows="right|bottom" font="SansSerifSmall"
+             bottom="-16" enabled="false" follows="right|bottom" font="SansSerifSmall"
-             halign="center" height="20" hidden="false" left="-20" mouse_opaque="true"
+             halign="center" height="12" left="-20" mouse_opaque="true"
             name="stat_btn" width="20" />
        <string name="packet_loss_tooltip">
                Packet Loss
diff --git a/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml b/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
index da06c58..1009b3d 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_toolbar.xml
@@ -1,34 +1,77 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel background_opaque="true" background_visible="true" bottom="0" can_close="true"
+<panel background_opaque="false" background_visible="false" bottom="0" can_close="true"
     can_minimize="false" can_resize="false" follows="left|right|bottom"
-     height="26" name="toolbar" width="1024">
+     height="28" name="toolbar" width="1024">
-        <string name="Redock Windows">
+    
-                Redock Windows
+  <string name="Redock Windows">Redock Windows</string>
-        </string>
+  <panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024" />
-        <button bottom="0" font="SansSerif" height="24" image_overlay="icn_chatbar.tga"
+  <layout_stack name="toolbar_stack" follows="left|right|bottom|top" bottom="2" left="1" width="1022" height="26" min_width="200" min_height="26"  orientation="horizontal" border_size="0">
-             image_selected="btn_chatbar_selected.tga"
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" left="0" />
-             image_unselected="btn_chatbar.tga" label="" left="0" name="chat_btn"
+    <button bottom="0" font="SansSerif" height="24"
-             scale_image="true" tool_tip="Show Chat Bar. (Enter)" width="50" />
+               image_selected="btn_chatbar_selected.tga" scale_image="true"
-        <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"
+               image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn"
-             list_position="above" name="communicate_btn"
+               image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"
-             tool_tip="Communicate with your Friends and Groups." width="50" />
+               width="50" auto_resize="false" follows="left|right" user_resize="false"/>
-        <button bottom="0" font="SansSerif" height="24" label="Fly"
+    <icon image_name="spacer24.tga" left_delta="2" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-             label_selected="Stop Flying" left="0" name="fly_btn"
+     <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"
-             tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
+               name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
-             width="50" />
+               list_position="above"
-        <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
+               width="50" follows="left|right" user_resize="false"/>
-             name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory."
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-             width="50" />
+    <button bottom="0" font="SansSerif" height="24" label="Fly"
-        <button bottom="0" font="SansSerif" height="24" label="Search" left="0"
+        image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
-             name="directory_btn"
+                        image_selected="toolbar_btn_selected.tga"
-             tool_tip="Search for places, events, people, and more." width="50" />
+             image_unselected="toolbar_btn_enabled.tga"
-        <button bottom="0" font="SansSerif" height="24" label="Build" left="0" name="build_btn"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-             tool_tip="Create new objects." width="50" />
+               label_selected="Stop Flying" left="0" name="fly_btn"
-        <button bottom="0" font="SansSerif" height="24" label="Mini-Map" left="0"
+               tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
-             name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)"
+               width="50" follows="left|right" user_resize="false"/>
-             width="50" />
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
-        <button bottom="0" font="SansSerif" height="24" label="Map" left="0" name="map_btn"
+    <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
-             tool_tip="Map of the world. (Ctrl-M)" width="50" />
+             image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"
-        <button bottom="0" font="SansSerif" height="24" label="Inventory" left="0"
+                        image_selected="toolbar_btn_selected.tga"
-             name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" />
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory."
+               width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+    <button bottom="0" font="SansSerif" height="24" label="Search" left="0"
+             image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left"
+             image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="directory_btn"
+               tool_tip="Search for places, events, people, and more." width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+    <button bottom="0" font="SansSerif" height="24" label="Build" left="0" name="build_btn"
+                         image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               tool_tip="Create new objects." width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+    <button bottom="0" font="SansSerif" height="24" label="Map" left="0" name="map_btn"
+                         image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+    <button bottom="0" font="SansSerif" height="24" label="Mini-Map" left="0"
+                         image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)"
+               width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+    <button bottom="0" font="SansSerif" height="24" label="Inventory" left="0"
+                         image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left"
+                        image_selected="toolbar_btn_selected.tga"
+             image_unselected="toolbar_btn_enabled.tga"
+             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
+               name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" user_resize="false"/>
+    <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" />
+  </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_top_pick.xml b/linden/indra/newview/skins/xui/en-us/panel_top_pick.xml
index 58e4c43..03d0919 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_top_pick.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_top_pick.xml
@@ -3,14 +3,14 @@
     name="Pick" title="Pick" width="450">
        <texture_picker bottom="-315" follows="left|top" height="300" left="20" name="snapshot_ctrl"
             width="400" />
-        <line_editor bg_readonly_color="clear" bottom_delta="-8" enabled="false" follows="left|top"
+        <line_editor bottom_delta="-8" enabled="false" follows="left|top"
             font="SansSerif" height="20" left="20" name="given_name_editor"
-             text_readonly_color="white" width="400" />
+             width="400" />
-        <text_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
+        <text_editor enabled="false" follows="left|top" font="SansSerif"
             height="90" left="20" max_length="1023" name="desc_editor"
-             text_readonly_color="white" width="400" word_wrap="true" />
+             width="400" word_wrap="true" />
-        <line_editor bg_readonly_color="clear" enabled="false" follows="left|top" font="SansSerif"
+        <line_editor enabled="false" follows="left|top" font="SansSerif"
-             height="20" left="20" name="location_editor" text_readonly_color="white"
+             height="20" left="20" name="location_editor" 
             width="400" />
        <button bottom_delta="0" follows="left|top" height="20" label="Set" left="380"
             name="set_location_btn" width="60" />
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
index fa41dd4..ee476f2 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_controls.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="2"
     enabled="true" follows="right|bottom" height="20" left="0"
-     mouse_opaque="true" name="voice_controls" width="128">
+     mouse_opaque="true" name="voice_controls" width="130">
-        <button bottom="-22" height="22" image_overlay="active_speakers.tga" label="" left="2"
+        <button bottom="-21" height="20" image_overlay="active_speakers.tga" label="" left="3"
             name="speakers_btn"
-             tool_tip="Show list of residents using voice chat around you" width="38" />
+             tool_tip="Show list of residents using voice chat around you" width="36" />
-        <button bottom="-22" height="22" label="Talk" left_delta="40" name="push_to_talk"
+        <button bottom="-21" height="20" label="Talk" left_delta="38" name="push_to_talk"
-             tab_stop="false" tool_tip="Hold the button to talk" width="64" />
+             tab_stop="false" tool_tip="Hold the button to talk" width="63" />
        <button bottom="-19" height="16" image_selected="ptt_lock_on.tga"
-             image_unselected="ptt_lock_off.tga" label="" left_delta="4" name="ptt_lock"
+             image_unselected="ptt_lock_off.tga" label="" left_delta="2" name="ptt_lock"
-             scale_image="true" toggle="true"
+             scale_image="false" toggle="true"
             tool_tip="Click lock to switch to talk mode" width="16" />
-        <icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="40"
+        <icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="42"
             name="voice_volume" width="16" />
-        <button bottom="-22" control_name="ShowVoiceChannelPopup" height="22" label=""
+        <button bottom="-21" control_name="ShowVoiceChannelPopup" height="20" label=""
-             left_delta="20" name="show_channel" scale_image="true" toggle="true"
+             left_delta="21" name="show_channel" scale_image="true" toggle="true"
-             tool_tip="Click to show current voice channel" width="22" />
+             tool_tip="Click to show current voice channel" width="20" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
index 78447c5..fdec2f4 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml
@@ -34,4 +34,4 @@
             name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true">
                Click the Next button to configure Voice Chat preferences or click Finish to continue using Second Life.
        </text_editor>
-</panel>
+</panel>
+\ No newline at end of file
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
index 4569db0..c785e72 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_remote.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
     enabled="true" follows="right|bottom" height="20" left="0"
     mouse_opaque="true" name="voice_remote" use_bounding_rect="true"
-     width="128">
+     width="130">
-        <panel bottom="0" filename="panel_bg_tab.xml" height="22" left="0" width="128" />
+        <panel bottom="1" filename="panel_bg_tab.xml" height="22" left="0" width="130" />
-        <panel bottom="0" filename="panel_voice_controls.xml" height="20" left="0" width="127" />
+        <panel bottom="3" filename="panel_voice_controls.xml" height="20" left="1" width="130" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml
index 27199d5..7464467 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_remote_expanded.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
     follows="right|bottom" height="45" left="0" mouse_opaque="true"
-     name="voice_remote" use_bounding_rect="true" width="128">
+     name="voice_remote" use_bounding_rect="true" width="130">
-        <panel bottom="0" filename="panel_bg_tab.xml" height="47" left="0" width="128" />
+        <panel bottom="1" filename="panel_bg_tab.xml" height="47" left="0" width="130" />
-        <button bottom="-23" height="22" image_overlay="icn_voice-call-end.tga" label=""
+        <button bottom="-20" height="20" image_overlay="icn_voice-call-end.tga" label=""
-             left="2" name="end_call_btn" tool_tip="Click to hang up" width="24" />
+             left="4" name="end_call_btn" tool_tip="Click to hang up" width="20" />
-        <button bottom="-23" height="23" image_disabled="icn_rounded-text-field.tga"
+        <button bottom="-21" height="22" image_disabled="icn_rounded-text-field.tga"
             image_disabled_selected="icn_rounded-text-field.tga"
             image_hover_selected="icn_rounded-text-field.tga"
             image_hover_unselected="icn_rounded-text-field.tga"
             image_selected="icn_rounded-text-field.tga"
-             image_unselected="icn_rounded-text-field.tga" label="" left_delta="26"
+             image_unselected="icn_rounded-text-field.tga" label="" left_delta="23"
-             name="voice_channel_bg" scale_image="true" width="97" />
+             name="voice_channel_bg" scale_image="true" width="102" />
-        <icon bottom="-20" height="16" image_name="icn_voice-localchat.tga" label=""
+        <icon bottom="-18" height="16" image_name="icn_voice-localchat.tga" label=""
-             left_delta="7" mouse_opaque="false" name="voice_channel_icon" width="16" />
+             left_delta="4" mouse_opaque="false" name="voice_channel_icon" width="16" />
-        <text bottom="-21" font="SansSerifSmall" height="16" label="" left_delta="18"
+        <text bottom="-19" font="SansSerifSmall" height="16" label="" left_delta="18"
             mouse_opaque="false" name="channel_label" text_color="0 0 0" width="65" />
-        <panel bottom_delta="-14" filename="panel_voice_controls.xml" left="0" />
+        <panel bottom="13" filename="panel_voice_controls.xml" left="1" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/es/floater_critical.xml b/linden/indra/newview/skins/xui/es/floater_critical.xml
index 4bfefe3..92c996d 100644
--- a/linden/indra/newview/skins/xui/es/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/es/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">
        <button label="Continuar" label_selected="Continuar" name="Continue" />
        <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
-        <text name="tos_title">
-                Mensaje crítico
-        </text>
        <text name="tos_heading">
                Por favor, lea los mensajes siguientes con cuidado
        </text>
diff --git a/linden/indra/newview/skins/xui/es/floater_friends.xml b/linden/indra/newview/skins/xui/es/floater_friends.xml
deleted file mode 100644
index e5f9a2a..0000000
--- a/linden/indra/newview/skins/xui/es/floater_friends.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="friends" title="Amigos">
-        <scroll_list name="friend_list"
-             tool_tip="Hold shift or control while clicking to select multiple friends">
-                <column label="Name" name="friend_name" />
-        </scroll_list>
-        <panel name="rights_container">
-                <check_box label="Can see my online status" name="online_status_cb"
-                     tool_tip="Set whether this friend see my online status in their friends list or calling cards" />
-                <check_box label="Can see me on the map" name="map_status_cb"
-                     tool_tip="Set whether this friend see my location on their map" />
-                <check_box label="Can modify my objects" name="modify_status_cb"
-                     tool_tip="Set whether this friend can modify my objects" />
-                <text name="process_rights_label">
-                        Processing rights change...
-                </text>
-        </panel>
-        <button label="MI" name="im_btn" tool_tip="Abrir sesión de mensaje instantáneo" />
-        <button label="Teleport..." name="offer_teleport_btn"
-             tool_tip="Ofrecer a este amigo un teletransporte para su posición actual" />
-        <button label="Adicionar..." name="add_btn" tool_tip="Ofrecer amistad a este residente" />
-        <button label="Perfil" name="profile_btn"
-             tool_tip="Mostrar figura, grupos y otras informaciones" />
-        <button label="Pagar..." name="pay_btn"
-             tool_tip="Dar (L$) Linden dólares a este amigo" />
-        <button label="Remover..." name="remove_btn"
-             tool_tip="Remover esta persona de su lista de amigos" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/es/floater_groups.xml b/linden/indra/newview/skins/xui/es/floater_groups.xml
deleted file mode 100644
index d5908fc..0000000
--- a/linden/indra/newview/skins/xui/es/floater_groups.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="Grupos">
-        <text name="groupdesc">
-                Su grupo activo actualmente es exhibido en negrito.
-        </text>
-        <text name="groupcount">
-                Usted pertenece a [COUNT] grupos (de un máximo de [MAX]).
-        </text>
-        <button label="Activar" label_selected="Activar" name="Activate" />
-        <button label="Información" label_selected="Información" name="Info" />
-        <button label="Dejar" label_selected="Dejar" name="Leave" />
-        <button label="Crear" label_selected="Crear" name="Create" />
-        <button label="Buscar..." label_selected="Buscar..." name="Search..." />
-        <button label="Cerrar" label_selected="Cerrar" name="Close" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/es/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/es/floater_preview_new_landmark.xml
deleted file mode 100644
index c5766ab..0000000
--- a/linden/indra/newview/skins/xui/es/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="landmark_preview">
-        <button label="Teletransportar" label_selected="" name="Teleport btn" />
-        <button label="Mostrar en el mapa" label_selected="" name="Show on Map btn" />
-        <button label="Descartar" label_selected="" name="Discard btn" />
-        <text type="string" length="1" name="desc txt">
-                Descripción:
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/es/floater_rate.xml b/linden/indra/newview/skins/xui/es/floater_rate.xml
deleted file mode 100644
index 3a344f5..0000000
--- a/linden/indra/newview/skins/xui/es/floater_rate.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="rate" title="Su valoración de Jeska Linden">
-        <radio_group name="behavior">
-                <radio_item type="string" length="1" name="Positive">
-                        Positivo
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        No Valorado
-                </radio_item>
-        </radio_group>
-        <radio_group name="appearance">
-                <radio_item type="string" length="1" name="Positive">
-                        Positivo
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        No Valorado
-                </radio_item>
-        </radio_group>
-        <radio_group name="building">
-                <radio_item type="string" length="1" name="Positive">
-                        Positivo
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        No Valorado
-                </radio_item>
-        </radio_group>
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
-        <text type="string" length="1" name="Overall behavior:">
-                Comportamiento general:
-        </text>
-        <text type="string" length="1" name="Skill at appearance (clothing and attachments):">
-                Habilidad en la apariencia (ropa y anexos):
-        </text>
-        <text type="string" length="1" name="Skill at building:">
-                Habilidad en la construcción:
-        </text>
-        <text type="string" length="1" name="Message:">
-                Mensaje:
-        </text>
-        <text type="string" length="1" name="cost">
-                Coste: L$[COST] para cambiar cada valoración.  Total: L$[TOTAL].
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/es/menu_viewer.xml b/linden/indra/newview/skins/xui/es/menu_viewer.xml
index 635a7ff..bb67d7c 100644
--- a/linden/indra/newview/skins/xui/es/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/es/menu_viewer.xml
@@ -14,7 +14,6 @@
                <menu_item_call label="Tirar foto instatánea" name="Take Snapshot" />
                <menu_item_call label="Foto instatánea para el disco" name="Snapshot to Disk" />
                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Empezar/Parar vídeo para el disco" name="Start/Stop Movie to Disk" />
                <menu label="Definir tamaño de la ventana" name="Set Window Size">
                        <menu_item_call label="320x240" name="320x240" />
                        <menu_item_call label="640x480" name="640x480" />
@@ -127,6 +126,7 @@
                <menu_item_separator label="-----------" name="separator3" />
                <menu_item_call label="Definir como ausente" name="Set Away" />
                <menu_item_call label="Definir como ocupado" name="Set Busy" />
+                <menu_item_call label="Parar todas las animaciones" name="Stop All Animations" />
                <menu_item_separator label="-----------" name="separator4" />
                <menu_item_call label="Historial de cuenta..." name="Account History..." />
                <menu_item_call label="Administrar mi cuenta..." name="Manage My Account..." />
@@ -171,7 +171,6 @@
                <menu_item_call label="Unir" name="Link" />
                <menu_item_call label="Separar" name="Unlink" />
                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Parar todas las animaciones" name="Stop All Animations" />
                <menu_item_separator label="-----------" name="separator5" />
                <menu_item_call label="Foco en la selección" name="Focus on Selection" />
                <menu_item_call label="Acercar en la selección" name="Zoom to Selection" />
diff --git a/linden/indra/newview/skins/xui/es/panel_music_remote.xml b/linden/indra/newview/skins/xui/es/panel_music_remote.xml
deleted file mode 100644
index 2d3a88d..0000000
--- a/linden/indra/newview/skins/xui/es/panel_music_remote.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="music_remote">
-        <text type="string" length="6" name="text">
-                Music
-        </text>
-        <volume_slider name="volume_slider"
-             tool_tip="Cambie el volumen usando este control deslizante" />
-        <button label="" label_selected="" name="stop_btn" tool_tip="Parar multimedia" />
-        <button label="" label_selected="" name="play_btn"
-             tool_tip="Reproducir streaming de multimedia" />
-        <button label="" label_selected="" name="pause_btn"
-             tool_tip="Pausar streaming de multimedia" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/es/panel_preferences_graphics2.xml
deleted file mode 100644
index a2a74ff..0000000
--- a/linden/indra/newview/skins/xui/es/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Detalles gráficos" name="Display panel 3">
-        <text type="string" length="1" name="text">
-                Sombra:
-        </text>
-        <check_box label="Activar Bumpmapping y brillo" name="bumpshiny" />
-        <check_box label="Activar ondas en la água" name="ripple" />
-        <check_box label="Programa de vertex del avatar" name="avatarvp" />
-        <text type="string" length="1" name="Avatar Rendering:">
-                Reconstrucción de avatar:
-        </text>
-        <radio_group name="Avatar Appearance">
-                <radio_item type="string" length="1" name="Normal">
-                        Normal
-                </radio_item>
-                <radio_item type="string" length="1" name="Bump">
-                        Bump Mapeado
-                </radio_item>
-                <radio_item type="string" length="1" name="Cloth">
-                        Bump Mapeado &amp; Cloth
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Lighting Detail:">
-                Detalle de iluminación:
-        </text>
-        <radio_group name="lighting detail radio">
-                <radio_item type="string" length="1" name="SunMoon">
-                        Sol y luna solamente
-                </radio_item>
-                <radio_item type="string" length="1" name="LocalLights">
-                        Próximo local visible
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Terrain Detail:">
-                Detalles de terreno:
-        </text>
-        <radio_group name="terrain detail radio">
-                <radio_item type="string" length="1" name="0">
-                        Bajo
-                </radio_item>
-                <radio_item type="string" length="1" name="2">
-                        Alto
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Object Mesh Detail:">
-                Detalle del objeto de red:
-        </text>
-        <text type="string" length="1" name="Flexible Mesh Detail:">
-                Detalles de red flexible:
-        </text>
-        <text type="string" length="1" name="Tree Mesh Detail:">
-                Detalle del árbol de red:
-        </text>
-        <text type="string" length="1" name="Avatar Mesh Detail:">
-                Detalle del avatar:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/es/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/es/panel_preferences_graphics3.xml
deleted file mode 100644
index 108a993..0000000
--- a/linden/indra/newview/skins/xui/es/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Adv. Gráficos" name="Display panel 2">
-        <text type="string" length="1" name="Filtering:">
-                Filtración:
-        </text>
-        <check_box label="Filtración anisotrópica (más lento cuando activado)" name="ani" />
-        <spinner label="Gama:" name="gamma" />
-        <text type="string" length="1" name="(brightness, lower is brighter)">
-                (brillo, bajo es brillante, 0=usar patrón)
-        </text>
-        <spinner label="Brillo nocturno:" name="nighttime_brightness" />
-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)">
-                (Más alto es brillante, 1.0 es patrón)
-        </text>
-        <text type="string" length="1" name="AGP Graphics Card:">
-                Placa de vídeo AGP:
-        </text>
-        <check_box label="Activar AGP (más rápido si usar placa de vídeo AGP)" name="agp"
-             tool_tip="Activar podrá reducir el desempeño y usar más memoria si está usando una placa de vídeo PCI patrón." />
-        <text type="string" length="1" name="Graphics Card Memory:">
-                Memoria de la placa de vídeo:
-        </text>
-        <radio_group name="video card memory radio">
-                <radio_item type="string" length="1" name="radio">
-                        16MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        32MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        64MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4">
-                        128MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio5">
-                        256MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio6">
-                        512MB
-                </radio_item>
-        </radio_group>
-        <spinner label="Tasa de distancia de la neblina:" name="fog" />
-        <spinner label="Max. de Recuento de partícula:" name="particles" />
-        <spinner label="Límite de la composición del vestuario:" name="comp limit"
-             tool_tip="Número de vestuarios cambiados recientemente" />
-        <text type="string" length="1" name="(lower is faster)">
-                (bajo es más rápido)
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/es/panel_settings_chat.xml b/linden/indra/newview/skins/xui/es/panel_settings_chat.xml
deleted file mode 100644
index d89277e..0000000
--- a/linden/indra/newview/skins/xui/es/panel_settings_chat.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat" title="Conversación">
-        <text>
-                Tamaño de la fuente del chat:
-        </text>
-        <radio_group name="chat font size">
-                <radio_item>
-                        Pequeño
-                </radio_item>
-                <radio_item>
-                        Medio
-                </radio_item>
-                <radio_item>
-                        Grande
-                </radio_item>
-        </radio_group>
-        <text>
-                Color del chat:
-        </text>
-        <color_swatch label="Sistema" name="system" />
-        <color_swatch label="Usuarios" name="users" />
-        <color_swatch label="Objetos" name="objects" />
-        <color_swatch label="Burbuja" name="background" />
-        <text>
-                Consola del chat:
-        </text>
-        <spinner label="Desaparecer chat después de" name="fade_chat_time" />
-        <text>
-                (segundos)
-        </text>
-        <spinner label="" name="max_chat_count" />
-        <text>
-                (# líneas)
-        </text>
-        <slider label="Opacidad" name="console_opacity" />
-        <text>
-                Opciones del chat:
-        </text>
-        <check_box label="Chat usa anchura de pantalla completa (después de reinicio)"
-             name="chat_full_width_check" />
-        <check_box label="Cerrar chat después de pulsar Enter" name="close_chat_on_return_check" />
-        <check_box label="Flechas de dirección mueven avatar durante charla"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="Mostrar fecha/hora en el chat" name="show_timestamps_check" />
-        <text>
-                Burbuja de chat:
-        </text>
-        <check_box label="Mostrar burbujas de chat" name="bubble_text_chat" />
-        <slider label="Opacidad" name="bubble_chat_opacity" />
-        <text>
-                Errores de script:
-        </text>
-        <check_box label="Mostrar errores de script y avisos como chat convencional"
-             name="script_errors_as_chat" />
-        <color_swatch label="Color" name="script_error" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/es/panel_settings_im.xml b/linden/indra/newview/skins/xui/es/panel_settings_im.xml
deleted file mode 100644
index ea8068a..0000000
--- a/linden/indra/newview/skins/xui/es/panel_settings_im.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="im" title="MI">
-        <text>
-                Opciones de MI:
-        </text>
-        <check_box label="Enviar MI para email" name="send_im_to_email"
-             tool_tip="Cambie su dirección de email en secondlife.com" />
-        <check_box label="Incluir MI en el historial de chat" name="include_im_in_chat_history" />
-        <check_box label="Mostrar fecha/hora en la MI" name="show_timestamps_check" />
-        <text>
-                Respuesta del modo ocupado:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/es/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/es/panel_settings_msgbox.xml
deleted file mode 100644
index 379731a..0000000
--- a/linden/indra/newview/skins/xui/es/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Popups" name="popups" title="Popups">
-        <text>
-                No exhibir popups:
-        </text>
-        <button label="Activar esta popup" name="enable_popup" />
-        <text>
-                Mostrar popups:
-        </text>
-        <button label="Restaurar cajas de diálogo &apos;Mostrar en la próxima vez&apos;..."
-             name="reset_dialogs_btn" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/es/panel_settings_network.xml b/linden/indra/newview/skins/xui/es/panel_settings_network.xml
deleted file mode 100644
index da0acd7..0000000
--- a/linden/indra/newview/skins/xui/es/panel_settings_network.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="network" title="Red">
-        <text>
-                Amplitud de banda máxima:
-        </text>
-        <slider label="" name="max_bandwidth" />
-        <text>
-                kbps (kilobits por segundo)
-        </text>
-        <text>
-                Tamaño del cache de disco:
-        </text>
-        <radio_group name="disk cache">
-                <radio_item>
-                        50 MB
-                </radio_item>
-                <radio_item>
-                        200 MB
-                </radio_item>
-                <radio_item>
-                        500 MB
-                </radio_item>
-                <radio_item>
-                        1000 MB
-                </radio_item>
-        </radio_group>
-        <button label="Limpiar cache" name="clear_cache" />
-        <text>
-                Configuración del proxy:
-        </text>
-        <check_box label="Usar proxy" name="proxy_enabled"
-             tool_tip="Especifiar configuración del proxy" />
-        <text>
-                Proxy:
-        </text>
-        <line_editor name="proxy_address"
-             tool_tip="El nombre o dirección de IP del proxy que le gustaría usar" />
-        <text>
-                Puerta:
-        </text>
-        <line_editor name="proxy_port"
-             tool_tip="El número de la puerta del proxy que le gustaría usar" />
-        <text>
-                Calcetines:
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                Sin proxy:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="Los nombres o direcciones de IP que no&apos; le gustaría usar como proxy" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/es/panel_settings_web.xml b/linden/indra/newview/skins/xui/es/panel_settings_web.xml
deleted file mode 100644
index 672515e..0000000
--- a/linden/indra/newview/skins/xui/es/panel_settings_web.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="web" title="Web">
-        <check_box label="Usar navegador de internet externo (Firefox, Safari, Internet Explorer)"
-             name="external_browser_check"
-             tool_tip="Usar navegador externo para ayuda, links de internet, etc.\nNo recomendable si funciona en pantalla completa." />
-        <text>
-                Explorar página inicial:
-        </text>
-        <line_editor name="home_page"
-             tool_tip="Página de la internet a visitar primero cuando abra el navegador de Second Life" />
-        <text>
-                Configuración del proxy:
-        </text>
-        <check_box label="Usar proxy para navegador de internet interno" name="proxy_enabled"
-             tool_tip="Especificar la configuración del proxy para el navegador interno de internet" />
-        <text>
-                Proxy:
-        </text>
-        <line_editor name="proxy_address"
-             tool_tip="El nombre o dirección de IP del proxy que le gustaría usar" />
-        <text>
-                Puerta:
-        </text>
-        <line_editor name="proxy_port"
-             tool_tip="El número de la puerta del proxy que le gustaría usar" />
-        <text>
-                Calcetines:
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                Sin proxy para:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="Los nombres o direcciones de IP que no&apos; le gustaría usar como proxy" />
-        <check_box
-             label="Mostrar páginas de internet en los objetos (experimental, requiere reinicio)"
-             name="web_pages_on_prims_check" />
-        <text>
-                Sitios confiables:
-(regístrese para ver)
-        </text>
-        <button label="Adicionar" name="add_trusted" />
-        <line_editor name="trusted_site_entry"
-             tool_tip="El sitio a adicionar en la lista de confiables" />
-        <button label="Remover" name="rem_trusted" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/es/panel_toolbar.xml b/linden/indra/newview/skins/xui/es/panel_toolbar.xml
index bd20679..b804f95 100644
--- a/linden/indra/newview/skins/xui/es/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/es/panel_toolbar.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="toolbar">
+        <layout_stack name="toolbar_stack">
        <button label="MI" name="im_btn"
             tool_tip="Enviar mensaje instantáneo para sus amigos." />
        <button label="Chat" name="chat_btn" tool_tip="Talk to people nearby. (Enter)" />
@@ -16,4 +17,5 @@
             tool_tip="Mapa de la área a su rededor. (Ctrl-Shift-M)" />
        <button label="Mapa" name="map_btn" tool_tip="Mapa del mundo. (Ctrl-M)" />
        <button label="Inventario" name="inventory_btn" tool_tip="Sus ítems. (Ctrl-I)" />
+  </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/fr/floater_critical.xml b/linden/indra/newview/skins/xui/fr/floater_critical.xml
index 46a14ba..f7b55c8 100644
--- a/linden/indra/newview/skins/xui/fr/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/fr/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">
        <button label="Continuer" label_selected="Continuer" name="Continue" />
        <button label="Annuler" label_selected="Annuler" name="Cancel" />
-        <text name="tos_title">
-                Message critique
-        </text>
        <text name="tos_heading">
                Veuillez lire attentivement le message suivant.
        </text>
diff --git a/linden/indra/newview/skins/xui/fr/floater_friends.xml b/linden/indra/newview/skins/xui/fr/floater_friends.xml
deleted file mode 100644
index 51456a3..0000000
--- a/linden/indra/newview/skins/xui/fr/floater_friends.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="friends" title="Amis">
-        <button label="Profil..." name="profile_btn"
-             tool_tip="Afficher photo, groupes et autres informations" />
-        <button label="Proposer Téléportation" name="offer_teleport_btn"
-             tool_tip="Proposer à cet ami de le téléporter vers votre position actuelle" />
-        <button label="Ajouter..." name="add_btn"
-             tool_tip="Proposer à un résident de devenir votre ami(e)" />
-        <button label="Payer..." name="pay_btn"
-             tool_tip="Offrir des Linden dollars (L$) à cet ami" />
-        <button label="Supprimer..." name="remove_btn"
-             tool_tip="Retirez cette personne de votre liste d&apos;amis" />
-        <button label="IM…" name="im_btn"
-             tool_tip="Démarrer une session de messagerie instantanée" />
-        <button label="Autoriser à modifier…" name="grant_btn"
-             tool_tip="Autoriser cet utilisateur à modifier vos objets" />
-        <button label="Déchoir de ses droits de modification…" name="revoke_btn"
-             tool_tip="Autoriser cet utilisateur à modifier vos objets" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/fr/floater_groups.xml b/linden/indra/newview/skins/xui/fr/floater_groups.xml
deleted file mode 100644
index ca38228..0000000
--- a/linden/indra/newview/skins/xui/fr/floater_groups.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="Groupes">
-        <text name="groupdesc">
-                Votre groupe actif apparaît en gras.
-        </text>
-        <text name="groupcount">
-                Vous appartenez à [COUNT] groupes (sur [MAX] maximum).
-        </text>
-        <button label="Activer" label_selected="Activer" name="Activate" />
-        <button label="Info" label_selected="Info" name="Info" />
-        <button label="Partir" label_selected="Partir" name="Leave" />
-        <button label="Créer" label_selected="Créer" name="Create" />
-        <button label="Rechercher..." label_selected="Rechercher..." name="Search..." />
-        <button label="Fermer" label_selected="Fermer" name="Close" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/fr/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/fr/floater_preview_new_landmark.xml
deleted file mode 100644
index c017b1e..0000000
--- a/linden/indra/newview/skins/xui/fr/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Linden Land, Da Boom (155, 136, 35)"
-     title="  Linden Land, Da Boom (155, 136, 35)">
-        <button label="Téléportation" label_selected="" name="Teleport btn" />
-        <button label="Localiser" label_selected="" name="Show on Map btn" />
-        <button label="Annuler" label_selected="" name="Discard btn" />
-        <text type="string" length="1" name="desc txt">
-                Description :
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/fr/floater_rate.xml b/linden/indra/newview/skins/xui/fr/floater_rate.xml
deleted file mode 100644
index 3ea6624..0000000
--- a/linden/indra/newview/skins/xui/fr/floater_rate.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="rate" title="Votre appréciation de Jeska Linden">
-        <radio_group name="behavior">
-                <radio_item type="string" length="1" name="Positive">
-                        Positives
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        Pas d&apos;appréciation
-                </radio_item>
-        </radio_group>
-        <radio_group name="appearance">
-                <radio_item type="string" length="1" name="Positive">
-                        Positives
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        Pas d&apos;appréciation
-                </radio_item>
-        </radio_group>
-        <radio_group name="building">
-                <radio_item type="string" length="1" name="Positive">
-                        Positives
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        Pas d&apos;appréciation
-                </radio_item>
-        </radio_group>
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="Annuler" label_selected="Annuler" name="Cancel" />
-        <text type="string" length="1" name="Overall behavior:">
-                Comportement général :
-        </text>
-        <text type="string" length="1" name="Skill at appearance (clothing and attachments):">
-                Compétences d&apos;apparence (vêtements et attachements) :
-        </text>
-        <text type="string" length="1" name="Skill at building:">
-                Compétences de construction :
-        </text>
-        <text type="string" length="1" name="Message:">
-                Message :
-        </text>
-        <text type="string" length="1" name="cost">
-                Coût : L$[COST] pour modifier chaque appréciation.  Coût total : L$[TOTAL].
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/fr/menu_viewer.xml b/linden/indra/newview/skins/xui/fr/menu_viewer.xml
index eb2ef81..0f6d7a2 100644
--- a/linden/indra/newview/skins/xui/fr/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/fr/menu_viewer.xml
@@ -14,7 +14,6 @@
                <menu_item_call label="Prendre un instantané" name="Take Snapshot" />
                <menu_item_call label="Enregistrer instantané sur disque dur" name="Snapshot to Disk" />
                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Démarrer/arrêter capture vidéo" name="Start/Stop Movie to Disk" />
                <menu label="Définir taille de la fenêtre" name="Set Window Size">
                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                        <menu_item_call label="320x240" name="320x240" />
@@ -136,6 +135,7 @@
                <menu_item_separator label="-----------" name="separator3" />
                <menu_item_call label="Définir comme : absent" name="Set Away" />
                <menu_item_call label="Définir comme : occupé" name="Set Busy" />
+                <menu_item_call label="Arrêter toutes les animations" name="Stop All Animations" />
                <menu_item_separator label="-----------" name="separator4" />
                <menu_item_call label="Historique du compte..." name="Account History..." />
                <menu_item_call label="Gérer mon compte..." name="Manage My Account..." />
@@ -185,7 +185,6 @@
                <menu_item_call label="Lier" name="Link" />
                <menu_item_call label="Délier" name="Unlink" />
                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Arrêter toutes les animations" name="Stop All Animations" />
                <menu_item_separator label="-----------" name="separator5" />
                <menu_item_call label="Faire le point sur la sélection" name="Focus on Selection" />
                <menu_item_call label="Zoom sur sélection" name="Zoom to Selection" />
diff --git a/linden/indra/newview/skins/xui/fr/panel_music_remote.xml b/linden/indra/newview/skins/xui/fr/panel_music_remote.xml
deleted file mode 100644
index 6839746..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_music_remote.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="music_remote">
-        <text type="string" length="1" name="text">
-                Audio
-        </text>
-        <button label="" label_selected="" name="stop_btn" tool_tip="Arrêter le media" />
-        <button label="" label_selected="" name="play_btn" tool_tip="Lire le flux" />
-        <button label="" label_selected="" name="pause_btn" tool_tip="Suspendre le flux" />
-        <volume_slider name="volume_slider" tool_tip="Réglez le volume à l&apos;aide du curseur" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/fr/panel_preferences_graphics2.xml
deleted file mode 100644
index dfcedfa..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Détails graphiques" name="Display panel 3">
-        <text type="string" length="1" name="text">
-                Shaders :
-        </text>
-        <check_box label="Activer Bumpmapping et Shiny" name="bumpshiny" />
-        <check_box label="Activer ondulation de l&apos;eau" name="ripple" />
-        <check_box label="Avatar Vertex Program" name="avatarvp" />
-        <text type="string" length="1" name="Avatar Rendering:">
-                Rendu de l&apos;avatar :
-        </text>
-        <radio_group name="Avatar Appearance">
-                <radio_item type="string" length="1" name="Normal">
-                        Normal
-                </radio_item>
-                <radio_item type="string" length="1" name="Bump">
-                        Bump Mapped
-                </radio_item>
-                <radio_item type="string" length="1" name="Cloth">
-                        Bump Mapped &amp; Cloth
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Lighting Detail:">
-                Détail de luminosité :
-        </text>
-        <radio_group name="lighting detail radio">
-                <radio_item type="string" length="1" name="SunMoon">
-                        Soleil et lune uniquement
-                </radio_item>
-                <radio_item type="string" length="1" name="LocalLights">
-                        Eclairage de proximité
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Terrain Detail:">
-                Détails du terrain :
-        </text>
-        <radio_group name="terrain detail radio">
-                <radio_item type="string" length="1" name="0">
-                        Bas
-                </radio_item>
-                <radio_item type="string" length="1" name="2">
-                        Elevés
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Object Mesh Detail:">
-                Object Mesh Detail:
-        </text>
-        <text type="string" length="1" name="Flexible Mesh Detail:">
-                Flexible Mesh Detail:
-        </text>
-        <text type="string" length="1" name="Tree Mesh Detail:">
-                Tree Mesh Detail:
-        </text>
-        <text type="string" length="1" name="Avatar Mesh Detail:">
-                Avatar Mesh Detail:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/fr/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/fr/panel_preferences_graphics3.xml
deleted file mode 100644
index ff62b1f..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Graphisme (avancé)" name="Display panel 2">
-        <text type="string" length="1" name="Filtering:">
-                Filtrage :
-        </text>
-        <check_box label="Filtrage anisotrope (ralentit la performance)" name="ani" />
-        <spinner label="Gamma :" name="gamma" />
-        <text type="string" length="1" name="(brightness, lower is brighter)">
-                (luminosité, moins = plus lumineux, 0=défaut)
-        </text>
-        <spinner label="Luminosité nocturne :" name="nighttime_brightness" />
-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)">
-                (plus = plus lumineux, 1.0 valeur par défaut)
-        </text>
-        <text type="string" length="1" name="AGP Graphics Card:">
-                Carte graphique AGP :
-        </text>
-        <check_box label="Activer AGP (plus rapide si carte AGP installée)" name="agp"
-             tool_tip="Peut ralentir la performance et consommer plus de mémoire si vous utilisez une carte graphique PCI classique." />
-        <text type="string" length="1" name="Graphics Card Memory:">
-                Mémoire carte graphique :
-        </text>
-        <radio_group name="video card memory radio">
-                <radio_item type="string" length="1" name="radio">
-                        16MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        32MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        64MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4">
-                        128MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio5">
-                        256MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio6">
-                        512MB
-                </radio_item>
-        </radio_group>
-        <spinner label="Coeff. distance du brouillard :" name="fog" />
-        <spinner label="Particules max. :" name="particles" />
-        <spinner label="Outfit Composite Limit:" name="comp limit"
-             tool_tip="Nombre de tenues récemment portées à afficher" />
-        <text type="string" length="1" name="(lower is faster)">
-                (moins = plus rapide)
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/fr/panel_settings_chat.xml b/linden/indra/newview/skins/xui/fr/panel_settings_chat.xml
deleted file mode 100644
index 73351a1..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_settings_chat.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat" title="Conversation">
-        <text>
-                Taille de police du chat :
-        </text>
-        <radio_group name="chat font size">
-                <radio_item>
-                        Petit
-                </radio_item>
-                <radio_item>
-                        Moyen(ne)
-                </radio_item>
-                <radio_item>
-                        Grand
-                </radio_item>
-        </radio_group>
-        <text>
-                Couleur du chat :
-        </text>
-        <color_swatch label="Système" name="system" />
-        <color_swatch label="Avatars" name="users" />
-        <color_swatch label="Objets" name="objects" />
-        <color_swatch label="Bulle" name="background" />
-        <text>
-                Console de chat :
-        </text>
-        <spinner label="Estomper après" name="fade_chat_time" />
-        <text>
-                (secondes)
-        </text>
-        <spinner label="" name="max_chat_count" />
-        <text>
-                (nb de lignes)
-        </text>
-        <slider label="Opacité" name="console_opacity" />
-        <text>
-                Options de Chat :
-        </text>
-        <check_box label="Chat en plein écran (au prochain redémarrage)"
-             name="chat_full_width_check" />
-        <check_box label="Refermer le chat à l&apos;aide de la touche &apos;envoi&apos;"
-             name="close_chat_on_return_check" />
-        <check_box label="Les touches directionnelles déplacent l&apos;avatar pendant le chat"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="Afficher l&apos;heure d&apos;envoi dans le chat"
-             name="show_timestamps_check" />
-        <text>
-                Bulles de Chat :
-        </text>
-        <check_box label="Afficher les bulles de chat" name="bubble_text_chat" />
-        <slider label="Opacité" name="bubble_chat_opacity" />
-        <text>
-                Erreurs :
-        </text>
-        <check_box label="Afficher les erreurs et alertes de scripts dans le chat"
-             name="script_errors_as_chat" />
-        <color_swatch label="Couleur" name="script_error" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/fr/panel_settings_im.xml b/linden/indra/newview/skins/xui/fr/panel_settings_im.xml
deleted file mode 100644
index 47fb58f..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_settings_im.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="im" title="IM">
-        <text>
-                Options IM :
-        </text>
-        <check_box label="Envoyer IM vers adresse mail" name="send_im_to_email"
-             tool_tip="Modifiez votre email sur secondlife.com" />
-        <check_box label="Inclure les IM dans l&apos;historique du chat"
-             name="include_im_in_chat_history" />
-        <check_box label="Afficher l&apos;heure d&apos;envoi dans les IM"
-             name="show_timestamps_check" />
-        <text>
-                Répondeur en mode Occupé :
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/fr/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/fr/panel_settings_msgbox.xml
deleted file mode 100644
index 903eb80..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Pop-ups" name="popups" title="Pop-ups">
-        <text>
-                Ne pas afficher les pop-ups :
-        </text>
-        <button label="Autoriser cette pop-up" name="enable_popup" />
-        <text>
-                Afficher les pop-ups :
-        </text>
-        <button label="Réinitialiser les dialogues &apos;Afficher la prochaine fois&apos;..."
-             name="reset_dialogs_btn" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/fr/panel_settings_network.xml b/linden/indra/newview/skins/xui/fr/panel_settings_network.xml
deleted file mode 100644
index a722e43..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_settings_network.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="network" title="Réseau">
-        <text>
-                Bande passante maximum :
-        </text>
-        <slider label="" name="max_bandwidth" />
-        <text>
-                kbps (kilobits/seconde)
-        </text>
-        <text>
-                Taille du cache :
-        </text>
-        <radio_group name="disk cache">
-                <radio_item>
-                        50 MB
-                </radio_item>
-                <radio_item>
-                        200 MB
-                </radio_item>
-                <radio_item>
-                        500 MB
-                </radio_item>
-                <radio_item>
-                        1000 MB
-                </radio_item>
-        </radio_group>
-        <button label="Vider le cache" name="clear_cache" />
-        <text>
-                Configuration :
-        </text>
-        <check_box label="Utiliser un proxy" name="proxy_enabled"
-             tool_tip="Précisez la configuration du proxy" />
-        <text>
-                Proxy :
-        </text>
-        <line_editor name="proxy_address"
-             tool_tip="Nom ou adresse IP du proxy que vous souhaitez utilser" />
-        <text>
-                Port :
-        </text>
-        <line_editor name="proxy_port"
-             tool_tip="Numéro de port du proxy que vous souhaitez utiliser" />
-        <text>
-                Socks :
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                Pas de proxy :
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="Noms ou adresses IP à ne pas utiliser pour le proxy" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/fr/panel_settings_web.xml b/linden/indra/newview/skins/xui/fr/panel_settings_web.xml
deleted file mode 100644
index 70b6384..0000000
--- a/linden/indra/newview/skins/xui/fr/panel_settings_web.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="web" title="Web">
-        <check_box label="Utiliser un navigateur externe (Firefox, Safari, Internet Explorer)"
-             name="external_browser_check"
-             tool_tip="Utiliser un navigateur externe pour l&apos;aide, les liens web, etc.\ Déconseillé en mode plein écran." />
-        <text>
-                Page d&apos;accueil du navigateur :
-        </text>
-        <line_editor name="home_page"
-             tool_tip="Page de démarrage à l&apos;ouverture du navigateur de Second Life" />
-        <text>
-                Configuration :
-        </text>
-        <check_box label="Utiliser un proxy pour le navigateur interne" name="proxy_enabled"
-             tool_tip="Précisez la configuration du proxy pour le navigateur interne." />
-        <text>
-                Proxy :
-        </text>
-        <line_editor name="proxy_address"
-             tool_tip="Nom ou adresse IP du proxy que vous souhaitez utilser" />
-        <text>
-                Port :
-        </text>
-        <line_editor name="proxy_port"
-             tool_tip="Numéro de port du proxy que vous souhaitez utiliser" />
-        <text>
-                Socks :
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                Pas de proxy pour :
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="Noms ou adresses IP à ne pas utiliser pour le proxy" />
-        <check_box
-             label="Afficher des pages web sur les objets (expérimental, nécessite un redémarrage)"
-             name="web_pages_on_prims_check" />
-        <text>
-                Sites de confiance :
-(identifiez-vous pour afficher)
-        </text>
-        <button label="Ajouter" name="add_trusted" />
-        <line_editor name="trusted_site_entry" tool_tip="Site à rajouter à la liste de confiance" />
-        <button label="Retirer" name="rem_trusted" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/fr/panel_toolbar.xml b/linden/indra/newview/skins/xui/fr/panel_toolbar.xml
index c0a821d..87e32b2 100644
--- a/linden/indra/newview/skins/xui/fr/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/fr/panel_toolbar.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="toolbar">
+        <layout_stack name="toolbar_stack">
        <button label="IM" name="im_btn"
             tool_tip="Envoyez des messages instantanés à vos amis." />
        <button label="Chat" name="chat_btn"
@@ -17,4 +18,5 @@
             tool_tip="Carte de la zone dans laquelle vous vous trouvez. (Ctrl-Shift-M)" />
        <button label="Carte" name="map_btn" tool_tip="Carte du monde. (Ctrl-M)" />
        <button label="Inventaire" name="inventory_btn" tool_tip="Vos éléments. (Ctrl-I)" />
+  </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/floater_about_land.xml b/linden/indra/newview/skins/xui/ja/floater_about_land.xml
index 15ac0cf..69b15b6 100644
--- a/linden/indra/newview/skins/xui/ja/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_about_land.xml
@@ -470,9 +470,12 @@
                        </text>
                        <button label="追加..." label_selected="追加..." name="add_allowed" />
                        <button label="削除" label_selected="削除" name="remove_allowed" />
-                        <check_box label="禁止" name="AccessCheck">
+                        <check_box label="禁止" name="BanCheck">
                                禁止された住人
                        </check_box>
+                        <check_box label="ｳ｣､ﾋﾔSｿﾉ" name="AccessCheck">
+                                許可された住人
+                        </check_box>
                        <name_list name="AccessList" tool_tip="([LISTED]リスト入り、[MAX]最大)">
                                <column label="許可された住人" name="name" />
                        </name_list>
diff --git a/linden/indra/newview/skins/xui/ja/floater_critical.xml b/linden/indra/newview/skins/xui/ja/floater_critical.xml
index 39f6ee8..0fc142c 100644
--- a/linden/indra/newview/skins/xui/ja/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">
        <button label="続行" label_selected="続行" name="Continue" />
        <button label="取り消し" label_selected="取り消し" name="Cancel" />
-        <text name="tos_title">
-                クリティカル・メッセージ
-        </text>
        <text name="tos_heading">
                次のメッセージを注意深くお読みください。
        </text>
diff --git a/linden/indra/newview/skins/xui/ja/floater_friends.xml b/linden/indra/newview/skins/xui/ja/floater_friends.xml
deleted file mode 100644
index dc24d74..0000000
--- a/linden/indra/newview/skins/xui/ja/floater_friends.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="friends" title="フレンド">
-        <scroll_list name="friend_list"
-             tool_tip="Shiftキーまたは Control　キーを押しながら複数のフレンドをクリックして選択する">
-                <column label="名前" name="friend_name" />
-        </scroll_list>
-        <panel name="rights_container">
-                <text name="friend_name_label">
-                        フレンドを選択して権利を変更...
-                </text>
-                <check_box label="オンライン・ステータスの確認を許可する"
-                     name="online_status_cb"
-                     tool_tip="あなたのオンライン・ステータスをこのフレンドがコーリング・カードまたはフレンド・リストで確認できるようにするかどうかを指定" />
-                <check_box label="自分を地図の上に示す" name="map_status_cb"
-                     tool_tip="あなたのロケーションをこのフレンドが地図上で確認できるようにするかどうかを指定" />
-                <check_box label="オブジェクトの修正を許可する" name="modify_status_cb"
-                     tool_tip="このフレンドにオブジェクトの修正を許可するかどうかを指定" />
-                <text name="process_rights_label">
-                        権利変更を処理中...
-                </text>
-        </panel>
-        <button label="IM/コール" name="im_btn"
-             tool_tip="インスタント・メッセージを開始" />
-        <button label="ﾃﾚﾎﾟｰﾄ" name="offer_teleport_btn"
-             tool_tip="このフレンドに、あなたの現在のロケーションへのテレポートを贈ります。" />
-        <button label="追加..." name="add_btn"
-             tool_tip="住人にフレンドシップを贈ります。" />
-        <button label="ﾌﾟﾛﾌｨｰﾙ" name="profile_btn"
-             tool_tip="写真、グループ、およびその他の情報を表示" />
-        <button label="支払い..." name="pay_btn"
-             tool_tip="リンデン・ドル（L$）をフレンドに贈る" />
-        <button label="削除..." name="remove_btn"
-             tool_tip="この人物をフレンド・リストから削除" />
-        <text name="Multiple">
-                複数のフレンド...
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_groups.xml b/linden/indra/newview/skins/xui/ja/floater_groups.xml
deleted file mode 100644
index 4fb56ed..0000000
--- a/linden/indra/newview/skins/xui/ja/floater_groups.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="グループ">
-        <text name="groupdesc">
-                現在のアクティブ・グループを太字表示。
-        </text>
-        <text name="groupcount">
-                あなたの所属グループ数： [COUNT] (上限数 [MAX])
-        </text>
-        <button label="IM/コール" name="IM"
-             tool_tip="インスタントメッセージ・セッションを開く" />
-        <button label="アクティブ" label_selected="アクティブ" name="Activate" />
-        <button label="情報" label_selected="情報" name="Info" />
-        <button label="立ち去る" label_selected="立ち去る" name="Leave" />
-        <button label="作成..." label_selected="作成" name="Create" />
-        <button label="検索..." label_selected="検索..." name="Search..." />
-        <button label="閉じる" label_selected="閉じる" name="Close" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
index e21c057..d1cf8af 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_instant_message_ad_hoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(不明）" name="im_floater" title="(不明）">
-        <layout_stack name="">
+        <layout_stack name="panels">
                <layout_panel name="im_contents_panel">
                        <button label="コール" name="start_call_btn" />
                        <button label="コールの終了" name="end_call_btn" />
diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
index adf0df0..ceacef6 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_instant_message_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(不明）" name="im_floater" title="(不明）">
-        <layout_stack name="">
+        <layout_stack name="panels">
                <layout_panel name="im_contents_panel">
                        <button label="グループインフォ：" name="group_info_btn" />
                        <button label="コールに参加" name="start_call_btn" />
diff --git a/linden/indra/newview/skins/xui/ja/floater_joystick.xml b/linden/indra/newview/skins/xui/ja/floater_joystick.xml
index e75fe31..6207687 100644
--- a/linden/indra/newview/skins/xui/ja/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_joystick.xml
@@ -1,54 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="build options floater" title="飛行カメラオプション">
+<floater name="Joystick">
-        <text name="x-axis">
+</floater>
+\ No newline at end of file
-                X軸
-        </text>
-        <text name="y-axis">
-                Y軸
-        </text>
-        <text name="z-axis">
-                Z軸
-        </text>
-        <spinner label="マッピング" name="FlycamAxis1" />
-        <spinner label="マッピング" name="FlycamAxis2" />
-        <spinner label="マッピング" name="FlycamAxis0" />
-        <spinner label="スケール" name="FlycamAxisScale1" />
-        <spinner label="スケール" name="FlycamAxisScale2" />
-        <spinner label="スケール" name="FlycamAxisScale0" />
-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone1" />
-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone2" />
-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone0" />
-        <text name="yaw">
-                ヨー
-        </text>
-        <text name="pitch">
-                ピッチ
-        </text>
-        <text name="roll">
-                ロール
-        </text>
-        <spinner label="マッピング" name="FlycamAxis5" />
-        <spinner label="マッピング" name="FlycamAxis4" />
-        <spinner label="マッピング" name="FlycamAxis3" />
-        <spinner label="スケール" name="FlycamAxisScale5" />
-        <spinner label="スケール" name="FlycamAxisScale4" />
-        <spinner label="スケール" name="FlycamAxisScale3" />
-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone5" />
-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone4" />
-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone3" />
-        <text name="ZoomLabel">
-                ズーム
-        </text>
-        <spinner label="マッピング" name="FlycamAxis6" />
-        <spinner label="スケール" name="FlycamAxisScale6" />
-        <spinner label="デッドゾーン" name="FlycamAxisDeadZone6" />
-        <slider label="フェザリング" name="FlycamFeathering" />
-        <check_box label="自動レベル" name="FlycamAutoLeveling" />
-        <check_box label="3Dカーソル" name="FlycamAbsolute" />
-        <text name="JoystickMonitor">
-                ジョイスティックモニター
-        </text>
-        <text name="Axis">
-                軸 [NUM]
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/ja/floater_preview_new_landmark.xml
deleted file mode 100644
index 152f3b0..0000000
--- a/linden/indra/newview/skins/xui/ja/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="landmark_preview">
-        <button label="テレポート" label_selected="" name="Teleport btn" />
-        <button label="地図上に表示" label_selected="" name="Show on Map btn" />
-        <button label="破棄" label_selected="" name="Discard btn" />
-        <text type="string" length="1" name="desc txt">
-                説明：
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ja/floater_rate.xml b/linden/indra/newview/skins/xui/ja/floater_rate.xml
deleted file mode 100644
index 7d26296..0000000
--- a/linden/indra/newview/skins/xui/ja/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">
-                        ポジティブ
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        評価なし
-                </radio_item>
-        </radio_group>
-        <radio_group name="appearance">
-                <radio_item type="string" length="1" name="Positive">
-                        ポジティブ
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        評価なし
-                </radio_item>
-        </radio_group>
-        <radio_group name="building">
-                <radio_item type="string" length="1" name="Positive">
-                        ポジティブ
-                </radio_item>
-                <radio_item type="string" length="1" name="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＄[TOTAL] 全体費用：L＄[COST].
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/xui/ja/menu_viewer.xml
index 610c109..eb8b62d 100644
--- a/linden/indra/newview/skins/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/ja/menu_viewer.xml
@@ -18,8 +18,6 @@
                <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="ウィンドウ・サイズを設定" name="Set Window Size">
                        <menu_item_call label="320x240" name="320x240" />
                        <menu_item_call label="640x480" name="640x480" />
@@ -146,6 +144,7 @@
                <menu_item_separator label="-----------" name="separator3" />
                <menu_item_call label="退席中に設定" name="Set Away" />
                <menu_item_call label="ビジーに設定" name="Set Busy" />
+                <menu_item_call label="アニメーションをすべて停止" name="Stop All Animations" />
                <menu_item_separator label="-----------" name="separator4" />
                <menu_item_call label="口座履歴..." name="Account History..." />
                <menu_item_call label="自分の口座の管理..." name="Manage My Account..." />
@@ -202,7 +201,6 @@
                <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" />
@@ -224,7 +222,6 @@
                     name="Set Scripts to Running in Selection" />
                <menu_item_call label="選択したスクリプトを起動しない"
                     name="Set Scripts to Not Running in Selection" />
-                <menu_item_separator label="-----------" name="separator6" />
                <menu_item_call label="バグの報告..." name="Report Bug..." />
                <menu label="バグの報告" name="Bug Reporting">
                        <menu_item_call label="パブリック問題トラッカー..." name="Public Issue Tracker..." />
@@ -254,6 +251,17 @@
                <menu_item_call label="ぶつかる、押す、および当たる..."
                     name="Bumps, Pushes &amp;amp; Hits..." />
                <menu_item_call label="ラグ メーター" name="Lag Meter" />
+                <menu label="バグの報告" name="Bug Reporting">
+                        <menu_item_call label="パブリック問題トラッカー..." name="Public Issue Tracker..." />
+                        <menu_item_call label="パブリック問題トラッカー ヘルプ..."
+                             name="Publc Issue Tracker Help..." />
+                        <menu_item_call label="バグの報告 101..." name="Bug Reporing 101..." />
+                        <menu_item_call label="セキュリティ問題..." name="Security Issues..." />
+                        <menu_item_call label="QA Wiki..." name="QA Wiki..." />
+                        <menu_item_separator label="-----------" name="separator7" />
+                        <menu_item_call label="バグの報告..." name="Report Bug..." />
+                </menu>
                <menu_item_separator label="-----------" name="separator5" />
                <menu_item_call label="リリースノート..." name="Release Notes..." />
                <menu_item_separator label="-----------" name="separator6" />
diff --git a/linden/indra/newview/skins/xui/ja/panel_music_remote.xml b/linden/indra/newview/skins/xui/ja/panel_music_remote.xml
deleted file mode 100644
index 35b4c70..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_music_remote.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="music_remote">
-        <text type="string" length="6" name="text">
-                ミュージック
-        </text>
-        <volume_slider name="volume_slider"
-             tool_tip="このスライダーでボリュームを調整" />
-        <button label="" label_selected="" name="stop_btn" tool_tip="メディアを停止" />
-        <button label="" label_selected="" name="play_btn"
-             tool_tip="メディア･ストリームを再生" />
-        <button label="" label_selected="" name="pause_btn"
-             tool_tip="メデイア・ストリームを一時停止" />
-        <button name="music_stop" tool_tip="メディアを停止します。" />
-        <button name="music_play"
-             tool_tip="メディア･ストリームを再生します。" />
-        <button name="music_pause"
-             tool_tip="メデイア・ストリームを一時停止します。" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml b/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml
index d201c8c..f37d351 100644
--- a/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_overlaybar.xml
@@ -12,8 +12,8 @@
        <button label="立ち上がる" label_selected="立ち上がる" name="Stand Up"
             tool_tip="立ち上がるには、ここをクリックします。" />
        <layout_stack name="overlay_layout_panel">
-                <layout_panel name="">
+                <layout_panel name="main_panel">
-                        <layout_stack name="">
+                        <layout_stack name="chatbar_and_buttons">
                                <layout_panel name="state_buttons">
                                        <button label="受信済みIM" label_selected="受信済みIM" name="IM Received"
                                             tool_tip="インスタント・メッセージが保留になっています。ここをクリックして、IMを見てください。" />
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics2.xml
deleted file mode 100644
index 9bcb946..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="グラフィック１" name="Display panel 3">
-        <text type="string" length="1" name="text">
-                シェーダー：
-        </text>
-        <check_box label="Vertex Shaderを有効にする" name="shaders"
-             tool_tip="このオプションを無効にするとグラフィックカードドライバーの種類によってはクラッシュ防止になります。" />
-        <check_box label="バンプマップと輝きを有効にする" name="bumpshiny" />
-        <check_box label="水の波紋を有効化" name="ripple" />
-        <check_box label="アバターVertexプログラム" name="avatarvp" />
-        <text type="string" length="1" name="Avatar Rendering:">
-                アバターの描画：
-        </text>
-        <radio_group name="Avatar Appearance">
-                <radio_item type="string" length="1" name="Normal">
-                        ノーマル
-                </radio_item>
-                <radio_item type="string" length="1" name="Bump">
-                        バンプマップ
-                </radio_item>
-                <radio_item type="string" length="1" name="Cloth">
-                        バンプマップと服
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Lighting Detail:">
-                ライティング詳細：
-        </text>
-        <radio_group name="lighting detail radio">
-                <radio_item type="string" length="1" name="SunMoon">
-                        太陽と月のみ
-                </radio_item>
-                <radio_item type="string" length="1" name="LocalLights">
-                        近隣のローカル・ライト
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Terrain Detail:">
-                地形詳細:
-        </text>
-        <radio_group name="terrain detail radio">
-                <radio_item type="string" length="1" name="0">
-                        低
-                </radio_item>
-                <radio_item type="string" length="1" name="2">
-                        高
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Object Mesh Detail:">
-                オブジェクトメッシュ：
-        </text>
-        <text type="string" length="1" name="Flexible Mesh Detail:">
-                フレキシブルメッシュ：
-        </text>
-        <text type="string" length="1" name="Tree Mesh Detail:">
-                樹木メッシュ:
-        </text>
-        <text type="string" length="1" name="Avatar Mesh Detail:">
-                アバターメッシュ：
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics3.xml
deleted file mode 100644
index 7a373e3..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="グラフィック２" name="Display panel 2">
-        <text type="string" length="1" name="Filtering:">
-                フィルタリング：
-        </text>
-        <check_box
-             label="異方的フィルタリング（有効にすると速度が低下します）"
-             name="ani" left="160" />
-        <spinner label="ガンマ：" name="gamma" label_width="148" width="208"/>
-        <text type="string" length="1" name="(brightness, lower is brighter)" left="223">
-                ０＝デフォルト値（最も明るい）
-        </text>
-        <spinner label="夜の明るさ：" name="nighttime_brightness" label_width="148" width="208"/>
-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)" left="223">
-                （高いほど明るい、1.0がデフォルト）
-        </text>
-        <text type="string" length="1" name="Enable VBO:">
-                VBOを有効化：
-        </text>
-        <check_box label="OpenGL Vertex Buffer オブジェクトを有効化" name="vbo"
-             tool_tip="一部のOpenGLドライバは、これを有効化するとクラッシュすることがあります。" left="160"/>
-        <text type="string" length="1" name="Graphics Card Memory:">
-                グラフィックメモリ：
-        </text>
-        <radio_group name="video card memory radio" left="160">
-                <radio_item type="string" length="1" name="radio" left="15">
-                        16MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2" left="15">
-                        32MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3" left="15">
-                        64MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4" left="15">
-                        128MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio5" left="15">
-                        256MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio6" left="15">
-                        512MB
-                </radio_item>
-        </radio_group>
-        <spinner label="霧／視界率：" name="fog" label_width="148" width="208"/>
-        <spinner label="最大パーティクル数：" name="particles" label_width="148" width="208"/>
-        <spinner label="服装合成限度：" name="comp limit"
-             tool_tip="服装の変更を過去何回まで表示するか" label_width="148" width="208"/>
-        <text type="string" length="1" name="(lower is faster)" left="223" >
-                （低いほど速い）
-        </text>
-        <spinner label="デバッグ用標識線の幅：" name="debug beacon line width" label_width="148" width="208"/>
-        <check_box
-             label="次回起動時にグラフィック・ハードウェアを自動検出"
-             name="probe_hardware_checkbox" left="160"
-             tool_tip="Second Lifeは、あなたのハードウェアに基づき、いくつかのグラフィック設定を自動的に構成します。新しいハードウェアをインストールした場合は、Second Lifeに再度検知させるようにしてください。" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_settings_chat.xml b/linden/indra/newview/skins/xui/ja/panel_settings_chat.xml
deleted file mode 100644
index 34a1a0d..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_settings_chat.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat" title="会話">
-        <text>
-                チャットのフォント：
-        </text>
-        <radio_group name="chat font size">
-                <radio_item>
-                        小
-                </radio_item>
-                <radio_item>
-                        中
-                </radio_item>
-                <radio_item>
-                        大
-                </radio_item>
-        </radio_group>
-        <text>
-                チャット・カラー：
-        </text>
-        <color_swatch label="システム" name="system" />
-        <color_swatch label="ユーザー" name="users" />
-        <color_swatch label="オブジェクト" name="objects" />
-        <color_swatch label="吹き出し" name="background" />
-        <text>
-                チャット・コンソール：
-        </text>
-        <spinner label="フェード" name="fade_chat_time" />
-        <text>
-                （秒後）
-        </text>
-        <spinner label="" name="max_chat_count" />
-        <text>
-                （行数）
-        </text>
-        <slider label="不透明度" name="console_opacity" />
-        <text>
-                チャット・オプション
-        </text>
-        <check_box label="チャットに全画面幅を使用（再起動後）"
-             name="chat_full_width_check" />
-        <check_box label="Enterキーを押した後チャットを閉じる"
-             name="close_chat_on_return_check" />
-        <check_box label="チャット中は、矢印キーでアバターを移動可能"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="チャットにタイムスタンプを表示"
-             name="show_timestamps_check" />
-        <text>
-                チャットの吹き出し：
-        </text>
-        <check_box label="チャットの吹き出しを表示" name="bubble_text_chat" />
-        <slider label="不透明度" name="bubble_chat_opacity" />
-        <text>
-                スクリプト・エラー：
-        </text>
-        <check_box label="スクリプト・エラーと警告をチャット同様に表示"
-             name="script_errors_as_chat" />
-        <color_swatch label="色" name="script_error" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_settings_im.xml b/linden/indra/newview/skins/xui/ja/panel_settings_im.xml
deleted file mode 100644
index 39b9b5e..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_settings_im.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="im" title="IM">
-        <text>
-                IMオプション：
-        </text>
-        <check_box label="IMを電子メールへ送信" name="send_im_to_email"
-             tool_tip="secondlife.com上の電子メール・アドレスを変更" />
-        <check_box label="チャット履歴にIMを含める" name="include_im_in_chat_history" />
-        <check_box label="IMにタイムスタンプを表示" name="show_timestamps_check" />
-        <text>
-                ビジー・モード応答：
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/ja/panel_settings_msgbox.xml
deleted file mode 100644
index b4c481d..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="ポップアップ" name="popups" title="ポップアップ">
-        <text>
-                ポップアップを表示しない：
-        </text>
-        <button label="これは表示する" name="enable_popup" />
-        <text>
-                ポップアップを表示：
-        </text>
-        <button label="「次回表示」ダイアログリセット..."
-             name="reset_dialogs_btn" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_settings_network.xml b/linden/indra/newview/skins/xui/ja/panel_settings_network.xml
deleted file mode 100644
index 65fe03d..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_settings_network.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="network" title="ネットワーク">
-        <text>
-                最大帯域幅：
-        </text>
-        <slider label="" name="max_bandwidth" />
-        <text>
-                Kbps
-        </text>
-        <text>
-                ディスク・キャッシュのサイズ：
-        </text>
-        <radio_group name="disk cache">
-                <radio_item>
-                        50MB
-                </radio_item>
-                <radio_item>
-                        200MB
-                </radio_item>
-                <radio_item>
-                        500MB
-                </radio_item>
-                <radio_item>
-                        100MB
-                </radio_item>
-        </radio_group>
-        <button label="クリア" name="clear_cache" />
-        <text>
-                プロキシー構成：
-        </text>
-        <check_box label="プロキシを使用" name="proxy_enabled"
-             tool_tip="プロキシーの構成を指定" />
-        <text>
-                プロキシー：
-        </text>
-        <line_editor name="proxy_address"
-             tool_tip="使用するプロキシの名前またはIPアドレス" />
-        <text>
-                ポート：
-        </text>
-        <line_editor name="proxy_port" tool_tip="使用するプロキシのポート番号" />
-        <text>
-                靴下：
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        靴下v4
-                </radio_item>
-                <radio_item>
-                        靴下v5
-                </radio_item>
-        </radio_group>
-        <text>
-                プロキシーがありません：
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="プロキシを使用しない名前またはIPアドレス" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_settings_web.xml b/linden/indra/newview/skins/xui/ja/panel_settings_web.xml
deleted file mode 100644
index 35ea206..0000000
--- a/linden/indra/newview/skins/xui/ja/panel_settings_web.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="web" title="ウェブ">
-        <check_box
-             label="外部のウェブ・ブラウザー(Firefox, Safari, Internet Explorer)を使用"
-             name="external_browser_check"
-             tool_tip="ヘルプ、ウェブリンクなどに、外部のウェブ・ブラウザーを使用。\nフルスクリーン起動時には推奨されない。" />
-        <text>
-                ブラウザーのホーム・ページ：
-        </text>
-        <line_editor name="home_page"
-             tool_tip="初めてSecond Lifeブラウザーを開くために訪れるウェブ・ページ" />
-        <text>
-                プロキシー構成：
-        </text>
-        <check_box label="内部ウェブ・ブラウザーにプロキシを使用"
-             name="proxy_enabled"
-             tool_tip="内蔵ブラウザー用のプロキシー構成を指定" />
-        <text>
-                プロキシー：
-        </text>
-        <line_editor name="proxy_address"
-             tool_tip="使用するプロキシの名前またはIPアドレス" />
-        <text>
-                ポート：
-        </text>
-        <line_editor name="proxy_port" tool_tip="使用するプロキシのポート番号" />
-        <text>
-                靴下：
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        靴下v4
-                </radio_item>
-                <radio_item>
-                        靴下v5
-                </radio_item>
-        </radio_group>
-        <text>
-                次に対応するプロキシーがありません：
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="プロキシを使用しない名前またはIPアドレス" />
-        <check_box
-             label="オブジェクトに関するウェブ・ページを表示（実験中、再起動要）"
-             name="web_pages_on_prims_check" />
-        <text>
-                信用できるサイト:
-(ログインして表示する)
-        </text>
-        <button label="追加" name="add_trusted" />
-        <line_editor name="trusted_site_entry"
-             tool_tip="このサイトを信頼できるサイトのリストに追加する。" />
-        <button label="削除" name="rem_trusted" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml
index 4e26137..fa646a7 100644
--- a/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_speaker_controls.xml
@@ -3,10 +3,12 @@
        <string name="moderator_label">
                (モデレータ)
        </string>
-        <layout_stack name="">
+        <layout_stack name="panels">
                <layout_panel name="moderation_mode_panel">
                        <combo_box name="moderation_mode">
-                                モデレート済みボイス
+                                <combo_item name="ModeratedVoice" value="moderated">
+                                  モデレート済みボイス
+                                </combo_item>
                        </combo_box>
                </layout_panel>
                <layout_panel name="moderate_chat_panel">
diff --git a/linden/indra/newview/skins/xui/ja/panel_toolbar.xml b/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
index 9f21fa1..276ec62 100644
--- a/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_toolbar.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="toolbar">
+        <string name="Redock Windows">ウィンドウを再置する</string>
+        <layout_stack name="toolbar_stack">
        <button label="IM" name="im_btn"
             tool_tip="フレンドとインスタント・メッセージ" />
-        <string name="Redock Windows">
-                ウィンドウを再置する
-        </string>
        <button label="コミュニケート" name="communicate_btn"
             tool_tip="フレンドやグループとコミュケート。" />
        <button label="" name="chat_btn"
@@ -23,4 +22,5 @@
        <button label="地図" name="map_btn" tool_tip="世界地図。 （Ctrl＋M）" />
        <button label="持ち物" name="inventory_btn"
             tool_tip="あなたのアイテム。 (Ctrl-I)" />
+  </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/xui/ko/floater_about_land.xml b/linden/indra/newview/skins/xui/ko/floater_about_land.xml
index 772b2eb..095ad9d 100644
--- a/linden/indra/newview/skins/xui/ko/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_about_land.xml
@@ -468,9 +468,12 @@
                        </text>
                        <button label="추가" label_selected="추가" name="add_allowed" />
                        <button label="제거" label_selected="제거" name="remove_allowed" />
-                        <check_box label="차단" name="AccessCheck">
+                        <check_box label="차단" name="BanCheck">
                                출입금지된 주민
                        </check_box>
+                        <check_box label="항상 허용" name="AccessCheck">
+                                허용된 주민
+                        </check_box>
                        <name_list name="AccessList" tool_tip="([LISTED] 목록에 있음, [MAX] 최대)">
                                <column label="허용된 주민" name="name" />
                        </name_list>
diff --git a/linden/indra/newview/skins/xui/ko/floater_critical.xml b/linden/indra/newview/skins/xui/ko/floater_critical.xml
index e5ce706..95a8157 100644
--- a/linden/indra/newview/skins/xui/ko/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">
        <button label="계속" label_selected="계속" name="Continue" />
        <button label="취소" label_selected="취소" name="Cancel" />
-        <text name="tos_title">
-                중요 메시지
-        </text>
        <text name="tos_heading">
                다음 메시지를 잘 읽으세요.
        </text>
diff --git a/linden/indra/newview/skins/xui/ko/floater_friends.xml b/linden/indra/newview/skins/xui/ko/floater_friends.xml
deleted file mode 100644
index b1fd36c..0000000
--- a/linden/indra/newview/skins/xui/ko/floater_friends.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="friends" title="친구">
-        <scroll_list name="friend_list"
-             tool_tip="다수의 친구를 선택하려면 선택하는 동안 shift나 Ctrl를 누르십시오.">
-                <column label="이름" name="friend_name" />
-        </scroll_list>
-        <panel name="rights_container">
-                <text name="friend_name_label">
-                        친구를 선택하여 권한 변경
-                </text>
-                <check_box label="내 온라인 상태를 확인할 수 있습니다."
-                     name="online_status_cb"
-                     tool_tip="친구가 친구 목록이나 통화 카드에서 내 온라인 상태를 확인 가능한지 여부를 설정합니다." />
-                <check_box label="지도에서 내 위치를 확인할 수 있습니다."
-                     name="map_status_cb"
-                     tool_tip="친구가 지도에서 내 위치를 확인 가능한지 여부를 설정합니다." />
-                <check_box label="내 오브젝트를 수정할 수 있습니다." name="modify_status_cb"
-                     tool_tip="친구가 내 오브젝트를 수정할 수 있는지 여부를 설정합니다." />
-                <text name="process_rights_label">
-                        권한 변경 중?
-                </text>
-        </panel>
-        <button label="메신저/전화걸기" name="im_btn" tool_tip="메신저 세션 열기" />
-        <button label="텔레포트..." name="offer_teleport_btn"
-             tool_tip="친구에게 내 현재 위치로 텔레포트를 제공함" />
-        <button label="추가..." name="add_btn" tool_tip="주민에게 우정 제공" />
-        <button label="프로필" name="profile_btn"
-             tool_tip="그림, 그룹 및 기타 정보 표시" />
-        <button label="지불…" name="pay_btn"
-             tool_tip="친구에게 린든 달러(L$) 주기" />
-        <button label="제거…" name="remove_btn"
-             tool_tip="이 사람을 내 친구 목록에서 삭제" />
-        <text name="Multiple">
-                친구들...
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_groups.xml b/linden/indra/newview/skins/xui/ko/floater_groups.xml
deleted file mode 100644
index a1e3fee..0000000
--- a/linden/indra/newview/skins/xui/ko/floater_groups.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="그룹">
-        <text name="groupdesc">
-                현재 활동중인 그룹은 굵은 글씨로 표시됩니다.
-        </text>
-        <text name="groupcount">
-                [COUNT]개의 그룹(최대 [MAX])에 속해 있습니다.
-        </text>
-        <button label="메신저/전화걸기" name="IM" tool_tip="메신저 세션 열기" />
-        <button label="활성화" label_selected="활성화" name="Activate" />
-        <button label="정보" label_selected="정보" name="Info" />
-        <button label="탈퇴" label_selected="탈퇴" name="Leave" />
-        <button label="만들기" label_selected="만들기" name="Create" />
-        <button label="검색…" label_selected="검색…" name="Search..." />
-        <button label="닫기" label_selected="닫기" name="Close" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
index 5a13aea..dc7f5af 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message_ad_hoc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(알 수 없음)" name="im_floater" title="(알 수 없음)">
-        <layout_stack name="">
+        <layout_stack name="panels">
                <layout_panel name="im_contents_panel">
                        <button label="전화" name="start_call_btn" />
                        <button label="전화 종료" name="end_call_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
index a06c626..891613c 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message_group.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(알 수 없음)" name="im_floater" title="(알 수 없음)">
-        <layout_stack name="">
+        <layout_stack name="panels">
                <layout_panel name="im_contents_panel">
                        <button label="그룹 정보" name="group_info_btn" />
                        <button label="전화에 참여하기" name="start_call_btn" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_joystick.xml b/linden/indra/newview/skins/xui/ko/floater_joystick.xml
index 14a5883..6207687 100644
--- a/linden/indra/newview/skins/xui/ko/floater_joystick.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_joystick.xml
@@ -1,96 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="build options floater" title="Flycam 옵션">
+<floater name="Joystick">
-        <text>
+</floater>
+\ No newline at end of file
-                X축
-        </text>
-        <text>
-                Y축
-        </text>
-        <text>
-                Z축
-        </text>
-        <spinner label="매핑" />
-        <spinner label="매핑" />
-        <spinner label="매핑" />
-        <spinner label="크기" />
-        <spinner label="크기" />
-        <spinner label="크기" />
-        <spinner label="사각지대" />
-        <spinner label="사각지대" />
-        <spinner label="사각지대" />
-        <text>
-                요
-        </text>
-        <text>
-                피치
-        </text>
-        <text>
-                역할
-        </text>
-        <spinner label="매핑" />
-        <spinner label="매핑" />
-        <spinner label="매핑" />
-        <spinner label="크기" />
-        <spinner label="크기" />
-        <spinner label="크기" />
-        <spinner label="사각지대" />
-        <spinner label="사각지대" />
-        <spinner label="사각지대" />
-        <text name="x-axis">
-                X축
-        </text>
-        <text name="y-axis">
-                Y축
-        </text>
-        <text name="z-axis">
-                Z축
-        </text>
-        <spinner label="매핑" name="FlycamAxis1" />
-        <spinner label="매핑" name="FlycamAxis2" />
-        <spinner label="매핑" name="FlycamAxis0" />
-        <spinner label="크기" name="FlycamAxisScale1" />
-        <spinner label="크기" name="FlycamAxisScale2" />
-        <spinner label="크기" name="FlycamAxisScale0" />
-        <spinner label="사각지대" name="FlycamAxisDeadZone1" />
-        <spinner label="사각지대" name="FlycamAxisDeadZone2" />
-        <spinner label="사각지대" name="FlycamAxisDeadZone0" />
-        <text name="yaw">
-                요
-        </text>
-        <text name="pitch">
-                피치
-        </text>
-        <text name="roll">
-                역할
-        </text>
-        <spinner label="매핑" name="FlycamAxis5" />
-        <spinner label="매핑" name="FlycamAxis4" />
-        <spinner label="매핑" name="FlycamAxis3" />
-        <spinner label="크기" name="FlycamAxisScale5" />
-        <spinner label="크기" name="FlycamAxisScale4" />
-        <spinner label="크기" name="FlycamAxisScale3" />
-        <spinner label="사각지대" name="FlycamAxisDeadZone5" />
-        <spinner label="사각지대" name="FlycamAxisDeadZone4" />
-        <spinner label="사각지대" name="FlycamAxisDeadZone3" />
-        <text name="ZoomLabel">
-                확대/축소
-        </text>
-        <spinner label="매핑" />
-        <spinner label="크기" />
-        <spinner label="사각지대" />
-        <check_box label="직접 확대/축소" />
-        <spinner label="매핑" name="FlycamAxis6" />
-        <spinner label="크기" name="FlycamAxisScale6" />
-        <spinner label="사각지대" name="FlycamAxisDeadZone6" />
-        <slider label="깃털 효과" name="FlycamFeathering" />
-        <check_box label="레벨 자동 수정" />
-        <check_box label="3D 커서" />
-        <check_box label="레벨 자동 수정" name="FlycamAutoLeveling" />
-        <check_box label="3D 커서" name="FlycamAbsolute" />
-        <text name="JoystickMonitor">
-                조이스틱 검사
-        </text>
-        <text name="Axis">
-                축 [NUM]
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/ko/floater_preview_new_landmark.xml
deleted file mode 100644
index 5256ce7..0000000
--- a/linden/indra/newview/skins/xui/ko/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="landmark_preview">
-        <button label="텔리포트" label_selected="" name="Teleport btn" />
-        <button label="지도에 표시" label_selected="" name="Show on Map btn" />
-        <button label="취소" label_selected="" name="Discard btn" />
-        <text type="string" length="1" name="desc txt">
-                설명:
-        </text>
-</floater>
diff --git a/linden/indra/newview/skins/xui/ko/floater_rate.xml b/linden/indra/newview/skins/xui/ko/floater_rate.xml
deleted file mode 100644
index 39aebc5..0000000
--- a/linden/indra/newview/skins/xui/ko/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">
-                        양수
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        등급 없음
-                </radio_item>
-        </radio_group>
-        <radio_group name="appearance">
-                <radio_item type="string" length="1" name="Positive">
-                        양수
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        등급 없음
-                </radio_item>
-        </radio_group>
-        <radio_group name="building">
-                <radio_item type="string" length="1" name="Positive">
-                        양수
-                </radio_item>
-                <radio_item type="string" length="1" name="No Rating">
-                        등급 없음
-                </radio_item>
-        </radio_group>
-        <button label="확인" label_selected="확인" 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/ko/menu_viewer.xml b/linden/indra/newview/skins/xui/ko/menu_viewer.xml
index d8e85c8..417b1f4 100644
--- a/linden/indra/newview/skins/xui/ko/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/ko/menu_viewer.xml
@@ -15,7 +15,6 @@
                <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="창 크기 조절" name="Set Window Size">
                        <menu_item_call label="320x240" name="320x240" />
                        <menu_item_call label="640x480" name="640x480" />
@@ -141,6 +140,7 @@
                <menu_item_separator label="-----------" name="separator3" />
                <menu_item_call label="자리비움 설정" name="Set Away" />
                <menu_item_call label="다른 용무중 설정" name="Set Busy" />
+                <menu_item_call label="모든 애니메이션 중지" name="Stop All Animations" />
                <menu_item_separator label="-----------" name="separator4" />
                <menu_item_call label="계정 기록" name="Account History..." />
                <menu_item_call label="내 계정 관리" name="Manage My Account..." />
@@ -197,7 +197,6 @@
                <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" />
@@ -247,6 +246,16 @@
                <menu_item_call label="밀기, 타격 등 감지" name="Bumps, Pushes &amp;amp; Hits..." />
                <menu_item_call label="지연 미터" name="Lag Meter" />
                <menu_item_separator label="-----------" name="separator5" />
+                <menu label="버그 신고" name="Bug Reporting">
+                        <menu_item_call label="일반 문제 추적하기" name="Public Issue Tracker..." />
+                        <menu_item_call label="일반 문제 추적하기 도움말" name="Publc Issue Tracker Help..." />
+                        <menu_item_call label="버그 보고 101" name="Bug Reporing 101..." />
+                        <menu_item_call label="보안 문제" name="Security Issues..." />
+                        <menu_item_call label="QA 위키" name="QA Wiki..." />
+                        <menu_item_separator label="-----------" name="separator7" />
+                        <menu_item_call label="버그 신고" name="Report Bug..." />
+                </menu>
                <menu_item_call label="출시 정보" name="Release Notes..." />
                <menu_item_separator label="-----------" name="separator6" />
                <menu_item_call label="세컨드라이프 정보" name="About Second Life..." />
diff --git a/linden/indra/newview/skins/xui/ko/panel_music_remote.xml b/linden/indra/newview/skins/xui/ko/panel_music_remote.xml
deleted file mode 100644
index fc5dfbf..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_music_remote.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="music_remote">
-        <text type="string" length="6" name="text">
-                음악
-        </text>
-        <volume_slider name="volume_slider"
-             tool_tip="이 슬라이더를 사용하여 볼륨을 변경" />
-        <button label="" label_selected="" name="stop_btn" tool_tip="미디어 중지" />
-        <button label="" label_selected="" name="play_btn"
-             tool_tip="미디어 스트림 재생" />
-        <button label="" label_selected="" name="pause_btn"
-             tool_tip="미디어 스트림 일시 정지" />
-        <button name="music_stop" tool_tip="미디어 중지" />
-        <button name="music_play" tool_tip="미디어 스트림 재생" />
-        <button name="music_pause" tool_tip="미디어 스트림 일시 정지" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml b/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
index dc89ec5..bb83a6a 100644
--- a/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_overlaybar.xml
@@ -12,8 +12,8 @@
        <button label="서기" label_selected="서기" name="Stand Up"
             tool_tip="일어서려면 여기를 클릭하십시오." />
        <layout_stack name="overlay_layout_panel">
-                <layout_panel name="">
+                <layout_panel name="main_panel">
-                        <layout_stack name="">
+                        <layout_stack name="chatbar_and_buttons">
                                <layout_panel name="state_buttons">
                                        <button label="메신저 수령" label_selected="메신저 수령" name="IM Received"
                                             tool_tip="도착한 메시지가 있습니다. 메시지를 확인 하시려면 메신저 버튼을 클릭하십시오." />
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics2.xml
deleted file mode 100644
index 8610748..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="그래픽 디테일" name="Display panel 3">
-        <text type="string" length="1" name="text">
-                쉐이더:
-        </text>
-        <check_box label="Vertex Shaders 사용함" name="shaders"
-             tool_tip="이 옵션을 사용하지 않으면 일부 그래픽 카드 드라이버에 오류가 발생할 수 있습니다." />
-        <check_box label="범프매핑 및 광택 보이기" name="bumpshiny" />
-        <check_box label="잔물결 보이기" name="ripple" />
-        <check_box label="아바타 버텍스 프로그램" name="avatarvp" />
-        <text type="string" length="1" name="Avatar Rendering:">
-                아바타 렌더링:
-        </text>
-        <radio_group name="Avatar Appearance">
-                <radio_item type="string" length="1" name="Normal">
-                        일반
-                </radio_item>
-                <radio_item type="string" length="1" name="Bump">
-                        범프 맵
-                </radio_item>
-                <radio_item type="string" length="1" name="Cloth">
-                        범프 맵 &amp; 옷감
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Lighting Detail:">
-                조명 세부 사항:
-        </text>
-        <radio_group name="lighting detail radio">
-                <radio_item type="string" length="1" name="SunMoon">
-                        자연광만 표시
-                </radio_item>
-                <radio_item type="string" length="1" name="LocalLights">
-                        근접 광원 표시
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Terrain Detail:">
-                지형 세부 사항:
-        </text>
-        <radio_group name="terrain detail radio">
-                <radio_item type="string" length="1" name="0">
-                        낮음
-                </radio_item>
-                <radio_item type="string" length="1" name="2">
-                        높음
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Object Mesh Detail:">
-                오브젝트 메쉬 디테일:
-        </text>
-        <text type="string" length="1" name="Flexible Mesh Detail:">
-                플렉시블 메쉬 디테일:
-        </text>
-        <text type="string" length="1" name="Tree Mesh Detail:">
-                나무 메쉬 디테일:
-        </text>
-        <text type="string" length="1" name="Avatar Mesh Detail:">
-                아바타 메쉬 디테일:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/ko/panel_preferences_graphics3.xml
deleted file mode 100644
index d64a3d1..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="그래픽 고급 사항" name="Display panel 2">
-        <text type="string" length="1" name="Filtering:">
-                필터링:
-        </text>
-        <check_box label="Anisotropic 필터링(사용시 느려짐)" name="ani" />
-        <spinner label="감마:" name="gamma" />
-        <text type="string" length="1" name="(brightness, lower is brighter)">
-                (밝기, 낮을 수록 밝음, 기본 설정값 0)
-        </text>
-        <spinner label="야간 밝기:" name="nighttime_brightness" />
-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)">
-                (높을 수록 밝음, 기본 설정값 1.0)
-        </text>
-        <text type="string" length="1" name="Enable VBO:">
-                VBO 사용:
-        </text>
-        <check_box label="OpenGL 버텍스 버퍼 오브젝트 사용" name="vbo"
-             tool_tip="활성화하면 OpenGL 드라이버에 오류가 발생할 수 있습니다." />
-        <text type="string" length="1" name="Graphics Card Memory:">
-                그래픽 카드 메모리:
-        </text>
-        <radio_group name="video card memory radio">
-                <radio_item type="string" length="1" name="radio">
-                        16MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        32MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        64MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4">
-                        128MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio5">
-                        256MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio6">
-                        512MB
-                </radio_item>
-        </radio_group>
-        <spinner label="안개 농도:" name="fog" />
-        <spinner label="최대 파티클 수:" name="particles" />
-        <spinner label="복장 구성 제한:" name="comp limit"
-             tool_tip="디스플레이할 최근 변경 복장의 수" />
-        <text type="string" length="1" name="(lower is faster)">
-                (낮을 수록 빠름)
-        </text>
-        <spinner label="디버그 표시 행 간격:" name="debug beacon line width" />
-        <check_box label="다음 시작할 때 그래픽 하드웨어 자동 감지"
-             name="probe_hardware_checkbox"
-             tool_tip="Second Life는 사용자의 하드웨어에 따라 일부 그래픽 설정을 자동으로 구성합니다.  새로운 하드웨어를 설치하려는 경우, Second Life가 이를 다시 감지하도록 해야 합니다." />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_chat.xml b/linden/indra/newview/skins/xui/ko/panel_settings_chat.xml
deleted file mode 100644
index aac33de..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_settings_chat.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat" title="대화">
-        <text>
-                글자 크기:
-        </text>
-        <radio_group name="chat font size">
-                <radio_item>
-                        소
-                </radio_item>
-                <radio_item>
-                        중
-                </radio_item>
-                <radio_item>
-                        대
-                </radio_item>
-        </radio_group>
-        <text>
-                글자 색:
-        </text>
-        <color_swatch label="시스템" name="system" />
-        <color_swatch label="사용자" name="users" />
-        <color_swatch label="오브젝트" name="objects" />
-        <color_swatch label="말풍선" name="background" />
-        <text>
-                콘솔:
-        </text>
-        <spinner label="채팅창 사라짐" name="fade_chat_time" />
-        <text>
-                (초)
-        </text>
-        <spinner label="" name="max_chat_count" />
-        <text>
-                (#행)
-        </text>
-        <slider label="투명도" name="console_opacity" />
-        <text>
-                옵션:
-        </text>
-        <check_box label="전체화면 사용(재시작 필요)" name="chat_full_width_check" />
-        <check_box label="Enter 키 누른 후 채팅창 닫기" name="close_chat_on_return_check" />
-        <check_box label="화살표 키는 채팅 시 아바타를 움직임"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="채팅 시간 표시하기" name="show_timestamps_check" />
-        <text>
-                말풍선 채팅:
-        </text>
-        <check_box label="말풍선 표시하기" name="bubble_text_chat" />
-        <slider label="투명도" name="bubble_chat_opacity" />
-        <text>
-                스크립트 오류:
-        </text>
-        <check_box label="스크립트 오류 및 경고를 일반 채팅으로 표시하기"
-             name="script_errors_as_chat" />
-        <color_swatch label="색" name="script_error" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_im.xml b/linden/indra/newview/skins/xui/ko/panel_settings_im.xml
deleted file mode 100644
index 985f2f6..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_settings_im.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="im" title="메신저">
-        <text>
-                메신저 옵션:
-        </text>
-        <check_box label="쪽지를 이메일로 전송" name="send_im_to_email"
-             tool_tip="secondlife.com에서 이메일 주소 변경" />
-        <check_box label="채팅 기록에 쪽지 포함" name="include_im_in_chat_history" />
-        <check_box label="메신저에 채팅 시간 표시하기" name="show_timestamps_check" />
-        <text>
-                부재중 답변:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/ko/panel_settings_msgbox.xml
deleted file mode 100644
index 6924e8b..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="팝업" name="popups" title="팝업">
-        <text>
-                팝업 차단:
-        </text>
-        <button label="팝업 보기" name="enable_popup" />
-        <text>
-                허용된 팝업:
-        </text>
-        <button label="나중에 알림&apos; 초기화…" name="reset_dialogs_btn" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_network.xml b/linden/indra/newview/skins/xui/ko/panel_settings_network.xml
deleted file mode 100644
index 30d2f8c..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_settings_network.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="network" title="네트워크">
-        <text>
-                최대 대역폭:
-        </text>
-        <slider label="" name="max_bandwidth" />
-        <text>
-                kbps (kilobits per second)
-        </text>
-        <text>
-                디스크 캐시 크기:
-        </text>
-        <radio_group name="disk cache">
-                <radio_item>
-                        50MB
-                </radio_item>
-                <radio_item>
-                        200MB
-                </radio_item>
-                <radio_item>
-                        500MB
-                </radio_item>
-                <radio_item>
-                        1000MB
-                </radio_item>
-        </radio_group>
-        <button label="캐시 비우기" name="clear_cache" />
-        <text>
-                프록시 구성:
-        </text>
-        <check_box label="프록시 사용" name="proxy_enabled"
-             tool_tip="프록시 구성 지정" />
-        <text>
-                프록시:
-        </text>
-        <line_editor name="proxy_address" tool_tip="사용할 프록시 이름 또는 IP 주소" />
-        <text>
-                포트:
-        </text>
-        <line_editor name="proxy_port" tool_tip="사용할 프록시의 포트 번호" />
-        <text>
-                양말:
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        양말 v4
-                </radio_item>
-                <radio_item>
-                        양말 v5
-                </radio_item>
-        </radio_group>
-        <text>
-                프록시 없음:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="다음에 대해 프록시를 사용하지 않을 이름 또는 IP 주소" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_settings_web.xml b/linden/indra/newview/skins/xui/ko/panel_settings_web.xml
deleted file mode 100644
index b60b43c..0000000
--- a/linden/indra/newview/skins/xui/ko/panel_settings_web.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="web" title="웹">
-        <check_box label="외부 웹 브라우저 사용(Firefox, Safari, Internet Explorer)"
-             name="external_browser_check"
-             tool_tip="도움말, 웹 링크 등의 경우 외부 웹 브라우저를 사용하십시오.\n전체 화면을 실행 중인 경우에는 권장되지 않습니다." />
-        <text>
-                프라우저 홈페이지:
-        </text>
-        <line_editor name="home_page"
-             tool_tip="세컨드라이프 브라우저를 열 때 처음으로 방문하는 웹 페이지" />
-        <text>
-                프록시 구성:
-        </text>
-        <check_box label="내부 웹 브라우저에 대해 프록시 사용" name="proxy_enabled"
-             tool_tip="내부 웹 브라우저에 대한 프록시 구성 지정" />
-        <text>
-                프록시:
-        </text>
-        <line_editor name="proxy_address" tool_tip="사용할 프록시 이름 또는 IP 주소" />
-        <text>
-                포트:
-        </text>
-        <line_editor name="proxy_port" tool_tip="사용할 프록시의 포트 번호" />
-        <text>
-                양말:
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        양말 v4
-                </radio_item>
-                <radio_item>
-                        양말 v5
-                </radio_item>
-        </radio_group>
-        <text>
-                다음 프록시 없음:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="다음에 대해 프록시를 사용하지 않을 이름 또는 IP 주소" />
-        <check_box
-             label="오브젝트에서 웹 페이지 표시(시험용, 컴퓨터를 다시 시작해야 함)"
-             name="web_pages_on_prims_check" />
-        <text>
-                트러스트된 사이트:
-(로그인하여 보기)
-        </text>
-        <button label="추가" name="add_trusted" />
-        <line_editor name="trusted_site_entry" tool_tip="신용 목록에 추가할 사이트" />
-        <button label="제거" name="rem_trusted" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml b/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml
index 66948e9..f98eb94 100644
--- a/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_speaker_controls.xml
@@ -3,10 +3,12 @@
        <string name="moderator_label">
                (진행자)
        </string>
-        <layout_stack name="">
+        <layout_stack name="panels">
                <layout_panel name="moderation_mode_panel">
                        <combo_box name="moderation_mode">
-                                음성 제어
+                                <combo_item name="ModeratedVoice" value="moderated">
+                                  음성 제어
+                                </combo_item>
                        </combo_box>
                </layout_panel>
                <layout_panel name="moderate_chat_panel">
diff --git a/linden/indra/newview/skins/xui/zh/floater_critical.xml b/linden/indra/newview/skins/xui/zh/floater_critical.xml
index 47d9e91..de628aa 100644
--- a/linden/indra/newview/skins/xui/zh/floater_critical.xml
+++ b/linden/indra/newview/skins/xui/zh/floater_critical.xml
@@ -2,9 +2,6 @@
 <floater name="modal container" title=" ">
        <button label="继续" label_selected="继续" name="Continue" />
        <button label="取消" label_selected="取消" name="Cancel" />
-        <text name="tos_title">
-                紧急信息
-        </text>
        <text name="tos_heading">
                请仔细阅读下列信息。
        </text>
diff --git a/linden/indra/newview/skins/xui/zh/floater_friends.xml b/linden/indra/newview/skins/xui/zh/floater_friends.xml
deleted file mode 100644
index d79cc3f..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_friends.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="friends" title="伙伴&quot;">
-        <scroll_list name="friend_list"
-             tool_tip="当点击选择多位好友时，按住shift键或者control键">
-                <column label="名字" name="friend_name" />
-        </scroll_list>
-        <panel name="rights_container">
-                <text name="friend_name_label">
-                        选择变更权利的朋友...
-                </text>
-                <check_box label="我的在线状态可见" name="online_status_cb"
-                     tool_tip="在朋友的好友列表或呼叫卡中设置我的在线状态是否对该朋友可见" />
-                <check_box label="我在地图中的位置可见" name="map_status_cb"
-                     tool_tip="设置该好友是否对我在地图中的位置可见" />
-                <check_box label="可以修改我的东东" name="modify_status_cb"
-                     tool_tip="设置该好友是否可以修改我的东东" />
-                <text name="process_rights_label">
-                        正在处理权力变更...
-                </text>
-        </panel>
-        <button label="档案..." name="profile_btn"
-             tool_tip="显示图片，社团以及其它信息" />
-        <button label="提供闪电传送..." name="offer_teleport_btn"
-             tool_tip="为此有人提供一次闪电传运到你现在所在地址。" />
-        <button label="添加..." name="add_btn" tool_tip="为一个用户提供友情卡。" />
-        <button label="付款..." name="pay_btn" tool_tip="馈赠林登元(L$)至这位朋友" />
-        <button label="移除e..." name="remove_btn"
-             tool_tip="将此人从你的友人列表中清除" />
-        <button label="即时通..." name="im_btn" tool_tip="打开即时消息单元" />
-        <button label="同意修改权利..." name="grant_btn"
-             tool_tip="允许此位用户来改进你的物体。" />
-        <button label="废除修改的权利..." name="revoke_btn"
-             tool_tip="允许此位用户来改进你的物体。" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_groups.xml b/linden/indra/newview/skins/xui/zh/floater_groups.xml
deleted file mode 100644
index de227f2..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_groups.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="社团">
-        <text name="groupdesc">
-                粗体字显示的是你目前正在活动的社团。
-        </text>
-        <text name="groupcount">
-                你属于[COUNT]个社团(最大数量为[MAX]).
-        </text>
-        <button label="激活" label_selected="激活" name="Activate" />
-        <button label="信息" label_selected="信息" name="Info" />
-        <button label="离开" label_selected="离开" name="Leave" />
-        <button label="创造" label_selected="创造" name="Create" />
-        <button label="搜索..." label_selected="搜索..." name="Search..." />
-        <button label="关闭" label_selected="关闭" name="Close" />
-</floater>
diff --git a/linden/indra/newview/skins/xui/zh/floater_preview_new_landmark.xml b/linden/indra/newview/skins/xui/zh/floater_preview_new_landmark.xml
deleted file mode 100644
index 0b1239a..0000000
--- a/linden/indra/newview/skins/xui/zh/floater_preview_new_landmark.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Linden Land, Da Boom (155, 136, 35)"
-     title="  Linden Land, Da Boom (155, 136, 35)">
-        <button label="闪电传送" label_selected="" name="Teleport btn" />
-        <button label="在地图中显示" label_selected="" name="Show on Map btn" />
-        <button label="放弃" label_selected="" name="Discard btn" />
-        <text type="string" length="1" name="desc txt">
-                描述:
-        </text>
-</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 1873576..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="你的杰斯卡 林登等级">
-        <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/menu_viewer.xml b/linden/indra/newview/skins/xui/zh/menu_viewer.xml
index 1178367..ea8610f 100644
--- a/linden/indra/newview/skins/xui/zh/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/zh/menu_viewer.xml
@@ -14,7 +14,6 @@
                <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" />
@@ -134,6 +133,7 @@
                <menu_item_separator label="-----------" name="separator3" />
                <menu_item_call label="设成离开状态" name="Set Away" />
                <menu_item_call label="设成繁忙模式" name="Set Busy" />
+                <menu_item_call label="停止所有动画" name="Stop All Animations" />
                <menu_item_separator label="-----------" name="separator4" />
                <menu_item_call label="帐户历史纪录..." name="Account History..." />
                <menu_item_call label="管理我的帐户..." name="Manage My Account..." />
@@ -180,7 +180,6 @@
                <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" />
diff --git a/linden/indra/newview/skins/xui/zh/panel_music_remote.xml b/linden/indra/newview/skins/xui/zh/panel_music_remote.xml
deleted file mode 100644
index 3e9db0c..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_music_remote.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="music_remote">
-        <text type="string" length="1" name="text">
-                音乐控制
-        </text>
-        <button label="" label_selected="" name="stop_btn" tool_tip="停止播放媒体" />
-        <button label="" label_selected="" name="play_btn" tool_tip="播放媒体流" />
-        <button label="" label_selected="" name="pause_btn" tool_tip="停止媒体流" />
-        <volume_slider name="volume_slider" tool_tip="使用这个滑动浮标调整音量" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_graphics2.xml b/linden/indra/newview/skins/xui/zh/panel_preferences_graphics2.xml
deleted file mode 100644
index 8683fff..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_graphics2.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Graphics Detail" name="Display panel 3">
-        <text type="string" length="1" name="text">
-                阴影:
-        </text>
-        <check_box label="应用放大地图和闪亮感" name="bumpshiny" />
-        <check_box label="激活水中波纹" name="ripple" />
-        <check_box label="化身最高级程序" name="avatarvp" />
-        <text type="string" length="1" name="Avatar Rendering:">
-                化身表现:
-        </text>
-        <radio_group name="Avatar Appearance">
-                <radio_item type="string" length="1" name="Normal">
-                        Normal
-                </radio_item>
-                <radio_item type="string" length="1" name="Bump">
-                        Bump Mapped
-                </radio_item>
-                <radio_item type="string" length="1" name="Cloth">
-                        Bump Mapped &amp; Cloth
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Lighting Detail:">
-                照明细节:
-        </text>
-        <radio_group name="lighting detail radio">
-                <radio_item type="string" length="1" name="SunMoon">
-                        Sun and moon only
-                </radio_item>
-                <radio_item type="string" length="1" name="LocalLights">
-                        Nearby local lights
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Terrain Detail:">
-                地形细节:
-        </text>
-        <radio_group name="terrain detail radio">
-                <radio_item type="string" length="1" name="0">
-                        低
-                </radio_item>
-                <radio_item type="string" length="1" name="2">
-                        高
-                </radio_item>
-        </radio_group>
-        <text type="string" length="1" name="Object Mesh Detail:">
-                对象循环细节:
-        </text>
-        <text type="string" length="1" name="Flexible Mesh Detail:">
-                灵活的网孔细节:
-        </text>
-        <text type="string" length="1" name="Tree Mesh Detail:">
-                树木网格细节:
-        </text>
-        <text type="string" length="1" name="Avatar Mesh Detail:">
-                化身咬合细节:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/zh/panel_preferences_graphics3.xml
deleted file mode 100644
index b17dbfb..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_preferences_graphics3.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Adv. Graphics" name="Display panel 2">
-        <text type="string" length="1" name="Filtering:">
-                过滤:
-        </text>
-        <check_box label="异性过滤(激活该功能时会影响速度)" name="ani" />
-        <spinner label="微克:" name="gamma" />
-        <text type="string" length="1" name="(brightness, lower is brighter)">
-                (亮度, 数字越小亮度越大, 0=使用默认)
-        </text>
-        <spinner label="夜晚亮度:" name="nighttime_brightness" />
-        <text type="string" length="1" name="(higher is brighter, 1.0 is default)">
-                (越高越亮,默认为1.0)
-        </text>
-        <text type="string" length="1" name="AGP Graphics Card:">
-                AGP图像卡:
-        </text>
-        <check_box label="激活AGP (如果使用AGP图像显卡速度会更快)" name="agp"
-             tool_tip="如果您是在使用标准PCI的显卡，启动此项可能会降低性能，并占用更多的内存。" />
-        <text type="string" length="1" name="Graphics Card Memory:">
-                图像卡记忆空间:
-        </text>
-        <radio_group name="video card memory radio">
-                <radio_item type="string" length="1" name="radio">
-                        16MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        32MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        64MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4">
-                        128MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio5">
-                        256MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio6">
-                        512MB
-                </radio_item>
-        </radio_group>
-        <spinner label="浓雾可见率:" name="fog" />
-        <spinner label="最大点数:" name="particles" />
-        <spinner label="最高装备额度:" name="comp limit"
-             tool_tip="显示最近被修改装备的数量。" />
-        <text type="string" length="1" name="(lower is faster)">
-                (越低越快)
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_settings_chat.xml b/linden/indra/newview/skins/xui/zh/panel_settings_chat.xml
deleted file mode 100644
index 7fd07cd..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_settings_chat.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="chat" title="谈话">
-        <text>
-                聊天字体大小:
-        </text>
-        <radio_group name="chat font size">
-                <radio_item>
-                        小型的
-                </radio_item>
-                <radio_item>
-                        中型的
-                </radio_item>
-                <radio_item>
-                        大型的
-                </radio_item>
-        </radio_group>
-        <text>
-                聊天颜色:
-        </text>
-        <color_swatch label="系统" name="system" />
-        <color_swatch label="用户" name="users" />
-        <color_swatch label="东东" name="objects" />
-        <color_swatch label="泡沫" name="background" />
-        <text>
-                聊天控制台:
-        </text>
-        <spinner label="聊天结束后淡出" name="fade_chat_time" />
-        <text>
-                (秒)
-        </text>
-        <spinner label="" name="max_chat_count" />
-        <text>
-                (#行)
-        </text>
-        <slider label="不透明" name="console_opacity" />
-        <text>
-                聊天选项:
-        </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>
-                泡泡聊:
-        </text>
-        <check_box label="显示聊天窗口" name="bubble_text_chat" />
-        <slider label="不透明" name="bubble_chat_opacity" />
-        <text>
-                脚本出错:
-        </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_settings_im.xml b/linden/indra/newview/skins/xui/zh/panel_settings_im.xml
deleted file mode 100644
index 3f80e77..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_settings_im.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="im" title="即时通">
-        <text>
-                即时通选项:
-        </text>
-        <check_box label="发送及时消息往 e-mail" name="send_im_to_email"
-             tool_tip="在 secondlife.com中更改你的电子邮箱地址" />
-        <check_box label="聊天记录中包含即时通信息" name="include_im_in_chat_history" />
-        <check_box label="在即时消息中显示时间" name="show_timestamps_check" />
-        <text>
-                忙碌模式的自动回复:
-        </text>
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_settings_msgbox.xml b/linden/indra/newview/skins/xui/zh/panel_settings_msgbox.xml
deleted file mode 100644
index 835e436..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_settings_msgbox.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="弹出程序" name="popups" title="弹出程序">
-        <text>
-                不显示弹出程序:
-        </text>
-        <button label="Enable this popup" name="enable_popup" />
-        <text>
-                显示弹出程序:
-        </text>
-        <button label="重置 &apos;下次显示&apos;对话..." name="reset_dialogs_btn" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_settings_network.xml b/linden/indra/newview/skins/xui/zh/panel_settings_network.xml
deleted file mode 100644
index b3e987f..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_settings_network.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="network" title="网络">
-        <text>
-                最大带宽:
-        </text>
-        <slider label="" name="max_bandwidth" />
-        <text>
-                kbps (每秒kb数)
-        </text>
-        <text>
-                磁盘高速缓存大小:
-        </text>
-        <radio_group name="disk cache">
-                <radio_item>
-                        50 MB
-                </radio_item>
-                <radio_item>
-                        200 MB
-                </radio_item>
-                <radio_item>
-                        500 MB
-                </radio_item>
-                <radio_item>
-                        1000 MB
-                </radio_item>
-        </radio_group>
-        <button label="清除缓存" name="clear_cache" />
-        <text>
-                代理服务器配置:
-        </text>
-        <check_box label="使用代理服务器" name="proxy_enabled"
-             tool_tip="特别设定代理服务器配置。" />
-        <text>
-                代理服务器:
-        </text>
-        <line_editor name="proxy_address" tool_tip="请输入代理服务器的名称或IP地址" />
-        <text>
-                端口：
-        </text>
-        <line_editor name="proxy_port" tool_tip="The port number of the proxy you would like to use" />
-        <text>
-                袜子：
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                没有代理:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="请输入不想使用代理服务器替换的名称或IP地址" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_settings_web.xml b/linden/indra/newview/skins/xui/zh/panel_settings_web.xml
deleted file mode 100644
index 46334d9..0000000
--- a/linden/indra/newview/skins/xui/zh/panel_settings_web.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="web" title="网络">
-        <check_box label="使用外部浏览器(Firefox, Safari, IE)"
-             name="external_browser_check"
-             tool_tip="使用外部网络浏览器获得帮助, 网页链接, 等等。\n若全屏显示则不推荐使用。" />
-        <text>
-                浏览器主页:
-        </text>
-        <line_editor name="home_page" tool_tip="首次打开第二人生浏览器时的浏览页面" />
-        <text>
-                代理服务器配置:
-        </text>
-        <check_box label="内部浏览器使用代理服务器" name="proxy_enabled"
-             tool_tip="请为因特网网络浏览器指定代理服务器配置。" />
-        <text>
-                代理服务器:
-        </text>
-        <line_editor name="proxy_address" tool_tip="请输入代理服务器的名称或IP地址" />
-        <text>
-                端口：
-        </text>
-        <line_editor name="proxy_port" tool_tip="The port number of the proxy you would like to use" />
-        <text>
-                袜子：
-        </text>
-        <radio_group name="socks_4_5">
-                <radio_item>
-                        Socks v4
-                </radio_item>
-                <radio_item>
-                        Socks v5
-                </radio_item>
-        </radio_group>
-        <text>
-                对以下内容不使用代理:
-        </text>
-        <line_editor name="proxy_exclusions"
-             tool_tip="请输入不想使用代理服务器替换的名称或IP地址" />
-        <check_box label="在东东上显示网页 (实验性功能, 需要重启)"
-             name="web_pages_on_prims_check" />
-        <text>
-                安全地址：
-（登陆察看）
-        </text>
-        <button label="添加" name="add_trusted" />
-        <line_editor name="trusted_site_entry" tool_tip="添加到安全名单中的网络地址" />
-        <button label="移除" name="rem_trusted" />
-</panel>
diff --git a/linden/indra/newview/skins/xui/zh/panel_toolbar.xml b/linden/indra/newview/skins/xui/zh/panel_toolbar.xml
index 372a2f5..74f8128 100644
--- a/linden/indra/newview/skins/xui/zh/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/zh/panel_toolbar.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="toolbar">
+        <layout_stack name="toolbar_stack">
        <button label="即时通" name="im_btn" tool_tip="用即时通联系你的朋友。" />
        <button label="聊天" name="chat_btn"
             tool_tip="与附近的人交谈.点击交谈之后点击历史去查找交谈记录。" />
@@ -16,4 +17,5 @@
             tool_tip="你周围区域的地图。 (Ctrl-Shift-M)" />
        <button label="地图" name="map_btn" tool_tip="全部完整地图。 (Ctrl-M)" />
        <button label="库存" name="inventory_btn" tool_tip="你的东东栏。 (Ctrl-I)" />
+  </layout_stack>
 </panel>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 43734df..d07ebf0 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -115,38 +115,18 @@ class ViewerManifest(LLManifest):
                if not self.default_grid():
                        if self.default_channel():
                                # beta grid viewer
-                                channel_flags = '-settings settings_beta.xml'
+                                channel_flags = '--settings settings_beta.xml'
-                        grid_flags = "-helperuri http://preview-%(grid)s.secondlife.com/helpers/ -loginuri https://login.%(grid)s.lindenlab.com/cgi-bin/login.cgi" % {'grid':self.args['grid']}
+                        grid_flags = "--grid %(grid)s --helperuri http://preview-%(grid)s.secondlife.com/helpers/" % {'grid':self.args['grid']}
                        
                if not self.default_channel():
                        # some channel on some grid
-                        channel_flags = '-settings settings_%s.xml -channel "%s"' % (self.channel_lowerword(), self.channel())
+                        channel_flags = '--settings settings_%s.xml --channel "%s"' % (self.channel_lowerword(), self.channel())
                elif self.login_channel():
                        # Report a special channel during login, but use default channel elsewhere
-                        channel_flags = '-channel "%s"' % (self.login_channel())
+                        channel_flags = '--channel "%s"' % (self.login_channel())
                        
                return " ".join((channel_flags, grid_flags)).strip()
-        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.default_grid()):
-                                if(self.default_channel()):
-                                        # agni release
-                                        return 'http://secondlife.com/app/login/'
-                                else:
-                                        # first look (or other) on agni
-                                        return 'http://secondlife.com/app/login/%s/' % self.channel_lowerword()
-                        else:
-                                # beta grid
-                                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):
@@ -229,7 +209,6 @@ class WindowsManifest(ViewerManifest):
 #                # 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):
@@ -349,7 +328,7 @@ class WindowsManifest(ViewerManifest):
                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.remove(self.dst_path_of(tempfile))
                self.created_path(installer_file)
@@ -363,6 +342,9 @@ class DarwinManifest(ViewerManifest):
                        #  <bundle>/Contents/MacOS/
                        self.contents_of_tar('mozilla-universal-darwin.tgz', 'MacOS')
+                        # copy additional libs in <bundle>/Contents/MacOS/
+                        self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib")
                        # replace the default theme with our custom theme (so scrollbars work).
                        if self.prefix(src="mozilla-theme", dst="MacOS/chrome"):
                                self.path("classic.jar")
@@ -387,9 +369,6 @@ class DarwinManifest(ViewerManifest):
                                # 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")
@@ -459,7 +438,7 @@ 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")
+                self.path("res/ll_icon.png","secondlife_icon.png")
                if self.prefix("linux_tools", ""):
                        self.path("client-readme.txt","README-linux.txt")
                        self.path("client-readme-voice.txt","README-linux-voice.txt")
@@ -471,15 +450,12 @@ class LinuxManifest(ViewerManifest):
                # 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']
@@ -491,6 +467,15 @@ class LinuxManifest(ViewerManifest):
                        else:
                                installer_name += '_' + self.channel_oneword().upper()
+                # Fix access permissions
+                self.run_command("""
+                find %(dst)s -type d | xargs chmod 755;
+                find %(dst)s -type f -perm 0700 | xargs chmod 0755;
+                find %(dst)s -type f -perm 0500 | xargs chmod 0555;
+                find %(dst)s -type f -perm 0600 | xargs chmod 0644;
+                find %(dst)s -type f -perm 0400 | xargs chmod 0444;
+                true""" %  {'dst':self.get_dst_prefix() })
                # 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.
diff --git a/linden/indra/test/files.lst b/linden/indra/test/files.lst
index d923d8f..b335dbf 100644
--- a/linden/indra/test/files.lst
+++ b/linden/indra/test/files.lst
@@ -5,6 +5,7 @@ test/llapp_tut.cpp
 test/llbase64_tut.cpp
 test/llblowfish_tut.cpp
 test/llbuffer_tut.cpp
+test/llcontrol_tut.cpp
 test/lldate_tut.cpp
 test/llerror_tut.cpp
 test/llhost_tut.cpp
@@ -38,6 +39,7 @@ test/lluuidhashmap_tut.cpp
 test/llxfer_tut.cpp
 test/math.cpp
 test/message_tut.cpp
+test/prim_linkability_tut.cpp
 test/reflection_tut.cpp
 test/test.cpp
 test/v2math_tut.cpp
diff --git a/linden/indra/test/inventory.cpp b/linden/indra/test/inventory.cpp
index 7c81dbe..3899dfc 100644
--- a/linden/indra/test/inventory.cpp
+++ b/linden/indra/test/inventory.cpp
@@ -453,9 +453,7 @@ namespace tut
                ensure_equals("9.sale price::getSalePrice() failed price", src1->getSaleInfo().getSalePrice(), src2->getSaleInfo().getSalePrice());
                ensure_equals("10.name::getName() failed", src1->getName(), src2->getName());
                ensure_equals("11.description::getDescription() failed", src1->getDescription(), src2->getDescription());                               
+                //skip_fail("12.creation::getCreationDate()");
-                skip_fail("12.creation::getCreationDate()");
                ensure_equals("12.creation::getCreationDate() failed", src1->getCreationDate(), src2->getCreationDate());
        }       
diff --git a/linden/indra/test/io.cpp b/linden/indra/test/io.cpp
index fe8c19d..408b7c8 100644
--- a/linden/indra/test/io.cpp
+++ b/linden/indra/test/io.cpp
@@ -1151,7 +1151,7 @@ namespace tut
                chain.push_back(LLIOPipe::ptr_t(new LLPipeStringInjector("hi")));
                chain.push_back(LLIOPipe::ptr_t(new LLIOSocketWriter(client)));
                chain.push_back(LLIOPipe::ptr_t(new LLIONull));
-                mPump->addChain(chain, 0.2);
+                mPump->addChain(chain, 0.2f);
                chain.clear();
                // pump for a bit and make sure all 3 chains are running
diff --git a/linden/indra/test/llcontrol_tut.cpp b/linden/indra/test/llcontrol_tut.cpp
new file mode 100644
index 0000000..aabe205
--- /dev/null
+++ b/linden/indra/test/llcontrol_tut.cpp
@@ -0,0 +1,147 @@
+/** 
+ * @file llcontrol_tut.cpp
+ * @date   February 2008
+ * @brief control group unit tests
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "linden_common.h"
+#include <tut/tut.h>
+#include "lltut.h"
+#include "llcontrol.h"
+#include "llsdserialize.h"
+namespace tut
+{
+        struct control_group
+        {
+                LLControlGroup* mCG;
+                LLString mTestConfigDir;
+                LLString mTestConfigFile;
+                static bool mListenerFired;
+                control_group()
+                {
+                        mCG = new LLControlGroup;
+                        LLUUID random;
+                        random.generate();
+                        // generate temp dir
+                        std::ostringstream oStr;
+                        oStr << "/tmp/llcontrol-test-" << random << "/";
+                        mTestConfigDir = oStr.str();
+                        mTestConfigFile = mTestConfigDir + "settings.xml";
+                        LLFile::mkdir(mTestConfigDir.c_str());
+                        LLSD config;
+                        config["TestSetting"]["Comment"] = "Dummy setting used for testing";
+                        config["TestSetting"]["Persist"] = 1;
+                        config["TestSetting"]["Type"] = "U32";
+                        config["TestSetting"]["Value"] = 12;
+                        writeSettingsFile(config);
+                }
+                ~control_group()
+                {
+                        //Remove test files
+                        delete mCG;
+                }
+                void writeSettingsFile(const LLSD& config)
+                {
+                        llofstream file(mTestConfigFile.c_str());
+                        if (file.is_open())
+                        {
+                                LLSDSerialize::toPrettyXML(config, file);
+                        }
+                        file.close();
+                }
+                static bool handleListenerTest(const LLSD& newvalue)
+                {
+                        control_group::mListenerFired = true;
+                        return true;
+                }
+        };
+        bool control_group::mListenerFired = false;
+        typedef test_group<control_group> control_group_test;
+        typedef control_group_test::object control_group_t;
+        control_group_test tut_control_group("control_group");
+        //load settings from files - LLSD
+        template<> template<>
+        void control_group_t::test<1>()
+        {
+                int results = mCG->loadFromFile(mTestConfigFile.c_str());
+                ensure("number of settings", (results == 1));
+                ensure("value of setting", (mCG->getU32("TestSetting") == 12));
+        }
+        //save settings to files
+        template<> template<>
+        void control_group_t::test<2>()
+        {
+                int results = mCG->loadFromFile(mTestConfigFile.c_str());
+                mCG->setU32("TestSetting", 13);
+                ensure_equals("value of changed setting", mCG->getU32("TestSetting"), 13);
+                LLControlGroup test_cg;
+                LLString temp_test_file = (mTestConfigDir + "setting_llsd_temp.xml");
+                mCG->saveToFile(temp_test_file.c_str(), TRUE);
+                results = test_cg.loadFromFile(temp_test_file.c_str());
+                ensure("number of changed settings loaded", (results == 1));
+                ensure("value of changed settings loaded", (test_cg.getU32("TestSetting") == 13));
+        }
+   
+        //priorities
+        template<> template<>
+        void control_group_t::test<3>()
+        {
+                int results = mCG->loadFromFile(mTestConfigFile.c_str());
+                LLControlVariable* control = mCG->getControl("TestSetting");
+                LLSD new_value = 13;
+                control->setValue(new_value, FALSE);
+                ensure_equals("value of changed setting", mCG->getU32("TestSetting"), 13);
+                LLControlGroup test_cg;
+                LLString temp_test_file = (mTestConfigDir + "setting_llsd_persist_temp.xml");
+                mCG->saveToFile(temp_test_file.c_str(), TRUE);
+                results = test_cg.loadFromFile(temp_test_file.c_str());
+                //If we haven't changed any settings, then we shouldn't have any settings to load
+                ensure("number of non-persisted changed settings loaded", (results == 0));
+        }
+        //listeners
+        template<> template<>
+        void control_group_t::test<4>()
+        {
+                int results = mCG->loadFromFile(mTestConfigFile.c_str());
+                ensure("number of settings", (results == 1));
+                mCG->getControl("TestSetting")->getSignal()->connect(boost::bind(&this->handleListenerTest, _1));
+                mCG->setU32("TestSetting", 13);
+                ensure("listener fired on changed setting", mListenerFired);       
+        }
+}
diff --git a/linden/indra/test/llmessageconfig_tut.cpp b/linden/indra/test/llmessageconfig_tut.cpp
index b709bfc..e5dd328 100644
--- a/linden/indra/test/llmessageconfig_tut.cpp
+++ b/linden/indra/test/llmessageconfig_tut.cpp
@@ -35,7 +35,6 @@
 #include "lltut.h"
 #include "llsdserialize.h"
 #include "llfile.h"
-#include "lldir.h"
 #include "lltimer.h"
 #include "llframetimer.h"
 #include "llsdutil.h"
@@ -51,7 +50,11 @@ namespace tut
                        random.generate();
                        // generate temp dir
                        std::ostringstream oStr;
+#if LL_WINDOWS 
+                        oStr << "llmessage-config-test-" << random;
+#else
                        oStr << "/tmp/llmessage-config-test-" << random;
+#endif
                        mTestConfigDir = oStr.str();
                        LLFile::mkdir(mTestConfigDir.c_str());
                        writeConfigFile(LLSD());
@@ -199,4 +202,23 @@ namespace tut
                                          LLMessageConfig::getServerDefaultFlavor(),
                                          LLMessageConfig::LLSD_FLAVOR);
        }
+        template<> template<>
+        void LLMessageConfigTestObject::test<8>()
+                // tests that config changes are picked up/refreshed periodically
+        {
+                LLSD config;
+                config["serverDefaults"]["simulator"] = "template";
+                config["messages"]["msg1"]["flavor"] = "llsd";
+                config["messages"]["msg1"]["only-send-latest"] = true;
+                config["messages"]["msg2"]["flavor"] = "llsd";
+                config["messages"]["msg2"]["only-send-latest"] = false;
+                LLMessageConfig::useConfig(config);
+                ensure_equals("Ensure msg1 exists, sent latest-only",
+                                          LLMessageConfig::onlySendLatest("msg1"),
+                                          true);
+                ensure_equals("Ensure msg2 exists, sent latest-only",
+                                          LLMessageConfig::onlySendLatest("msg2"),
+                                          false);
+        }
 }
diff --git a/linden/indra/test/llmessagetemplateparser_tut.cpp b/linden/indra/test/llmessagetemplateparser_tut.cpp
index fe8e34c..7634e90 100644
--- a/linden/indra/test/llmessagetemplateparser_tut.cpp
+++ b/linden/indra/test/llmessagetemplateparser_tut.cpp
@@ -56,7 +56,7 @@ namespace tut
                char * prehash(const char * name)
                {
-                        return gMessageStringTable.getString(name);
+                        return LLMessageStringTable::getInstance()->getString(name);
                }
                void ensure_block_attributes(std::string identifier,
diff --git a/linden/indra/test/llnamevalue_tut.cpp b/linden/indra/test/llnamevalue_tut.cpp
index d38913a..f604e84 100644
--- a/linden/indra/test/llnamevalue_tut.cpp
+++ b/linden/indra/test/llnamevalue_tut.cpp
@@ -42,133 +42,7 @@ namespace tut
        {
                namevalue_test() 
                {                       
-                        mExpectedNameValueReference.string = NULL;
-                        mExpectedNameValueType = NVT_NULL;
-                        mCallbackCount = 0;
                }
-                ~namevalue_test() 
-                {
-                        reset();
-                };
-                
-                void reset() 
-                {
-                        switch(mExpectedNameValueType)
-                        {
-                        case NVT_STRING: 
-                        case NVT_ASSET: 
-                                delete [] mExpectedNameValueReference.string;
-                                mExpectedNameValueReference.string = NULL;
-                                break;
-                        case NVT_F32:
-                                delete mExpectedNameValueReference.f32;
-                                mExpectedNameValueReference.f32 = NULL;
-                                break;
-                        case NVT_S32:
-                                delete mExpectedNameValueReference.s32;
-                                mExpectedNameValueReference.s32 = NULL;
-                                break;
-                        case NVT_U32:
-                                delete mExpectedNameValueReference.u32;
-                                mExpectedNameValueReference.u32 = NULL;
-                                break;
-                        case NVT_VEC3:
-                                delete mExpectedNameValueReference.vec3;
-                                mExpectedNameValueReference.vec3 = NULL;
-                                break;
-                        case NVT_U64:
-                                delete mExpectedNameValueReference.u64;
-                                mExpectedNameValueReference.u64 = NULL;
-                        default:
-                                break;
-                        }
-                        mExpectedNameValueType = NVT_NULL;
-                        mCallbackCount = 0;
-                }
-                void setExpectedResult(ENameValueType type, void* value)
-                {
-                        reset();
-                        mExpectedNameValueType = type;
-                        switch(type)
-                        {
-                        case NVT_STRING:
-                        case NVT_ASSET: 
-                                mExpectedNameValueReference.string = new char[strlen((const char*) value)+1];
-                                strcpy(mExpectedNameValueReference.string, (const char*) value);
-                                break;
-                        case NVT_F32:
-                                mExpectedNameValueReference.f32 = new F32(*((F32*) value));
-                                break;
-                        case NVT_S32:
-                                mExpectedNameValueReference.s32 = new S32(*((S32*) value));
-                                break;
-                        case NVT_U32:
-                                mExpectedNameValueReference.u32 = new U32(*((U32*) value));
-                                break;
-                        case NVT_VEC3:
-                                mExpectedNameValueReference.vec3 = new LLVector3(*((LLVector3*) value));
-                                break;
-                        case NVT_U64:
-                                mExpectedNameValueReference.u64 = new U64(*((U64*) value));
-                        default:
-                                break;
-                        }
-                }
-                void verifyChange(LLNameValue* changed)
-                {
-                        std::string str = "";
-                        str += "Expected Value of type: ";
-                        str += NameValueTypeStrings[mExpectedNameValueType];
-                        str += "not equal";
-                        switch(mExpectedNameValueType)
-                        {
-                        case NVT_STRING:
-                                ensure_memory_matches(str.c_str(),  changed->getString(), strlen(changed->getString()), mExpectedNameValueReference.string, strlen(mExpectedNameValueReference.string)); 
-                                break;
-                        case NVT_ASSET: 
-                                ensure_memory_matches(str.c_str(),  changed->getAsset(), strlen(changed->getAsset()), mExpectedNameValueReference.string, strlen(mExpectedNameValueReference.string)); 
-                                break;
-                        case NVT_F32:
-                                ensure(str, *(changed->getF32()) == *mExpectedNameValueReference.f32);
-                                break;
-                        case NVT_S32:
-                                ensure(str, *(changed->getS32()) == *mExpectedNameValueReference.s32);
-                                break;
-                        case NVT_U32:
-                                ensure(str, *(changed->getU32()) == *mExpectedNameValueReference.u32);
-                                break;
-                        case NVT_VEC3:
-                                ensure(str, *(changed->getVec3()) == *mExpectedNameValueReference.vec3);
-                                break;
-                        case NVT_U64:
-                                ensure(str, *(changed->getU64()) == *mExpectedNameValueReference.u64);
-                                break;
-                        default:
-                                break;
-                        }
-                }
-                void HandleCallback(LLNameValue* changed)
-                {
-                        mCallbackCount++;
-                        verifyChange(changed);
-                        ensure("Callback called more than once", mCallbackCount == 1);
-                }
-                static void NameValueCallbackFunction(LLNameValue* changed, void** data)
-                {
-                        namevalue_test* pNameValue = (namevalue_test*)data;
-                        pNameValue->HandleCallback(changed);
-                }
-                ENameValueType          mExpectedNameValueType;
-                UNameValueReference     mExpectedNameValueReference;
-                int  mCallbackCount;
        };
        typedef test_group<namevalue_test> namevalue_t;
        typedef namevalue_t::object namevalue_object_t;
@@ -225,33 +99,33 @@ namespace tut
                ensure("3. getS32 failed", *nValue3.getS32() == -43456787);
                ensure("sendToData or sendToViewer failed", nValue3.sendToData() && !nValue3.sendToViewer());
-                LLNameValue nValue4("SecondLife", "<1.0, 2.0, 3.0>", "VEC3", "CB", "SV");
+                LLNameValue nValue4("SecondLife", "<1.0, 2.0, 3.0>", "VEC3", "RW", "SV");
                LLVector3 llvec4(1.0, 2.0, 3.0);
                ensure("4. getTypeEnum failed", nValue4.getTypeEnum() == NVT_VEC3);
-                ensure("4. getClassEnum failed", nValue4.getClassEnum() == NVC_CALLBACK);
+                ensure("4. getClassEnum failed", nValue4.getClassEnum() == NVC_READ_WRITE);
                ensure("4. getSendtoEnum failed", nValue4.getSendtoEnum() == NVS_SIM_VIEWER);
                ensure("4. getVec3 failed", *nValue4.getVec3() == llvec4);
                ensure("4. sendToData or sendToViewer failed", !nValue4.sendToData() && nValue4.sendToViewer());
-                LLNameValue nValue5("SecondLife", "-1.0, 2.4, 3", "VEC3", "CALLBACK", "SIM_VIEWER");
+                LLNameValue nValue5("SecondLife", "-1.0, 2.4, 3", "VEC3", "RW", "SIM_VIEWER");
                LLVector3 llvec5(-1.0f, 2.4f, 3);
                ensure("5. getTypeEnum failed", nValue5.getTypeEnum() == NVT_VEC3);
-                ensure("5. getClassEnum failed", nValue5.getClassEnum() == NVC_CALLBACK);
+                ensure("5. getClassEnum failed", nValue5.getClassEnum() == NVC_READ_WRITE);
                ensure("5. getSendtoEnum failed", nValue5.getSendtoEnum() == NVS_SIM_VIEWER);
                ensure("5. getVec3 failed", *nValue5.getVec3() == llvec5);
                ensure("5. sendToData or sendToViewer failed", !nValue5.sendToData() && nValue5.sendToViewer());
-                LLNameValue nValue6("SecondLife", "89764323", "U32", "CALLBACK", "DSV");
+                LLNameValue nValue6("SecondLife", "89764323", "U32", "RW", "DSV");
                ensure("6. getTypeEnum failed", nValue6.getTypeEnum() == NVT_U32);
-                ensure("6. getClassEnum failed", nValue6.getClassEnum() == NVC_CALLBACK);
+                ensure("6. getClassEnum failed", nValue6.getClassEnum() == NVC_READ_WRITE);
                ensure("6. getSendtoEnum failed", nValue6.getSendtoEnum() == NVS_DATA_SIM_VIEWER);
                ensure("6. getU32 failed", *nValue6.getU32() == 89764323);
                ensure("6. sendToData or sendToViewer failed", nValue6.sendToData() && nValue6.sendToViewer());
-                LLNameValue nValue7("SecondLife", "89764323323232", "U64", "CALLBACK", "SIM_SPACE_VIEWER");
+                LLNameValue nValue7("SecondLife", "89764323323232", "U64", "RW", "SIM_SPACE_VIEWER");
                U64 u64_7 = U64L(89764323323232);
                ensure("7. getTypeEnum failed", nValue7.getTypeEnum() == NVT_U64);
-                ensure("7. getClassEnum failed", nValue7.getClassEnum() == NVC_CALLBACK);
+                ensure("7. getClassEnum failed", nValue7.getClassEnum() == NVC_READ_WRITE);
                ensure("7. getSendtoEnum failed", nValue7.getSendtoEnum() == NVS_DATA_SIM_VIEWER);
                ensure("7. getU32 failed", *nValue7.getU64() == u64_7);
                ensure("7. sendToData or sendToViewer failed", nValue7.sendToData() && nValue7.sendToViewer());
@@ -288,30 +162,30 @@ namespace tut
                ensure("3. getSendtoEnum failed", nValue3.getSendtoEnum() == NVS_SIM);
                ensure("3. getS32 failed", *nValue3.getS32() == -43456787);
-                LLNameValue nValue4("SecondLife", "<1.0, 2.0, 3.0>", "VEC3", "CB");
+                LLNameValue nValue4("SecondLife", "<1.0, 2.0, 3.0>", "VEC3", "RW");
                LLVector3 llvec4(1.0, 2.0, 3.0);
                ensure("4. getTypeEnum failed", nValue4.getTypeEnum() == NVT_VEC3);
-                ensure("4. getClassEnum failed", nValue4.getClassEnum() == NVC_CALLBACK);
+                ensure("4. getClassEnum failed", nValue4.getClassEnum() == NVC_READ_WRITE);
                ensure("4. getSendtoEnum failed", nValue4.getSendtoEnum() == NVS_SIM);
                ensure("4. getVec3 failed", *nValue4.getVec3() == llvec4);
-                LLNameValue nValue5("SecondLife", "-1.0, 2.4, 3", "VEC3", "CALLBACK");
+                LLNameValue nValue5("SecondLife", "-1.0, 2.4, 3", "VEC3", "RW");
                LLVector3 llvec5(-1.0f, 2.4f, 3);
                ensure("5. getTypeEnum failed", nValue5.getTypeEnum() == NVT_VEC3);
-                ensure("5. getClassEnum failed", nValue5.getClassEnum() == NVC_CALLBACK);
+                ensure("5. getClassEnum failed", nValue5.getClassEnum() == NVC_READ_WRITE);
                ensure("5. getSendtoEnum failed", nValue5.getSendtoEnum() == NVS_SIM);
                ensure("5. getVec3 failed", *nValue5.getVec3() == llvec5);
-                LLNameValue nValue6("SecondLife", "89764323", "U32", "CALLBACK");
+                LLNameValue nValue6("SecondLife", "89764323", "U32", "RW");
                ensure("6. getTypeEnum failed", nValue6.getTypeEnum() == NVT_U32);
-                ensure("6. getClassEnum failed", nValue6.getClassEnum() == NVC_CALLBACK);
+                ensure("6. getClassEnum failed", nValue6.getClassEnum() == NVC_READ_WRITE);
                ensure("6. getSendtoEnum failed", nValue6.getSendtoEnum() == NVS_SIM);
                ensure("6. getU32 failed", *nValue6.getU32() == 89764323);
-                LLNameValue nValue7("SecondLife", "89764323323232", "U64", "CALLBACK");
+                LLNameValue nValue7("SecondLife", "89764323323232", "U64", "RW");
                U64 u64_7 = U64L(89764323323232);
                ensure("7. getTypeEnum failed", nValue7.getTypeEnum() == NVT_U64);
-                ensure("7. getClassEnum failed", nValue7.getClassEnum() == NVC_CALLBACK);
+                ensure("7. getClassEnum failed", nValue7.getClassEnum() == NVC_READ_WRITE);
                ensure("7. getSendtoEnum failed", nValue7.getSendtoEnum() == NVS_SIM);
                ensure("7. getU32 failed", *nValue7.getU64() == u64_7);
        }
@@ -343,208 +217,118 @@ namespace tut
                ensure("3. getClassEnum failed", nValue3.getClassEnum() == NVC_READ_ONLY);
                ensure("3. getSendtoEnum failed", nValue3.getSendtoEnum() == NVS_SIM);
-                skip_fail("NVC_CALLBACK does not parse.");
+                LLNameValue nValue4("SecondLife", "VEC3", "READ_WRITE");
-                LLNameValue nValue4("SecondLife", "VEC3", "CALLBACK");
                ensure("4. getTypeEnum failed", nValue4.getTypeEnum() == NVT_VEC3);
-                ensure("4. getClassEnum failed", nValue4.getClassEnum() == NVC_CALLBACK);
+                ensure("4. getClassEnum failed", nValue4.getClassEnum() == NVC_READ_WRITE);
                ensure("4. getSendtoEnum failed", nValue4.getSendtoEnum() == NVS_SIM);
-                LLNameValue nValue6("SecondLife", "U32", "CALLBACK");
+                LLNameValue nValue6("SecondLife", "U32", "READ_WRITE");
                ensure("6. getTypeEnum failed", nValue6.getTypeEnum() == NVT_U32);
-                ensure("6. getClassEnum failed", nValue6.getClassEnum() == NVC_CALLBACK);
+                ensure("6. getClassEnum failed", nValue6.getClassEnum() == NVC_READ_WRITE);
                ensure("6. getSendtoEnum failed", nValue6.getSendtoEnum() == NVS_SIM);
-                LLNameValue nValue7("SecondLife", "U64", "CALLBACK");
+                LLNameValue nValue7("SecondLife", "U64", "READ_WRITE");
                ensure("7. getTypeEnum failed", nValue7.getTypeEnum() == NVT_U64);
-                ensure("7. getClassEnum failed", nValue7.getClassEnum() == NVC_CALLBACK);
+                ensure("7. getClassEnum failed", nValue7.getClassEnum() == NVC_READ_WRITE);
                ensure("7. getSendtoEnum failed", nValue7.getSendtoEnum() == NVS_SIM);
        }
        template<> template<>
        void namevalue_object_t::test<5>()
        {
-                skip_fail("callback will be called more than once.");
+                LLNameValue nValue("SecondLife", "This is a test", "STRING", "RW", "SIM");
-                LLNameValue nValue("SecondLife", "This is a test", "STRING", "CB", "SIM", NameValueCallbackFunction, (void**) this);
                ensure("getString failed", (0 == strcmp(nValue.getString(),"This is a test")));
-                reset();
-                setExpectedResult(NVT_STRING, (void*)"New Value");
-                nValue.setString("New Value");
-                ensure("String nonzero failed", nValue.nonzero() == TRUE);
-                reset();
-                setExpectedResult(NVT_STRING, (void*)"");
-                nValue.setString("");
-                ensure("String nonzero failed", nValue.nonzero() == FALSE);
-                reset();
        }
        template<> template<>
        void namevalue_object_t::test<6>()
        {
-                skip_fail("callback will be called more than once.");
+                LLNameValue nValue("SecondLife", "This is a test", "ASSET", "RW", "S");
-                LLNameValue nValue("SecondLife", "This is a test", "ASSET", "CALLBACK", "S", NameValueCallbackFunction, (void**) this);
                ensure("getAsset failed", (0 == strcmp(nValue.getAsset(),"This is a test")));
-                reset();
-                setExpectedResult(NVT_ASSET, (void*)"New Value");
-                nValue.setAsset("New Value");
-                reset();
        }
                
        template<> template<>
        void namevalue_object_t::test<7>()
        {
-                skip_fail("callback will be called more than once.");
+                LLNameValue nValue("SecondLife", "555555", "F32", "RW", "SIM");
-                LLNameValue nValue("SecondLife", "555555", "F32", "CB", "SIM", NameValueCallbackFunction, (void**) this);
                
                ensure("getF32 failed",*nValue.getF32() == 555555.f);
-                reset();
-                F32 fVal = 0.1f;
-                setExpectedResult(NVT_F32, &fVal);
-                nValue.setF32(fVal);
-                fVal = -11111.1f;
-                setExpectedResult(NVT_F32, &fVal);
-                nValue.setF32(fVal);
-                ensure("F32 nonzero failed", nValue.nonzero() == TRUE);
-                reset();
-                fVal = 0.;
-                setExpectedResult(NVT_F32, &fVal);
-                nValue.setF32(fVal);
-                ensure("F32 nonzero failed", nValue.nonzero() == FALSE);
-                reset();
        }
        template<> template<>
        void namevalue_object_t::test<8>()
        {
-                skip_fail("callback will be called more than once.");
+                LLNameValue nValue("SecondLife", "-5555", "S32", "RW", "SIM");
-                LLNameValue nValue("SecondLife", "-5555", "S32", "CB", "SIM", NameValueCallbackFunction, (void**) this);
                ensure("getS32 failed", *nValue.getS32() == -5555);
-                reset();
                S32 sVal = 0x7FFFFFFF;
-                setExpectedResult(NVT_S32, &sVal);
                nValue.setS32(sVal);
+                ensure("getS32 failed", *nValue.getS32() == sVal);
                sVal = -0x7FFFFFFF;
-                setExpectedResult(NVT_S32, &sVal);
                nValue.setS32(sVal);
-                ensure("S32 nonzero failed", nValue.nonzero() == TRUE);
+                ensure("getS32 failed", *nValue.getS32() == sVal);
-                reset();
                sVal = 0;
-                setExpectedResult(NVT_S32, &sVal);
                nValue.setS32(sVal);
-                ensure("S32 nonzero failed", nValue.nonzero() == FALSE);
+                ensure("getS32 failed", *nValue.getS32() == sVal);
-                reset();
        }
        
        template<> template<>
        void namevalue_object_t::test<9>()
        {
-                LLNameValue nValue("SecondLife", "<-3, 2, 1>", "VEC3", "CB", "SIM", NameValueCallbackFunction, (void**) this);
+                LLNameValue nValue("SecondLife", "<-3, 2, 1>", "VEC3", "RW", "SIM");
                LLVector3 vecExpected(-3, 2, 1);
                LLVector3 vec;
                nValue.getVec3(vec);
                ensure("getVec3 failed", vec == vecExpected);
-                reset();
-                vecExpected.setVec(2, -1, 0);
-                setExpectedResult(NVT_VEC3, &vecExpected);
-                nValue.setVec3(vecExpected);
-                ensure("VEC3 nonzero failed", nValue.nonzero() == TRUE);
-                reset();
-                vecExpected.setVec(0, 0, 0);
-                setExpectedResult(NVT_VEC3, &vecExpected);
-                nValue.setVec3(vecExpected);
-                ensure("VEC3 nonzero failed", nValue.nonzero() == FALSE);
-                reset();
        }
        
        template<> template<>
        void namevalue_object_t::test<10>()
        {
-                LLNameValue nValue("SecondLife", "12345678", "U32", "CB", "SIM", NameValueCallbackFunction, (void**) this);
+                LLNameValue nValue("SecondLife", "12345678", "U32", "RW", "SIM");
                ensure("getU32 failed",*nValue.getU32() == 12345678);
                U32 val = 0xFFFFFFFF;
-                setExpectedResult(NVT_U32, &val);
                nValue.setU32(val);
-                ensure("U32 nonzero failed", nValue.nonzero() == TRUE);
+                ensure("U32 max", *nValue.getU32() == val);
-                reset();
                val = 0;
-                setExpectedResult(NVT_U32, &val);
                nValue.setU32(val);             
-                ensure("U32 nonzero failed", nValue.nonzero() == FALSE);
+                ensure("U32 min", *nValue.getU32() == val);
-                reset();
        }
        
        template<> template<>
        void namevalue_object_t::test<11>()
        {
-                skip_fail("incomplete support for U64.");
+                //skip_fail("incomplete support for U64.");
-                LLNameValue nValue("SecondLife", "44444444444", "U64", "CB", "SIM", NameValueCallbackFunction, (void**) this);
+                LLNameValue nValue("SecondLife", "44444444444", "U64", "RW", "SIM");
                ensure("getU64 failed",*nValue.getU64() == U64L(44444444444));
-                ensure("U64 nonzero failed", nValue.nonzero() == TRUE);
                // there is no LLNameValue::setU64()  
        }
        
-        template<> template<>
-        void namevalue_object_t::test<12>()
-        {
-                LLNameValue nValue("SecondLife F32 RW SIM -333.337600");        
-                F32 val = nValue.magnitude();
-                ensure_equals("F32 magnitude failed", val, 333.337600f);
-        
-                LLNameValue nValue1("SecondLife STRING RW SIM 3300");   
-                val = nValue1.magnitude();
-                ensure_equals("STRING magnitude failed",val,4.0f);
-                
-                LLNameValue nValue2("SecondLife S32 RW SIM -3300");     
-                val = nValue2.magnitude();
-                ensure_equals("S32 magnitude failed", val, 3300.);
-                
-                LLNameValue nValue3("SecondLife U32 RW SIM 3300");      
-                val = nValue3.magnitude();
-                ensure_equals("U32 magnitude failed", val, 3300.);
-                
-                LLNameValue nValue4("SecondLife VEC3 RW SIM <1,2,3>");  
-                LLVector3 vec(1,2,3);
-                val = nValue4.magnitude();
-                ensure_equals("VEC3 magnitude failed", val, vec.magVec());
-                
-                skip_fail("incomplete support for U64.");
-                LLNameValue nValue5("SecondLife U64 RW SIM 12345");     
-                val = nValue5.magnitude();
-                ensure_equals("U62 magnitude failed", val, 12345);              
-        }
        
        template<> template<>
-        void namevalue_object_t::test<13>()
+        void namevalue_object_t::test<12>()
        {
-                skip_fail("incomplete support for U64.");
+                //skip_fail("incomplete support for U64.");
                LLNameValue nValue("SecondLife U64 RW DSV 44444444444");        
                std::string ret_str = nValue.printNameValue();
                
                ensure_equals("1:printNameValue failed",ret_str,"SecondLife U64 RW DSV 44444444444");
                
                LLNameValue nValue1(ret_str.c_str());
-                ensure_equals("Serialization of printNameValue failed", nValue, nValue1);               
+                ensure_equals("Serialization of printNameValue failed", *nValue.getU64(), *nValue1.getU64());           
        }
        template<> template<>
-        void namevalue_object_t::test<14>()
+        void namevalue_object_t::test<13>()
        {
                LLNameValue nValue("SecondLife STRING RW DSV 44444444444");     
                std::string ret_str = nValue.printData();
@@ -556,7 +340,7 @@ namespace tut
        }
        
        template<> template<>
-        void namevalue_object_t::test<15>()
+        void namevalue_object_t::test<14>()
        {
                LLNameValue nValue("SecodLife STRING RW SIM 22222");
                std::ostringstream stream1,stream2,stream3, stream4, stream5;
@@ -575,271 +359,39 @@ namespace tut
                stream4<< nValue3;
                ensure_equals("U32 << failed",stream4.str(),"122222");
-                skip_fail("incomplete support for U64.");
+                // I don't think we use U64 name value pairs.  JC
-                LLNameValue nValue4("SecodLife U64 RW SIM 22222");
+                //skip_fail("incomplete support for U64.");
-                stream5<< nValue4;
+                //LLNameValue nValue4("SecodLife U64 RW SIM 22222");
-                ensure("U64 << failed",0 == strcmp((stream5.str()).c_str(),"22222"));
+                //stream5<< nValue4;
-        }
+                //ensure("U64 << failed",0 == strcmp((stream5.str()).c_str(),"22222"));
-        template<> template<>
-        void namevalue_object_t::test<16>()
-        {
-                LLNameValue nValue1("SecondLife STRING RW DSV 44444");
-                LLNameValue nValue2("SecondLife STRING RW SIM 33333");
-                LLNameValue nValue3("SecondLife");
-                nValue3 = nValue1 + nValue2;
-                ensure("1:operator+ failed",(0==strcmp(nValue3.getString(),"4444433333")));
-                
-                LLNameValue nValue4("SecondLife F32 R DSV 44444");
-                LLNameValue nValue5("SecondLife F32 RW SIM 33333");
-                LLNameValue nValue6("SecondLife");
-                nValue6 = nValue4 + nValue5;
-                ensure_equals("2:operator+ failed",*nValue6.getF32(),77777.0);
-                
-                LLNameValue nValue7("SecondLife F32 R DSV 44444");
-                LLNameValue nValue8("SecondLife S32 RW SIM 33333");
-                LLNameValue nValue9("SecondLife F32");
-                nValue9 = nValue7 + nValue8;
-                ensure_equals("3:operator+ failed",*nValue9.getF32(),77777.0);
-                
-                LLNameValue nValue10("SecondLife VEC3 RW SIM <4, 4, 4>");
-                LLNameValue nValue11("SecondLife VEC3 RW SV <3, 3, 3>");
-                LLNameValue nValue12("SecondLife VEC3");
-                nValue12 = nValue10 + nValue11;
-                LLVector3 vec(7,7,7);
-                ensure_equals("4:operator+ failed",*nValue12.getVec3(), vec);   
-        }
-        template<> template<>
-        void namevalue_object_t::test<17>()
-        {
-                LLNameValue nValue7(" SecondLife S32 RW SIM 22222");
-                LLNameValue nValue8(" SecondLife  F32 RW SIM 33333");
-                LLNameValue nValue9(" SecondLife F32");
-                nValue9 = nValue7 - nValue8;
-                ensure_equals("1:operator- failed",*nValue9.getF32(),-11111.f);
-                
-                LLNameValue nValue10(" SecondLife VEC3 RW SIM <2, 2, 2>");
-                LLNameValue nValue11(" SecondLife VEC3 RW SIM <3, 3, 3>");
-                LLNameValue nValue12(" SecondLife VEC3");
-                LLVector3 vec(-1,-1,-1);
-                nValue12 = nValue10 - nValue11;
-                ensure_equals("2:operator- failed",*nValue12.getVec3(), vec);
-        }
-        template<> template<>
-        void namevalue_object_t::test<18>()
-        {
-                LLNameValue nValue1(" SecondLife F32 RW SIM 22222");
-                LLNameValue nValue2(" SecondLife F32 RW SIM 33333");
-                LLNameValue nValue3(" SecondLife F32");
-                nValue3 = nValue1 * nValue2;
-                ensure_equals("1:operator* failed",*nValue3.getF32(),740725926.f);
-                
-                LLNameValue nValue4(" SecondLife S32 RW SIM 22222");
-                LLNameValue nValue5(" SecondLife  F32 RW SIM 33333");
-                LLNameValue nValue6(" SecondLife F32");
-                nValue6 = nValue4 * nValue5;
-                ensure_equals("2:operator* failed",*nValue6.getF32(),740725926.f);
-                LLNameValue nValue10(" SecondLife VEC3 RW SIM <2, 2, 2>");
-                LLNameValue nValue11(" SecondLife VEC3 RW SIM <3, 3, 3>");
-                LLNameValue nValue12(" SecondLife F32");
-                LLVector3 vec1(2,2,2);
-                LLVector3 vec2(3,3,3);
-                nValue12 = nValue10 * nValue11;
-                ensure_equals("2:operator* failed",*nValue12.getF32(), (vec1 * vec2));
        }
        template<> template<>
-        void namevalue_object_t::test<19>()
+        void namevalue_object_t::test<15>()
-        {
-                LLNameValue nValue1(" SecondLife S32 RW SIM 22222");
-                LLNameValue nValue2(" Virtual F32 RW SIM 44444");
-                LLNameValue nValue3(" SecondLife F32");
-                nValue3 = nValue1 / nValue2;
-                ensure_equals("1:operator/ failed",*nValue3.getF32(),0.5);
-                
-                LLNameValue nValue4(" SecondLife F32 RW SIM 33333");
-                LLNameValue nValue5(" SecondLife S32 RW SIM 22222");
-                LLNameValue nValue6(" SecondLife F32");
-                nValue6 = nValue4 / nValue5;
-                ensure_equals("2:operator/ failed",*nValue6.getF32(),1.5);
-        }
-        
-        template<> template<>
-        void namevalue_object_t::test<20>()
-        {
-                LLNameValue nValue1(" SecondLife S32 RW SIM 22222");
-                LLNameValue nValue2(" Virtual S32 RW SIM 33333");
-                LLNameValue nValue3(" SecondLife S32");
-                nValue3 = nValue1 % nValue2;
-                ensure_equals("1:operator% failed",*nValue3.getS32(),22222);
-                LLNameValue nValue4(" SecondLife U32 RW SIM 3");
-                LLNameValue nValue5(" SecondLife S32 RW SIM 2");
-                LLNameValue nValue6(" SecondLife S32");
-                nValue6 = nValue4 % nValue5;
-                ensure_equals("2:operator% failed",*nValue6.getS32(),1);
-                LLNameValue nValue10(" SecondLife VEC3 RW SIM <4, 5, 6>");
-                LLNameValue nValue11(" SecondLife VEC3 RW SIM <1, 2, 3>");
-                LLNameValue nValue12(" SecondLife VEC3");
-                LLVector3 vec1(4,5,6);
-                LLVector3 vec2(1,2,3);
-                LLVector3 vec3(vec1 % vec2);
-                nValue12 = nValue10 % nValue11;
-                ensure_equals("5:operator% failed",*nValue12.getVec3(), vec3);
-        }
-        template<> template<>
-        void namevalue_object_t::test<21>()
-        {
-                LLNameValue nValue1(" SecondLife STRING RW SIM 22222");
-                LLNameValue nValue2(" Virtual STRING RW SIM 22222");
-                ensure("1:operator== failed", nValue1 == nValue2);
-                LLNameValue nValue3(" SecondLife F32 RW SIM 33333");
-                LLNameValue nValue4(" Virtual F32 RW SIM 22222");
-                ensure("2:operator== failed",!(nValue3 == nValue4));
-                LLNameValue nValue5(" SecondLife STRING RW SIM 22222");
-                LLNameValue nValue6(" Virtual STRING RW SIM 33333");
-                ensure("3:operator== failed",!(nValue5 == nValue6));
-                LLNameValue nValue7(" SecondLife VEC3 RW SIM <2, 2, 2>");
-                LLNameValue nValue8(" Virtual VEC3 RW SIM <2, 2, 2>");
-                ensure("4:operator== failed",(nValue7 == nValue8));             
-        }
-        template<> template<>
-        void namevalue_object_t::test<22>()
-        {
-                LLNameValue nValue1(" SecondLife STRING RW SIM 22222");
-                LLNameValue nValue2(" Virtual STRING RW SIM 33333");
-                bool b_ret = (nValue1 <= nValue2) ? 1 : 0;
-                ensure("1:operator<= failed",(1==b_ret));       
-                LLNameValue nValue3(" SecondLife F32 RW SIM 33333");
-                LLNameValue nValue4(" Virtual F32 RW SIM 22222");
-                b_ret = (nValue3 <= nValue4) ? 1 : 0;
-                ensure("2:operator<= failed",(0==b_ret));
-        }
-        template<> template<>
-        void namevalue_object_t::test<23>()
-        {
-                LLNameValue nValue1(" SecondLife STRING RW SIM 22222");
-                LLNameValue nValue2(" Virtual STRING RW SIM 33333");
-                bool b_ret = (nValue1 >= nValue2) ? 1 : 0;
-                ensure("operator>= failed",!b_ret);     
-                LLNameValue nValue3(" SecondLife F32 RW SIM 33333");
-                LLNameValue nValue4(" Virtual F32 RW SIM 22222");
-                b_ret = (nValue3 >= nValue4) ? 1 : 0;
-                ensure("2:operator<= failed",b_ret);
-        }
-        template<> template<>
-        void namevalue_object_t::test<24>()
-        {
-                LLNameValue nValue1(" SecondLife STRING RW SIM 33333");
-                LLNameValue nValue2(" Virtual STRING RW SIM 33333");
-                bool b_ret = (nValue1 < nValue2) ? 1 : 0;
-                ensure("operator< failed",!b_ret);      
-                LLNameValue nValue3(" SecondLife F32 RW SIM 11111");
-                LLNameValue nValue4(" Virtual F32 RW SIM 22222");
-                b_ret = (nValue3 < nValue4) ? 1 : 0;
-                ensure("2:operator< failed",b_ret);
-        }
-        template<> template<>
-        void namevalue_object_t::test<25>()
-        {
-                LLNameValue nValue1(" SecondLife STRING RW SIM 33333");
-                LLNameValue nValue2(" Virtual STRING RW SIM 33333");
-                bool b_ret = (nValue1 > nValue2) ? 1 : 0;
-                ensure("1:operator> failed",!b_ret);    
-                LLNameValue nValue3(" SecondLife F32 RW SIM 11111");
-                LLNameValue nValue4(" Virtual F32 RW SIM 22222");
-                b_ret = (nValue3 > nValue4) ? 1 : 0;
-                ensure("2:operator> failed",!b_ret);
-                LLNameValue nValue5(" SecondLife S32 RW SIM 22222");
-                LLNameValue nValue6(" Virtual F32 RW SIM 11111");
-                b_ret = (nValue5 > nValue6) ? 1 : 0;
-                ensure("3:operator> failed",b_ret);
-        }
-        template<> template<>
-        void namevalue_object_t::test<26>()
-        {
-                LLNameValue nValue1(" SecondLife STRING RW SIM 33333");
-                LLNameValue nValue2(" Virtual STRING RW SIM 33333");
-                bool b_ret = (nValue1 != nValue2) ? 1 : 0;
-                ensure("1:operator!= failed",!b_ret);   
-                LLNameValue nValue3(" SecondLife F32 RW SIM 11111");
-                LLNameValue nValue4(" Virtual F32 RW SIM 22222");
-                b_ret = (nValue3 != nValue4) ? 1 : 0;
-                ensure("2:operator!= failed",b_ret);
-        }
-        
-        template<> template<>
-        void namevalue_object_t::test<27>()
-        {
-                LLNameValue nValue1(" SecondLife F32 RW SIM 33333");
-                LLNameValue nValue2("Virtual");
-                nValue2 = -nValue1;
-                ensure_equals("1:operator unary- failed",*nValue2.getF32(), -33333.f);
-                LLNameValue nValue3(" SecondLife U32 RW SIM 11111");
-                LLNameValue nValue4("Virtual S32");
-                nValue4 = -nValue3;
-                ensure_equals("2:operator unary- failed",*nValue4.getS32(), -11111);
-                LLNameValue nValue5(" SecondLife VEC3 RW SIM <1, 1, 1>");
-                LLNameValue nValue6("Virtual VEC3");
-                LLVector3 vec(-1, -1, -1);
-                nValue6 = -nValue5;
-                ensure_equals("3:operator unary- failed",*nValue6.getVec3(), vec);
-        }       
-        template<> template<>
-        void namevalue_object_t::test<28>()
        {
-                LLNameValue nValue("SecondLife", "This is a test", "ASSET", "R", "S", NameValueCallbackFunction, (void**) this);
+                LLNameValue nValue("SecondLife", "This is a test", "ASSET", "R", "S");
                ensure("getAsset failed", (0 == strcmp(nValue.getAsset(),"This is a test")));
                // this should not have updated as it is read only.
                nValue.setAsset("New Value should not be updated");
                ensure("setAsset on ReadOnly failed", (0 == strcmp(nValue.getAsset(),"This is a test")));
-                LLNameValue nValue1("SecondLife", "1234", "U32", "R", "S", NameValueCallbackFunction, (void**) this);
+                LLNameValue nValue1("SecondLife", "1234", "U32", "R", "S");
                // this should not have updated as it is read only.
                nValue1.setU32(4567);
                ensure("setU32 on ReadOnly failed", *nValue1.getU32() == 1234);
-                LLNameValue nValue2("SecondLife", "1234", "S32", "R", "S", NameValueCallbackFunction, (void**) this);
+                LLNameValue nValue2("SecondLife", "1234", "S32", "R", "S");
                // this should not have updated as it is read only.
                nValue2.setS32(4567);
                ensure("setS32 on ReadOnly failed", *nValue2.getS32() == 1234);
-                LLNameValue nValue3("SecondLife", "1234", "F32", "R", "S", NameValueCallbackFunction, (void**) this);
+                LLNameValue nValue3("SecondLife", "1234", "F32", "R", "S");
                // this should not have updated as it is read only.
                nValue3.setF32(4567);
                ensure("setF32 on ReadOnly failed", *nValue3.getF32() == 1234);
-                nValue3 = nValue3 * 2;
-                ensure("setF32 on ReadOnly failed", *nValue3.getF32() == 1234);
-                LLNameValue nValue4("SecondLife", "<1,2,3>", "VEC3", "R", "S", NameValueCallbackFunction, (void**) this);
+                LLNameValue nValue4("SecondLife", "<1,2,3>", "VEC3", "R", "S");
                // this should not have updated as it is read only.
                LLVector3 vec(4,5,6);
                nValue3.setVec3(vec);
diff --git a/linden/indra/test/llsdmessagereader_tut.cpp b/linden/indra/test/llsdmessagereader_tut.cpp
index e52809f..04861c4 100755
--- a/linden/indra/test/llsdmessagereader_tut.cpp
+++ b/linden/indra/test/llsdmessagereader_tut.cpp
@@ -46,7 +46,7 @@ namespace tut
                                                                        const std::string& expected_name)
                {
                        LLSDMessageReader msg;
-                        msg.setMessage(gMessageStringTable.getString(msg_name.c_str()), msg_data);
+                        msg.setMessage(LLMessageStringTable::getInstance()->getString(msg_name.c_str()), msg_data);
                        ensure_equals("Ensure name", std::string(msg.getMessageName()), 
                                                  expected_name);
                }
diff --git a/linden/indra/test/llstreamtools_tut.cpp b/linden/indra/test/llstreamtools_tut.cpp
index 3e89282..c360cc1 100644
--- a/linden/indra/test/llstreamtools_tut.cpp
+++ b/linden/indra/test/llstreamtools_tut.cpp
@@ -491,7 +491,7 @@ namespace tut
                is.str(str = "First Second \t \r\n Third  Fourth-ShouldThisBePartOfFourth  IsThisFifth\n");
                actual_result = "";
                ret = get_line(actual_result, is);
-                expected_result = "First Second \t \n";
+                expected_result = "First Second \t \r\n";
                ensure_equals("get_line: 1", actual_result, expected_result);
                actual_result = "";
@@ -545,7 +545,6 @@ namespace tut
        template<> template<>
        void streamtools_object::test<12>()
        {
-                skip_fail("get_line() incorrectly handles lone carriage return.");
                std::string str;
                std::string expected_result;
                std::string actual_result;
@@ -554,10 +553,10 @@ namespace tut
                // need to be check if this test case is wrong or the implementation is wrong.
                is.clear();
-                is.str(str = "Should not skip \r unless they are followed with newline .\r\n");
+                is.str(str = "Should not skip lone \r.\r\n");
                actual_result = "";
                ret = get_line(actual_result, is);
-                expected_result = "Should not skip \r unless they are followed with newline .\n";
+                expected_result = "Should not skip lone \r.\r\n";
                ensure_equals("get_line: carriage return skipped even though not followed by newline", actual_result, expected_result);
        }
@@ -804,37 +803,6 @@ namespace tut
        template<> template<>
        void streamtools_object::test<21>()
        {
-                skip_fail("get_brace_count() has bugs.");
-                std::string str;
-                std::string expected_result;
-                int count;
-                str = "  {  ";
-                count = get_brace_count(str);
-                ensure("get_brace_count: 1 for {", count == 1);
-                str = "\t}\t\t   \n";
-                count = get_brace_count(str);
-                ensure("get_brace_count: 1 for {", count == -1);
-                str = "\t\t\t   \n";
-                count = get_brace_count(str);
-                ensure("get_brace_count: 0 for no braces", count == 0);
-                str = "{ Remaining line not empty\n";
-                count = get_brace_count(str);
-                ensure("get_brace_count: 0 for remainign line not empty", count == 0);
-                /* shouldn't this return 1? */
-                str = "{ /*Remaining line in comment*/\n";
-                count = get_brace_count(str);
-                ensure("get_brace_count: 1 for { with remaining line in comment", count == 1);
-                /* shouldn't this return -1? */
-                str = "  } //Remaining line in comment  \n";
-                count = get_brace_count(str);
-                ensure("get_brace_count: -1 for } with remaining line in comment", count == -1);
        }
        //testcases for get_keyword_and_value()
@@ -860,8 +828,6 @@ namespace tut
        template<> template<>
        void streamtools_object::test<23>()
        {
-                skip_fail("get_keyword_and_value() has bugs.");
                std::string s;
                std::string keyword = "SOME PRIOR KEYWORD";
                std::string value = "SOME PRIOR VALUE";
@@ -875,8 +841,6 @@ namespace tut
        template<> template<>
        void streamtools_object::test<24>()
        {
-                skip_fail("get_keyword_and_value() has bugs.");
                std::string s;
                std::string keyword = "SOME PRIOR KEYWORD";
                std::string value = "SOME PRIOR VALUE";
diff --git a/linden/indra/test/lltemplatemessagebuilder_tut.cpp b/linden/indra/test/lltemplatemessagebuilder_tut.cpp
index 1b3d600..86b1fbd 100644
--- a/linden/indra/test/lltemplatemessagebuilder_tut.cpp
+++ b/linden/indra/test/lltemplatemessagebuilder_tut.cpp
@@ -65,7 +65,7 @@ namespace tut
                                                                           LL_VERSION_PATCH,        
                                                                           FALSE,        
                                                                           "notasharedsecret");
-                                init_prehash_data();
+                                //init_prehash_data();
                                init = true;
                        }
                        return LLMessageTemplate(_PREHASH_TestMessage, 1, MFT_HIGH);
diff --git a/linden/indra/test/lltut.h b/linden/indra/test/lltut.h
index e5c2419..4e4af73 100644
--- a/linden/indra/test/lltut.h
+++ b/linden/indra/test/lltut.h
@@ -44,6 +44,16 @@ class LLSD;
 namespace tut
 {
+        inline void ensure_approximately_equals(const char* msg, F64 actual, F64 expected, U32 frac_bits)
+        {
+                if(!is_approx_equal_fraction(actual, expected, frac_bits))
+                {
+                        std::stringstream ss;
+                        ss << (msg?msg:"") << (msg?": ":"") << "not equal actual: " << actual << " expected: " << expected;
+                        throw tut::failure(ss.str().c_str());
+                }
+        }
        inline void ensure_approximately_equals(const char* msg, F32 actual, F32 expected, U32 frac_bits)
        {
                if(!is_approx_equal_fraction(actual, expected, frac_bits))
diff --git a/linden/indra/test/mass_properties_tut.cpp b/linden/indra/test/mass_properties_tut.cpp
new file mode 100644
index 0000000..08cfeac
--- /dev/null
+++ b/linden/indra/test/mass_properties_tut.cpp
@@ -0,0 +1,1008 @@
+/** 
+ * @file mass_properties.cpp
+ * @author andrew@lindenlab.com
+ * @date 2007-12-20
+ * @brief Tests for the LLPrimMassProperties and LLObjectMassProperties classes
+ *
+ * $LicenseInfo:firstyear=2007&license=internal$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "linden_common.h"
+#include "lltut.h"
+#include <llmath/v3math.h>
+#include <llmath/llquaternion.h>
+#include <llphysics/abstract/utils/llinertiatensorutils.h>
+#include <llphysics/abstract/utils/llobjectmassproperties.h>
+#include <llphysics/abstract/utils/llprimmassproperties.h>
+#include <llphysics/abstract/utils/llphysicsvolumemanager.h>
+#include <llprimitive/llmaterialtable.h>
+#include <llprimitive/llprimitive.h>
+const F32 SMALL_RELATIVE_ERROR = 0.001f;        // 0.1%
+const F32 SQRT_THREE = 1.732050808f;
+const F32 SQRT_SIX = 2.449489743f;
+namespace tut
+{
+        struct mass_properties_data
+        {
+                LLPrimMassProperties prim_properties;
+                LLObjectMassProperties object_properties;
+        };
+        typedef test_group<mass_properties_data> mass_properties_group;
+        typedef mass_properties_group::object mass_properties;
+        tut::mass_properties_group mp_test_group("mass properties");
+        template<> template<>
+        void mass_properties::test<1>()
+        {
+                // test SPHERE mass properties
+                LLPrimMassProperties prim_sphere;
+                prim_sphere.setUnitSphere();
+                F32 density = 1000.f;
+                F32 radius = 5.f;
+                F32 diameter = 2.f * radius;
+                LLVector3 scale(diameter, diameter, diameter);
+                LLObjectMassProperties obj_sphere(prim_sphere, scale, density);
+                
+                F32 computed_mass = obj_sphere.getMass();
+                //LLVector3 center_of_mass
+                //obj_sphere.getCenterOfMass(center_of_mass);
+                LLMatrix3 inertia;
+                obj_sphere.getInertiaLocal(inertia);
+                F32 computed_inertia_eigenvalue = inertia.mMatrix[0][0];
+                // volume is normalized for scale = <1,1,1>
+                // V = 4/3 * PI * r^3
+                // inertia_eigenvalue = (2/5) * M * r^2
+                F32 volume = ( 4.f / 3.f ) * radius * radius * radius * F_PI;
+                F32 expected_mass = density * volume;
+                F32 expected_inertia_eigenvalue = ( 2.f / 5.f ) * expected_mass * radius * radius;
+        
+                F32 error = fabs(computed_mass - expected_mass) / expected_mass;
+                ensure("expected sphere mass should match computed", error < SMALL_RELATIVE_ERROR);
+                error = fabs(computed_inertia_eigenvalue - expected_inertia_eigenvalue) / expected_inertia_eigenvalue;
+                ensure("expected sphere inertia should match computed", error < SMALL_RELATIVE_ERROR);
+        }
+        template<> template<>
+        void mass_properties::test<2>()
+        {
+                // test LLInertiaTensorUtils
+                // define a known inertia tensor in the center of mass frame
+                // from the numerical example in this paper:
+                // http://www.journaldatabase.org/articles/87064/Explicit_Exact_Formulas_f.html
+                F32 known_mass = 1873.23f;
+                LLVector3 known_center( 0.f, 0.f, 0.f );
+                LLMatrix3 known_inertia;
+                known_inertia.mMatrix[0][0] = 43520.33257f;
+                known_inertia.mMatrix[1][1] = 194711.28938f;
+                known_inertia.mMatrix[2][2] = 191168.76173f;
+                known_inertia.mMatrix[0][1] = -11996.20119f;
+                known_inertia.mMatrix[1][0] = -11996.20119f;
+                known_inertia.mMatrix[0][2] =  46343.16662f;
+                known_inertia.mMatrix[2][0] =  46343.16662f;
+                known_inertia.mMatrix[2][1] = -4417.66150f;
+                known_inertia.mMatrix[1][2] = -4417.66150f;
+                // the following two shifts should have null effect
+                {
+                        LLVector3 first_shift(2.f, 3.f, 4.f);
+                        LLVector3 second_shift = - first_shift;
+                        LLMatrix3 inertia = known_inertia;
+                        
+                        LLInertiaTensorUtils::shiftCenteredInertiaTensor(inertia, first_shift, known_mass);
+                        LLInertiaTensorUtils::centerInertiaTensor(inertia, second_shift, known_mass);
+                        // we should now have the same inertia with which we started
+                        for (S32 i=0; i<3; ++i)
+                        {
+                                for (S32 j=0; j<3; ++j)
+                                {
+                                        F32 error = fabs(1.f - inertia.mMatrix[i][j] / known_inertia.mMatrix[i][j]);
+                                        ensure("LLInertiaTensorUtils shift+sclae-shift-scale should be no-op", error < SMALL_RELATIVE_ERROR);
+                                }
+                        }
+                }
+                // the following series operations should have null effect
+                {
+                        LLVector3 first_shift(1.f, 5.f, 10.f);
+                        LLVector3 second_scale(2.f, 3.f, 4.f);
+                        LLVector3 third_shift;
+                        LLVector3 fourth_scale;
+                        for (S32 i = 0; i < 3; ++i)
+                        {
+                                third_shift.mV[i] = -first_shift.mV[i] * second_scale.mV[i];
+                                fourth_scale.mV[i] = 1.f / second_scale.mV[i];
+                        }
+        
+                        F32 mass = known_mass;
+                        LLVector3 center = known_center;
+                        LLMatrix3 inertia = known_inertia;
+        
+                        // first
+                        LLInertiaTensorUtils::shiftCenteredInertiaTensor(inertia, first_shift, mass);
+                        center += first_shift;
+        
+                        // second
+                        LLInertiaTensorUtils::scaleInertiaTensor(inertia, second_scale);
+                        mass *= second_scale.mV[VX] * second_scale.mV[VY] * second_scale.mV[VZ];
+                        for (S32 i = 0; i < 3; ++i)
+                        {
+                                center.mV[i] *= second_scale.mV[i];
+                        }
+        
+                        // third
+                        LLInertiaTensorUtils::centerInertiaTensor(inertia, third_shift, mass);
+                        center -= third_shift;
+        
+                        // foruth
+                        LLInertiaTensorUtils::scaleInertiaTensor(inertia, fourth_scale);
+        
+                        // we should now have the same inertia with which we started
+                        for (S32 i=0; i<3; ++i)
+                        {
+                                for (S32 j=0; j<3; ++j)
+                                {
+                                        F32 error = fabs(1.f - inertia.mMatrix[i][j] / known_inertia.mMatrix[i][j]);
+                                        ensure("LLInertiaTensorUtils shift+sclae-shift-scale should be no-op", error < SMALL_RELATIVE_ERROR);
+                                }
+                        }
+                }
+        }
+        template<> template<>
+        void mass_properties::test<3>()
+        {
+                // test tetrahedral decomposition of unit tetrahedron centered on origin
+                std::vector< LLVector3 > points;
+                points.push_back( LLVector3(  0.f, 0.f, 0.f ) );
+                points.push_back( LLVector3(  1.f, 0.f, 0.f ) );
+                points.push_back( LLVector3( 0.5f, 0.5f * SQRT_THREE, 0.f) );
+                points.push_back( LLVector3( 0.5f, SQRT_THREE / 6.f, SQRT_SIX / 3.f) );
+                // compute the center
+                LLVector3 center;
+                for (S32 i = 0; i < (S32)points.size(); ++i)
+                {
+                        center += points[i];
+                }
+                center *= ( 1.f / F32(points.size()) );
+                // shift all points to center of mass frame
+                for (S32 i = 0; i < (S32)points.size(); ++i)
+                {
+                        points[i] -= center;
+                }
+                LLPrimMassProperties tetrahedron;
+                tetrahedron.addSignedTetrahedron(1.0, points[0], points[1], points[2], points[3]);
+                // we must manually center the inertia tensor here 
+                // since addSignedTetrahedron() does not do it automatically
+                tetrahedron.centerInertiaTensor();
+                F32 density = 1.0f;
+                LLVector3 scale(1.f, 1.f, 1.f);
+                LLMatrix3 analytic_inertia;
+                tetrahedron.getScaledInertiaTensor(analytic_inertia, scale, density);
+                // compute the mesh
+                std::vector< S32 > triangle_indices;
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(3);
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(3);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(3);
+                // compute the same inertia using a mesh
+                {
+                        LLPrimMassProperties mesh;
+                        mesh.setUnitMesh(points, triangle_indices);
+                        // the two properties should agree
+                        F32 error = ( tetrahedron.getVolume() - mesh.getVolume() ) / tetrahedron.getVolume();
+                        ensure("tetrahedron and mesh volume should match", error < SMALL_RELATIVE_ERROR);
+        
+                        error = ( tetrahedron.getCenterOfMass() - mesh.getCenterOfMass() ).length();
+                        ensure("tetrahedron and mesh centers should match", error < SMALL_RELATIVE_ERROR);
+        
+                        LLMatrix3 mesh_inertia;
+                        mesh.getScaledInertiaTensor(mesh_inertia, scale, density);
+                        for (S32 i=0; i<3; ++i)
+                        {
+                                for (S32 j=0; j<3; ++j)
+                                {
+                                        // only verify the non-small elements
+                                        if (analytic_inertia.mMatrix[i][j] > SMALL_RELATIVE_ERROR)
+                                        {
+                                                error = fabs(1.f - mesh_inertia.mMatrix[i][j] / analytic_inertia.mMatrix[i][j]);
+                                                ensure("LLPrimMassProperties::setUnitMesh() inertia ", error < SMALL_RELATIVE_ERROR);
+                                        }
+                                }
+                        }
+                }
+                // shift the whole tetrahedron away from the center of mass and recompute the mesh
+                {
+                        LLVector3 shift(11.f, 7.f, 3.f);
+                        for (S32 i = 0; i < (S32)points.size(); ++i)
+                        {
+                                points[i] += shift;
+                        }
+                        LLPrimMassProperties mesh;
+                        mesh.setUnitMesh(points, triangle_indices);
+        
+                        // the two properties should agree
+                        F32 error = ( tetrahedron.getVolume() - mesh.getVolume() ) / tetrahedron.getVolume();
+                        ensure("tetrahedron and mesh volume should match", error < SMALL_RELATIVE_ERROR);
+        
+                        LLMatrix3 mesh_inertia;
+                        mesh.getScaledInertiaTensor(mesh_inertia, scale, density);
+                        for (S32 i=0; i<3; ++i)
+                        {
+                                for (S32 j=0; j<3; ++j)
+                                {
+                                        // only verify the non-small elements
+                                        if (analytic_inertia.mMatrix[i][j] > SMALL_RELATIVE_ERROR)
+                                        {
+                                                error = fabs(1.f - mesh_inertia.mMatrix[i][j] / analytic_inertia.mMatrix[i][j]);
+                                                ensure("LLPrimMassProperties::setUnitMesh() inertia ", error < SMALL_RELATIVE_ERROR);
+                                        }
+                                }
+                        }
+                }
+        }
+        template<> template<>
+        void mass_properties::test<4>()
+        {
+                // test tetrahedron utilities
+                // from the paper described here:
+                // from the numerical example in this paper:
+                // http://www.journaldatabase.org/articles/87064/Explicit_Exact_Formulas_f.html
+                // initialize info about the tetrahedron
+                std::vector< LLVector3 > points;
+                points.push_back( LLVector3(  8.33220f, -11.86875f,   0.93355f) );
+                points.push_back( LLVector3(  0.75523f,   5.00000f,  16.37072f) );
+                points.push_back( LLVector3( 52.61236f,   5.00000f, - 5.38580f) );
+                points.push_back( LLVector3(  2.00000f,   5.00000f,   3.00000f) );
+                LLVector3 expected_center( 15.92492f, 0.78281f, 3.732962f);
+                LLMatrix3 expected_inertia;
+                expected_inertia.mMatrix[0][0] = 43520.33257f;
+                expected_inertia.mMatrix[1][1] = 194711.28938f;
+                expected_inertia.mMatrix[2][2] = 191168.76173f;
+                expected_inertia.mMatrix[0][1] = -11996.20119f;
+                expected_inertia.mMatrix[1][0] = -11996.20119f;
+                expected_inertia.mMatrix[0][2] =  46343.16662f;
+                expected_inertia.mMatrix[2][0] =  46343.16662f;
+                expected_inertia.mMatrix[2][1] = -4417.66150f;
+                expected_inertia.mMatrix[1][2] = -4417.66150f;
+                // measure tetrahedron bounding box max dimension 
+                // for relative error estimates
+                LLVector3 box_min(FLT_MAX, FLT_MAX, FLT_MAX);
+                LLVector3 box_max(-FLT_MAX, -FLT_MAX, -FLT_MAX);
+                for (S32 point_index = 0; point_index < (S32)points.size(); ++point_index)
+                {
+                        for (S32 i = 0; i < 3; ++i)
+                        {
+                                if (points[point_index].mV[i] < box_min.mV[i])
+                                {
+                                        box_min.mV[i] = points[point_index].mV[i];
+                                }
+                                if (points[point_index].mV[i] > box_max.mV[i])
+                                {
+                                        box_max.mV[i] = points[point_index].mV[i];
+                                }
+                        }
+                }
+                F32 tetrahedron_max_dimension = (box_max - box_min).length();
+                // test LLPrimMassProperties::addSignedTetrahedron()
+                {
+                        LLPrimMassProperties tetrahedron;
+                        tetrahedron.addSignedTetrahedron(1.f, points[0], points[1], points[2], points[3]);
+                        // we must manually center the inertia tensor here 
+                        // since addSignedTetrahedron() does not do it automatically
+                        tetrahedron.centerInertiaTensor();
+        
+                        // check the center of mass
+                        LLVector3 center = tetrahedron.getCenterOfMass();
+                        F32 error = (center - expected_center).length() / tetrahedron_max_dimension;
+        
+                        ensure("LLPrimMassProperties::addSignedTetrahedron() center of mass ", error < SMALL_RELATIVE_ERROR);
+        
+                        // check the inertia tensor
+                        LLMatrix3 computed_inertia;
+                        LLVector3 scale(1.f, 1.f, 1.f);
+                        F32 density = 1.f;
+                        tetrahedron.getScaledInertiaTensor(computed_inertia, scale, density);
+                        for (S32 i=0; i<3; ++i)
+                        {
+                                for (S32 j=0; j<3; ++j)
+                                {
+                                        error = fabs(1.f - computed_inertia.mMatrix[i][j] / expected_inertia.mMatrix[i][j]);
+                                        ensure("LLPrimMassProperties::addSignedTetrahedron inertia ", error < SMALL_RELATIVE_ERROR);
+                                }
+                        }
+                }
+                // test LLPrimMassProperties::addUnitMesh()
+                {
+                        std::vector< S32 > triangle_indices;
+                        triangle_indices.push_back(0);
+                        triangle_indices.push_back(2);
+                        triangle_indices.push_back(1);
+        
+                        triangle_indices.push_back(1);
+                        triangle_indices.push_back(3);
+                        triangle_indices.push_back(0);
+        
+                        triangle_indices.push_back(2);
+                        triangle_indices.push_back(0);
+                        triangle_indices.push_back(3);
+        
+                        triangle_indices.push_back(3);
+                        triangle_indices.push_back(1);
+                        triangle_indices.push_back(2);
+        
+                        LLPrimMassProperties mesh;
+                        mesh.setUnitMesh(points, triangle_indices);
+                        // check the center of mass
+                        LLVector3 center = mesh.getCenterOfMass();
+                        F32 error = (center - expected_center).length() / tetrahedron_max_dimension;
+        
+                        ensure("LLPrimMassProperties::setUnitMesh() center of mass ", error < SMALL_RELATIVE_ERROR);
+        
+                        // check the inertia tensor
+                        LLMatrix3 computed_inertia;
+                        LLVector3 scale(1.f, 1.f, 1.f);
+                        F32 density = 1.f;
+                        mesh.getScaledInertiaTensor(computed_inertia, scale, density);
+                        for (S32 i=0; i<3; ++i)
+                        {
+                                for (S32 j=0; j<3; ++j)
+                                {
+                                        error = fabs(1.f - computed_inertia.mMatrix[i][j] / expected_inertia.mMatrix[i][j]);
+                                        ensure("LLPrimMassProperties::setUnitMesh() inertia diagonal elements mismatch", error < SMALL_RELATIVE_ERROR);
+                                }
+                        }
+                }
+        }
+        template<> template<>
+        void mass_properties::test<5>()
+        {
+                // test LLPrimMassProperties
+                // unit shape box
+                LLPrimMassProperties box;
+                box.setUnitBox();
+                // unit shape mesh -- box
+                //      
+                //          4-----------0
+                //  z      /|          /|
+                //  |     / |         / |
+                //  |    /  |        /  |
+                //  |   6-----------2   |
+                //  |   |   |       |   |
+                //  |   |   5-------|---1
+                //  |   |  /        |  /
+                //  |   | /         | /
+                //  | y |/          |/
+                //  |/  7-----------3
+                //  +------------------------ x
+                std::vector< LLVector3 > points;
+                points.push_back( LLVector3( 0.5f,  0.5f,  0.5f) );
+                points.push_back( LLVector3( 0.5f,  0.5f, -0.5f) );
+                points.push_back( LLVector3( 0.5f, -0.5f,  0.5f) );
+                points.push_back( LLVector3( 0.5f, -0.5f, -0.5f) );
+                points.push_back( LLVector3(-0.5f,  0.5f,  0.5f) );
+                points.push_back( LLVector3(-0.5f,  0.5f, -0.5f) );
+                points.push_back( LLVector3(-0.5f, -0.5f,  0.5f) );
+                points.push_back( LLVector3(-0.5f, -0.5f, -0.5f) );
+                std::vector< S32 > triangle_indices;
+                // +x
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(3);
+                // -y
+                triangle_indices.push_back(3);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(6);
+                // -x
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(6);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(5);
+                // +y
+                triangle_indices.push_back(5);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(0);
+                // +z
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(6);
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(6);
+                triangle_indices.push_back(2);
+                // -z
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(5);
+                triangle_indices.push_back(3);
+                triangle_indices.push_back(3);
+                triangle_indices.push_back(5);
+                triangle_indices.push_back(1);
+                                
+                LLPrimMassProperties mesh;
+                mesh.setUnitMesh(points, triangle_indices);
+                // the unit box and unit mesh mass properties should be nearly the same
+                // volume should agree
+                F32 error = fabs(box.getVolume() - mesh.getVolume()) / box.getVolume();
+                ensure("UnitBox and UnitMesh(box) should have same volume", error < SMALL_RELATIVE_ERROR);
+                // center of mass should agree
+                LLVector3 box_center = box.getCenterOfMass();
+                LLVector3 mesh_center = mesh.getCenterOfMass();
+                error = fabs( (box_center - mesh_center).length() );
+                ensure("UnitBox and UnitMesh(box) centers of mass should agree", error < SMALL_RELATIVE_ERROR );
+                LLVector3 scale(1.f, 1.f, 1.f);
+                F32 density = 1.f;
+                LLMatrix3 box_inertia, mesh_inertia;
+                box.getScaledInertiaTensor(box_inertia, scale, density);
+                mesh.getScaledInertiaTensor(mesh_inertia, scale, density);
+                // mesh eigenvalues should be uniform
+                for (S32 i = 0; i < 2; ++i)
+                {
+                        error =  fabs(mesh_inertia.mMatrix[i][i] - mesh_inertia.mMatrix[i+1][i+1]) / mesh_inertia.mMatrix[i][i];
+                        ensure("UnitMesh(box) should have uniform eigenvalues", error < SMALL_RELATIVE_ERROR);
+                }
+                // inertias should agree
+                for (S32 i = 0; i < 3; ++i)
+                {
+                        for (S32 j = 0; j < 3; ++j)
+                        {
+                                error = fabs(box_inertia.mMatrix[i][j] - mesh_inertia.mMatrix[i][j]);
+                                if (error > 0.f
+                                        && box_inertia.mMatrix[i][j] != 0.f)
+                                {
+                                        error /= box_inertia.mMatrix[i][j];
+                                }
+                                ensure("UnitBox and UnitMesh(box) should have same inertia", error < SMALL_RELATIVE_ERROR);
+                        }
+                }
+                // Here we test the boundary of the LLPrimLinkInfo::canLink() method 
+                // between semi-random middle-sized objects.
+        }
+        template<> template<>
+        void mass_properties::test<6>()
+        {
+                // test LLObjectMassProperties
+                // we make a large single-prim box, then a similarly shaped object
+                // that is multiple prims, and compare their mass properties
+                LLPrimMassProperties box;
+                box.setUnitBox();
+                F32 density = 3.7f;
+                LLVector3 big_scale(1.f, 2.f, 3.f);
+                LLObjectMassProperties big_box(box, big_scale, density);
+                LLObjectMassProperties multiple_box;
+                LLVector3 position;
+                LLQuaternion rotation;
+                rotation.loadIdentity();
+                F32 small_box_size = 0.5f;
+                LLVector3 small_scale( small_box_size, small_box_size, small_box_size);
+                S32 num_boxes_x = S32(big_scale.mV[VX] / small_box_size);
+                S32 num_boxes_y = S32(big_scale.mV[VY] / small_box_size);
+                S32 num_boxes_z = S32(big_scale.mV[VZ] / small_box_size);
+                LLVector3 start_pos = 0.5f * (small_scale - big_scale);
+                for (S32 x = 0; x < num_boxes_x; ++x)
+                {
+                        for (S32 y = 0; y < num_boxes_y; ++y)
+                        {
+                                for (S32 z = 0; z < num_boxes_z; ++z)
+                                {
+                                        position.set( F32(x) * small_box_size, F32(y) * small_box_size, F32(z) * small_box_size );
+                                        position += start_pos;
+                                        multiple_box.add(box, small_scale, density, position, rotation);
+                                }
+                        }
+                }
+                // the mass properties of the two boxes should match
+                // mass
+                F32 big_mass = big_box.getMass();
+                F32 multiple_mass = multiple_box.getMass();
+                F32 error = (big_mass - multiple_mass) / big_mass;
+                ensure("Big box and equivalent multi-prim box should have same mass", error < SMALL_RELATIVE_ERROR);
+                // center of mass
+                LLVector3 big_center, multiple_center;
+                big_box.getCenterOfMass(big_center);
+                multiple_box.getCenterOfMass(multiple_center);
+                error = (big_center - multiple_center).length();
+                ensure("Big box and equivalent multi-prim box should have same center", error < SMALL_RELATIVE_ERROR);
+                // inertia
+                LLMatrix3 big_inertia, multiple_inertia;
+                big_box.getInertiaLocal(big_inertia);
+                multiple_box.getInertiaLocal(multiple_inertia);
+                for (S32 i = 0; i < 3; ++i)
+                {
+                        for (S32 j = 0; j < 3; ++j)
+                        {
+                                error = fabs(big_inertia.mMatrix[i][j] - multiple_inertia.mMatrix[i][j]);
+                                if (error > 0.f
+                                        && big_inertia.mMatrix[i][j] != 0.f)
+                                {
+                                        error /= big_inertia.mMatrix[i][j];
+                                }
+                                ensure("UnitBox and UnitMesh(box) should have same inertia", error < SMALL_RELATIVE_ERROR);
+                        }
+                }
+        }
+        template<> template<>
+        void mass_properties::test<7>()
+        {
+                // test LLObjectMassProperties with rotations
+                // we make a large single-prim box via mesh, then a similarly shaped 
+                // object that is multiple prims (implicit boxes), and compare their 
+                // mass properties
+                //      
+                //          4-----------0
+                //  z      /|          /|
+                //  |     / |         / |
+                //  |    /  |        /  |
+                //  |   6-----------2   |
+                //  |   |   |       |   |
+                //  |   |   5-------|---1
+                //  |   |  /        |  /
+                //  |   | /         | /
+                //  | y |/          |/
+                //  |/  7-----------3
+                //  +------------------------ x
+                std::vector< LLVector3 > points;
+                points.push_back( LLVector3( 0.5f,  0.5f,  0.5f) );
+                points.push_back( LLVector3( 0.5f,  0.5f, -0.5f) );
+                points.push_back( LLVector3( 0.5f, -0.5f,  0.5f) );
+                points.push_back( LLVector3( 0.5f, -0.5f, -0.5f) );
+                points.push_back( LLVector3(-0.5f,  0.5f,  0.5f) );
+                points.push_back( LLVector3(-0.5f,  0.5f, -0.5f) );
+                points.push_back( LLVector3(-0.5f, -0.5f,  0.5f) );
+                points.push_back( LLVector3(-0.5f, -0.5f, -0.5f) );
+                std::vector< S32 > triangle_indices;
+                // +x
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(3);
+                // -y
+                triangle_indices.push_back(3);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(6);
+                // -x
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(6);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(5);
+                // +y
+                triangle_indices.push_back(5);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(0);
+                // +z
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(6);
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(6);
+                triangle_indices.push_back(2);
+                // -z
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(5);
+                triangle_indices.push_back(3);
+                triangle_indices.push_back(3);
+                triangle_indices.push_back(5);
+                triangle_indices.push_back(1);
+                F32 angle_step = F_PI / (2.f * 3.f);
+                for (F32 angle = 0.f; angle < 0.51f * F_PI; angle += angle_step)
+                {
+                        // scale and rotate mesh points
+                        LLVector3 axis(0.f, 0.f, angle);
+                        LLQuaternion mesh_rotation(angle, axis);
+                        LLVector3 big_scale(3.f, 5.f, 7.f);
+                        std::vector< LLVector3 > new_points;
+                        for (S32 p = 0; p < (S32)points.size(); ++p)
+                        {
+                                LLVector3 new_point = points[p];
+                                for (S32 i = 0; i < 3; ++i)
+                                {
+                                        new_point.mV[i] *= big_scale.mV[i];
+                                }
+                                new_points.push_back( new_point * mesh_rotation );
+                        }
+                                
+                        // build the big mesh box
+                        LLPrimMassProperties mesh_box;
+                        mesh_box.setUnitMesh(new_points, triangle_indices);
+        
+                        F32 density = 3.7f;
+                        LLVector3 unit_scale(1.f, 1.f, 1.f);
+                        LLObjectMassProperties big_box(mesh_box, unit_scale, density);
+        
+                        // build the multiple_box
+                        LLPrimMassProperties box;
+                        box.setUnitBox();
+        
+                        LLObjectMassProperties multiple_box;
+                        LLVector3 position;
+        
+                        F32 small_box_size = 0.5f;
+                        LLVector3 small_scale( small_box_size, small_box_size, small_box_size);
+                        S32 num_boxes_x = S32(big_scale.mV[VX] / small_box_size);
+                        S32 num_boxes_y = S32(big_scale.mV[VY] / small_box_size);
+                        S32 num_boxes_z = S32(big_scale.mV[VZ] / small_box_size);
+                        LLVector3 start_pos = (0.5f * (small_scale - big_scale)) * mesh_rotation;
+                        for (S32 x = 0; x < num_boxes_x; ++x)
+                        {
+                                for (S32 y = 0; y < num_boxes_y; ++y)
+                                {
+                                        for (S32 z = 0; z < num_boxes_z; ++z)
+                                        {
+                                                position.set( F32(x) * small_box_size, F32(y) * small_box_size, F32(z) * small_box_size );
+                                                position *= mesh_rotation;
+                                                position += start_pos;
+                                                multiple_box.add(box, small_scale, density, position, mesh_rotation);
+                                        }
+                                }
+                        }
+                        // the mass properties of the two boxes should match
+                        // mass
+                        F32 big_mass = big_box.getMass();
+                        F32 multiple_mass = multiple_box.getMass();
+                        F32 error = (big_mass - multiple_mass) / big_mass;
+                        ensure("Big box and equivalent multi-prim box should have same mass", error < SMALL_RELATIVE_ERROR);
+                        // center of mass
+                        LLVector3 big_center, multiple_center;
+                        big_box.getCenterOfMass(big_center);
+                        multiple_box.getCenterOfMass(multiple_center);
+                        error = (big_center - multiple_center).length();
+                        ensure("Big box and equivalent multi-prim box should have same center", error < SMALL_RELATIVE_ERROR);
+                        LLMatrix3 big_inertia, multiple_inertia;
+                        big_box.getInertiaLocal(big_inertia);
+                        multiple_box.getInertiaLocal(multiple_inertia);
+                        for (S32 i = 0; i < 3; ++i)
+                        {
+                                for (S32 j = 0; j < 3; ++j)
+                                {
+                                        error = fabs(big_inertia.mMatrix[i][j] - multiple_inertia.mMatrix[i][j]);
+                                        if (error > 0.f
+                                                && big_inertia.mMatrix[i][j] > SMALL_RELATIVE_ERROR)
+                                        {
+                                                error /= big_inertia.mMatrix[i][j];
+                                        }
+                                        ensure("UnitBox and UnitMesh(box) should have same inertia", error < SMALL_RELATIVE_ERROR);
+                                }
+                        }
+                }
+        }
+        template<> template<>
+        void mass_properties::test<8>()
+        {
+                // test LLPhysicsVolumeManager
+                // we make a large single-prim box, then a similarly shaped object
+                // that is multiple prims, and compare their mass properties
+                // first we make the single-prim giant
+                //      
+                //          4-----------0
+                //  z      /|          /|
+                //  |     / |         / |
+                //  |    /  |        /  |
+                //  |   6-----------2   |
+                //  |   |   |       |   |
+                //  |   |   5-------|---1
+                //  |   |  /        |  /
+                //  |   | /         | /
+                //  | y |/          |/
+                //  |/  7-----------3
+                //  +------------------------ x
+                std::vector< LLVector3 > points;
+                points.push_back( LLVector3( 0.5f,  0.5f,  0.5f) );
+                points.push_back( LLVector3( 0.5f,  0.5f, -0.5f) );
+                points.push_back( LLVector3( 0.5f, -0.5f,  0.5f) );
+                points.push_back( LLVector3( 0.5f, -0.5f, -0.5f) );
+                points.push_back( LLVector3(-0.5f,  0.5f,  0.5f) );
+                points.push_back( LLVector3(-0.5f,  0.5f, -0.5f) );
+                points.push_back( LLVector3(-0.5f, -0.5f,  0.5f) );
+                points.push_back( LLVector3(-0.5f, -0.5f, -0.5f) );
+                std::vector< S32 > triangle_indices;
+                // +x
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(3);
+                // -y
+                triangle_indices.push_back(3);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(2);
+                triangle_indices.push_back(6);
+                // -x
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(6);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(5);
+                // +y
+                triangle_indices.push_back(5);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(1);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(0);
+                // +z
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(4);
+                triangle_indices.push_back(6);
+                triangle_indices.push_back(0);
+                triangle_indices.push_back(6);
+                triangle_indices.push_back(2);
+                // -z
+                triangle_indices.push_back(7);
+                triangle_indices.push_back(5);
+                triangle_indices.push_back(3);
+                triangle_indices.push_back(3);
+                triangle_indices.push_back(5);
+                triangle_indices.push_back(1);
+                // scale the mesh points
+                LLVector3 big_scale(1.f, 2.f, 3.f);
+                std::vector< LLVector3 > new_points;
+                for (S32 p = 0; p < (S32)points.size(); ++p)
+                {
+                        LLVector3 new_point = points[p];
+                        for (S32 i = 0; i < 3; ++i)
+                        {
+                                new_point.mV[i] *= big_scale.mV[i];
+                        }
+                        new_points.push_back( new_point );
+                }
+                // build the big mesh box (primitive)
+                LLPrimMassProperties mesh_box;
+                mesh_box.setUnitMesh(new_points, triangle_indices);
+                F32 density = DEFAULT_OBJECT_DENSITY;
+                LLVector3 unit_scale(1.f, 1.f, 1.f);
+                LLObjectMassProperties big_box(mesh_box, unit_scale, density);
+                
+                // build the multi-prim box (object)
+                S32 TEST_VOLUME_DETAIL = 1;
+                LLVolumeParams volume_params;
+                volume_params.setCube();
+                
+                LLObjectMassProperties multiple_box;
+                F32 small_box_size = 0.5f;
+                LLVector3 small_scale( small_box_size, small_box_size, small_box_size);
+                {
+                        // hijack the volume manager used by LLPrimitive
+                        LLPhysicsVolumeManager* volume_manager = new LLPhysicsVolumeManager();
+                        //volume_manager->setThreadSafe(false);
+                        LLPrimitive::setVolumeManager(volume_manager);
+                        std::vector< const LLPrimitive* > prim_list;
+        
+                        F32 angle = 0.f;
+                        LLVector3 axis(0.f, 0.f, angle);
+                        LLVector3 position;
+                        LLQuaternion rotation(angle, axis);
+                        S32 num_boxes_x = S32(big_scale.mV[VX] / small_box_size);
+                        S32 num_boxes_y = S32(big_scale.mV[VY] / small_box_size);
+                        S32 num_boxes_z = S32(big_scale.mV[VZ] / small_box_size);
+        
+                        for (S32 x = 0; x < num_boxes_x; ++x)
+                        {
+                                for (S32 y = 0; y < num_boxes_y; ++y)
+                                {
+                                        for (S32 z = 0; z < num_boxes_z; ++z)
+                                        {
+                                                LLPrimitive* primp = new LLPrimitive();
+                                                primp->setVolume( volume_params, TEST_VOLUME_DETAIL);
+        
+                                                position.set( F32(x) * small_box_size, F32(y) * small_box_size, F32(z) * small_box_size );
+                                                position *= rotation;
+        
+                                                primp->setPosition(position);
+                                                primp->setRotation(rotation);
+                                                primp->setScale(small_scale);
+        
+                                                prim_list.push_back(primp);
+                                        }
+                                }
+                        }
+        
+                        volume_manager->getObjectMassProperties(multiple_box, prim_list);
+        
+                        for (S32 i = 0; i < (S32)prim_list.size(); ++i)
+                        {
+                                delete prim_list[i];
+                                prim_list[i] = NULL;
+                        }
+                        LLPrimitive::cleanupVolumeManager();
+                }
+                // mass
+                F32 big_mass = big_box.getMass();
+                F32 multiple_mass = multiple_box.getMass();
+                F32 error = (big_mass - multiple_mass) / big_mass;
+                ensure("Big box and equivalent multi-prim box should have same mass", error < SMALL_RELATIVE_ERROR);
+                // center of mass
+                LLVector3 big_center, multiple_center;
+                big_box.getCenterOfMass(big_center);
+                multiple_box.getCenterOfMass(multiple_center);
+                LLVector3 expected_shift = 0.5f * ( big_scale - small_scale );
+                error = ( big_center - (multiple_center - expected_shift) ).length();
+                ensure("Big box and equivalent multi-prim box should have same center", error < SMALL_RELATIVE_ERROR);
+                // inertia
+                LLMatrix3 big_inertia, multiple_inertia;
+                big_box.getInertiaLocal(big_inertia);
+                multiple_box.getInertiaLocal(multiple_inertia);
+                for (S32 i = 0; i < 3; ++i)
+                {
+                        for (S32 j = 0; j < 3; ++j)
+                        {
+                                error = fabs(big_inertia.mMatrix[i][j] - multiple_inertia.mMatrix[i][j]);
+                                if (error > 0.f
+                                        && big_inertia.mMatrix[i][j] > SMALL_RELATIVE_ERROR)
+                                {
+                                        error /= big_inertia.mMatrix[i][j];
+                                }
+                                bool ok = error < SMALL_RELATIVE_ERROR
+                                                  || (i != j 
+                                                          && error < SMALL_RELATIVE_ERROR);
+                                ensure("UnitBox and UnitMesh(box) should have same inertia", ok );
+                        }
+                }
+        }
+}
diff --git a/linden/indra/test/math.cpp b/linden/indra/test/math.cpp
index 9cab3fe..405b8a3 100644
--- a/linden/indra/test/math.cpp
+++ b/linden/indra/test/math.cpp
@@ -34,9 +34,13 @@
 #include "linden_common.h"
 #include "lltut.h"
+#include "llcrc.h"
+#include "llline.h"
 #include "llmath.h"
+#include "llrand.h"
+#include "llsphere.h"
 #include "lluuid.h"
-#include "llcrc.h"
+#include "v3math.h"
 namespace tut
 {
@@ -277,3 +281,439 @@ namespace tut
                ensure_equals("crc update 2", c1.getCRC(), c2.getCRC());
        }
 }
+namespace tut
+{
+        struct sphere_data
+        {
+        };
+        typedef test_group<sphere_data> sphere_test;
+        typedef sphere_test::object sphere_object;
+        tut::sphere_test tsphere("LLSphere");
+        template<> template<>
+        void sphere_object::test<1>()
+        {
+                // test LLSphere::contains() and ::overlaps()
+                S32 number_of_tests = 10;
+                for (S32 test = 0; test < number_of_tests; ++test)
+                {
+                        LLVector3 first_center(1.f, 1.f, 1.f);
+                        F32 first_radius = 3.f;
+                        LLSphere first_sphere( first_center, first_radius );
+        
+                        F32 half_millimeter = 0.0005f;
+                        LLVector3 direction( ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f);
+                        direction.normalize();
+        
+                        F32 distance = ll_frand(first_radius - 2.f * half_millimeter);
+                        LLVector3 second_center = first_center + distance * direction;
+                        F32 second_radius = first_radius - distance - half_millimeter;
+                        LLSphere second_sphere( second_center, second_radius );
+                        ensure("first sphere should contain the second", first_sphere.contains(second_sphere));
+                        ensure("first sphere should overlap the second", first_sphere.overlaps(second_sphere));
+        
+                        distance = first_radius + ll_frand(first_radius);
+                        second_center = first_center + distance * direction;
+                        second_radius = distance - first_radius + half_millimeter;
+                        second_sphere.set( second_center, second_radius );
+                        ensure("first sphere should NOT contain the second", !first_sphere.contains(second_sphere));
+                        ensure("first sphere should overlap the second", first_sphere.overlaps(second_sphere));
+        
+                        distance = first_radius + ll_frand(first_radius) + half_millimeter;
+                        second_center = first_center + distance * direction;
+                        second_radius = distance - first_radius - half_millimeter;
+                        second_sphere.set( second_center, second_radius );
+                        ensure("first sphere should NOT contain the second", !first_sphere.contains(second_sphere));
+                        ensure("first sphere should NOT overlap the second", !first_sphere.overlaps(second_sphere));
+                }
+        }
+        template<> template<>
+        void sphere_object::test<2>()
+        {
+                // test LLSphere::getBoundingSphere()
+                S32 number_of_tests = 100;
+                S32 number_of_spheres = 10;
+                F32 sphere_center_range = 32.f;
+                F32 sphere_radius_range = 5.f;
+                for (S32 test = 0; test < number_of_tests; ++test)
+                {
+                        // gegnerate a bunch of random sphere
+                        std::vector< LLSphere > sphere_list;
+                        for (S32 sphere_count=0; sphere_count < number_of_spheres; ++sphere_count)
+                        {
+                                LLVector3 direction( ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f);
+                                direction.normalize();
+                                F32 distance = ll_frand(sphere_center_range);
+                                LLVector3 center = distance * direction;
+                                F32 radius = ll_frand(sphere_radius_range);
+                                LLSphere sphere( center, radius );
+                                sphere_list.push_back(sphere);
+                        }
+                        // compute the bounding sphere
+                        LLSphere bounding_sphere = LLSphere::getBoundingSphere(sphere_list);
+                        // make sure all spheres are inside the bounding sphere
+                        {
+                                std::vector< LLSphere >::const_iterator sphere_itr;
+                                for (sphere_itr = sphere_list.begin(); sphere_itr != sphere_list.end(); ++sphere_itr)
+                                {
+                                        ensure("sphere should be contained by the bounding sphere", bounding_sphere.contains(*sphere_itr));
+                                }
+                        }
+                        // TODO -- improve LLSphere::getBoundingSphere() to the point where
+                        // we can reduce the 'expansion' in the two tests below to about 
+                        // 2 mm or less
+                        F32 expansion = 0.005f;
+                        // move all spheres out a little bit 
+                        // and count how many are NOT contained
+                        {
+                                std::vector< LLVector3 > uncontained_directions;
+                                std::vector< LLSphere >::iterator sphere_itr;
+                                for (sphere_itr = sphere_list.begin(); sphere_itr != sphere_list.end(); ++sphere_itr)
+                                {
+                                        LLVector3 direction = sphere_itr->getCenter() - bounding_sphere.getCenter();
+                                        direction.normalize();
+        
+                                        sphere_itr->setCenter( sphere_itr->getCenter() + expansion * direction );
+                                        if (! bounding_sphere.contains( *sphere_itr ) )
+                                        {
+                                                uncontained_directions.push_back(direction);
+                                        }
+                                }
+                                ensure("when moving spheres out there should be at least two uncontained spheres", 
+                                                uncontained_directions.size() > 1);
+                                /* TODO -- when the bounding sphere algorithm is improved we can open up this test
+                                 * at the moment it occasionally fails when the sphere collection is tight and small
+                                 * (2 meters or less)
+                                if (2 == uncontained_directions.size() )
+                                {
+                                        // if there were only two uncontained spheres then
+                                        // the two directions should be nearly opposite
+                                        F32 dir_dot = uncontained_directions[0] * uncontained_directions[1];
+                                        ensure("two uncontained spheres should lie opposite the bounding center", dir_dot < -0.95f);
+                                }
+                                */
+                        }
+                        // compute the new bounding sphere
+                        bounding_sphere = LLSphere::getBoundingSphere(sphere_list);
+                        // increase the size of all spheres a little bit
+                        // and count how many are NOT contained
+                        {
+                                std::vector< LLVector3 > uncontained_directions;
+                                std::vector< LLSphere >::iterator sphere_itr;
+                                for (sphere_itr = sphere_list.begin(); sphere_itr != sphere_list.end(); ++sphere_itr)
+                                {
+                                        LLVector3 direction = sphere_itr->getCenter() - bounding_sphere.getCenter();
+                                        direction.normalize();
+        
+                                        sphere_itr->setRadius( sphere_itr->getRadius() + expansion );
+                                        if (! bounding_sphere.contains( *sphere_itr ) )
+                                        {
+                                                uncontained_directions.push_back(direction);
+                                        }
+                                }
+                                ensure("when boosting sphere radii there should be at least two uncontained spheres", 
+                                                uncontained_directions.size() > 1);
+                                /* TODO -- when the bounding sphere algorithm is improved we can open up this test
+                                 * at the moment it occasionally fails when the sphere collection is tight and small
+                                 * (2 meters or less)
+                                if (2 == uncontained_directions.size() )
+                                {
+                                        // if there were only two uncontained spheres then
+                                        // the two directions should be nearly opposite
+                                        F32 dir_dot = uncontained_directions[0] * uncontained_directions[1];
+                                        ensure("two uncontained spheres should lie opposite the bounding center", dir_dot < -0.95f);
+                                }
+                                */
+                        }
+                }
+        }
+}
+namespace tut
+{
+        F32 SMALL_RADIUS = 1.0f;
+        F32 MEDIUM_RADIUS = 5.0f;
+        F32 LARGE_RADIUS = 10.0f;
+        struct line_data
+        {
+        };
+        typedef test_group<line_data> line_test;
+        typedef line_test::object line_object;
+        tut::line_test tline("LLLine");
+        template<> template<>
+        void line_object::test<1>()
+        {
+                // this is a test for LLLine::intersects(point) which returns TRUE 
+                // if the line passes within some tolerance of point
+                // these tests will have some floating point error, 
+                // so we need to specify how much error is ok
+                F32 allowable_relative_error = 0.00001f;
+                S32 number_of_tests = 100;
+                for (S32 test = 0; test < number_of_tests; ++test)
+                {
+                        // generate some random point to be on the line
+                        LLVector3 point_on_line( ll_frand(2.f) - 1.f, 
+                                                                         ll_frand(2.f) - 1.f, 
+                                                                         ll_frand(2.f) - 1.f);
+                        point_on_line.normalize();
+                        point_on_line *= ll_frand(LARGE_RADIUS);
+                        // generate some random point to "intersect"
+                        LLVector3 random_direction ( ll_frand(2.f) - 1.f, 
+                                                                                 ll_frand(2.f) - 1.f, 
+                                                                                 ll_frand(2.f) - 1.f);
+                        random_direction.normalize();
+                        LLVector3 random_offset( ll_frand(2.f) - 1.f, 
+                                                                         ll_frand(2.f) - 1.f, 
+                                                                         ll_frand(2.f) - 1.f);
+                        random_offset.normalize();
+                        random_offset *= ll_frand(SMALL_RADIUS);
+                        LLVector3 point = point_on_line + MEDIUM_RADIUS * random_direction
+                                + random_offset;
+        
+                        // compute the axis of approach (a unit vector between the points)
+                        LLVector3 axis_of_approach = point - point_on_line;
+                        axis_of_approach.normalize();
+        
+                        // compute the direction of the the first line (perp to axis_of_approach)
+                        LLVector3 first_dir( ll_frand(2.f) - 1.f, 
+                                                                 ll_frand(2.f) - 1.f, 
+                                                                 ll_frand(2.f) - 1.f);
+                        first_dir.normalize();
+                        F32 dot = first_dir * axis_of_approach;         
+                        first_dir -= dot * axis_of_approach;    // subtract component parallel to axis
+                        first_dir.normalize();
+        
+                        // construct the line
+                        LLVector3 another_point_on_line = point_on_line + ll_frand(LARGE_RADIUS) * first_dir;
+                        LLLine line(another_point_on_line, point_on_line);
+        
+                        // test that the intersection point is within MEDIUM_RADIUS + SMALL_RADIUS
+                        F32 test_radius = MEDIUM_RADIUS + SMALL_RADIUS;
+                        test_radius += (LARGE_RADIUS * allowable_relative_error);
+                        ensure("line should pass near intersection point", line.intersects(point, test_radius));
+                        test_radius = allowable_relative_error * (point - point_on_line).length();
+                        ensure("line should intersect point used to define it", line.intersects(point_on_line, test_radius));
+                }
+        }
+        template<> template<>
+        void line_object::test<2>()
+        {
+                // this is a test for LLLine::nearestApproach(LLLIne) method
+                // which computes the point on a line nearest another line
+                // these tests will have some floating point error, 
+                // so we need to specify how much error is ok
+                // TODO -- make nearestApproach() algorithm more accurate so
+                // we can tighten the allowable_error.  Most tests are tighter
+                // than one milimeter, however when doing randomized testing
+                // you can walk into inaccurate cases.
+                F32 allowable_relative_error = 0.001f;
+                S32 number_of_tests = 100;
+                for (S32 test = 0; test < number_of_tests; ++test)
+                {
+                        // generate two points to be our known nearest approaches
+                        LLVector3 some_point( ll_frand(2.f) - 1.f, 
+                                                                  ll_frand(2.f) - 1.f, 
+                                                                  ll_frand(2.f) - 1.f);
+                        some_point.normalize();
+                        some_point *= ll_frand(LARGE_RADIUS);
+                        LLVector3 another_point( ll_frand(2.f) - 1.f, 
+                                                                         ll_frand(2.f) - 1.f, 
+                                                                         ll_frand(2.f) - 1.f);
+                        another_point.normalize();
+                        another_point *= ll_frand(LARGE_RADIUS);
+                        // compute the axis of approach (a unit vector between the points)
+                        LLVector3 axis_of_approach = another_point - some_point;
+                        axis_of_approach.normalize();
+        
+                        // compute the direction of the the first line (perp to axis_of_approach)
+                        LLVector3 first_dir( ll_frand(2.f) - 1.f, 
+                                                                 ll_frand(2.f) - 1.f, 
+                                                                 ll_frand(2.f) - 1.f);
+                        F32 dot = first_dir * axis_of_approach;         
+                        first_dir -= dot * axis_of_approach;            // subtract component parallel to axis
+                        first_dir.normalize();                                          // normalize
+        
+                        // compute the direction of the the second line
+                        LLVector3 second_dir( ll_frand(2.f) - 1.f, 
+                                                                  ll_frand(2.f) - 1.f, 
+                                                                  ll_frand(2.f) - 1.f);
+                        dot = second_dir * axis_of_approach;            
+                        second_dir -= dot * axis_of_approach;
+                        second_dir.normalize();
+                        // make sure the lines aren't too parallel, 
+                        dot = fabsf(first_dir * second_dir);
+                        if (dot > 0.99f)
+                        {
+                                // skip this test, we're not interested in testing 
+                                // the intractible cases
+                                continue;
+                        }
+        
+                        // construct the lines
+                        LLVector3 first_point = some_point + ll_frand(LARGE_RADIUS) * first_dir;
+                        LLLine first_line(first_point, some_point);
+        
+                        LLVector3 second_point = another_point + ll_frand(LARGE_RADIUS) * second_dir;
+                        LLLine second_line(second_point, another_point);
+        
+                        // compute the points of nearest approach
+                        LLVector3 some_computed_point = first_line.nearestApproach(second_line);
+                        LLVector3 another_computed_point = second_line.nearestApproach(first_line);
+        
+                        // compute the error
+                        F32 first_error = (some_point - some_computed_point).length();
+                        F32 scale = llmax((some_point - another_point).length(), some_point.length());
+                        scale = llmax(scale, another_point.length());
+                        scale = llmax(scale, 1.f);
+                        F32 first_relative_error = first_error / scale;
+                        F32 second_error = (another_point - another_computed_point).length();
+                        F32 second_relative_error = second_error / scale;
+                        //if (first_relative_error > allowable_relative_error)
+                        //{
+                        //      std::cout << "first_error = " << first_error 
+                        //              << "  first_relative_error = " << first_relative_error 
+                        //              << "  scale = " << scale 
+                        //              << "  dir_dot = " << (first_dir * second_dir)
+                        //              << std::endl;
+                        //}
+                        //if (second_relative_error > allowable_relative_error)
+                        //{
+                        //      std::cout << "second_error = " << second_error 
+                        //              << "  second_relative_error = " << second_relative_error 
+                        //              << "  scale = " << scale 
+                        //              << "  dist = " << (some_point - another_point).length()
+                        //              << "  dir_dot = " << (first_dir * second_dir)
+                        //              << std::endl;
+                        //}
+                        // test that the errors are small
+                        ensure("first line should accurately compute its closest approach", 
+                                        first_relative_error <= allowable_relative_error);
+                        ensure("second line should accurately compute its closest approach", 
+                                        second_relative_error <= allowable_relative_error);
+                }
+        }
+        F32 ALMOST_PARALLEL = 0.99f;
+        template<> template<>
+        void line_object::test<3>()
+        {
+                // this is a test for LLLine::getIntersectionBetweenTwoPlanes() method
+                // first some known tests
+                LLLine xy_plane(LLVector3(0.f, 0.f, 2.f), LLVector3(0.f, 0.f, 3.f));
+                LLLine yz_plane(LLVector3(2.f, 0.f, 0.f), LLVector3(3.f, 0.f, 0.f));
+                LLLine zx_plane(LLVector3(0.f, 2.f, 0.f), LLVector3(0.f, 3.f, 0.f));
+                LLLine x_line;
+                LLLine y_line;
+                LLLine z_line;
+                bool x_success = LLLine::getIntersectionBetweenTwoPlanes(x_line, xy_plane, zx_plane);
+                bool y_success = LLLine::getIntersectionBetweenTwoPlanes(y_line, yz_plane, xy_plane);
+                bool z_success = LLLine::getIntersectionBetweenTwoPlanes(z_line, zx_plane, yz_plane);
+                ensure("xy and zx planes should intersect", x_success);
+                ensure("yz and xy planes should intersect", y_success);
+                ensure("zx and yz planes should intersect", z_success);
+                LLVector3 direction = x_line.getDirection();
+                ensure("x_line should be parallel to x_axis", fabs(direction.mV[VX]) == 1.f
+                                                                      && 0.f == direction.mV[VY]
+                                                                      && 0.f == direction.mV[VZ] );
+                direction = y_line.getDirection();
+                ensure("y_line should be parallel to y_axis", 0.f == direction.mV[VX]
+                                                                                                          && fabs(direction.mV[VY]) == 1.f
+                                                                      && 0.f == direction.mV[VZ] );
+                direction = z_line.getDirection();
+                ensure("z_line should be parallel to z_axis", 0.f == direction.mV[VX]
+                                                                      && 0.f == direction.mV[VY]
+                                                                                                          && fabs(direction.mV[VZ]) == 1.f );
+                // next some random tests
+                F32 allowable_relative_error = 0.0001f;
+                S32 number_of_tests = 20;
+                for (S32 test = 0; test < number_of_tests; ++test)
+                {
+                        // generate the known line
+                        LLVector3 some_point( ll_frand(2.f) - 1.f, 
+                                                                  ll_frand(2.f) - 1.f, 
+                                                                  ll_frand(2.f) - 1.f);
+                        some_point.normalize();
+                        some_point *= ll_frand(LARGE_RADIUS);
+                        LLVector3 another_point( ll_frand(2.f) - 1.f, 
+                                                                         ll_frand(2.f) - 1.f, 
+                                                                         ll_frand(2.f) - 1.f);
+                        another_point.normalize();
+                        another_point *= ll_frand(LARGE_RADIUS);
+                        LLLine known_intersection(some_point, another_point);
+                        // compute a plane that intersect the line
+                        LLVector3 point_on_plane( ll_frand(2.f) - 1.f, 
+                                                                          ll_frand(2.f) - 1.f, 
+                                                                          ll_frand(2.f) - 1.f);
+                        point_on_plane.normalize();
+                        point_on_plane *= ll_frand(LARGE_RADIUS);
+                        LLVector3 plane_normal = (point_on_plane - some_point) % known_intersection.getDirection();
+                        plane_normal.normalize();
+                        LLLine first_plane(point_on_plane, point_on_plane + plane_normal);
+                        // compute a different plane that intersect the line
+                        LLVector3 point_on_different_plane( ll_frand(2.f) - 1.f, 
+                                                                                                ll_frand(2.f) - 1.f, 
+                                                                                                ll_frand(2.f) - 1.f);
+                        point_on_different_plane.normalize();
+                        point_on_different_plane *= ll_frand(LARGE_RADIUS);
+                        LLVector3 different_plane_normal = (point_on_different_plane - another_point) % known_intersection.getDirection();
+                        different_plane_normal.normalize();
+                        LLLine second_plane(point_on_different_plane, point_on_different_plane + different_plane_normal);
+                        if (fabs(plane_normal * different_plane_normal) > ALMOST_PARALLEL)
+                        {
+                                // the two planes are approximately parallel, so we won't test this case
+                                continue;
+                        }
+                        LLLine measured_intersection;
+                        bool success = LLLine::getIntersectionBetweenTwoPlanes(
+                                        measured_intersection,
+                                        first_plane,
+                                        second_plane);
+                        ensure("plane intersection should succeed", success);
+                        F32 dot = fabs(known_intersection.getDirection() * measured_intersection.getDirection());
+                        ensure("measured intersection should be parallel to known intersection",
+                                        dot > ALMOST_PARALLEL);
+                        ensure("measured intersection should pass near known point",
+                                        measured_intersection.intersects(some_point, LARGE_RADIUS * allowable_relative_error));
+                }
+        }
+}
diff --git a/linden/indra/test/message_tut.cpp b/linden/indra/test/message_tut.cpp
index 60a249c..b619d38 100644
--- a/linden/indra/test/message_tut.cpp
+++ b/linden/indra/test/message_tut.cpp
@@ -62,7 +62,7 @@ namespace tut
                        if(! init)
                        {
                                ll_init_apr();
-                                init_prehash_data();
+                                //init_prehash_data();
                                init = true;
                        }
diff --git a/linden/indra/test/prim_linkability_tut.cpp b/linden/indra/test/prim_linkability_tut.cpp
new file mode 100644
index 0000000..c5f2958
--- /dev/null
+++ b/linden/indra/test/prim_linkability_tut.cpp
@@ -0,0 +1,490 @@
+/** 
+ * @file linkability.cpp
+ * @author andrew@lindenlab.com
+ * @date 2007-04-23
+ * @brief Tests for the LLPrimLinkInfo template which computes the linkability of prims
+ *
+ * $LicenseInfo:firstyear=2007&license=internal$
+ * 
+ * Copyright (c) 2007-2008, Linden Research, Inc.
+ * 
+ * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
+ * this source code is governed by the Linden Lab Source Code Disclosure
+ * Agreement ("Agreement") previously entered between you and Linden
+ * Lab. By accessing, using, copying, modifying or distributing this
+ * software, you acknowledge that you have been informed of your
+ * obligations under the Agreement and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "linden_common.h"
+#include "lltut.h"
+#include "llprimlinkinfo.h"
+#include "llrand.h"
+// helper function
+void randomize_sphere(LLSphere& sphere, F32 center_range, F32 radius_range)
+{
+        F32 radius = ll_frand(2.f * radius_range) - radius_range;
+        LLVector3 center;
+        for (S32 i=0; i<3; ++i)
+        {
+                center.mV[i] = ll_frand(2.f * center_range) - center_range;
+        }
+        sphere.setRadius(radius);
+        sphere.setCenter(center);
+}
+// helper function.  Same as above with a min and max radius.
+void randomize_sphere(LLSphere& sphere, F32 center_range, F32 minimum_radius, F32 maximum_radius)
+{
+        F32 radius = ll_frand(maximum_radius - minimum_radius) + minimum_radius; 
+        LLVector3 center;
+        for (S32 i=0; i<3; ++i)
+        {
+                center.mV[i] = ll_frand(2.f * center_range) - center_range;
+        }
+        sphere.setRadius(radius);
+        sphere.setCenter(center);
+}
+// helper function
+bool random_sort( const LLPrimLinkInfo< S32 >&, const LLPrimLinkInfo< S32 >& b)
+{
+        return (ll_rand(64) < 32);
+}
+namespace tut
+{
+        struct linkable_data
+        {
+                LLPrimLinkInfo<S32> info;
+        };
+        typedef test_group<linkable_data> linkable_test;
+        typedef linkable_test::object linkable_object;
+        tut::linkable_test wtf("prim linkability");
+        template<> template<>
+        void linkable_object::test<1>()
+        {
+                // Here we test the boundary of the LLPrimLinkInfo::canLink() method 
+                // between semi-random middle-sized objects.
+                S32 number_of_tests = 100;
+                for (S32 test = 0; test < number_of_tests; ++test)
+                {
+                        // compute the radii that would provide the above max link distance
+                        F32 first_radius = 0.f;
+                        F32 second_radius = 0.f;
+                        
+                        // compute a random center for the first sphere
+                        // compute some random max link distance
+                        F32 max_link_span = ll_frand(MAX_OBJECT_SPAN);
+                        if (max_link_span < OBJECT_SPAN_BONUS)
+                        {
+                                max_link_span += OBJECT_SPAN_BONUS;
+                        }
+                        LLVector3 first_center(
+                                        ll_frand(2.f * max_link_span) - max_link_span, 
+                                        ll_frand(2.f * max_link_span) - max_link_span, 
+                                        ll_frand(2.f * max_link_span) - max_link_span);
+                        // put the second sphere at the right distance from the origin
+                        // such that it is within the max_link_distance of the first
+                        LLVector3 direction(ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f);
+                        direction.normalize();
+                        F32 half_milimeter = 0.0005f;
+                        LLVector3 second_center;
+                        // max_span = 3 * (first_radius + second_radius) + OBJECT_SPAN_BONUS
+                        // make sure they link at short distances
+                        {
+                                second_center = first_center + (OBJECT_SPAN_BONUS - half_milimeter) * direction;
+                                LLPrimLinkInfo<S32> first_info(0, LLSphere(first_center, first_radius) );
+                                LLPrimLinkInfo<S32> second_info(1, LLSphere(second_center, second_radius) );
+                                ensure("these nearby objects should link", first_info.canLink(second_info) );
+                        }
+                        // make sure they fail to link if we move them apart just a little bit
+                        {
+                                second_center = first_center + (OBJECT_SPAN_BONUS + half_milimeter) * direction;
+                                LLPrimLinkInfo<S32> first_info(0, LLSphere(first_center, first_radius) );
+                                LLPrimLinkInfo<S32> second_info(1, LLSphere(second_center, second_radius) );
+                                ensure("these nearby objects should NOT link", !first_info.canLink(second_info) );
+                        }
+                        // make sure the objects link or not at medium distances
+                        {
+                                first_radius = 0.3f * ll_frand(max_link_span - OBJECT_SPAN_BONUS);
+                                // This is the exact second radius that will link at exactly our random max_link_distance
+                                second_radius = ((max_link_span - OBJECT_SPAN_BONUS) / 3.f) - first_radius;
+                                second_center = first_center + (max_link_span - first_radius - second_radius - half_milimeter) * direction;
+                                LLPrimLinkInfo<S32> first_info(0, LLSphere(first_center, first_radius) );
+                                LLPrimLinkInfo<S32> second_info(1, LLSphere(second_center, second_radius) );
+                                ensure("these objects should link", first_info.canLink(second_info) );
+                        }
+                        // make sure they fail to link if we move them apart just a little bit
+                        {
+                                // move the second sphere such that it is a little too far from the first
+                                second_center += (2.f * half_milimeter) * direction;
+                                LLPrimLinkInfo<S32> first_info(0, LLSphere(first_center, first_radius) );
+                                LLPrimLinkInfo<S32> second_info(1, LLSphere(second_center, second_radius) );
+                                
+                                ensure("these objects should NOT link", !first_info.canLink(second_info) );
+                        }
+                        // make sure things don't link at far distances
+                        {
+                                second_center = first_center + (MAX_OBJECT_SPAN + 2.f * half_milimeter) * direction;
+                                second_radius = 0.3f * MAX_OBJECT_SPAN;
+                                LLPrimLinkInfo<S32> first_info(0, LLSphere(first_center, first_radius) );
+                                LLPrimLinkInfo<S32> second_info(1, LLSphere(second_center, second_radius) );
+                                ensure("these objects should NOT link", !first_info.canLink(second_info) );
+                        }
+                        
+                }
+        }
+        template<> template<>
+        void linkable_object::test<2>()
+        {
+                // Consider a row of eight spheres in a row, each 10m in diameter and centered
+                // at 10m intervals:  01234567.
+                F32 radius = 5.f;
+                F32 spacing = 10.f;
+                LLVector3 line_direction(ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f);
+                line_direction.normalize();
+                LLVector3 first_center(ll_frand(2.f * spacing) -spacing, ll_frand(2.f * spacing) - spacing, ll_frand(2.f * spacing) - spacing);
+                LLPrimLinkInfo<S32> infos[8];
+                for (S32 index = 0; index < 8; ++index)
+                {
+                        LLVector3 center = first_center + ((F32)(index) * spacing) * line_direction;
+                        infos[index].set(index, LLSphere(center, radius));
+                }
+                // Max span for 2 spheres of 5m radius is 3 * (5 + 5) + 1 = 31m
+                // spheres 0&2 have a 30m span (from outside edge to outside edge) and should link
+                {
+                        LLPrimLinkInfo<S32> root_info = infos[0];
+                        std::list< LLPrimLinkInfo<S32> > info_list;
+                        info_list.push_back(infos[2]);
+                        root_info.mergeLinkableSet(info_list);
+                        S32 prim_count = root_info.getPrimCount();
+                        ensure_equals("0&2 prim count should be 2", prim_count, 2);
+                        ensure_equals("0&2 unlinkable list should have length 0", (S32) info_list.size(), 0);
+                }
+                
+                // spheres 0&3 have a 40 meter span and should NOT link outright
+                {
+                        LLPrimLinkInfo<S32> root_info = infos[0];
+                        std::list< LLPrimLinkInfo<S32> > info_list;
+                        info_list.push_back(infos[3]);
+                        root_info.mergeLinkableSet(info_list);
+                        S32 prim_count = root_info.getPrimCount();
+                        ensure_equals("0&4 prim count should be 1", prim_count, 1);
+                        ensure_equals("0&4 unlinkable list should have length 1", (S32) info_list.size(), 1);
+                }
+                
+                // spheres 0-4 should link no matter what order : 01234
+                // Total span = 50m, 012 link with a r=15.5 giving max span of 3 * (15.5 + 5) + 1 = 62.5, but the cap is 54m
+                {
+                        LLPrimLinkInfo<S32> root_info = infos[0];
+                        std::list< LLPrimLinkInfo<S32> > info_list;
+                        for (S32 index = 1; index < 5; ++index)
+                        {
+                                info_list.push_back(infos[index]);
+                        }
+                        root_info.mergeLinkableSet(info_list);
+                        S32 prim_count = root_info.getPrimCount();
+                        ensure_equals("01234 prim count should be 5", prim_count, 5);
+                        ensure_equals("01234 unlinkable list should have length 0", (S32) info_list.size(), 0);
+                }
+                
+                // spheres 0-5 should link no matter what order : 04321
+                {
+                        LLPrimLinkInfo<S32> root_info = infos[0];
+                        std::list< LLPrimLinkInfo<S32> > info_list;
+                        for (S32 index = 4; index > 0; --index)
+                        {
+                                info_list.push_back(infos[index]);
+                        }
+                        root_info.mergeLinkableSet(info_list);
+                        S32 prim_count = root_info.getPrimCount();
+                        ensure_equals("04321 prim count should be 5", prim_count, 5);
+                        ensure_equals("04321 unlinkable list should have length 0", (S32) info_list.size(), 0);
+                }
+                // spheres 0-4 should link no matter what order : 01423
+                {
+                        LLPrimLinkInfo<S32> root_info = infos[0];
+                        std::list< LLPrimLinkInfo<S32> > info_list;
+                        info_list.push_back(infos[1]);
+                        info_list.push_back(infos[4]);
+                        info_list.push_back(infos[2]);
+                        info_list.push_back(infos[3]);
+                        root_info.mergeLinkableSet(info_list);
+                        S32 prim_count = root_info.getPrimCount();
+                        ensure_equals("01423 prim count should be 5", prim_count, 5);
+                        ensure_equals("01423 unlinkable list should have length 0", (S32) info_list.size(), 0);
+                }
+                // spheres 0-5 should NOT fully link, only 0-4 
+                {
+                        LLPrimLinkInfo<S32> root_info = infos[0];
+                        std::list< LLPrimLinkInfo<S32> > info_list;
+                        for (S32 index = 1; index < 6; ++index)
+                        {
+                                info_list.push_back(infos[index]);
+                        }
+                        root_info.mergeLinkableSet(info_list);
+                        S32 prim_count = root_info.getPrimCount();
+                        ensure_equals("012345 prim count should be 5", prim_count, 5);
+                        ensure_equals("012345 unlinkable list should have length 1", (S32) info_list.size(), 1);
+                        std::list< LLPrimLinkInfo<S32> >::iterator info_itr = info_list.begin();
+                        if (info_itr != info_list.end())
+                        {
+                                // examine the contents of the unlinked info
+                                std::list<S32> unlinked_indecies;
+                                info_itr->getData(unlinked_indecies);
+                                // make sure there is only one index in the unlinked_info
+                                ensure_equals("012345 unlinkable index count should be 1", (S32) unlinked_indecies.size(), 1);
+                                // make sure its value is 6
+                                std::list<S32>::iterator unlinked_index_itr = unlinked_indecies.begin();
+                                S32 unlinkable_index = *unlinked_index_itr;
+                                ensure_equals("012345 unlinkable index should be 5", (S32) unlinkable_index, 5);
+                        }
+                }
+                
+                // spheres 0-7 should NOT fully link, only 0-5 
+                {
+                        LLPrimLinkInfo<S32> root_info = infos[0];
+                        std::list< LLPrimLinkInfo<S32> > info_list;
+                        for (S32 index = 1; index < 8; ++index)
+                        {
+                                info_list.push_back(infos[index]);
+                        }
+                        root_info.mergeLinkableSet(info_list);
+                        S32 prim_count = root_info.getPrimCount();
+                        ensure_equals("01234567 prim count should be 5", prim_count, 5);
+                        // Should be 1 linkinfo on unlinkable that has 2 prims
+                        ensure_equals("01234567 unlinkable list should have length 1", (S32) info_list.size(), 1);
+                        std::list< LLPrimLinkInfo<S32> >::iterator info_itr = info_list.begin();
+                        if (info_itr != info_list.end())
+                        {
+                                // make sure there is only one index in the unlinked_info
+                                std::list<S32> unlinked_indecies;
+                                info_itr->getData(unlinked_indecies);
+                                ensure_equals("0123456 unlinkable index count should be 3", (S32) unlinked_indecies.size(), 3);
+                                // make sure its values are 6 and 7
+                                std::list<S32>::iterator unlinked_index_itr = unlinked_indecies.begin();
+                                S32 unlinkable_index = *unlinked_index_itr;
+                                ensure_equals("0123456 first unlinkable index should be 5", (S32) unlinkable_index, 5);
+                                ++unlinked_index_itr;
+                                unlinkable_index = *unlinked_index_itr;
+                                ensure_equals("0123456 second unlinkable index should be 6", (S32) unlinkable_index, 6);
+                                ++unlinked_index_itr;
+                                unlinkable_index = *unlinked_index_itr;
+                                ensure_equals("0123456 third unlinkable index should be 7", (S32) unlinkable_index, 7);
+                        }
+                }
+        }
+        template<> template<>
+        void linkable_object::test<3>()
+        {
+                // Here we test the link results between an LLPrimLinkInfo and a set of
+                // randomized LLPrimLinkInfos where the expected results are known.
+                S32 number_of_tests = 5;
+                for (S32 test = 0; test < number_of_tests; ++test)
+                {
+                        // the radii are known
+                        F32 first_radius = 1.f;
+                        F32 second_radius = 2.f;
+                        F32 third_radius = 3.f;
+                        // compute the distances
+                        F32 half_milimeter = 0.0005f;
+                        F32 max_first_second_span = 3.f * (first_radius + second_radius) + OBJECT_SPAN_BONUS;
+                        F32 linkable_distance = max_first_second_span - first_radius - second_radius - half_milimeter;
+                        F32 max_full_span = 3.f * (0.5f * max_first_second_span + third_radius) + OBJECT_SPAN_BONUS;
+                        F32 unlinkable_distance = max_full_span - 0.5f * linkable_distance - third_radius + half_milimeter;
+                        // compute some random directions
+                        LLVector3 first_direction(ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f);
+                        first_direction.normalize();
+                        LLVector3 second_direction(ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f);
+                        second_direction.normalize();
+                        LLVector3 third_direction(ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f, ll_frand(2.f) - 1.f);
+                        third_direction.normalize();
+        
+                        // compute the centers
+                        LLVector3 first_center = ll_frand(10.f) * first_direction;
+                        LLVector3 second_center = first_center + ll_frand(linkable_distance) * second_direction;
+                        LLVector3 first_join_center = 0.5f * (first_center + second_center);
+                        LLVector3 third_center = first_join_center + unlinkable_distance * third_direction;
+                        // make sure the second info links and the third does not
+                        {
+                                // initialize the infos
+                                S32 index = 0;
+                                LLPrimLinkInfo<S32> first_info(index++, LLSphere(first_center, first_radius));
+                                LLPrimLinkInfo<S32> second_info(index++, LLSphere(second_center, second_radius));
+                                LLPrimLinkInfo<S32> third_info(index++, LLSphere(third_center, third_radius));
+        
+                                // put the second and third infos in a list
+                                std::list< LLPrimLinkInfo<S32> > info_list;
+                                info_list.push_back(second_info);
+                                info_list.push_back(third_info); 
+        
+                                // merge the list with the first_info
+                                first_info.mergeLinkableSet(info_list);
+                                S32 prim_count = first_info.getPrimCount();
+                                ensure_equals("prim count should be 2", prim_count, 2);
+                                ensure_equals("unlinkable list should have length 1", (S32) info_list.size(), 1);
+                        }
+                        // reverse the order and make sure we get the same results
+                        {
+                                // initialize the infos
+                                S32 index = 0;
+                                LLPrimLinkInfo<S32> first_info(index++, LLSphere(first_center, first_radius));
+                                LLPrimLinkInfo<S32> second_info(index++, LLSphere(second_center, second_radius));
+                                LLPrimLinkInfo<S32> third_info(index++, LLSphere(third_center, third_radius));
+        
+                                // build the list in the reverse order
+                                std::list< LLPrimLinkInfo<S32> > info_list;
+                                info_list.push_back(third_info); 
+                                info_list.push_back(second_info);
+        
+                                // merge the list with the first_info
+                                first_info.mergeLinkableSet(info_list);
+                                S32 prim_count = first_info.getPrimCount();
+                                ensure_equals("prim count should be 2", prim_count, 2);
+                                ensure_equals("unlinkable list should have length 1", (S32) info_list.size(), 1);
+                        }
+                }
+        }
+        template<> template<>
+        void linkable_object::test<4>()
+        {
+                // Here we test whether linkability is invarient under permutations
+                // of link order.  To do this we generate a bunch of random spheres
+                // and then try to link them in different ways.
+                //
+                // NOTE: the linkability will only be invarient if there is only one
+                // linkable solution.  Multiple solutions will exist if the set of 
+                // candidates are larger than the maximum linkable distance, or more 
+                // numerous than a single linked object can contain.  This is easily 
+                // understood by considering a very large set of link candidates, 
+                // and first linking preferentially to the left until linking fails, 
+                // then doing the same to the right -- the final solutions will differ.
+                // Hence for this test we must generate candidate sets that lie within 
+                // the linkability envelope of a single object.
+                //
+                // NOTE: a random set of objects will tend to either be totally linkable
+                // or totally not.  That is, the random orientations that 
+                F32 root_center_range = 0.f;
+                F32 min_prim_radius = 0.1f;
+                F32 max_prim_radius = 2.f;
+                
+                // Linkability is min(MAX_OBJECT_SPAN,3 *( R1 + R2 ) + BONUS)
+                // 3 * (min_prim_radius + min_prim_radius) + OBJECT_SPAN_BONUS = 6 * min_prim_radius + OBJECT_SPAN_BONUS;
+                // Use .45 instead of .5 to gaurantee objects are within the minimum span.
+                F32 child_center_range = 0.45f * ( (6*min_prim_radius) + OBJECT_SPAN_BONUS );
+                S32 number_of_tests = 100;
+                S32 number_of_spheres = 10;
+                S32 number_of_scrambles = 10;
+                S32 number_of_random_bubble_sorts = 10;
+                for (S32 test = 0; test < number_of_tests; ++test)
+                {
+                        LLSphere sphere;
+                        S32 sphere_index = 0;
+                        // build the root piece
+                        randomize_sphere(sphere, root_center_range, min_prim_radius, max_prim_radius);
+                        info.set( sphere_index++, sphere );
+                        // build the unlinked pieces
+                        std::list< LLPrimLinkInfo<S32> > info_list;
+                        for (; sphere_index < number_of_spheres; ++sphere_index)
+                        {
+                                randomize_sphere(sphere, child_center_range, min_prim_radius, max_prim_radius);
+                                LLPrimLinkInfo<S32> child_info( sphere_index, sphere );
+                                info_list.push_back(child_info);
+                        }
+                        // declare the variables used to store the results
+                        std::list<S32> first_linked_list;
+                        {
+                                // the link attempt will modify our original info's, so we
+                                // have to make copies of the originals for testing
+                                LLPrimLinkInfo<S32> test_info( 0, LLSphere(info.getCenter(), 0.5f * info.getDiameter()) );
+                                std::list< LLPrimLinkInfo<S32> > test_list;
+                                test_list.assign(info_list.begin(), info_list.end());
+                                // try to link
+                                test_info.mergeLinkableSet(test_list);
+        
+                                ensure("All prims should link, but did not.",test_list.empty());
+                                // store the results 
+                                test_info.getData(first_linked_list);
+                                first_linked_list.sort();
+                        }
+                        // try to link the spheres in various random orders
+                        for (S32 scramble = 0; scramble < number_of_scrambles; ++scramble)
+                        {
+                                LLPrimLinkInfo<S32> test_info(0, LLSphere(info.getCenter(), 0.5f * info.getDiameter()) );
+                                // scramble the order of the info_list
+                                std::list< LLPrimLinkInfo<S32> > test_list;
+                                test_list.assign(info_list.begin(), info_list.end());
+                                for (S32 i = 0; i < number_of_random_bubble_sorts; i++)
+                                {
+                                        test_list.sort(random_sort);
+                                }
+                                // try to link
+                                test_info.mergeLinkableSet(test_list);
+        
+                                // get the results 
+                                std::list<S32> linked_list;
+                                test_info.getData(linked_list);
+                                linked_list.sort();
+                                ensure_equals("linked set size should be order independent",linked_list.size(),first_linked_list.size());
+                        }
+                }
+        }
+}
diff --git a/linden/indra/test/test.vcproj b/linden/indra/test/test.vcproj
index 4476c2e..f720d9a 100644
--- a/linden/indra/test/test.vcproj
+++ b/linden/indra/test/test.vcproj
@@ -20,7 +20,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                                AdditionalIncludeDirectories="..\llcharacter;..\llcommon;..\lldatabase;..\llinventory;..\llmath;..\llmessage;..\llxml;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include"
+                                AdditionalIncludeDirectories="..\;..\llcharacter;..\llcommon;..\lldatabase;..\llinventory;..\llmath;..\llmessage;..\llprimitive;..\llxml;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LL_WINDOWS;LL_DEBUG"
                                MinimalRebuild="FALSE"
                                BasicRuntimeChecks="3"
@@ -35,7 +35,7 @@
                        <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-vc71-mt-s.lib libcurld.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 psapi.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
+                                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-vc71-mt-sgd-1_34_1.lib libcurld.lib libeay32.lib libexpatMT.lib llcommon.lib llphysics.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib psapi.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;"
@@ -74,7 +74,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                                AdditionalIncludeDirectories="..\llcharacter;..\llcommon;..\lldatabase;..\llinventory;..\llmath;..\llmessage;..\llxml;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include"
+                                AdditionalIncludeDirectories="..\;..\llcharacter;..\llcommon;..\lldatabase;..\llinventory;..\llmath;..\llmessage;..\llprimitive;..\llxml;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include"
                                PreprocessorDefinitions="WIN32;__WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;APR_DECLARE_STATIC;LL_HTTPD=1"
                                MinimalRebuild="FALSE"
                                BasicRuntimeChecks="3"
@@ -90,7 +90,7 @@
                        <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-vc71-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 psapi.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
+                                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-vc71-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llphysics.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib psapi.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;"
@@ -130,7 +130,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                                AdditionalIncludeDirectories="..\llcharacter;..\llcommon;..\lldatabase;..\llinventory;..\llmath;..\llmessage;..\llxml;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include"
+                                AdditionalIncludeDirectories="..\;..\llcharacter;..\llcommon;..\lldatabase;..\llinventory;..\llmath;..\llmessage;..\llprimitive;..\llxml;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include"
                                PreprocessorDefinitions="WIN32;__WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;APR_DECLARE_STATIC;LL_HTTPD=1"
                                MinimalRebuild="FALSE"
                                BasicRuntimeChecks="3"
@@ -145,7 +145,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib gdi32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib ssleay32.lib user32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib gdi32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s-1_34_1.lib libcurl.lib libeay32.lib libexpatMT.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib ssleay32.lib user32.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;"
@@ -219,6 +219,9 @@
                                RelativePath=".\lljoint_tut.cpp">
                        </File>
                        <File
+                                RelativePath=".\llmessageconfig_tut.cpp">
+                        </File>
+                        <File
                                RelativePath=".\llmime_tut.cpp">
                        </File>
                        <File
@@ -281,10 +284,14 @@
                        <File
                                RelativePath=".\lluuidhashmap_tut.cpp">
                        </File>
                        <File
                                RelativePath=".\math.cpp">
                        </File>
                        <File
+                                RelativePath=".\prim_linkability_tut.cpp">
+                        </File>
+                        <File
                                RelativePath=".\reflection_tut.cpp">
                        </File>
                        <File
diff --git a/linden/indra/test/test_vc8.vcproj b/linden/indra/test/test_vc8.vcproj
index 2f607cb..6d47de8 100644
--- a/linden/indra/test/test_vc8.vcproj
+++ b/linden/indra/test/test_vc8.vcproj
@@ -65,7 +65,7 @@
                        <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"
+                                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-sgd-1_34_1.lib libboost_signals-vc80-mt-sgd-1_34_1.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;"
@@ -155,7 +155,7 @@
                        <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"
+                                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-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.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;"
@@ -243,7 +243,7 @@
                        />
                        <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"
+                                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-1_34_1.lib libboost_signals-vc80-mt-s-1_34_1.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;"
diff --git a/linden/indra/test/test_vc9.vcproj b/linden/indra/test/test_vc9.vcproj
index 7230df4..d7fcfae 100644
--- a/linden/indra/test/test_vc9.vcproj
+++ b/linden/indra/test/test_vc9.vcproj
@@ -242,7 +242,7 @@
                        />
                        <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"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr.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;"
diff --git a/linden/libraries/i686-win32/include/GL/README.txt b/linden/libraries/i686-win32/include/GL/README.txt
new file mode 100644
index 0000000..f9a39e9
--- /dev/null
+++ b/linden/libraries/i686-win32/include/GL/README.txt
@@ -0,0 +1,5 @@
+Note:
+Most of these files (glext.h, glxext.h, wglext.h) come from the Khronos GL Extension registry at:
+http://www.opengl.org/registry/
diff --git a/linden/libraries/i686-win32/include/GL/glext.h b/linden/libraries/i686-win32/include/GL/glext.h
new file mode 100644
index 0000000..3d69d4e
--- /dev/null
+++ b/linden/libraries/i686-win32/include/GL/glext.h
@@ -0,0 +1,7271 @@
+#ifndef __glext_h_
+#define __glext_h_
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+/*************************************************************/
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glext.h last updated 2007/02/12 */
+/* Current version at http://www.opengl.org/registry/ */
+#define GL_GLEXT_VERSION 39
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
+#define GL_SINGLE_COLOR                   0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#endif
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+#define GL_FUNC_ADD                       0x8006
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX                         0x802E
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CONSTANT_BORDER                0x8151
+#define GL_REPLICATE_BORDER               0x8153
+#define GL_CONVOLUTION_BORDER_COLOR       0x8154
+#endif
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
+#define GL_MAX_TEXTURE_UNITS              0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_MULTISAMPLE_BIT                0x20000000
+#define GL_NORMAL_MAP                     0x8511
+#define GL_REFLECTION_MAP                 0x8512
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_ALPHA               0x84E9
+#define GL_COMPRESSED_LUMINANCE           0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
+#define GL_COMPRESSED_INTENSITY           0x84EC
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#define GL_COMBINE                        0x8570
+#define GL_COMBINE_RGB                    0x8571
+#define GL_COMBINE_ALPHA                  0x8572
+#define GL_SOURCE0_RGB                    0x8580
+#define GL_SOURCE1_RGB                    0x8581
+#define GL_SOURCE2_RGB                    0x8582
+#define GL_SOURCE0_ALPHA                  0x8588
+#define GL_SOURCE1_ALPHA                  0x8589
+#define GL_SOURCE2_ALPHA                  0x858A
+#define GL_OPERAND0_RGB                   0x8590
+#define GL_OPERAND1_RGB                   0x8591
+#define GL_OPERAND2_RGB                   0x8592
+#define GL_OPERAND0_ALPHA                 0x8598
+#define GL_OPERAND1_ALPHA                 0x8599
+#define GL_OPERAND2_ALPHA                 0x859A
+#define GL_RGB_SCALE                      0x8573
+#define GL_ADD_SIGNED                     0x8574
+#define GL_INTERPOLATE                    0x8575
+#define GL_SUBTRACT                       0x84E7
+#define GL_CONSTANT                       0x8576
+#define GL_PRIMARY_COLOR                  0x8577
+#define GL_PREVIOUS                       0x8578
+#define GL_DOT3_RGB                       0x86AE
+#define GL_DOT3_RGBA                      0x86AF
+#endif
+#ifndef GL_VERSION_1_4
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_SIZE_MIN                 0x8126
+#define GL_POINT_SIZE_MAX                 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_POINT_DISTANCE_ATTENUATION     0x8129
+#define GL_GENERATE_MIPMAP                0x8191
+#define GL_GENERATE_MIPMAP_HINT           0x8192
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_FOG_COORDINATE_SOURCE          0x8450
+#define GL_FOG_COORDINATE                 0x8451
+#define GL_FRAGMENT_DEPTH                 0x8452
+#define GL_CURRENT_FOG_COORDINATE         0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
+#define GL_FOG_COORDINATE_ARRAY           0x8457
+#define GL_COLOR_SUM                      0x8458
+#define GL_CURRENT_SECONDARY_COLOR        0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
+#define GL_SECONDARY_COLOR_ARRAY          0x845E
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_FILTER_CONTROL         0x8500
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_DEPTH_TEXTURE_MODE             0x884B
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#define GL_COMPARE_R_TO_TEXTURE           0x884E
+#endif
+#ifndef GL_VERSION_1_5
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#define GL_FOG_COORD_SRC                  GL_FOG_COORDINATE_SOURCE
+#define GL_FOG_COORD                      GL_FOG_COORDINATE
+#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
+#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
+#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
+#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+#define GL_SRC0_RGB                       GL_SOURCE0_RGB
+#define GL_SRC1_RGB                       GL_SOURCE1_RGB
+#define GL_SRC2_RGB                       GL_SOURCE2_RGB
+#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
+#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
+#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
+#endif
+#ifndef GL_VERSION_2_0
+#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#define GL_DRAW_BUFFER0                   0x8825
+#define GL_DRAW_BUFFER1                   0x8826
+#define GL_DRAW_BUFFER2                   0x8827
+#define GL_DRAW_BUFFER3                   0x8828
+#define GL_DRAW_BUFFER4                   0x8829
+#define GL_DRAW_BUFFER5                   0x882A
+#define GL_DRAW_BUFFER6                   0x882B
+#define GL_DRAW_BUFFER7                   0x882C
+#define GL_DRAW_BUFFER8                   0x882D
+#define GL_DRAW_BUFFER9                   0x882E
+#define GL_DRAW_BUFFER10                  0x882F
+#define GL_DRAW_BUFFER11                  0x8830
+#define GL_DRAW_BUFFER12                  0x8831
+#define GL_DRAW_BUFFER13                  0x8832
+#define GL_DRAW_BUFFER14                  0x8833
+#define GL_DRAW_BUFFER15                  0x8834
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+#define GL_POINT_SPRITE                   0x8861
+#define GL_COORD_REPLACE                  0x8862
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_COORDS             0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
+#define GL_MAX_VARYING_FLOATS             0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_1D                     0x8B5D
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_3D                     0x8B5F
+#define GL_SAMPLER_CUBE                   0x8B60
+#define GL_SAMPLER_1D_SHADOW              0x8B61
+#define GL_SAMPLER_2D_SHADOW              0x8B62
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
+#define GL_LOWER_LEFT                     0x8CA1
+#define GL_UPPER_LEFT                     0x8CA2
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#endif
+#ifndef GL_VERSION_2_1
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
+#define GL_FLOAT_MAT2x3                   0x8B65
+#define GL_FLOAT_MAT2x4                   0x8B66
+#define GL_FLOAT_MAT3x2                   0x8B67
+#define GL_FLOAT_MAT3x4                   0x8B68
+#define GL_FLOAT_MAT4x2                   0x8B69
+#define GL_FLOAT_MAT4x3                   0x8B6A
+#define GL_SRGB                           0x8C40
+#define GL_SRGB8                          0x8C41
+#define GL_SRGB_ALPHA                     0x8C42
+#define GL_SRGB8_ALPHA8                   0x8C43
+#define GL_SLUMINANCE_ALPHA               0x8C44
+#define GL_SLUMINANCE8_ALPHA8             0x8C45
+#define GL_SLUMINANCE                     0x8C46
+#define GL_SLUMINANCE8                    0x8C47
+#define GL_COMPRESSED_SRGB                0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#define GL_COMPRESSED_SLUMINANCE          0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
+#endif
+#ifndef GL_ARB_multitexture
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_TEXTURE4_ARB                   0x84C4
+#define GL_TEXTURE5_ARB                   0x84C5
+#define GL_TEXTURE6_ARB                   0x84C6
+#define GL_TEXTURE7_ARB                   0x84C7
+#define GL_TEXTURE8_ARB                   0x84C8
+#define GL_TEXTURE9_ARB                   0x84C9
+#define GL_TEXTURE10_ARB                  0x84CA
+#define GL_TEXTURE11_ARB                  0x84CB
+#define GL_TEXTURE12_ARB                  0x84CC
+#define GL_TEXTURE13_ARB                  0x84CD
+#define GL_TEXTURE14_ARB                  0x84CE
+#define GL_TEXTURE15_ARB                  0x84CF
+#define GL_TEXTURE16_ARB                  0x84D0
+#define GL_TEXTURE17_ARB                  0x84D1
+#define GL_TEXTURE18_ARB                  0x84D2
+#define GL_TEXTURE19_ARB                  0x84D3
+#define GL_TEXTURE20_ARB                  0x84D4
+#define GL_TEXTURE21_ARB                  0x84D5
+#define GL_TEXTURE22_ARB                  0x84D6
+#define GL_TEXTURE23_ARB                  0x84D7
+#define GL_TEXTURE24_ARB                  0x84D8
+#define GL_TEXTURE25_ARB                  0x84D9
+#define GL_TEXTURE26_ARB                  0x84DA
+#define GL_TEXTURE27_ARB                  0x84DB
+#define GL_TEXTURE28_ARB                  0x84DC
+#define GL_TEXTURE29_ARB                  0x84DD
+#define GL_TEXTURE30_ARB                  0x84DE
+#define GL_TEXTURE31_ARB                  0x84DF
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+#endif
+#ifndef GL_ARB_transpose_matrix
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
+#endif
+#ifndef GL_ARB_multisample
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+#endif
+#ifndef GL_ARB_texture_env_add
+#endif
+#ifndef GL_ARB_texture_cube_map
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#endif
+#ifndef GL_ARB_texture_compression
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+#endif
+#ifndef GL_ARB_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_ARB            0x812D
+#endif
+#ifndef GL_ARB_point_parameters
+#define GL_POINT_SIZE_MIN_ARB             0x8126
+#define GL_POINT_SIZE_MAX_ARB             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+#endif
+#ifndef GL_ARB_vertex_blend
+#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
+#define GL_VERTEX_BLEND_ARB               0x86A7
+#define GL_CURRENT_WEIGHT_ARB             0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
+#define GL_WEIGHT_ARRAY_ARB               0x86AD
+#define GL_MODELVIEW0_ARB                 0x1700
+#define GL_MODELVIEW1_ARB                 0x850A
+#define GL_MODELVIEW2_ARB                 0x8722
+#define GL_MODELVIEW3_ARB                 0x8723
+#define GL_MODELVIEW4_ARB                 0x8724
+#define GL_MODELVIEW5_ARB                 0x8725
+#define GL_MODELVIEW6_ARB                 0x8726
+#define GL_MODELVIEW7_ARB                 0x8727
+#define GL_MODELVIEW8_ARB                 0x8728
+#define GL_MODELVIEW9_ARB                 0x8729
+#define GL_MODELVIEW10_ARB                0x872A
+#define GL_MODELVIEW11_ARB                0x872B
+#define GL_MODELVIEW12_ARB                0x872C
+#define GL_MODELVIEW13_ARB                0x872D
+#define GL_MODELVIEW14_ARB                0x872E
+#define GL_MODELVIEW15_ARB                0x872F
+#define GL_MODELVIEW16_ARB                0x8730
+#define GL_MODELVIEW17_ARB                0x8731
+#define GL_MODELVIEW18_ARB                0x8732
+#define GL_MODELVIEW19_ARB                0x8733
+#define GL_MODELVIEW20_ARB                0x8734
+#define GL_MODELVIEW21_ARB                0x8735
+#define GL_MODELVIEW22_ARB                0x8736
+#define GL_MODELVIEW23_ARB                0x8737
+#define GL_MODELVIEW24_ARB                0x8738
+#define GL_MODELVIEW25_ARB                0x8739
+#define GL_MODELVIEW26_ARB                0x873A
+#define GL_MODELVIEW27_ARB                0x873B
+#define GL_MODELVIEW28_ARB                0x873C
+#define GL_MODELVIEW29_ARB                0x873D
+#define GL_MODELVIEW30_ARB                0x873E
+#define GL_MODELVIEW31_ARB                0x873F
+#endif
+#ifndef GL_ARB_matrix_palette
+#define GL_MATRIX_PALETTE_ARB             0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+#endif
+#ifndef GL_ARB_texture_env_combine
+#define GL_COMBINE_ARB                    0x8570
+#define GL_COMBINE_RGB_ARB                0x8571
+#define GL_COMBINE_ALPHA_ARB              0x8572
+#define GL_SOURCE0_RGB_ARB                0x8580
+#define GL_SOURCE1_RGB_ARB                0x8581
+#define GL_SOURCE2_RGB_ARB                0x8582
+#define GL_SOURCE0_ALPHA_ARB              0x8588
+#define GL_SOURCE1_ALPHA_ARB              0x8589
+#define GL_SOURCE2_ALPHA_ARB              0x858A
+#define GL_OPERAND0_RGB_ARB               0x8590
+#define GL_OPERAND1_RGB_ARB               0x8591
+#define GL_OPERAND2_RGB_ARB               0x8592
+#define GL_OPERAND0_ALPHA_ARB             0x8598
+#define GL_OPERAND1_ALPHA_ARB             0x8599
+#define GL_OPERAND2_ALPHA_ARB             0x859A
+#define GL_RGB_SCALE_ARB                  0x8573
+#define GL_ADD_SIGNED_ARB                 0x8574
+#define GL_INTERPOLATE_ARB                0x8575
+#define GL_SUBTRACT_ARB                   0x84E7
+#define GL_CONSTANT_ARB                   0x8576
+#define GL_PRIMARY_COLOR_ARB              0x8577
+#define GL_PREVIOUS_ARB                   0x8578
+#endif
+#ifndef GL_ARB_texture_env_crossbar
+#endif
+#ifndef GL_ARB_texture_env_dot3
+#define GL_DOT3_RGB_ARB                   0x86AE
+#define GL_DOT3_RGBA_ARB                  0x86AF
+#endif
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_ARB            0x8370
+#endif
+#ifndef GL_ARB_depth_texture
+#define GL_DEPTH_COMPONENT16_ARB          0x81A5
+#define GL_DEPTH_COMPONENT24_ARB          0x81A6
+#define GL_DEPTH_COMPONENT32_ARB          0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
+#endif
+#ifndef GL_ARB_shadow
+#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
+#endif
+#ifndef GL_ARB_shadow_ambient
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+#endif
+#ifndef GL_ARB_window_pos
+#endif
+#ifndef GL_ARB_vertex_program
+#define GL_COLOR_SUM_ARB                  0x8458
+#define GL_VERTEX_PROGRAM_ARB             0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
+#define GL_PROGRAM_LENGTH_ARB             0x8627
+#define GL_PROGRAM_STRING_ARB             0x8628
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_CURRENT_MATRIX_ARB             0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
+#define GL_PROGRAM_BINDING_ARB            0x8677
+#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
+#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
+#define GL_PROGRAM_FORMAT_ARB             0x8876
+#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
+#define GL_MATRIX0_ARB                    0x88C0
+#define GL_MATRIX1_ARB                    0x88C1
+#define GL_MATRIX2_ARB                    0x88C2
+#define GL_MATRIX3_ARB                    0x88C3
+#define GL_MATRIX4_ARB                    0x88C4
+#define GL_MATRIX5_ARB                    0x88C5
+#define GL_MATRIX6_ARB                    0x88C6
+#define GL_MATRIX7_ARB                    0x88C7
+#define GL_MATRIX8_ARB                    0x88C8
+#define GL_MATRIX9_ARB                    0x88C9
+#define GL_MATRIX10_ARB                   0x88CA
+#define GL_MATRIX11_ARB                   0x88CB
+#define GL_MATRIX12_ARB                   0x88CC
+#define GL_MATRIX13_ARB                   0x88CD
+#define GL_MATRIX14_ARB                   0x88CE
+#define GL_MATRIX15_ARB                   0x88CF
+#define GL_MATRIX16_ARB                   0x88D0
+#define GL_MATRIX17_ARB                   0x88D1
+#define GL_MATRIX18_ARB                   0x88D2
+#define GL_MATRIX19_ARB                   0x88D3
+#define GL_MATRIX20_ARB                   0x88D4
+#define GL_MATRIX21_ARB                   0x88D5
+#define GL_MATRIX22_ARB                   0x88D6
+#define GL_MATRIX23_ARB                   0x88D7
+#define GL_MATRIX24_ARB                   0x88D8
+#define GL_MATRIX25_ARB                   0x88D9
+#define GL_MATRIX26_ARB                   0x88DA
+#define GL_MATRIX27_ARB                   0x88DB
+#define GL_MATRIX28_ARB                   0x88DC
+#define GL_MATRIX29_ARB                   0x88DD
+#define GL_MATRIX30_ARB                   0x88DE
+#define GL_MATRIX31_ARB                   0x88DF
+#endif
+#ifndef GL_ARB_fragment_program
+#define GL_FRAGMENT_PROGRAM_ARB           0x8804
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
+#endif
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_BUFFER_SIZE_ARB                0x8764
+#define GL_BUFFER_USAGE_ARB               0x8765
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB                  0x88B8
+#define GL_WRITE_ONLY_ARB                 0x88B9
+#define GL_READ_WRITE_ARB                 0x88BA
+#define GL_BUFFER_ACCESS_ARB              0x88BB
+#define GL_BUFFER_MAPPED_ARB              0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
+#define GL_STREAM_DRAW_ARB                0x88E0
+#define GL_STREAM_READ_ARB                0x88E1
+#define GL_STREAM_COPY_ARB                0x88E2
+#define GL_STATIC_DRAW_ARB                0x88E4
+#define GL_STATIC_READ_ARB                0x88E5
+#define GL_STATIC_COPY_ARB                0x88E6
+#define GL_DYNAMIC_DRAW_ARB               0x88E8
+#define GL_DYNAMIC_READ_ARB               0x88E9
+#define GL_DYNAMIC_COPY_ARB               0x88EA
+#endif
+#ifndef GL_ARB_occlusion_query
+#define GL_QUERY_COUNTER_BITS_ARB         0x8864
+#define GL_CURRENT_QUERY_ARB              0x8865
+#define GL_QUERY_RESULT_ARB               0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
+#define GL_SAMPLES_PASSED_ARB             0x8914
+#endif
+#ifndef GL_ARB_shader_objects
+#define GL_PROGRAM_OBJECT_ARB             0x8B40
+#define GL_SHADER_OBJECT_ARB              0x8B48
+#define GL_OBJECT_TYPE_ARB                0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
+#define GL_FLOAT_VEC2_ARB                 0x8B50
+#define GL_FLOAT_VEC3_ARB                 0x8B51
+#define GL_FLOAT_VEC4_ARB                 0x8B52
+#define GL_INT_VEC2_ARB                   0x8B53
+#define GL_INT_VEC3_ARB                   0x8B54
+#define GL_INT_VEC4_ARB                   0x8B55
+#define GL_BOOL_ARB                       0x8B56
+#define GL_BOOL_VEC2_ARB                  0x8B57
+#define GL_BOOL_VEC3_ARB                  0x8B58
+#define GL_BOOL_VEC4_ARB                  0x8B59
+#define GL_FLOAT_MAT2_ARB                 0x8B5A
+#define GL_FLOAT_MAT3_ARB                 0x8B5B
+#define GL_FLOAT_MAT4_ARB                 0x8B5C
+#define GL_SAMPLER_1D_ARB                 0x8B5D
+#define GL_SAMPLER_2D_ARB                 0x8B5E
+#define GL_SAMPLER_3D_ARB                 0x8B5F
+#define GL_SAMPLER_CUBE_ARB               0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
+#define GL_SAMPLER_2D_RECT_ARB            0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+#endif
+#ifndef GL_ARB_vertex_shader
+#define GL_VERTEX_SHADER_ARB              0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+#endif
+#ifndef GL_ARB_fragment_shader
+#define GL_FRAGMENT_SHADER_ARB            0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+#endif
+#ifndef GL_ARB_shading_language_100
+#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
+#endif
+#ifndef GL_ARB_texture_non_power_of_two
+#endif
+#ifndef GL_ARB_point_sprite
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif
+#ifndef GL_ARB_fragment_program_shadow
+#endif
+#ifndef GL_ARB_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
+#define GL_DRAW_BUFFER0_ARB               0x8825
+#define GL_DRAW_BUFFER1_ARB               0x8826
+#define GL_DRAW_BUFFER2_ARB               0x8827
+#define GL_DRAW_BUFFER3_ARB               0x8828
+#define GL_DRAW_BUFFER4_ARB               0x8829
+#define GL_DRAW_BUFFER5_ARB               0x882A
+#define GL_DRAW_BUFFER6_ARB               0x882B
+#define GL_DRAW_BUFFER7_ARB               0x882C
+#define GL_DRAW_BUFFER8_ARB               0x882D
+#define GL_DRAW_BUFFER9_ARB               0x882E
+#define GL_DRAW_BUFFER10_ARB              0x882F
+#define GL_DRAW_BUFFER11_ARB              0x8830
+#define GL_DRAW_BUFFER12_ARB              0x8831
+#define GL_DRAW_BUFFER13_ARB              0x8832
+#define GL_DRAW_BUFFER14_ARB              0x8833
+#define GL_DRAW_BUFFER15_ARB              0x8834
+#endif
+#ifndef GL_ARB_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif
+#ifndef GL_ARB_color_buffer_float
+#define GL_RGBA_FLOAT_MODE_ARB            0x8820
+#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
+#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
+#define GL_CLAMP_READ_COLOR_ARB           0x891C
+#define GL_FIXED_ONLY_ARB                 0x891D
+#endif
+#ifndef GL_ARB_half_float_pixel
+#define GL_HALF_FLOAT_ARB                 0x140B
+#endif
+#ifndef GL_ARB_texture_float
+#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
+#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
+#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
+#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
+#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
+#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
+#define GL_RGBA32F_ARB                    0x8814
+#define GL_RGB32F_ARB                     0x8815
+#define GL_ALPHA32F_ARB                   0x8816
+#define GL_INTENSITY32F_ARB               0x8817
+#define GL_LUMINANCE32F_ARB               0x8818
+#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
+#define GL_RGBA16F_ARB                    0x881A
+#define GL_RGB16F_ARB                     0x881B
+#define GL_ALPHA16F_ARB                   0x881C
+#define GL_INTENSITY16F_ARB               0x881D
+#define GL_LUMINANCE16F_ARB               0x881E
+#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
+#endif
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
+#endif
+#ifndef GL_EXT_abgr
+#define GL_ABGR_EXT                       0x8000
+#endif
+#ifndef GL_EXT_blend_color
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+#endif
+#ifndef GL_EXT_polygon_offset
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+#endif
+#ifndef GL_EXT_texture
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#endif
+#ifndef GL_EXT_texture3D
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+#endif
+#ifndef GL_SGIS_texture_filter4
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+#endif
+#ifndef GL_EXT_subtexture
+#endif
+#ifndef GL_EXT_copy_texture
+#endif
+#ifndef GL_EXT_histogram
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+#endif
+#ifndef GL_EXT_convolution
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+#endif
+#ifndef GL_SGI_color_matrix
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#endif
+#ifndef GL_SGI_color_table
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+#endif
+#ifndef GL_SGIS_pixel_texture
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+#endif
+#ifndef GL_SGIX_pixel_texture
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+#endif
+#ifndef GL_SGIS_texture4D
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+#endif
+#ifndef GL_SGI_texture_color_table
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#endif
+#ifndef GL_EXT_cmyka
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#endif
+#ifndef GL_EXT_texture_object
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+#endif
+#ifndef GL_SGIS_detail_texture
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+#endif
+#ifndef GL_SGIS_sharpen_texture
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+#endif
+#ifndef GL_EXT_packed_pixels
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#endif
+#ifndef GL_SGIS_texture_lod
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#endif
+#ifndef GL_SGIS_multisample
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+#endif
+#ifndef GL_EXT_rescale_normal
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#endif
+#ifndef GL_EXT_vertex_array
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+#endif
+#ifndef GL_EXT_misc_attribute
+#endif
+#ifndef GL_SGIS_generate_mipmap
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#endif
+#ifndef GL_SGIX_clipmap
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#endif
+#ifndef GL_SGIX_shadow
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#endif
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#endif
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#endif
+#ifndef GL_EXT_blend_minmax
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_BLEND_EQUATION_EXT             0x8009
+#endif
+#ifndef GL_EXT_blend_subtract
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#endif
+#ifndef GL_EXT_blend_logic_op
+#endif
+#ifndef GL_SGIX_interlace
+#define GL_INTERLACE_SGIX                 0x8094
+#endif
+#ifndef GL_SGIX_pixel_tiles
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#endif
+#ifndef GL_SGIS_texture_select
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#endif
+#ifndef GL_SGIX_sprite
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+#endif
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#endif
+#ifndef GL_EXT_point_parameters
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+#endif
+#ifndef GL_SGIS_point_parameters
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+#endif
+#ifndef GL_SGIX_instruments
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+#endif
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#endif
+#ifndef GL_SGIX_framezoom
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+#endif
+#ifndef GL_SGIX_tag_sample_buffer
+#endif
+#ifndef GL_FfdMaskSGIX
+#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
+#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
+#endif
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
+#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
+#define GL_DEFORMATIONS_MASK_SGIX         0x8196
+#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
+#endif
+#ifndef GL_SGIX_reference_plane
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+#endif
+#ifndef GL_SGIX_flush_raster
+#endif
+#ifndef GL_SGIX_depth_texture
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#endif
+#ifndef GL_SGIS_fog_function
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+#endif
+#ifndef GL_SGIX_fog_offset
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#endif
+#ifndef GL_HP_image_transform
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+#endif
+#ifndef GL_HP_convolution_border_modes
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#endif
+#ifndef GL_INGR_palette_buffer
+#endif
+#ifndef GL_SGIX_texture_add_env
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#endif
+#ifndef GL_EXT_color_subtable
+#endif
+#ifndef GL_PGI_vertex_hints
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#endif
+#ifndef GL_PGI_misc_hints
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+#endif
+#ifndef GL_EXT_paletted_texture
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+#endif
+#ifndef GL_EXT_clip_volume_hint
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#endif
+#ifndef GL_SGIX_list_priority
+#define GL_LIST_PRIORITY_SGIX             0x8182
+#endif
+#ifndef GL_SGIX_ir_instrument1
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#endif
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#endif
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#endif
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#endif
+#ifndef GL_EXT_index_texture
+#endif
+#ifndef GL_EXT_index_material
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+#endif
+#ifndef GL_EXT_index_func
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+#endif
+#ifndef GL_EXT_index_array_formats
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#endif
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+#endif
+#ifndef GL_EXT_cull_vertex
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+#endif
+#ifndef GL_SGIX_ycrcb
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#endif
+#ifndef GL_SGIX_fragment_lighting
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+#endif
+#ifndef GL_IBM_rasterpos_clip
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#endif
+#ifndef GL_HP_texture_lighting
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#endif
+#ifndef GL_EXT_draw_range_elements
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+#endif
+#ifndef GL_WIN_phong_shading
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#endif
+#ifndef GL_WIN_specular_fog
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#endif
+#ifndef GL_EXT_light_texture
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+/* reuse GL_FRAGMENT_DEPTH_EXT */
+#endif
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#endif
+#ifndef GL_SGIX_impact_pixel_texture
+#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
+#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
+#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
+#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
+#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
+#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
+#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
+#endif
+#ifndef GL_EXT_bgra
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif
+#ifndef GL_SGIX_async
+#define GL_ASYNC_MARKER_SGIX              0x8329
+#endif
+#ifndef GL_SGIX_async_pixel
+#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
+#endif
+#ifndef GL_SGIX_async_histogram
+#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
+#endif
+#ifndef GL_INTEL_texture_scissor
+#endif
+#ifndef GL_INTEL_parallel_arrays
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+#endif
+#ifndef GL_HP_occlusion_test
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#endif
+#ifndef GL_EXT_pixel_transform
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+#endif
+#ifndef GL_EXT_pixel_transform_color_table
+#endif
+#ifndef GL_EXT_shared_texture_palette
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#endif
+#ifndef GL_EXT_separate_specular_color
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#endif
+#ifndef GL_EXT_secondary_color
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+#endif
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+#endif
+#ifndef GL_EXT_multi_draw_arrays
+#endif
+#ifndef GL_EXT_fog_coord
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+#endif
+#ifndef GL_REND_screen_coordinates
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#endif
+#ifndef GL_EXT_coordinate_frame
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+#endif
+#ifndef GL_EXT_texture_env_combine
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#endif
+#ifndef GL_APPLE_specular_vector
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#endif
+#ifndef GL_APPLE_transform_hint
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#endif
+#ifndef GL_SGIX_fog_scale
+#define GL_FOG_SCALE_SGIX                 0x81FC
+#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
+#endif
+#ifndef GL_SUNX_constant_data
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+#endif
+#ifndef GL_SUN_global_alpha
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+#endif
+#ifndef GL_SUN_triangle_list
+#define GL_RESTART_SUN                    0x0001
+#define GL_REPLACE_MIDDLE_SUN             0x0002
+#define GL_REPLACE_OLDEST_SUN             0x0003
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+#endif
+#ifndef GL_SUN_vertex
+#endif
+#ifndef GL_EXT_blend_func_separate
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+#endif
+#ifndef GL_INGR_color_clamp
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#endif
+#ifndef GL_INGR_interlace_read
+#define GL_INTERLACE_READ_INGR            0x8568
+#endif
+#ifndef GL_EXT_stencil_wrap
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#endif
+#ifndef GL_EXT_422_pixels
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#endif
+#ifndef GL_NV_texgen_reflection
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#endif
+#ifndef GL_EXT_texture_cube_map
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#endif
+#ifndef GL_SUN_convolution_border_modes
+#define GL_WRAP_BORDER_SUN                0x81D4
+#endif
+#ifndef GL_EXT_texture_env_add
+#endif
+#ifndef GL_EXT_texture_lod_bias
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#endif
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#endif
+#ifndef GL_EXT_vertex_weighting
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
+#define GL_MODELVIEW1_MATRIX_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+#endif
+#ifndef GL_NV_light_max_exponent
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#endif
+#ifndef GL_NV_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+#endif
+#ifndef GL_NV_register_combiners
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+/* reuse GL_TEXTURE0_ARB */
+/* reuse GL_TEXTURE1_ARB */
+/* reuse GL_ZERO */
+/* reuse GL_NONE */
+/* reuse GL_FOG */
+#endif
+#ifndef GL_NV_fog_distance
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+/* reuse GL_EYE_PLANE */
+#endif
+#ifndef GL_NV_texgen_emboss
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#endif
+#ifndef GL_NV_blend_square
+#endif
+#ifndef GL_NV_texture_env_combine4
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#endif
+#ifndef GL_MESA_resize_buffers
+#endif
+#ifndef GL_MESA_window_pos
+#endif
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif
+#ifndef GL_IBM_cull_vertex
+#define GL_CULL_VERTEX_IBM                103050
+#endif
+#ifndef GL_IBM_multimode_draw_arrays
+#endif
+#ifndef GL_IBM_vertex_array_lists
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+#endif
+#ifndef GL_SGIX_subsample
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#endif
+#ifndef GL_SGIX_ycrcb_subsample
+#endif
+#ifndef GL_SGIX_ycrcba
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#endif
+#ifndef GL_SGI_depth_pass_instrument
+#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
+#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
+#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
+#endif
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#endif
+#ifndef GL_3DFX_multisample
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#endif
+#ifndef GL_3DFX_tbuffer
+#endif
+#ifndef GL_EXT_multisample
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#define GL_MULTISAMPLE_BIT_EXT            0x20000000
+#endif
+#ifndef GL_SGIX_vertex_preclip
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#endif
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#endif
+#ifndef GL_SGIX_resample
+#define GL_PACK_RESAMPLE_SGIX             0x842C
+#define GL_UNPACK_RESAMPLE_SGIX           0x842D
+#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#endif
+#ifndef GL_SGIS_point_line_texgen
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+#endif
+#ifndef GL_SGIS_texture_color_mask
+#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
+#endif
+#ifndef GL_EXT_texture_env_dot3
+#define GL_DOT3_RGB_EXT                   0x8740
+#define GL_DOT3_RGBA_EXT                  0x8741
+#endif
+#ifndef GL_ATI_texture_mirror_once
+#define GL_MIRROR_CLAMP_ATI               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
+#endif
+#ifndef GL_NV_fence
+#define GL_ALL_COMPLETED_NV               0x84F2
+#define GL_FENCE_STATUS_NV                0x84F3
+#define GL_FENCE_CONDITION_NV             0x84F4
+#endif
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_IBM            0x8370
+#endif
+#ifndef GL_NV_evaluators
+#define GL_EVAL_2D_NV                     0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
+#define GL_MAP_TESSELLATION_NV            0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
+#endif
+#ifndef GL_NV_packed_depth_stencil
+#define GL_DEPTH_STENCIL_NV               0x84F9
+#define GL_UNSIGNED_INT_24_8_NV           0x84FA
+#endif
+#ifndef GL_NV_register_combiners2
+#define GL_PER_STAGE_CONSTANTS_NV         0x8535
+#endif
+#ifndef GL_NV_texture_compression_vtc
+#endif
+#ifndef GL_NV_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_NV           0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
+#endif
+#ifndef GL_NV_texture_shader
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
+#define GL_SHADER_CONSISTENT_NV           0x86DD
+#define GL_TEXTURE_SHADER_NV              0x86DE
+#define GL_SHADER_OPERATION_NV            0x86DF
+#define GL_CULL_MODES_NV                  0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
+#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
+#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
+#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
+#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
+#define GL_CONST_EYE_NV                   0x86E5
+#define GL_PASS_THROUGH_NV                0x86E6
+#define GL_CULL_FRAGMENT_NV               0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
+#define GL_DOT_PRODUCT_NV                 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV                        0x86F4
+#define GL_DSDT_NV                        0x86F5
+#define GL_DSDT_MAG_NV                    0x86F6
+#define GL_DSDT_MAG_VIB_NV                0x86F7
+#define GL_HILO16_NV                      0x86F8
+#define GL_SIGNED_HILO_NV                 0x86F9
+#define GL_SIGNED_HILO16_NV               0x86FA
+#define GL_SIGNED_RGBA_NV                 0x86FB
+#define GL_SIGNED_RGBA8_NV                0x86FC
+#define GL_SIGNED_RGB_NV                  0x86FE
+#define GL_SIGNED_RGB8_NV                 0x86FF
+#define GL_SIGNED_LUMINANCE_NV            0x8701
+#define GL_SIGNED_LUMINANCE8_NV           0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
+#define GL_SIGNED_ALPHA_NV                0x8705
+#define GL_SIGNED_ALPHA8_NV               0x8706
+#define GL_SIGNED_INTENSITY_NV            0x8707
+#define GL_SIGNED_INTENSITY8_NV           0x8708
+#define GL_DSDT8_NV                       0x8709
+#define GL_DSDT8_MAG8_NV                  0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV                    0x870E
+#define GL_LO_SCALE_NV                    0x870F
+#define GL_DS_SCALE_NV                    0x8710
+#define GL_DT_SCALE_NV                    0x8711
+#define GL_MAGNITUDE_SCALE_NV             0x8712
+#define GL_VIBRANCE_SCALE_NV              0x8713
+#define GL_HI_BIAS_NV                     0x8714
+#define GL_LO_BIAS_NV                     0x8715
+#define GL_DS_BIAS_NV                     0x8716
+#define GL_DT_BIAS_NV                     0x8717
+#define GL_MAGNITUDE_BIAS_NV              0x8718
+#define GL_VIBRANCE_BIAS_NV               0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
+#define GL_TEXTURE_HI_SIZE_NV             0x871B
+#define GL_TEXTURE_LO_SIZE_NV             0x871C
+#define GL_TEXTURE_DS_SIZE_NV             0x871D
+#define GL_TEXTURE_DT_SIZE_NV             0x871E
+#define GL_TEXTURE_MAG_SIZE_NV            0x871F
+#endif
+#ifndef GL_NV_texture_shader2
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
+#endif
+#ifndef GL_NV_vertex_array_range2
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+#endif
+#ifndef GL_NV_vertex_program
+#define GL_VERTEX_PROGRAM_NV              0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
+#define GL_CURRENT_ATTRIB_NV              0x8626
+#define GL_PROGRAM_LENGTH_NV              0x8627
+#define GL_PROGRAM_STRING_NV              0x8628
+#define GL_MODELVIEW_PROJECTION_NV        0x8629
+#define GL_IDENTITY_NV                    0x862A
+#define GL_INVERSE_NV                     0x862B
+#define GL_TRANSPOSE_NV                   0x862C
+#define GL_INVERSE_TRANSPOSE_NV           0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV          0x862F
+#define GL_MATRIX0_NV                     0x8630
+#define GL_MATRIX1_NV                     0x8631
+#define GL_MATRIX2_NV                     0x8632
+#define GL_MATRIX3_NV                     0x8633
+#define GL_MATRIX4_NV                     0x8634
+#define GL_MATRIX5_NV                     0x8635
+#define GL_MATRIX6_NV                     0x8636
+#define GL_MATRIX7_NV                     0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
+#define GL_CURRENT_MATRIX_NV              0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
+#define GL_PROGRAM_PARAMETER_NV           0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
+#define GL_PROGRAM_TARGET_NV              0x8646
+#define GL_PROGRAM_RESIDENT_NV            0x8647
+#define GL_TRACK_MATRIX_NV                0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
+#endif
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
+#endif
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SCALEBIAS_HINT_SGIX            0x8322
+#endif
+#ifndef GL_OML_interlace
+#define GL_INTERLACE_OML                  0x8980
+#define GL_INTERLACE_READ_OML             0x8981
+#endif
+#ifndef GL_OML_subsample
+#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
+#endif
+#ifndef GL_OML_resample
+#define GL_PACK_RESAMPLE_OML              0x8984
+#define GL_UNPACK_RESAMPLE_OML            0x8985
+#define GL_RESAMPLE_REPLICATE_OML         0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
+#define GL_RESAMPLE_AVERAGE_OML           0x8988
+#define GL_RESAMPLE_DECIMATE_OML          0x8989
+#endif
+#ifndef GL_NV_copy_depth_to_color
+#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
+#endif
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_BUMP_ROT_MATRIX_ATI            0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
+#define GL_BUMP_TEX_UNITS_ATI             0x8778
+#define GL_DUDV_ATI                       0x8779
+#define GL_DU8DV8_ATI                     0x877A
+#define GL_BUMP_ENVMAP_ATI                0x877B
+#define GL_BUMP_TARGET_ATI                0x877C
+#endif
+#ifndef GL_ATI_fragment_shader
+#define GL_FRAGMENT_SHADER_ATI            0x8920
+#define GL_REG_0_ATI                      0x8921
+#define GL_REG_1_ATI                      0x8922
+#define GL_REG_2_ATI                      0x8923
+#define GL_REG_3_ATI                      0x8924
+#define GL_REG_4_ATI                      0x8925
+#define GL_REG_5_ATI                      0x8926
+#define GL_REG_6_ATI                      0x8927
+#define GL_REG_7_ATI                      0x8928
+#define GL_REG_8_ATI                      0x8929
+#define GL_REG_9_ATI                      0x892A
+#define GL_REG_10_ATI                     0x892B
+#define GL_REG_11_ATI                     0x892C
+#define GL_REG_12_ATI                     0x892D
+#define GL_REG_13_ATI                     0x892E
+#define GL_REG_14_ATI                     0x892F
+#define GL_REG_15_ATI                     0x8930
+#define GL_REG_16_ATI                     0x8931
+#define GL_REG_17_ATI                     0x8932
+#define GL_REG_18_ATI                     0x8933
+#define GL_REG_19_ATI                     0x8934
+#define GL_REG_20_ATI                     0x8935
+#define GL_REG_21_ATI                     0x8936
+#define GL_REG_22_ATI                     0x8937
+#define GL_REG_23_ATI                     0x8938
+#define GL_REG_24_ATI                     0x8939
+#define GL_REG_25_ATI                     0x893A
+#define GL_REG_26_ATI                     0x893B
+#define GL_REG_27_ATI                     0x893C
+#define GL_REG_28_ATI                     0x893D
+#define GL_REG_29_ATI                     0x893E
+#define GL_REG_30_ATI                     0x893F
+#define GL_REG_31_ATI                     0x8940
+#define GL_CON_0_ATI                      0x8941
+#define GL_CON_1_ATI                      0x8942
+#define GL_CON_2_ATI                      0x8943
+#define GL_CON_3_ATI                      0x8944
+#define GL_CON_4_ATI                      0x8945
+#define GL_CON_5_ATI                      0x8946
+#define GL_CON_6_ATI                      0x8947
+#define GL_CON_7_ATI                      0x8948
+#define GL_CON_8_ATI                      0x8949
+#define GL_CON_9_ATI                      0x894A
+#define GL_CON_10_ATI                     0x894B
+#define GL_CON_11_ATI                     0x894C
+#define GL_CON_12_ATI                     0x894D
+#define GL_CON_13_ATI                     0x894E
+#define GL_CON_14_ATI                     0x894F
+#define GL_CON_15_ATI                     0x8950
+#define GL_CON_16_ATI                     0x8951
+#define GL_CON_17_ATI                     0x8952
+#define GL_CON_18_ATI                     0x8953
+#define GL_CON_19_ATI                     0x8954
+#define GL_CON_20_ATI                     0x8955
+#define GL_CON_21_ATI                     0x8956
+#define GL_CON_22_ATI                     0x8957
+#define GL_CON_23_ATI                     0x8958
+#define GL_CON_24_ATI                     0x8959
+#define GL_CON_25_ATI                     0x895A
+#define GL_CON_26_ATI                     0x895B
+#define GL_CON_27_ATI                     0x895C
+#define GL_CON_28_ATI                     0x895D
+#define GL_CON_29_ATI                     0x895E
+#define GL_CON_30_ATI                     0x895F
+#define GL_CON_31_ATI                     0x8960
+#define GL_MOV_ATI                        0x8961
+#define GL_ADD_ATI                        0x8963
+#define GL_MUL_ATI                        0x8964
+#define GL_SUB_ATI                        0x8965
+#define GL_DOT3_ATI                       0x8966
+#define GL_DOT4_ATI                       0x8967
+#define GL_MAD_ATI                        0x8968
+#define GL_LERP_ATI                       0x8969
+#define GL_CND_ATI                        0x896A
+#define GL_CND0_ATI                       0x896B
+#define GL_DOT2_ADD_ATI                   0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
+#define GL_NUM_PASSES_ATI                 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
+#define GL_SWIZZLE_STR_ATI                0x8976
+#define GL_SWIZZLE_STQ_ATI                0x8977
+#define GL_SWIZZLE_STR_DR_ATI             0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
+#define GL_SWIZZLE_STRQ_ATI               0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
+#define GL_RED_BIT_ATI                    0x00000001
+#define GL_GREEN_BIT_ATI                  0x00000002
+#define GL_BLUE_BIT_ATI                   0x00000004
+#define GL_2X_BIT_ATI                     0x00000001
+#define GL_4X_BIT_ATI                     0x00000002
+#define GL_8X_BIT_ATI                     0x00000004
+#define GL_HALF_BIT_ATI                   0x00000008
+#define GL_QUARTER_BIT_ATI                0x00000010
+#define GL_EIGHTH_BIT_ATI                 0x00000020
+#define GL_SATURATE_BIT_ATI               0x00000040
+#define GL_COMP_BIT_ATI                   0x00000002
+#define GL_NEGATE_BIT_ATI                 0x00000004
+#define GL_BIAS_BIT_ATI                   0x00000008
+#endif
+#ifndef GL_ATI_pn_triangles
+#define GL_PN_TRIANGLES_ATI               0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+#endif
+#ifndef GL_ATI_vertex_array_object
+#define GL_STATIC_ATI                     0x8760
+#define GL_DYNAMIC_ATI                    0x8761
+#define GL_PRESERVE_ATI                   0x8762
+#define GL_DISCARD_ATI                    0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
+#endif
+#ifndef GL_EXT_vertex_shader
+#define GL_VERTEX_SHADER_EXT              0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
+#define GL_OP_INDEX_EXT                   0x8782
+#define GL_OP_NEGATE_EXT                  0x8783
+#define GL_OP_DOT3_EXT                    0x8784
+#define GL_OP_DOT4_EXT                    0x8785
+#define GL_OP_MUL_EXT                     0x8786
+#define GL_OP_ADD_EXT                     0x8787
+#define GL_OP_MADD_EXT                    0x8788
+#define GL_OP_FRAC_EXT                    0x8789
+#define GL_OP_MAX_EXT                     0x878A
+#define GL_OP_MIN_EXT                     0x878B
+#define GL_OP_SET_GE_EXT                  0x878C
+#define GL_OP_SET_LT_EXT                  0x878D
+#define GL_OP_CLAMP_EXT                   0x878E
+#define GL_OP_FLOOR_EXT                   0x878F
+#define GL_OP_ROUND_EXT                   0x8790
+#define GL_OP_EXP_BASE_2_EXT              0x8791
+#define GL_OP_LOG_BASE_2_EXT              0x8792
+#define GL_OP_POWER_EXT                   0x8793
+#define GL_OP_RECIP_EXT                   0x8794
+#define GL_OP_RECIP_SQRT_EXT              0x8795
+#define GL_OP_SUB_EXT                     0x8796
+#define GL_OP_CROSS_PRODUCT_EXT           0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
+#define GL_OP_MOV_EXT                     0x8799
+#define GL_OUTPUT_VERTEX_EXT              0x879A
+#define GL_OUTPUT_COLOR0_EXT              0x879B
+#define GL_OUTPUT_COLOR1_EXT              0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
+#define GL_OUTPUT_FOG_EXT                 0x87BD
+#define GL_SCALAR_EXT                     0x87BE
+#define GL_VECTOR_EXT                     0x87BF
+#define GL_MATRIX_EXT                     0x87C0
+#define GL_VARIANT_EXT                    0x87C1
+#define GL_INVARIANT_EXT                  0x87C2
+#define GL_LOCAL_CONSTANT_EXT             0x87C3
+#define GL_LOCAL_EXT                      0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
+#define GL_X_EXT                          0x87D5
+#define GL_Y_EXT                          0x87D6
+#define GL_Z_EXT                          0x87D7
+#define GL_W_EXT                          0x87D8
+#define GL_NEGATIVE_X_EXT                 0x87D9
+#define GL_NEGATIVE_Y_EXT                 0x87DA
+#define GL_NEGATIVE_Z_EXT                 0x87DB
+#define GL_NEGATIVE_W_EXT                 0x87DC
+#define GL_ZERO_EXT                       0x87DD
+#define GL_ONE_EXT                        0x87DE
+#define GL_NEGATIVE_ONE_EXT               0x87DF
+#define GL_NORMALIZED_RANGE_EXT           0x87E0
+#define GL_FULL_RANGE_EXT                 0x87E1
+#define GL_CURRENT_VERTEX_EXT             0x87E2
+#define GL_MVP_MATRIX_EXT                 0x87E3
+#define GL_VARIANT_VALUE_EXT              0x87E4
+#define GL_VARIANT_DATATYPE_EXT           0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
+#define GL_VARIANT_ARRAY_EXT              0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
+#define GL_INVARIANT_VALUE_EXT            0x87EA
+#define GL_INVARIANT_DATATYPE_EXT         0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
+#endif
+#ifndef GL_ATI_vertex_streams
+#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
+#define GL_VERTEX_STREAM0_ATI             0x876C
+#define GL_VERTEX_STREAM1_ATI             0x876D
+#define GL_VERTEX_STREAM2_ATI             0x876E
+#define GL_VERTEX_STREAM3_ATI             0x876F
+#define GL_VERTEX_STREAM4_ATI             0x8770
+#define GL_VERTEX_STREAM5_ATI             0x8771
+#define GL_VERTEX_STREAM6_ATI             0x8772
+#define GL_VERTEX_STREAM7_ATI             0x8773
+#define GL_VERTEX_SOURCE_ATI              0x8774
+#endif
+#ifndef GL_ATI_element_array
+#define GL_ELEMENT_ARRAY_ATI              0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
+#endif
+#ifndef GL_SUN_mesh_array
+#define GL_QUAD_MESH_SUN                  0x8614
+#define GL_TRIANGLE_MESH_SUN              0x8615
+#endif
+#ifndef GL_SUN_slice_accum
+#define GL_SLICE_ACCUM_SUN                0x85CC
+#endif
+#ifndef GL_NV_multisample_filter_hint
+#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
+#endif
+#ifndef GL_NV_depth_clamp
+#define GL_DEPTH_CLAMP_NV                 0x864F
+#endif
+#ifndef GL_NV_occlusion_query
+#define GL_PIXEL_COUNTER_BITS_NV          0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
+#define GL_PIXEL_COUNT_NV                 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
+#endif
+#ifndef GL_NV_point_sprite
+#define GL_POINT_SPRITE_NV                0x8861
+#define GL_COORD_REPLACE_NV               0x8862
+#define GL_POINT_SPRITE_R_MODE_NV         0x8863
+#endif
+#ifndef GL_NV_texture_shader3
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV                       0x885E
+#define GL_SIGNED_HILO8_NV                0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
+#endif
+#ifndef GL_NV_vertex_program1_1
+#endif
+#ifndef GL_EXT_shadow_funcs
+#endif
+#ifndef GL_EXT_stencil_two_side
+#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
+#endif
+#ifndef GL_ATI_text_fragment_shader
+#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
+#endif
+#ifndef GL_APPLE_client_storage
+#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
+#endif
+#ifndef GL_APPLE_element_array
+#define GL_ELEMENT_ARRAY_APPLE            0x8768
+#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
+#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
+#endif
+#ifndef GL_APPLE_fence
+#define GL_DRAW_PIXELS_APPLE              0x8A0A
+#define GL_FENCE_APPLE                    0x8A0B
+#endif
+#ifndef GL_APPLE_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
+#endif
+#ifndef GL_APPLE_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CACHED_APPLE           0x85BE
+#define GL_STORAGE_SHARED_APPLE           0x85BF
+#endif
+#ifndef GL_APPLE_ycbcr_422
+#define GL_YCBCR_422_APPLE                0x85B9
+#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
+#endif
+#ifndef GL_S3_s3tc
+#define GL_RGB_S3TC                       0x83A0
+#define GL_RGB4_S3TC                      0x83A1
+#define GL_RGBA_S3TC                      0x83A2
+#define GL_RGBA4_S3TC                     0x83A3
+#endif
+#ifndef GL_ATI_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
+#define GL_DRAW_BUFFER0_ATI               0x8825
+#define GL_DRAW_BUFFER1_ATI               0x8826
+#define GL_DRAW_BUFFER2_ATI               0x8827
+#define GL_DRAW_BUFFER3_ATI               0x8828
+#define GL_DRAW_BUFFER4_ATI               0x8829
+#define GL_DRAW_BUFFER5_ATI               0x882A
+#define GL_DRAW_BUFFER6_ATI               0x882B
+#define GL_DRAW_BUFFER7_ATI               0x882C
+#define GL_DRAW_BUFFER8_ATI               0x882D
+#define GL_DRAW_BUFFER9_ATI               0x882E
+#define GL_DRAW_BUFFER10_ATI              0x882F
+#define GL_DRAW_BUFFER11_ATI              0x8830
+#define GL_DRAW_BUFFER12_ATI              0x8831
+#define GL_DRAW_BUFFER13_ATI              0x8832
+#define GL_DRAW_BUFFER14_ATI              0x8833
+#define GL_DRAW_BUFFER15_ATI              0x8834
+#endif
+#ifndef GL_ATI_pixel_format_float
+#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
+#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+#endif
+#ifndef GL_ATI_texture_env_combine3
+#define GL_MODULATE_ADD_ATI               0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
+#define GL_MODULATE_SUBTRACT_ATI          0x8746
+#endif
+#ifndef GL_ATI_texture_float
+#define GL_RGBA_FLOAT32_ATI               0x8814
+#define GL_RGB_FLOAT32_ATI                0x8815
+#define GL_ALPHA_FLOAT32_ATI              0x8816
+#define GL_INTENSITY_FLOAT32_ATI          0x8817
+#define GL_LUMINANCE_FLOAT32_ATI          0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
+#define GL_RGBA_FLOAT16_ATI               0x881A
+#define GL_RGB_FLOAT16_ATI                0x881B
+#define GL_ALPHA_FLOAT16_ATI              0x881C
+#define GL_INTENSITY_FLOAT16_ATI          0x881D
+#define GL_LUMINANCE_FLOAT16_ATI          0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
+#endif
+#ifndef GL_NV_float_buffer
+#define GL_FLOAT_R_NV                     0x8880
+#define GL_FLOAT_RG_NV                    0x8881
+#define GL_FLOAT_RGB_NV                   0x8882
+#define GL_FLOAT_RGBA_NV                  0x8883
+#define GL_FLOAT_R16_NV                   0x8884
+#define GL_FLOAT_R32_NV                   0x8885
+#define GL_FLOAT_RG16_NV                  0x8886
+#define GL_FLOAT_RG32_NV                  0x8887
+#define GL_FLOAT_RGB16_NV                 0x8888
+#define GL_FLOAT_RGB32_NV                 0x8889
+#define GL_FLOAT_RGBA16_NV                0x888A
+#define GL_FLOAT_RGBA32_NV                0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
+#define GL_FLOAT_RGBA_MODE_NV             0x888E
+#endif
+#ifndef GL_NV_fragment_program
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV            0x8870
+#define GL_MAX_TEXTURE_COORDS_NV          0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
+#define GL_PROGRAM_ERROR_STRING_NV        0x8874
+#endif
+#ifndef GL_NV_half_float
+#define GL_HALF_FLOAT_NV                  0x140B
+#endif
+#ifndef GL_NV_pixel_data_range
+#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+#endif
+#ifndef GL_NV_primitive_restart
+#define GL_PRIMITIVE_RESTART_NV           0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
+#endif
+#ifndef GL_NV_texture_expand_normal
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+#endif
+#ifndef GL_NV_vertex_program2
+#endif
+#ifndef GL_ATI_map_object_buffer
+#endif
+#ifndef GL_ATI_separate_stencil
+#define GL_STENCIL_BACK_FUNC_ATI          0x8800
+#define GL_STENCIL_BACK_FAIL_ATI          0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+#endif
+#ifndef GL_ATI_vertex_attrib_array_object
+#endif
+#ifndef GL_OES_read_format
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
+#endif
+#ifndef GL_EXT_depth_bounds_test
+#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
+#define GL_DEPTH_BOUNDS_EXT               0x8891
+#endif
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_MIRROR_CLAMP_EXT               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
+#endif
+#ifndef GL_EXT_blend_equation_separate
+#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
+#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
+#endif
+#ifndef GL_MESA_pack_invert
+#define GL_PACK_INVERT_MESA               0x8758
+#endif
+#ifndef GL_MESA_ycbcr_texture
+#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
+#define GL_YCBCR_MESA                     0x8757
+#endif
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
+#endif
+#ifndef GL_NV_fragment_program_option
+#endif
+#ifndef GL_NV_fragment_program2
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
+#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
+#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
+#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
+#endif
+#ifndef GL_NV_vertex_program2_option
+/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
+#endif
+#ifndef GL_NV_vertex_program3
+/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+#endif
+#ifndef GL_EXT_framebuffer_object
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
+#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
+#define GL_FRAMEBUFFER_EXT                0x8D40
+#define GL_RENDERBUFFER_EXT               0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#define GL_STENCIL_INDEX1_EXT             0x8D46
+#define GL_STENCIL_INDEX4_EXT             0x8D47
+#define GL_STENCIL_INDEX8_EXT             0x8D48
+#define GL_STENCIL_INDEX16_EXT            0x8D49
+#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
+#endif
+#ifndef GL_GREMEDY_string_marker
+#endif
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_DEPTH_STENCIL_EXT              0x84F9
+#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
+#define GL_DEPTH24_STENCIL8_EXT           0x88F0
+#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
+#endif
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_STENCIL_TAG_BITS_EXT           0x88F2
+#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
+#endif
+#ifndef GL_EXT_texture_sRGB
+#define GL_SRGB_EXT                       0x8C40
+#define GL_SRGB8_EXT                      0x8C41
+#define GL_SRGB_ALPHA_EXT                 0x8C42
+#define GL_SRGB8_ALPHA8_EXT               0x8C43
+#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
+#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
+#define GL_SLUMINANCE_EXT                 0x8C46
+#define GL_SLUMINANCE8_EXT                0x8C47
+#define GL_COMPRESSED_SRGB_EXT            0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
+#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+#endif
+#ifndef GL_EXT_framebuffer_blit
+#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
+#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   0x8CAA
+#endif
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+#define GL_MAX_SAMPLES_EXT                0x8D57
+#endif
+#ifndef GL_MESAX_texture_stack
+#define GL_TEXTURE_1D_STACK_MESAX         0x8759
+#define GL_TEXTURE_2D_STACK_MESAX         0x875A
+#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
+#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
+#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
+#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
+#endif
+#ifndef GL_EXT_timer_query
+#define GL_TIME_ELAPSED_EXT               0x88BF
+#endif
+#ifndef GL_EXT_gpu_program_parameters
+#endif
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
+#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
+#endif
+#ifndef GL_NV_gpu_program4
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
+#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
+#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
+#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
+#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
+#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
+#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
+#endif
+#ifndef GL_NV_geometry_program4
+#define GL_LINES_ADJACENCY_EXT            0x000A
+#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
+#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
+#define GL_GEOMETRY_PROGRAM_NV            0x8C26
+#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
+#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
+#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
+#endif
+#ifndef GL_EXT_geometry_shader4
+#define GL_GEOMETRY_SHADER_EXT            0x8DD9
+/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */
+/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */
+/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */
+/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
+#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+/* reuse GL_LINES_ADJACENCY_EXT */
+/* reuse GL_LINE_STRIP_ADJACENCY_EXT */
+/* reuse GL_TRIANGLES_ADJACENCY_EXT */
+/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+/* reuse GL_PROGRAM_POINT_SIZE_EXT */
+#endif
+#ifndef GL_NV_vertex_program4
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
+#endif
+#ifndef GL_EXT_gpu_shader4
+#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
+#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
+#define GL_SAMPLER_BUFFER_EXT             0x8DC2
+#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
+#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
+#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
+#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
+#define GL_INT_SAMPLER_1D_EXT             0x8DC9
+#define GL_INT_SAMPLER_2D_EXT             0x8DCA
+#define GL_INT_SAMPLER_3D_EXT             0x8DCB
+#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
+#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
+#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
+#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
+#endif
+#ifndef GL_EXT_draw_instanced
+#endif
+#ifndef GL_EXT_packed_float
+#define GL_R11F_G11F_B10F_EXT             0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
+#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
+#endif
+#ifndef GL_EXT_texture_array
+#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
+#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+#endif
+#ifndef GL_EXT_texture_buffer_object
+#define GL_TEXTURE_BUFFER_EXT             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
+#endif
+#ifndef GL_EXT_texture_compression_latc
+#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
+#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
+#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
+#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
+#endif
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
+#endif
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_RGB9_E5_EXT                    0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
+#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
+#endif
+#ifndef GL_NV_depth_buffer_float
+#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
+#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
+#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
+#endif
+#ifndef GL_NV_fragment_program4
+#endif
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
+#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
+#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
+#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
+#endif
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
+#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
+#endif
+#ifndef GL_NV_geometry_shader4
+#endif
+#ifndef GL_NV_parameter_buffer_object
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
+#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
+#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
+#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
+#endif
+#ifndef GL_EXT_draw_buffers2
+#endif
+#ifndef GL_NV_transform_feedback
+#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
+#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
+#define GL_TEXTURE_COORD_NV               0x8C79
+#define GL_CLIP_DISTANCE_NV               0x8C7A
+#define GL_VERTEX_ID_NV                   0x8C7B
+#define GL_PRIMITIVE_ID_NV                0x8C7C
+#define GL_GENERIC_ATTRIB_NV              0x8C7D
+#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
+#define GL_ACTIVE_VARYINGS_NV             0x8C81
+#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
+#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
+#define GL_PRIMITIVES_GENERATED_NV        0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
+#define GL_RASTERIZER_DISCARD_NV          0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
+#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
+#endif
+#ifndef GL_EXT_bindable_uniform
+#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
+#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
+#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
+#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
+#define GL_UNIFORM_BUFFER_EXT             0x8DEE
+#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
+#endif
+#ifndef GL_EXT_texture_integer
+#define GL_RGBA32UI_EXT                   0x8D70
+#define GL_RGB32UI_EXT                    0x8D71
+#define GL_ALPHA32UI_EXT                  0x8D72
+#define GL_INTENSITY32UI_EXT              0x8D73
+#define GL_LUMINANCE32UI_EXT              0x8D74
+#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
+#define GL_RGBA16UI_EXT                   0x8D76
+#define GL_RGB16UI_EXT                    0x8D77
+#define GL_ALPHA16UI_EXT                  0x8D78
+#define GL_INTENSITY16UI_EXT              0x8D79
+#define GL_LUMINANCE16UI_EXT              0x8D7A
+#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
+#define GL_RGBA8UI_EXT                    0x8D7C
+#define GL_RGB8UI_EXT                     0x8D7D
+#define GL_ALPHA8UI_EXT                   0x8D7E
+#define GL_INTENSITY8UI_EXT               0x8D7F
+#define GL_LUMINANCE8UI_EXT               0x8D80
+#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
+#define GL_RGBA32I_EXT                    0x8D82
+#define GL_RGB32I_EXT                     0x8D83
+#define GL_ALPHA32I_EXT                   0x8D84
+#define GL_INTENSITY32I_EXT               0x8D85
+#define GL_LUMINANCE32I_EXT               0x8D86
+#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
+#define GL_RGBA16I_EXT                    0x8D88
+#define GL_RGB16I_EXT                     0x8D89
+#define GL_ALPHA16I_EXT                   0x8D8A
+#define GL_INTENSITY16I_EXT               0x8D8B
+#define GL_LUMINANCE16I_EXT               0x8D8C
+#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
+#define GL_RGBA8I_EXT                     0x8D8E
+#define GL_RGB8I_EXT                      0x8D8F
+#define GL_ALPHA8I_EXT                    0x8D90
+#define GL_INTENSITY8I_EXT                0x8D91
+#define GL_LUMINANCE8I_EXT                0x8D92
+#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
+#define GL_RED_INTEGER_EXT                0x8D94
+#define GL_GREEN_INTEGER_EXT              0x8D95
+#define GL_BLUE_INTEGER_EXT               0x8D96
+#define GL_ALPHA_INTEGER_EXT              0x8D97
+#define GL_RGB_INTEGER_EXT                0x8D98
+#define GL_RGBA_INTEGER_EXT               0x8D99
+#define GL_BGR_INTEGER_EXT                0x8D9A
+#define GL_BGRA_INTEGER_EXT               0x8D9B
+#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
+#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
+#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
+#endif
+#ifndef GL_GREMEDY_frame_terminator
+#endif
+/*************************************************************/
+#include <stddef.h>
+#ifndef GL_VERSION_2_0
+/* GL type for program/shader text */
+typedef char GLchar;                    /* native character */
+#endif
+#ifndef GL_VERSION_1_5
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+#endif
+#ifndef GL_ARB_vertex_buffer_object
+/* GL types for handling large vertex buffer objects */
+typedef ptrdiff_t GLintptrARB;
+typedef ptrdiff_t GLsizeiptrARB;
+#endif
+#ifndef GL_ARB_shader_objects
+/* GL types for handling shader object handles and program/shader text */
+typedef char GLcharARB;         /* native character */
+typedef unsigned int GLhandleARB;       /* shader object handle */
+#endif
+/* GL types for "half" precision (s10e5) float data in host memory */
+#ifndef GL_ARB_half_float_pixel
+typedef unsigned short GLhalfARB;
+#endif
+#ifndef GL_NV_half_float
+typedef unsigned short GLhalfNV;
+#endif
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GL_EXT_timer_query extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS )
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <inttypes.h>     /* Fallback option */
+#endif
+#endif
+#ifndef GL_EXT_timer_query
+typedef int64_t GLint64EXT;
+typedef uint64_t GLuint64EXT;
+#endif
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
+GLAPI void APIENTRY glBlendEquation (GLenum);
+GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
+GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
+GLAPI void APIENTRY glResetHistogram (GLenum);
+GLAPI void APIENTRY glResetMinmax (GLenum);
+GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum);
+GLAPI void APIENTRY glClientActiveTexture (GLenum);
+GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
+GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
+GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
+GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
+GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
+GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
+GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
+GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glFogCoordf (GLfloat);
+GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
+GLAPI void APIENTRY glFogCoordd (GLdouble);
+GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
+GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
+GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
+GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
+GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
+GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
+GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
+GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
+GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
+GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
+GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
+GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
+GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
+GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
+GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2iv (const GLint *);
+GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
+GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3iv (const GLint *);
+GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
+#endif
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint);
+GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
+GLAPI void APIENTRY glEndQuery (GLenum);
+GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
+GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
+GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
+GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
+GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
+GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
+GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
+GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
+GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
+GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
+GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
+GLAPI void APIENTRY glCompileShader (GLuint);
+GLAPI GLuint APIENTRY glCreateProgram (void);
+GLAPI GLuint APIENTRY glCreateShader (GLenum);
+GLAPI void APIENTRY glDeleteProgram (GLuint);
+GLAPI void APIENTRY glDeleteShader (GLuint);
+GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
+GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
+GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
+GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
+GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
+GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
+GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
+GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
+GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
+GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgram (GLuint);
+GLAPI GLboolean APIENTRY glIsShader (GLuint);
+GLAPI void APIENTRY glLinkProgram (GLuint);
+GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
+GLAPI void APIENTRY glUseProgram (GLuint);
+GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
+GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform1i (GLint, GLint);
+GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glValidateProgram (GLuint);
+GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+#endif
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformMatrix2x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix2x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4x2fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3x4fv (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4x3fv (GLint, GLsizei, GLboolean, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTextureARB (GLenum);
+GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
+GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
+GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
+GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
+GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
+GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
+GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
+GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#endif
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
+GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
+GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
+GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+#endif
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+#endif
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+#endif
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+#endif
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+#endif
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
+#endif
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
+GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
+GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
+GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
+GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
+GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
+GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
+GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
+GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexBlendARB (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
+#endif
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
+GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
+GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
+GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
+GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+#endif
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+#endif
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+#endif
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+#endif
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+#endif
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+#endif
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+#endif
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
+GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
+GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
+GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
+#endif
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
+GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
+GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
+GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
+GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
+GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
+#endif
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
+#endif
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
+GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
+GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
+GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
+GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
+GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
+GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
+GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
+GLAPI void APIENTRY glEndQueryARB (GLenum);
+GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
+GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
+GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
+GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
+GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
+GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
+GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
+GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
+GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
+GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
+GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
+GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
+GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
+GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
+GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
+GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
+GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
+GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
+GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
+GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
+GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
+GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
+GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
+GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+#endif
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+#endif
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+#endif
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+#endif
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+#endif
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+#endif
+#ifndef GL_ARB_draw_buffers
+#define GL_ARB_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
+#endif
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+#endif
+#ifndef GL_ARB_color_buffer_float
+#define GL_ARB_color_buffer_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
+#endif
+#ifndef GL_ARB_half_float_pixel
+#define GL_ARB_half_float_pixel 1
+#endif
+#ifndef GL_ARB_texture_float
+#define GL_ARB_texture_float 1
+#endif
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_ARB_pixel_buffer_object 1
+#endif
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+#endif
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#endif
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#endif
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+#endif
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
+typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
+GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
+GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
+GLAPI void APIENTRY glResetHistogramEXT (GLenum);
+GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
+#endif
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
+GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+#endif
+#ifndef GL_SGI_color_matrix
+#define GL_SGI_color_matrix 1
+#endif
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
+GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
+#endif
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+#endif
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
+GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
+GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
+GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
+GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+#endif
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+#endif
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+#endif
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
+GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
+GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+#endif
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+#endif
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
+GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+#endif
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+#endif
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glArrayElementEXT (GLint);
+GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
+GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
+GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
+GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
+typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+#endif
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+#endif
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+#endif
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+#endif
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+#endif
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+#endif
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+#endif
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+#endif
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+#endif
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+#endif
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+#endif
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+#endif
+#ifndef GL_SGIX_texture_select
+#define GL_SGIX_texture_select 1
+#endif
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
+GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
+GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
+GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+#endif
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+#endif
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+#endif
+#ifndef GL_SGIS_point_parameters
+#define GL_SGIS_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
+GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+#endif
+#ifndef GL_SGIX_instruments
+#define GL_SGIX_instruments 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
+GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
+GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
+GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
+GLAPI void APIENTRY glStartInstrumentsSGIX (void);
+GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
+typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
+typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
+#endif
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+#endif
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameZoomSGIX (GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+#endif
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTagSampleBufferSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+#endif
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_SGIX_polynomial_ffd 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
+GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
+GLAPI void APIENTRY glDeformSGIX (GLbitfield);
+GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
+#endif
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+#endif
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushRasterSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
+#endif
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+#endif
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
+GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
+#endif
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+#endif
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+#endif
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+#endif
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+#endif
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glHintPGI (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+#endif
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
+GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
+GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+#endif
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
+GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
+GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
+GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+#endif
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+#endif
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+#endif
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+#endif
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+#endif
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+#endif
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+#endif
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+#endif
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
+GLAPI void APIENTRY glUnlockArraysEXT (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
+#endif
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
+GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
+#endif
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+#endif
+#ifndef GL_SGIX_fragment_lighting
+#define GL_SGIX_fragment_lighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
+GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
+GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
+GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+#endif
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+#endif
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+#endif
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+#endif
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+#endif
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+#endif
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyTextureEXT (GLenum);
+GLAPI void APIENTRY glTextureLightEXT (GLenum);
+GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+#endif
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+#endif
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
+GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
+GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
+GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
+GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
+GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
+typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
+typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+#endif
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+#endif
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+#endif
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
+GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
+GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
+GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+#endif
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+#endif
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
+GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+#endif
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+#endif
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+#endif
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+#endif
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
+GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
+GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
+GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
+GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
+GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
+GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureNormalEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+#endif
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+#endif
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
+GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
+GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
+GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
+GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+#endif
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
+GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
+GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
+GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
+GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
+GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
+GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
+GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
+GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
+typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
+typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
+typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
+typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+#endif
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+#endif
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+#endif
+#ifndef GL_SGIX_fog_scale
+#define GL_SGIX_fog_scale 1
+#endif
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFinishTextureSUNX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
+#endif
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
+GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
+GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
+GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
+GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
+GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
+GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
+GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+#endif
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
+GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
+GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
+GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
+GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
+GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
+GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
+#endif
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+#ifndef GL_INGR_blend_func_separate
+#define GL_INGR_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+#endif
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+#endif
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+#endif
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+#endif
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+#endif
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+#endif
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+#endif
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+#endif
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#endif
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
+GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
+GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+#endif
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
+GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
+#endif
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
+GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
+GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
+GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
+GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
+GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+#endif
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+#endif
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+#endif
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+#endif
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+#endif
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glResizeBuffersMESA (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
+#endif
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
+GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
+GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
+GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
+GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
+GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
+GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+#endif
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+#endif
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
+GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
+#endif
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
+GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+#endif
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+#endif
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+#endif
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+#endif
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+#endif
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+#endif
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+#endif
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+#endif
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
+GLAPI void APIENTRY glSamplePatternEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+#endif
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+#endif
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+#endif
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+#endif
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+#endif
+#ifndef GL_SGIS_texture_color_mask
+#define GL_SGIS_texture_color_mask 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif
+#ifndef GL_SGIX_igloo_interface
+#define GL_SGIX_igloo_interface 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
+#endif
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+#endif
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+#endif
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
+GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
+GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glFinishFenceNV (GLuint);
+GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#endif
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
+GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
+GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
+typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+#endif
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+#endif
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
+#endif
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+#endif
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+#endif
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+#endif
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+#endif
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+#endif
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
+GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
+GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
+GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
+GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
+GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
+GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
+GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
+GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
+GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
+GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
+GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
+GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
+GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
+GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
+GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
+GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
+GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
+GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
+typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
+#endif
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+#endif
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SGIX_scalebias_hint 1
+#endif
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+#endif
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+#endif
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+#endif
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+#endif
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
+GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+#endif
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
+GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
+GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
+GLAPI void APIENTRY glBeginFragmentShaderATI (void);
+GLAPI void APIENTRY glEndFragmentShaderATI (void);
+GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
+GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
+GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
+#endif
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
+GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+#endif
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
+GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
+GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
+GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
+GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
+typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
+#endif
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVertexShaderEXT (void);
+GLAPI void APIENTRY glEndVertexShaderEXT (void);
+GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
+GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
+GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
+GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
+GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
+GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
+GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
+GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
+GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
+GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
+GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
+GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
+GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
+GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
+GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
+GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
+GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
+GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
+GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
+typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
+typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
+typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
+typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
+typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
+typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+#endif
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
+GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
+GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
+GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
+GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
+GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
+GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
+GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
+GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
+GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
+GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
+GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
+GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
+GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
+GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
+GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+#endif
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
+GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
+GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+#endif
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+#endif
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+#endif
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
+GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
+GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
+GLAPI void APIENTRY glEndOcclusionQueryNV (void);
+GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
+GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+#endif
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+#endif
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+#endif
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+#endif
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+#endif
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+#endif
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+#endif
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
+GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
+GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
+GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
+GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
+GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
+GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
+GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
+GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
+GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
+typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+#endif
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
+GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, GLuint *);
+GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+#endif
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
+GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
+GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+#endif
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+#endif
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+#endif
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
+#endif
+#ifndef GL_ATI_pixel_format_float
+#define GL_ATI_pixel_format_float 1
+/* This is really a WGL extension, but defines some associated GL enums.
+ * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
+ */
+#endif
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+#endif
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+#endif
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+#endif
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
+GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
+GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
+GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
+GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
+GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
+GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
+GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
+GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
+typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+#endif
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
+GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+#endif
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveRestartNV (void);
+GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+#endif
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+#endif
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+#endif
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
+GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+#endif
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
+GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
+#endif
+#ifndef GL_OES_read_format
+#define GL_OES_read_format 1
+#endif
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+#endif
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+#endif
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+#endif
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+#endif
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+#endif
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_EXT_pixel_buffer_object 1
+#endif
+#ifndef GL_NV_fragment_program_option
+#define GL_NV_fragment_program_option 1
+#endif
+#ifndef GL_NV_fragment_program2
+#define GL_NV_fragment_program2 1
+#endif
+#ifndef GL_NV_vertex_program2_option
+#define GL_NV_vertex_program2_option 1
+#endif
+#ifndef GL_NV_vertex_program3
+#define GL_NV_vertex_program3 1
+#endif
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
+GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
+GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
+GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
+GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
+GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
+GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
+GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
+GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+#endif
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
+#endif
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_EXT_packed_depth_stencil 1
+#endif
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_EXT_stencil_clear_tag 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilClearTagEXT (GLsizei, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
+#endif
+#ifndef GL_EXT_texture_sRGB
+#define GL_EXT_texture_sRGB 1
+#endif
+#ifndef GL_EXT_framebuffer_blit
+#define GL_EXT_framebuffer_blit 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlitFramebufferEXT (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_EXT_framebuffer_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#ifndef GL_MESAX_texture_stack
+#define GL_MESAX_texture_stack 1
+#endif
+#ifndef GL_EXT_timer_query
+#define GL_EXT_timer_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint, GLenum, GLint64EXT *);
+GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint, GLenum, GLuint64EXT *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
+#endif
+#ifndef GL_EXT_gpu_program_parameters
+#define GL_EXT_gpu_program_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#endif
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_APPLE_flush_buffer_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum, GLenum, GLint);
+GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum, GLintptr, GLsizeiptr);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
+#endif
+#ifndef GL_NV_gpu_program4
+#define GL_NV_gpu_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum, GLuint, const GLint *);
+GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum, GLuint, const GLuint *);
+GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum, GLuint, const GLint *);
+GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum, GLuint, const GLuint *);
+GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum, GLuint, GLuint *);
+GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum, GLuint, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+#endif
+#ifndef GL_NV_geometry_program4
+#define GL_NV_geometry_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramVertexLimitNV (GLenum, GLint);
+GLAPI void APIENTRY glFramebufferTextureEXT (GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum, GLenum, GLuint, GLint, GLint);
+GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum, GLenum, GLuint, GLint, GLenum);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+#ifndef GL_EXT_geometry_shader4
+#define GL_EXT_geometry_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriEXT (GLuint, GLenum, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+#endif
+#ifndef GL_NV_vertex_program4
+#define GL_NV_vertex_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint, GLint);
+GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint, GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint, const GLint *);
+GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint, const GLuint *);
+GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint, const GLbyte *);
+GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint, const GLshort *);
+GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint, const GLubyte *);
+GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint, const GLushort *);
+GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
+GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint, GLenum, GLint *);
+GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint, GLenum, GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
+#endif
+#ifndef GL_EXT_gpu_shader4
+#define GL_EXT_gpu_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUniformuivEXT (GLuint, GLint, GLuint *);
+GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint, GLuint, const GLchar *);
+GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint, const GLchar *);
+GLAPI void APIENTRY glUniform1uiEXT (GLint, GLuint);
+GLAPI void APIENTRY glUniform2uiEXT (GLint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform3uiEXT (GLint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform4uiEXT (GLint, GLuint, GLuint, GLuint, GLuint);
+GLAPI void APIENTRY glUniform1uivEXT (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform2uivEXT (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform3uivEXT (GLint, GLsizei, const GLuint *);
+GLAPI void APIENTRY glUniform4uivEXT (GLint, GLsizei, const GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+#endif
+#ifndef GL_EXT_draw_instanced
+#define GL_EXT_draw_instanced 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum, GLint, GLsizei, GLsizei);
+GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif
+#ifndef GL_EXT_packed_float
+#define GL_EXT_packed_float 1
+#endif
+#ifndef GL_EXT_texture_array
+#define GL_EXT_texture_array 1
+#endif
+#ifndef GL_EXT_texture_buffer_object
+#define GL_EXT_texture_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferEXT (GLenum, GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+#ifndef GL_EXT_texture_compression_latc
+#define GL_EXT_texture_compression_latc 1
+#endif
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_EXT_texture_compression_rgtc 1
+#endif
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_EXT_texture_shared_exponent 1
+#endif
+#ifndef GL_NV_depth_buffer_float
+#define GL_NV_depth_buffer_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthRangedNV (GLdouble, GLdouble);
+GLAPI void APIENTRY glClearDepthdNV (GLdouble);
+GLAPI void APIENTRY glDepthBoundsdNV (GLdouble, GLdouble);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
+#endif
+#ifndef GL_NV_fragment_program4
+#define GL_NV_fragment_program4 1
+#endif
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_NV_framebuffer_multisample_coverage 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_EXT_framebuffer_sRGB 1
+#endif
+#ifndef GL_NV_geometry_shader4
+#define GL_NV_geometry_shader4 1
+#endif
+#ifndef GL_NV_parameter_buffer_object
+#define GL_NV_parameter_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum, GLuint, GLuint, GLsizei, const GLfloat *);
+GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum, GLuint, GLuint, GLsizei, const GLint *);
+GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum, GLuint, GLuint, GLsizei, const GLuint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
+#endif
+#ifndef GL_EXT_draw_buffers2
+#define GL_EXT_draw_buffers2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint, GLboolean, GLboolean, GLboolean, GLboolean);
+GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum, GLuint, GLboolean *);
+GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum, GLuint, GLint *);
+GLAPI void APIENTRY glEnableIndexedEXT (GLenum, GLuint);
+GLAPI void APIENTRY glDisableIndexedEXT (GLenum, GLuint);
+GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
+#endif
+#ifndef GL_NV_transform_feedback
+#define GL_NV_transform_feedback 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum);
+GLAPI void APIENTRY glEndTransformFeedbackNV (void);
+GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint, const GLint *, GLenum);
+GLAPI void APIENTRY glBindBufferRangeNV (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr);
+GLAPI void APIENTRY glBindBufferOffsetNV (GLenum, GLuint, GLuint, GLintptr);
+GLAPI void APIENTRY glBindBufferBaseNV (GLenum, GLuint, GLuint);
+GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint, GLsizei, const GLint *, GLenum);
+GLAPI void APIENTRY glActiveVaryingNV (GLuint, const GLchar *);
+GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint, const GLchar *);
+GLAPI void APIENTRY glGetActiveVaryingNV (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint, GLuint, GLint *);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
+#endif
+#ifndef GL_EXT_bindable_uniform
+#define GL_EXT_bindable_uniform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformBufferEXT (GLuint, GLint, GLuint);
+GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint, GLint);
+GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint, GLint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
+typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
+#endif
+#ifndef GL_EXT_texture_integer
+#define GL_EXT_texture_integer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexParameterIivEXT (GLenum, GLenum, const GLint *);
+GLAPI void APIENTRY glTexParameterIuivEXT (GLenum, GLenum, const GLuint *);
+GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum, GLenum, GLint *);
+GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum, GLenum, GLuint *);
+GLAPI void APIENTRY glClearColorIiEXT (GLint, GLint, GLint, GLint);
+GLAPI void APIENTRY glClearColorIuiEXT (GLuint, GLuint, GLuint, GLuint);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
+typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#endif
+#ifndef GL_GREMEDY_frame_terminator
+#define GL_GREMEDY_frame_terminator 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/linden/libraries/i686-win32/include/GL/glut.h b/linden/libraries/i686-win32/include/GL/glut.h
new file mode 100644
index 0000000..e0692ad
--- /dev/null
+++ b/linden/libraries/i686-win32/include/GL/glut.h
@@ -0,0 +1,596 @@
+#ifndef __glut_h__
+#define __glut_h__
+/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1998. */
+/* This program is freely distributable without licensing fees  and is
+   provided without guarantee or warrantee expressed or  implied. This
+   program is -not- in the public domain. */
+#if defined(_WIN32)
+/* GLUT 3.7 now tries to avoid including <windows.h>
+   to avoid name space pollution, but Win32's <GL/gl.h> 
+   needs APIENTRY and WINGDIAPI defined properly. */
+# if 0
+#  define  WIN32_LEAN_AND_MEAN
+#  include <windows.h>
+# else
+   /* XXX This is from Win32's <windef.h> */
+#  ifndef APIENTRY
+#   define GLUT_APIENTRY_DEFINED
+#   if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
+#    define APIENTRY    __stdcall
+#   else
+#    define APIENTRY
+#   endif
+#  endif
+   /* XXX This is from Win32's <winnt.h> */
+#  ifndef CALLBACK
+#   if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
+#    define CALLBACK __stdcall
+#   else
+#    define CALLBACK
+#   endif
+#  endif
+   /* XXX This is from Win32's <wingdi.h> and <winnt.h> */
+#  ifndef WINGDIAPI
+#   define GLUT_WINGDIAPI_DEFINED
+#   define WINGDIAPI __declspec(dllimport)
+#  endif
+   /* XXX This is from Win32's <ctype.h> */
+#  ifndef _WCHAR_T_DEFINED
+typedef unsigned short wchar_t;
+#   define _WCHAR_T_DEFINED
+#  endif
+# endif
+#pragma comment (lib, "winmm.lib")     /* link with Windows MultiMedia lib */
+#pragma comment (lib, "opengl32.lib")  /* link with Microsoft OpenGL lib */
+#pragma comment (lib, "glu32.lib")     /* link with OpenGL Utility lib */
+#pragma comment (lib, "glut32.lib")    /* link with Win32 GLUT lib */
+#pragma warning (disable:4244)  /* Disable bogus conversion warnings. */
+#pragma warning (disable:4305)  /* VC++ 5.0 version of above warning. */
+#endif
+#include <GL/gl.h>
+#include <GL/glu.h>
+/* define APIENTRY and CALLBACK to null string if we aren't on Win32 */
+#if !defined(_WIN32)
+#define APIENTRY
+#define GLUT_APIENTRY_DEFINED
+#define CALLBACK
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+/**
+ GLUT API revision history:
+ 
+ GLUT_API_VERSION is updated to reflect incompatible GLUT
+ API changes (interface changes, semantic changes, deletions,
+ or additions).
+ 
+ GLUT_API_VERSION=1  First public release of GLUT.  11/29/94
+ GLUT_API_VERSION=2  Added support for OpenGL/GLX multisampling,
+ extension.  Supports new input devices like tablet, dial and button
+ box, and Spaceball.  Easy to query OpenGL extensions.
+ GLUT_API_VERSION=3  glutMenuStatus added.
+ GLUT_API_VERSION=4  glutInitDisplayString, glutWarpPointer,
+ glutBitmapLength, glutStrokeLength, glutWindowStatusFunc, dynamic
+ video resize subAPI, glutPostWindowRedisplay, glutKeyboardUpFunc,
+ glutSpecialUpFunc, glutIgnoreKeyRepeat, glutSetKeyRepeat,
+ glutJoystickFunc, glutForceJoystickFunc (NOT FINALIZED!).
+**/
+#ifndef GLUT_API_VERSION  /* allow this to be overriden */
+#define GLUT_API_VERSION                3
+#endif
+/**
+ GLUT implementation revision history:
+ 
+ GLUT_XLIB_IMPLEMENTATION is updated to reflect both GLUT
+ API revisions and implementation revisions (ie, bug fixes).
+ GLUT_XLIB_IMPLEMENTATION=1  mjk's first public release of
+ GLUT Xlib-based implementation.  11/29/94
+ GLUT_XLIB_IMPLEMENTATION=2  mjk's second public release of
+ GLUT Xlib-based implementation providing GLUT version 2 
+ interfaces.
+ GLUT_XLIB_IMPLEMENTATION=3  mjk's GLUT 2.2 images. 4/17/95
+ GLUT_XLIB_IMPLEMENTATION=4  mjk's GLUT 2.3 images. 6/?/95
+ GLUT_XLIB_IMPLEMENTATION=5  mjk's GLUT 3.0 images. 10/?/95
+ GLUT_XLIB_IMPLEMENTATION=7  mjk's GLUT 3.1+ with glutWarpPoitner.  7/24/96
+ GLUT_XLIB_IMPLEMENTATION=8  mjk's GLUT 3.1+ with glutWarpPoitner
+ and video resize.  1/3/97
+ GLUT_XLIB_IMPLEMENTATION=9 mjk's GLUT 3.4 release with early GLUT 4 routines.
+ GLUT_XLIB_IMPLEMENTATION=11 Mesa 2.5's GLUT 3.6 release.
+ GLUT_XLIB_IMPLEMENTATION=12 mjk's GLUT 3.6 release with early GLUT 4 routines + signal handling.
+ GLUT_XLIB_IMPLEMENTATION=13 mjk's GLUT 3.7 release with GameGLUT support.
+**/
+#ifndef GLUT_XLIB_IMPLEMENTATION  /* Allow this to be overriden. */
+#define GLUT_XLIB_IMPLEMENTATION        13
+#endif
+/* Display mode bit masks. */
+#define GLUT_RGB                        0
+#define GLUT_RGBA                       GLUT_RGB
+#define GLUT_INDEX                      1
+#define GLUT_SINGLE                     0
+#define GLUT_DOUBLE                     2
+#define GLUT_ACCUM                      4
+#define GLUT_ALPHA                      8
+#define GLUT_DEPTH                      16
+#define GLUT_STENCIL                    32
+#if (GLUT_API_VERSION >= 2)
+#define GLUT_MULTISAMPLE                128
+#define GLUT_STEREO                     256
+#endif
+#if (GLUT_API_VERSION >= 3)
+#define GLUT_LUMINANCE                  512
+#endif
+/* Mouse buttons. */
+#define GLUT_LEFT_BUTTON                0
+#define GLUT_MIDDLE_BUTTON              1
+#define GLUT_RIGHT_BUTTON               2
+/* Mouse button  state. */
+#define GLUT_DOWN                       0
+#define GLUT_UP                         1
+#if (GLUT_API_VERSION >= 2)
+/* function keys */
+#define GLUT_KEY_F1                     1
+#define GLUT_KEY_F2                     2
+#define GLUT_KEY_F3                     3
+#define GLUT_KEY_F4                     4
+#define GLUT_KEY_F5                     5
+#define GLUT_KEY_F6                     6
+#define GLUT_KEY_F7                     7
+#define GLUT_KEY_F8                     8
+#define GLUT_KEY_F9                     9
+#define GLUT_KEY_F10                    10
+#define GLUT_KEY_F11                    11
+#define GLUT_KEY_F12                    12
+/* directional keys */
+#define GLUT_KEY_LEFT                   100
+#define GLUT_KEY_UP                     101
+#define GLUT_KEY_RIGHT                  102
+#define GLUT_KEY_DOWN                   103
+#define GLUT_KEY_PAGE_UP                104
+#define GLUT_KEY_PAGE_DOWN              105
+#define GLUT_KEY_HOME                   106
+#define GLUT_KEY_END                    107
+#define GLUT_KEY_INSERT                 108
+#endif
+/* Entry/exit  state. */
+#define GLUT_LEFT                       0
+#define GLUT_ENTERED                    1
+/* Menu usage  state. */
+#define GLUT_MENU_NOT_IN_USE            0
+#define GLUT_MENU_IN_USE                1
+/* Visibility  state. */
+#define GLUT_NOT_VISIBLE                0
+#define GLUT_VISIBLE                    1
+/* Window status  state. */
+#define GLUT_HIDDEN                     0
+#define GLUT_FULLY_RETAINED             1
+#define GLUT_PARTIALLY_RETAINED         2
+#define GLUT_FULLY_COVERED              3
+/* Color index component selection values. */
+#define GLUT_RED                        0
+#define GLUT_GREEN                      1
+#define GLUT_BLUE                       2
+/* Layers for use. */
+#define GLUT_NORMAL                     0
+#define GLUT_OVERLAY                    1
+#if defined(_WIN32)
+/* Stroke font constants (use these in GLUT program). */
+#define GLUT_STROKE_ROMAN               ((void*)0)
+#define GLUT_STROKE_MONO_ROMAN          ((void*)1)
+/* Bitmap font constants (use these in GLUT program). */
+#define GLUT_BITMAP_9_BY_15             ((void*)2)
+#define GLUT_BITMAP_8_BY_13             ((void*)3)
+#define GLUT_BITMAP_TIMES_ROMAN_10      ((void*)4)
+#define GLUT_BITMAP_TIMES_ROMAN_24      ((void*)5)
+#if (GLUT_API_VERSION >= 3)
+#define GLUT_BITMAP_HELVETICA_10        ((void*)6)
+#define GLUT_BITMAP_HELVETICA_12        ((void*)7)
+#define GLUT_BITMAP_HELVETICA_18        ((void*)8)
+#endif
+#else
+/* Stroke font opaque addresses (use constants instead in source code). */
+extern void *glutStrokeRoman;
+extern void *glutStrokeMonoRoman;
+/* Stroke font constants (use these in GLUT program). */
+#define GLUT_STROKE_ROMAN               (&glutStrokeRoman)
+#define GLUT_STROKE_MONO_ROMAN          (&glutStrokeMonoRoman)
+/* Bitmap font opaque addresses (use constants instead in source code). */
+extern void *glutBitmap9By15;
+extern void *glutBitmap8By13;
+extern void *glutBitmapTimesRoman10;
+extern void *glutBitmapTimesRoman24;
+extern void *glutBitmapHelvetica10;
+extern void *glutBitmapHelvetica12;
+extern void *glutBitmapHelvetica18;
+/* Bitmap font constants (use these in GLUT program). */
+#define GLUT_BITMAP_9_BY_15             (&glutBitmap9By15)
+#define GLUT_BITMAP_8_BY_13             (&glutBitmap8By13)
+#define GLUT_BITMAP_TIMES_ROMAN_10      (&glutBitmapTimesRoman10)
+#define GLUT_BITMAP_TIMES_ROMAN_24      (&glutBitmapTimesRoman24)
+#if (GLUT_API_VERSION >= 3)
+#define GLUT_BITMAP_HELVETICA_10        (&glutBitmapHelvetica10)
+#define GLUT_BITMAP_HELVETICA_12        (&glutBitmapHelvetica12)
+#define GLUT_BITMAP_HELVETICA_18        (&glutBitmapHelvetica18)
+#endif
+#endif
+/* glutGet parameters. */
+#define GLUT_WINDOW_X                   100
+#define GLUT_WINDOW_Y                   101
+#define GLUT_WINDOW_WIDTH               102
+#define GLUT_WINDOW_HEIGHT              103
+#define GLUT_WINDOW_BUFFER_SIZE         104
+#define GLUT_WINDOW_STENCIL_SIZE        105
+#define GLUT_WINDOW_DEPTH_SIZE          106
+#define GLUT_WINDOW_RED_SIZE            107
+#define GLUT_WINDOW_GREEN_SIZE          108
+#define GLUT_WINDOW_BLUE_SIZE           109
+#define GLUT_WINDOW_ALPHA_SIZE          110
+#define GLUT_WINDOW_ACCUM_RED_SIZE      111
+#define GLUT_WINDOW_ACCUM_GREEN_SIZE    112
+#define GLUT_WINDOW_ACCUM_BLUE_SIZE     113
+#define GLUT_WINDOW_ACCUM_ALPHA_SIZE    114
+#define GLUT_WINDOW_DOUBLEBUFFER        115
+#define GLUT_WINDOW_RGBA                116
+#define GLUT_WINDOW_PARENT              117
+#define GLUT_WINDOW_NUM_CHILDREN        118
+#define GLUT_WINDOW_COLORMAP_SIZE       119
+#if (GLUT_API_VERSION >= 2)
+#define GLUT_WINDOW_NUM_SAMPLES         120
+#define GLUT_WINDOW_STEREO              121
+#endif
+#if (GLUT_API_VERSION >= 3)
+#define GLUT_WINDOW_CURSOR              122
+#endif
+#define GLUT_SCREEN_WIDTH               200
+#define GLUT_SCREEN_HEIGHT              201
+#define GLUT_SCREEN_WIDTH_MM            202
+#define GLUT_SCREEN_HEIGHT_MM           203
+#define GLUT_MENU_NUM_ITEMS             300
+#define GLUT_DISPLAY_MODE_POSSIBLE      400
+#define GLUT_INIT_WINDOW_X              500
+#define GLUT_INIT_WINDOW_Y              501
+#define GLUT_INIT_WINDOW_WIDTH          502
+#define GLUT_INIT_WINDOW_HEIGHT         503
+#define GLUT_INIT_DISPLAY_MODE          504
+#if (GLUT_API_VERSION >= 2)
+#define GLUT_ELAPSED_TIME               700
+#endif
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
+#define GLUT_WINDOW_FORMAT_ID           123
+#endif
+#if (GLUT_API_VERSION >= 2)
+/* glutDeviceGet parameters. */
+#define GLUT_HAS_KEYBOARD               600
+#define GLUT_HAS_MOUSE                  601
+#define GLUT_HAS_SPACEBALL              602
+#define GLUT_HAS_DIAL_AND_BUTTON_BOX    603
+#define GLUT_HAS_TABLET                 604
+#define GLUT_NUM_MOUSE_BUTTONS          605
+#define GLUT_NUM_SPACEBALL_BUTTONS      606
+#define GLUT_NUM_BUTTON_BOX_BUTTONS     607
+#define GLUT_NUM_DIALS                  608
+#define GLUT_NUM_TABLET_BUTTONS         609
+#endif
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
+#define GLUT_DEVICE_IGNORE_KEY_REPEAT   610
+#define GLUT_DEVICE_KEY_REPEAT          611
+#define GLUT_HAS_JOYSTICK               612
+#define GLUT_OWNS_JOYSTICK              613
+#define GLUT_JOYSTICK_BUTTONS           614
+#define GLUT_JOYSTICK_AXES              615
+#define GLUT_JOYSTICK_POLL_RATE         616
+#endif
+#if (GLUT_API_VERSION >= 3)
+/* glutLayerGet parameters. */
+#define GLUT_OVERLAY_POSSIBLE           800
+#define GLUT_LAYER_IN_USE               801
+#define GLUT_HAS_OVERLAY                802
+#define GLUT_TRANSPARENT_INDEX          803
+#define GLUT_NORMAL_DAMAGED             804
+#define GLUT_OVERLAY_DAMAGED            805
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
+/* glutVideoResizeGet parameters. */
+#define GLUT_VIDEO_RESIZE_POSSIBLE      900
+#define GLUT_VIDEO_RESIZE_IN_USE        901
+#define GLUT_VIDEO_RESIZE_X_DELTA       902
+#define GLUT_VIDEO_RESIZE_Y_DELTA       903
+#define GLUT_VIDEO_RESIZE_WIDTH_DELTA   904
+#define GLUT_VIDEO_RESIZE_HEIGHT_DELTA  905
+#define GLUT_VIDEO_RESIZE_X             906
+#define GLUT_VIDEO_RESIZE_Y             907
+#define GLUT_VIDEO_RESIZE_WIDTH         908
+#define GLUT_VIDEO_RESIZE_HEIGHT        909
+#endif
+/* glutUseLayer parameters. */
+#define GLUT_NORMAL                     0
+#define GLUT_OVERLAY                    1
+/* glutGetModifiers return mask. */
+#define GLUT_ACTIVE_SHIFT               1
+#define GLUT_ACTIVE_CTRL                2
+#define GLUT_ACTIVE_ALT                 4
+/* glutSetCursor parameters. */
+/* Basic arrows. */
+#define GLUT_CURSOR_RIGHT_ARROW         0
+#define GLUT_CURSOR_LEFT_ARROW          1
+/* Symbolic cursor shapes. */
+#define GLUT_CURSOR_INFO                2
+#define GLUT_CURSOR_DESTROY             3
+#define GLUT_CURSOR_HELP                4
+#define GLUT_CURSOR_CYCLE               5
+#define GLUT_CURSOR_SPRAY               6
+#define GLUT_CURSOR_WAIT                7
+#define GLUT_CURSOR_TEXT                8
+#define GLUT_CURSOR_CROSSHAIR           9
+/* Directional cursors. */
+#define GLUT_CURSOR_UP_DOWN             10
+#define GLUT_CURSOR_LEFT_RIGHT          11
+/* Sizing cursors. */
+#define GLUT_CURSOR_TOP_SIDE            12
+#define GLUT_CURSOR_BOTTOM_SIDE         13
+#define GLUT_CURSOR_LEFT_SIDE           14
+#define GLUT_CURSOR_RIGHT_SIDE          15
+#define GLUT_CURSOR_TOP_LEFT_CORNER     16
+#define GLUT_CURSOR_TOP_RIGHT_CORNER    17
+#define GLUT_CURSOR_BOTTOM_RIGHT_CORNER 18
+#define GLUT_CURSOR_BOTTOM_LEFT_CORNER  19
+/* Inherit from parent window. */
+#define GLUT_CURSOR_INHERIT             100
+/* Blank cursor. */
+#define GLUT_CURSOR_NONE                101
+/* Fullscreen crosshair (if available). */
+#define GLUT_CURSOR_FULL_CROSSHAIR      102
+#endif
+/* GLUT initialization sub-API. */
+extern void APIENTRY glutInit(int *argcp, char **argv);
+extern void APIENTRY glutInitDisplayMode(unsigned int mode);
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
+extern void APIENTRY glutInitDisplayString(const char *string);
+#endif
+extern void APIENTRY glutInitWindowPosition(int x, int y);
+extern void APIENTRY glutInitWindowSize(int width, int height);
+extern void APIENTRY glutMainLoop(void);
+/* GLUT window sub-API. */
+extern int APIENTRY glutCreateWindow(const char *title);
+extern int APIENTRY glutCreateSubWindow(int win, int x, int y, int width, int height);
+extern void APIENTRY glutDestroyWindow(int win);
+extern void APIENTRY glutPostRedisplay(void);
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11)
+extern void APIENTRY glutPostWindowRedisplay(int win);
+#endif
+extern void APIENTRY glutSwapBuffers(void);
+extern int APIENTRY glutGetWindow(void);
+extern void APIENTRY glutSetWindow(int win);
+extern void APIENTRY glutSetWindowTitle(const char *title);
+extern void APIENTRY glutSetIconTitle(const char *title);
+extern void APIENTRY glutPositionWindow(int x, int y);
+extern void APIENTRY glutReshapeWindow(int width, int height);
+extern void APIENTRY glutPopWindow(void);
+extern void APIENTRY glutPushWindow(void);
+extern void APIENTRY glutIconifyWindow(void);
+extern void APIENTRY glutShowWindow(void);
+extern void APIENTRY glutHideWindow(void);
+#if (GLUT_API_VERSION >= 3)
+extern void APIENTRY glutFullScreen(void);
+extern void APIENTRY glutSetCursor(int cursor);
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
+extern void APIENTRY glutWarpPointer(int x, int y);
+#endif
+/* GLUT overlay sub-API. */
+extern void APIENTRY glutEstablishOverlay(void);
+extern void APIENTRY glutRemoveOverlay(void);
+extern void APIENTRY glutUseLayer(GLenum layer);
+extern void APIENTRY glutPostOverlayRedisplay(void);
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11)
+extern void APIENTRY glutPostWindowOverlayRedisplay(int win);
+#endif
+extern void APIENTRY glutShowOverlay(void);
+extern void APIENTRY glutHideOverlay(void);
+#endif
+/* GLUT menu sub-API. */
+extern int APIENTRY glutCreateMenu(void (*)(int));
+extern void APIENTRY glutDestroyMenu(int menu);
+extern int APIENTRY glutGetMenu(void);
+extern void APIENTRY glutSetMenu(int menu);
+extern void APIENTRY glutAddMenuEntry(const char *label, int value);
+extern void APIENTRY glutAddSubMenu(const char *label, int submenu);
+extern void APIENTRY glutChangeToMenuEntry(int item, const char *label, int value);
+extern void APIENTRY glutChangeToSubMenu(int item, const char *label, int submenu);
+extern void APIENTRY glutRemoveMenuItem(int item);
+extern void APIENTRY glutAttachMenu(int button);
+extern void APIENTRY glutDetachMenu(int button);
+/* GLUT window callback sub-API. */
+extern void APIENTRY glutDisplayFunc(void (*func)(void));
+extern void APIENTRY glutReshapeFunc(void (*func)(int width, int height));
+extern void APIENTRY glutKeyboardFunc(void (*func)(unsigned char key, int x, int y));
+extern void APIENTRY glutMouseFunc(void (*func)(int button, int state, int x, int y));
+extern void APIENTRY glutMotionFunc(void (*func)(int x, int y));
+extern void APIENTRY glutPassiveMotionFunc(void (*func)(int x, int y));
+extern void APIENTRY glutEntryFunc(void (*func)(int state));
+extern void APIENTRY glutVisibilityFunc(void (*func)(int state));
+extern void APIENTRY glutIdleFunc(void (*func)(void));
+extern void APIENTRY glutTimerFunc(unsigned int millis, void (*func)(int value), int value);
+extern void APIENTRY glutMenuStateFunc(void (*func)(int state));
+#if (GLUT_API_VERSION >= 2)
+extern void APIENTRY glutSpecialFunc(void (*func)(int key, int x, int y));
+extern void APIENTRY glutSpaceballMotionFunc(void (*func)(int x, int y, int z));
+extern void APIENTRY glutSpaceballRotateFunc(void (*func)(int x, int y, int z));
+extern void APIENTRY glutSpaceballButtonFunc(void (*func)(int button, int state));
+extern void APIENTRY glutButtonBoxFunc(void (*func)(int button, int state));
+extern void APIENTRY glutDialsFunc(void (*func)(int dial, int value));
+extern void APIENTRY glutTabletMotionFunc(void (*func)(int x, int y));
+extern void APIENTRY glutTabletButtonFunc(void (*func)(int button, int state, int x, int y));
+#if (GLUT_API_VERSION >= 3)
+extern void APIENTRY glutMenuStatusFunc(void (*func)(int status, int x, int y));
+extern void APIENTRY glutOverlayDisplayFunc(void (*func)(void));
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
+extern void APIENTRY glutWindowStatusFunc(void (*func)(int state));
+#endif
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
+extern void APIENTRY glutKeyboardUpFunc(void (*func)(unsigned char key, int x, int y));
+extern void APIENTRY glutSpecialUpFunc(void (*func)(int key, int x, int y));
+extern void APIENTRY glutJoystickFunc(void (*func)(unsigned int buttonMask, int x, int y, int z), int pollInterval);
+#endif
+#endif
+#endif
+/* GLUT color index sub-API. */
+extern void APIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue);
+extern GLfloat APIENTRY glutGetColor(int ndx, int component);
+extern void APIENTRY glutCopyColormap(int win);
+/* GLUT state retrieval sub-API. */
+extern int APIENTRY glutGet(GLenum type);
+extern int APIENTRY glutDeviceGet(GLenum type);
+#if (GLUT_API_VERSION >= 2)
+/* GLUT extension support sub-API */
+extern int APIENTRY glutExtensionSupported(const char *name);
+#endif
+#if (GLUT_API_VERSION >= 3)
+extern int APIENTRY glutGetModifiers(void);
+extern int APIENTRY glutLayerGet(GLenum type);
+#endif
+/* GLUT font sub-API */
+extern void APIENTRY glutBitmapCharacter(void *font, int character);
+extern int APIENTRY glutBitmapWidth(void *font, int character);
+extern void APIENTRY glutStrokeCharacter(void *font, int character);
+extern int APIENTRY glutStrokeWidth(void *font, int character);
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
+extern int APIENTRY glutBitmapLength(void *font, const unsigned char *string);
+extern int APIENTRY glutStrokeLength(void *font, const unsigned char *string);
+#endif
+/* GLUT pre-built models sub-API */
+extern void APIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks);
+extern void APIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks);
+extern void APIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
+extern void APIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
+extern void APIENTRY glutWireCube(GLdouble size);
+extern void APIENTRY glutSolidCube(GLdouble size);
+extern void APIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
+extern void APIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
+extern void APIENTRY glutWireDodecahedron(void);
+extern void APIENTRY glutSolidDodecahedron(void);
+extern void APIENTRY glutWireTeapot(GLdouble size);
+extern void APIENTRY glutSolidTeapot(GLdouble size);
+extern void APIENTRY glutWireOctahedron(void);
+extern void APIENTRY glutSolidOctahedron(void);
+extern void APIENTRY glutWireTetrahedron(void);
+extern void APIENTRY glutSolidTetrahedron(void);
+extern void APIENTRY glutWireIcosahedron(void);
+extern void APIENTRY glutSolidIcosahedron(void);
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
+/* GLUT video resize sub-API. */
+extern int APIENTRY glutVideoResizeGet(GLenum param);
+extern void APIENTRY glutSetupVideoResizing(void);
+extern void APIENTRY glutStopVideoResizing(void);
+extern void APIENTRY glutVideoResize(int x, int y, int width, int height);
+extern void APIENTRY glutVideoPan(int x, int y, int width, int height);
+/* GLUT debugging sub-API. */
+extern void APIENTRY glutReportErrors(void);
+#endif
+#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
+/* GLUT device control sub-API. */
+/* glutSetKeyRepeat modes. */
+#define GLUT_KEY_REPEAT_OFF             0
+#define GLUT_KEY_REPEAT_ON              1
+#define GLUT_KEY_REPEAT_DEFAULT         2
+/* Joystick button masks. */
+#define GLUT_JOYSTICK_BUTTON_A          1
+#define GLUT_JOYSTICK_BUTTON_B          2
+#define GLUT_JOYSTICK_BUTTON_C          4
+#define GLUT_JOYSTICK_BUTTON_D          8
+extern void APIENTRY glutIgnoreKeyRepeat(int ignore);
+extern void APIENTRY glutSetKeyRepeat(int repeatMode);
+extern void APIENTRY glutForceJoystickFunc(void);
+/* GLUT game mode sub-API. */
+/* glutGameModeGet. */
+#define GLUT_GAME_MODE_ACTIVE           0
+#define GLUT_GAME_MODE_POSSIBLE         1
+#define GLUT_GAME_MODE_WIDTH            2
+#define GLUT_GAME_MODE_HEIGHT           3
+#define GLUT_GAME_MODE_PIXEL_DEPTH      4
+#define GLUT_GAME_MODE_REFRESH_RATE     5
+#define GLUT_GAME_MODE_DISPLAY_CHANGED  6
+extern void APIENTRY glutGameModeString(const char *string);
+extern int APIENTRY glutEnterGameMode(void);
+extern void APIENTRY glutLeaveGameMode(void);
+extern int APIENTRY glutGameModeGet(GLenum mode);
+#endif
+#ifdef __cplusplus
+}
+#endif
+#ifdef GLUT_APIENTRY_DEFINED
+# undef GLUT_APIENTRY_DEFINED
+# undef APIENTRY
+#endif
+#ifdef GLUT_WINGDIAPI_DEFINED
+# undef GLUT_WINGDIAPI_DEFINED
+# undef WINGDIAPI
+#endif
+#endif                  /* __glut_h__ */
diff --git a/linden/libraries/i686-win32/include/GL/glxext.h b/linden/libraries/i686-win32/include/GL/glxext.h
new file mode 100644
index 0000000..0f66df6
--- /dev/null
+++ b/linden/libraries/i686-win32/include/GL/glxext.h
@@ -0,0 +1,785 @@
+#ifndef __glxext_h_
+#define __glxext_h_
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+/*************************************************************/
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glxext.h last updated 2007/04/21 */
+/* Current version at http://www.opengl.org/registry/ */
+#define GLX_GLXEXT_VERSION 19
+#ifndef GLX_VERSION_1_3
+#define GLX_WINDOW_BIT                     0x00000001
+#define GLX_PIXMAP_BIT                     0x00000002
+#define GLX_PBUFFER_BIT                    0x00000004
+#define GLX_RGBA_BIT                       0x00000001
+#define GLX_COLOR_INDEX_BIT                0x00000002
+#define GLX_PBUFFER_CLOBBER_MASK           0x08000000
+#define GLX_FRONT_LEFT_BUFFER_BIT          0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT         0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT           0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT          0x00000008
+#define GLX_AUX_BUFFERS_BIT                0x00000010
+#define GLX_DEPTH_BUFFER_BIT               0x00000020
+#define GLX_STENCIL_BUFFER_BIT             0x00000040
+#define GLX_ACCUM_BUFFER_BIT               0x00000080
+#define GLX_CONFIG_CAVEAT                  0x20
+#define GLX_X_VISUAL_TYPE                  0x22
+#define GLX_TRANSPARENT_TYPE               0x23
+#define GLX_TRANSPARENT_INDEX_VALUE        0x24
+#define GLX_TRANSPARENT_RED_VALUE          0x25
+#define GLX_TRANSPARENT_GREEN_VALUE        0x26
+#define GLX_TRANSPARENT_BLUE_VALUE         0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE        0x28
+#define GLX_DONT_CARE                      0xFFFFFFFF
+#define GLX_NONE                           0x8000
+#define GLX_SLOW_CONFIG                    0x8001
+#define GLX_TRUE_COLOR                     0x8002
+#define GLX_DIRECT_COLOR                   0x8003
+#define GLX_PSEUDO_COLOR                   0x8004
+#define GLX_STATIC_COLOR                   0x8005
+#define GLX_GRAY_SCALE                     0x8006
+#define GLX_STATIC_GRAY                    0x8007
+#define GLX_TRANSPARENT_RGB                0x8008
+#define GLX_TRANSPARENT_INDEX              0x8009
+#define GLX_VISUAL_ID                      0x800B
+#define GLX_SCREEN                         0x800C
+#define GLX_NON_CONFORMANT_CONFIG          0x800D
+#define GLX_DRAWABLE_TYPE                  0x8010
+#define GLX_RENDER_TYPE                    0x8011
+#define GLX_X_RENDERABLE                   0x8012
+#define GLX_FBCONFIG_ID                    0x8013
+#define GLX_RGBA_TYPE                      0x8014
+#define GLX_COLOR_INDEX_TYPE               0x8015
+#define GLX_MAX_PBUFFER_WIDTH              0x8016
+#define GLX_MAX_PBUFFER_HEIGHT             0x8017
+#define GLX_MAX_PBUFFER_PIXELS             0x8018
+#define GLX_PRESERVED_CONTENTS             0x801B
+#define GLX_LARGEST_PBUFFER                0x801C
+#define GLX_WIDTH                          0x801D
+#define GLX_HEIGHT                         0x801E
+#define GLX_EVENT_MASK                     0x801F
+#define GLX_DAMAGED                        0x8020
+#define GLX_SAVED                          0x8021
+#define GLX_WINDOW                         0x8022
+#define GLX_PBUFFER                        0x8023
+#define GLX_PBUFFER_HEIGHT                 0x8040
+#define GLX_PBUFFER_WIDTH                  0x8041
+#endif
+#ifndef GLX_VERSION_1_4
+#define GLX_SAMPLE_BUFFERS                 100000
+#define GLX_SAMPLES                        100001
+#endif
+#ifndef GLX_ARB_get_proc_address
+#endif
+#ifndef GLX_ARB_multisample
+#define GLX_SAMPLE_BUFFERS_ARB             100000
+#define GLX_SAMPLES_ARB                    100001
+#endif
+#ifndef GLX_ARB_fbconfig_float
+#define GLX_RGBA_FLOAT_TYPE_ARB            0x20B9
+#define GLX_RGBA_FLOAT_BIT_ARB             0x00000004
+#endif
+#ifndef GLX_SGIS_multisample
+#define GLX_SAMPLE_BUFFERS_SGIS            100000
+#define GLX_SAMPLES_SGIS                   100001
+#endif
+#ifndef GLX_EXT_visual_info
+#define GLX_X_VISUAL_TYPE_EXT              0x22
+#define GLX_TRANSPARENT_TYPE_EXT           0x23
+#define GLX_TRANSPARENT_INDEX_VALUE_EXT    0x24
+#define GLX_TRANSPARENT_RED_VALUE_EXT      0x25
+#define GLX_TRANSPARENT_GREEN_VALUE_EXT    0x26
+#define GLX_TRANSPARENT_BLUE_VALUE_EXT     0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE_EXT    0x28
+#define GLX_NONE_EXT                       0x8000
+#define GLX_TRUE_COLOR_EXT                 0x8002
+#define GLX_DIRECT_COLOR_EXT               0x8003
+#define GLX_PSEUDO_COLOR_EXT               0x8004
+#define GLX_STATIC_COLOR_EXT               0x8005
+#define GLX_GRAY_SCALE_EXT                 0x8006
+#define GLX_STATIC_GRAY_EXT                0x8007
+#define GLX_TRANSPARENT_RGB_EXT            0x8008
+#define GLX_TRANSPARENT_INDEX_EXT          0x8009
+#endif
+#ifndef GLX_SGI_swap_control
+#endif
+#ifndef GLX_SGI_video_sync
+#endif
+#ifndef GLX_SGI_make_current_read
+#endif
+#ifndef GLX_SGIX_video_source
+#endif
+#ifndef GLX_EXT_visual_rating
+#define GLX_VISUAL_CAVEAT_EXT              0x20
+#define GLX_SLOW_VISUAL_EXT                0x8001
+#define GLX_NON_CONFORMANT_VISUAL_EXT      0x800D
+/* reuse GLX_NONE_EXT */
+#endif
+#ifndef GLX_EXT_import_context
+#define GLX_SHARE_CONTEXT_EXT              0x800A
+#define GLX_VISUAL_ID_EXT                  0x800B
+#define GLX_SCREEN_EXT                     0x800C
+#endif
+#ifndef GLX_SGIX_fbconfig
+#define GLX_WINDOW_BIT_SGIX                0x00000001
+#define GLX_PIXMAP_BIT_SGIX                0x00000002
+#define GLX_RGBA_BIT_SGIX                  0x00000001
+#define GLX_COLOR_INDEX_BIT_SGIX           0x00000002
+#define GLX_DRAWABLE_TYPE_SGIX             0x8010
+#define GLX_RENDER_TYPE_SGIX               0x8011
+#define GLX_X_RENDERABLE_SGIX              0x8012
+#define GLX_FBCONFIG_ID_SGIX               0x8013
+#define GLX_RGBA_TYPE_SGIX                 0x8014
+#define GLX_COLOR_INDEX_TYPE_SGIX          0x8015
+/* reuse GLX_SCREEN_EXT */
+#endif
+#ifndef GLX_SGIX_pbuffer
+#define GLX_PBUFFER_BIT_SGIX               0x00000004
+#define GLX_BUFFER_CLOBBER_MASK_SGIX       0x08000000
+#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX     0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX    0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT_SGIX      0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX     0x00000008
+#define GLX_AUX_BUFFERS_BIT_SGIX           0x00000010
+#define GLX_DEPTH_BUFFER_BIT_SGIX          0x00000020
+#define GLX_STENCIL_BUFFER_BIT_SGIX        0x00000040
+#define GLX_ACCUM_BUFFER_BIT_SGIX          0x00000080
+#define GLX_SAMPLE_BUFFERS_BIT_SGIX        0x00000100
+#define GLX_MAX_PBUFFER_WIDTH_SGIX         0x8016
+#define GLX_MAX_PBUFFER_HEIGHT_SGIX        0x8017
+#define GLX_MAX_PBUFFER_PIXELS_SGIX        0x8018
+#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX     0x8019
+#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX    0x801A
+#define GLX_PRESERVED_CONTENTS_SGIX        0x801B
+#define GLX_LARGEST_PBUFFER_SGIX           0x801C
+#define GLX_WIDTH_SGIX                     0x801D
+#define GLX_HEIGHT_SGIX                    0x801E
+#define GLX_EVENT_MASK_SGIX                0x801F
+#define GLX_DAMAGED_SGIX                   0x8020
+#define GLX_SAVED_SGIX                     0x8021
+#define GLX_WINDOW_SGIX                    0x8022
+#define GLX_PBUFFER_SGIX                   0x8023
+#endif
+#ifndef GLX_SGI_cushion
+#endif
+#ifndef GLX_SGIX_video_resize
+#define GLX_SYNC_FRAME_SGIX                0x00000000
+#define GLX_SYNC_SWAP_SGIX                 0x00000001
+#endif
+#ifndef GLX_SGIX_dmbuffer
+#define GLX_DIGITAL_MEDIA_PBUFFER_SGIX     0x8024
+#endif
+#ifndef GLX_SGIX_swap_group
+#endif
+#ifndef GLX_SGIX_swap_barrier
+#endif
+#ifndef GLX_SGIS_blended_overlay
+#define GLX_BLENDED_RGBA_SGIS              0x8025
+#endif
+#ifndef GLX_SGIS_shared_multisample
+#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
+#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
+#endif
+#ifndef GLX_SUN_get_transparent_index
+#endif
+#ifndef GLX_3DFX_multisample
+#define GLX_SAMPLE_BUFFERS_3DFX            0x8050
+#define GLX_SAMPLES_3DFX                   0x8051
+#endif
+#ifndef GLX_MESA_copy_sub_buffer
+#endif
+#ifndef GLX_MESA_pixmap_colormap
+#endif
+#ifndef GLX_MESA_release_buffers
+#endif
+#ifndef GLX_MESA_set_3dfx_mode
+#define GLX_3DFX_WINDOW_MODE_MESA          0x1
+#define GLX_3DFX_FULLSCREEN_MODE_MESA      0x2
+#endif
+#ifndef GLX_SGIX_visual_select_group
+#define GLX_VISUAL_SELECT_GROUP_SGIX       0x8028
+#endif
+#ifndef GLX_OML_swap_method
+#define GLX_SWAP_METHOD_OML                0x8060
+#define GLX_SWAP_EXCHANGE_OML              0x8061
+#define GLX_SWAP_COPY_OML                  0x8062
+#define GLX_SWAP_UNDEFINED_OML             0x8063
+#endif
+#ifndef GLX_OML_sync_control
+#endif
+#ifndef GLX_NV_float_buffer
+#define GLX_FLOAT_COMPONENTS_NV            0x20B0
+#endif
+#ifndef GLX_SGIX_hyperpipe
+#define GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX 80
+#define GLX_BAD_HYPERPIPE_CONFIG_SGIX      91
+#define GLX_BAD_HYPERPIPE_SGIX             92
+#define GLX_HYPERPIPE_DISPLAY_PIPE_SGIX    0x00000001
+#define GLX_HYPERPIPE_RENDER_PIPE_SGIX     0x00000002
+#define GLX_PIPE_RECT_SGIX                 0x00000001
+#define GLX_PIPE_RECT_LIMITS_SGIX          0x00000002
+#define GLX_HYPERPIPE_STEREO_SGIX          0x00000003
+#define GLX_HYPERPIPE_PIXEL_AVERAGE_SGIX   0x00000004
+#define GLX_HYPERPIPE_ID_SGIX              0x8030
+#endif
+#ifndef GLX_MESA_agp_offset
+#endif
+#ifndef GLX_EXT_fbconfig_packed_float
+#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT   0x20B1
+#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT    0x00000008
+#endif
+#ifndef GLX_EXT_framebuffer_sRGB
+#define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x20B2
+#endif
+#ifndef GLX_EXT_texture_from_pixmap
+#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
+#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
+#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
+#define GLX_Y_INVERTED_EXT                 0x20D4
+#define GLX_TEXTURE_FORMAT_EXT             0x20D5
+#define GLX_TEXTURE_TARGET_EXT             0x20D6
+#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
+#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
+#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
+#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
+#define GLX_TEXTURE_1D_EXT                 0x20DB
+#define GLX_TEXTURE_2D_EXT                 0x20DC
+#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
+#define GLX_FRONT_LEFT_EXT                 0x20DE
+#define GLX_FRONT_RIGHT_EXT                0x20DF
+#define GLX_BACK_LEFT_EXT                  0x20E0
+#define GLX_BACK_RIGHT_EXT                 0x20E1
+#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
+#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
+#define GLX_AUX0_EXT                       0x20E2
+#define GLX_AUX1_EXT                       0x20E3
+#define GLX_AUX2_EXT                       0x20E4
+#define GLX_AUX3_EXT                       0x20E5
+#define GLX_AUX4_EXT                       0x20E6
+#define GLX_AUX5_EXT                       0x20E7
+#define GLX_AUX6_EXT                       0x20E8
+#define GLX_AUX7_EXT                       0x20E9
+#define GLX_AUX8_EXT                       0x20EA
+#define GLX_AUX9_EXT                       0x20EB
+#endif
+/*************************************************************/
+#ifndef GLX_ARB_get_proc_address
+typedef void (*__GLXextFuncPtr)(void);
+#endif
+#ifndef GLX_SGIX_video_source
+typedef XID GLXVideoSourceSGIX;
+#endif
+#ifndef GLX_SGIX_fbconfig
+typedef XID GLXFBConfigIDSGIX;
+typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
+#endif
+#ifndef GLX_SGIX_pbuffer
+typedef XID GLXPbufferSGIX;
+typedef struct {
+    int type;
+    unsigned long serial;         /* # of last request processed by server */
+    Bool send_event;              /* true if this came for SendEvent request */
+    Display *display;             /* display the event was read from */
+    GLXDrawable drawable;         /* i.d. of Drawable */
+    int event_type;               /* GLX_DAMAGED_SGIX or GLX_SAVED_SGIX */
+    int draw_type;                /* GLX_WINDOW_SGIX or GLX_PBUFFER_SGIX */
+    unsigned int mask;    /* mask indicating which buffers are affected*/
+    int x, y;
+    int width, height;
+    int count;            /* if nonzero, at least this many more */
+} GLXBufferClobberEventSGIX;
+#endif
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glxext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GLX_OML_sync_control extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__) || defined(__digital__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS )
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <inttypes.h>     /* Fallback option */
+#endif
+#endif
+#ifndef GLX_VERSION_1_3
+#define GLX_VERSION_1_3 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXFBConfig * glXGetFBConfigs (Display *, int, int *);
+extern GLXFBConfig * glXChooseFBConfig (Display *, int, const int *, int *);
+extern int glXGetFBConfigAttrib (Display *, GLXFBConfig, int, int *);
+extern XVisualInfo * glXGetVisualFromFBConfig (Display *, GLXFBConfig);
+extern GLXWindow glXCreateWindow (Display *, GLXFBConfig, Window, const int *);
+extern void glXDestroyWindow (Display *, GLXWindow);
+extern GLXPixmap glXCreatePixmap (Display *, GLXFBConfig, Pixmap, const int *);
+extern void glXDestroyPixmap (Display *, GLXPixmap);
+extern GLXPbuffer glXCreatePbuffer (Display *, GLXFBConfig, const int *);
+extern void glXDestroyPbuffer (Display *, GLXPbuffer);
+extern void glXQueryDrawable (Display *, GLXDrawable, int, unsigned int *);
+extern GLXContext glXCreateNewContext (Display *, GLXFBConfig, int, GLXContext, Bool);
+extern Bool glXMakeContextCurrent (Display *, GLXDrawable, GLXDrawable, GLXContext);
+extern GLXDrawable glXGetCurrentReadDrawable (void);
+extern Display * glXGetCurrentDisplay (void);
+extern int glXQueryContext (Display *, GLXContext, int, int *);
+extern void glXSelectEvent (Display *, GLXDrawable, unsigned long);
+extern void glXGetSelectedEvent (Display *, GLXDrawable, unsigned long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXFBConfig * ( * PFNGLXGETFBCONFIGSPROC) (Display *dpy, int screen, int *nelements);
+typedef GLXFBConfig * ( * PFNGLXCHOOSEFBCONFIGPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
+typedef int ( * PFNGLXGETFBCONFIGATTRIBPROC) (Display *dpy, GLXFBConfig config, int attribute, int *value);
+typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGPROC) (Display *dpy, GLXFBConfig config);
+typedef GLXWindow ( * PFNGLXCREATEWINDOWPROC) (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYWINDOWPROC) (Display *dpy, GLXWindow win);
+typedef GLXPixmap ( * PFNGLXCREATEPIXMAPPROC) (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
+typedef GLXPbuffer ( * PFNGLXCREATEPBUFFERPROC) (Display *dpy, GLXFBConfig config, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf);
+typedef void ( * PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
+typedef GLXContext ( * PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+typedef Bool ( * PFNGLXMAKECONTEXTCURRENTPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLEPROC) (void);
+typedef Display * ( * PFNGLXGETCURRENTDISPLAYPROC) (void);
+typedef int ( * PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value);
+typedef void ( * PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask);
+typedef void ( * PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
+#endif
+#ifndef GLX_VERSION_1_4
+#define GLX_VERSION_1_4 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern __GLXextFuncPtr glXGetProcAddress (const GLubyte *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName);
+#endif
+#ifndef GLX_ARB_get_proc_address
+#define GLX_ARB_get_proc_address 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName);
+#endif
+#ifndef GLX_ARB_multisample
+#define GLX_ARB_multisample 1
+#endif
+#ifndef GLX_ARB_fbconfig_float
+#define GLX_ARB_fbconfig_float 1
+#endif
+#ifndef GLX_SGIS_multisample
+#define GLX_SGIS_multisample 1
+#endif
+#ifndef GLX_EXT_visual_info
+#define GLX_EXT_visual_info 1
+#endif
+#ifndef GLX_SGI_swap_control
+#define GLX_SGI_swap_control 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXSwapIntervalSGI (int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
+#endif
+#ifndef GLX_SGI_video_sync
+#define GLX_SGI_video_sync 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXGetVideoSyncSGI (unsigned int *);
+extern int glXWaitVideoSyncSGI (int, int, unsigned int *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int *count);
+typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int *count);
+#endif
+#ifndef GLX_SGI_make_current_read
+#define GLX_SGI_make_current_read 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXMakeCurrentReadSGI (Display *, GLXDrawable, GLXDrawable, GLXContext);
+extern GLXDrawable glXGetCurrentReadDrawableSGI (void);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void);
+#endif
+#ifndef GLX_SGIX_video_source
+#define GLX_SGIX_video_source 1
+#ifdef _VL_H
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXVideoSourceSGIX glXCreateGLXVideoSourceSGIX (Display *, int, VLServer, VLPath, int, VLNode);
+extern void glXDestroyGLXVideoSourceSGIX (Display *, GLXVideoSourceSGIX);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXVideoSourceSGIX ( * PFNGLXCREATEGLXVIDEOSOURCESGIXPROC) (Display *display, int screen, VLServer server, VLPath path, int nodeClass, VLNode drainNode);
+typedef void ( * PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (Display *dpy, GLXVideoSourceSGIX glxvideosource);
+#endif /* _VL_H */
+#endif
+#ifndef GLX_EXT_visual_rating
+#define GLX_EXT_visual_rating 1
+#endif
+#ifndef GLX_EXT_import_context
+#define GLX_EXT_import_context 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Display * glXGetCurrentDisplayEXT (void);
+extern int glXQueryContextInfoEXT (Display *, GLXContext, int, int *);
+extern GLXContextID glXGetContextIDEXT (const GLXContext);
+extern GLXContext glXImportContextEXT (Display *, GLXContextID);
+extern void glXFreeContextEXT (Display *, GLXContext);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Display * ( * PFNGLXGETCURRENTDISPLAYEXTPROC) (void);
+typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display *dpy, GLXContext context, int attribute, int *value);
+typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
+typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display *dpy, GLXContextID contextID);
+typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context);
+#endif
+#ifndef GLX_SGIX_fbconfig
+#define GLX_SGIX_fbconfig 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXGetFBConfigAttribSGIX (Display *, GLXFBConfigSGIX, int, int *);
+extern GLXFBConfigSGIX * glXChooseFBConfigSGIX (Display *, int, int *, int *);
+extern GLXPixmap glXCreateGLXPixmapWithConfigSGIX (Display *, GLXFBConfigSGIX, Pixmap);
+extern GLXContext glXCreateContextWithConfigSGIX (Display *, GLXFBConfigSGIX, int, GLXContext, Bool);
+extern XVisualInfo * glXGetVisualFromFBConfigSGIX (Display *, GLXFBConfigSGIX);
+extern GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX (Display *, XVisualInfo *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
+typedef GLXFBConfigSGIX * ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, int *attrib_list, int *nelements);
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
+typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
+typedef XVisualInfo * ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfigSGIX config);
+typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display *dpy, XVisualInfo *vis);
+#endif
+#ifndef GLX_SGIX_pbuffer
+#define GLX_SGIX_pbuffer 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXPbufferSGIX glXCreateGLXPbufferSGIX (Display *, GLXFBConfigSGIX, unsigned int, unsigned int, int *);
+extern void glXDestroyGLXPbufferSGIX (Display *, GLXPbufferSGIX);
+extern int glXQueryGLXPbufferSGIX (Display *, GLXPbufferSGIX, int, unsigned int *);
+extern void glXSelectEventSGIX (Display *, GLXDrawable, unsigned long);
+extern void glXGetSelectedEventSGIX (Display *, GLXDrawable, unsigned long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXPbufferSGIX ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
+typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf);
+typedef int ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
+typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long mask);
+typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long *mask);
+#endif
+#ifndef GLX_SGI_cushion
+#define GLX_SGI_cushion 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXCushionSGI (Display *, Window, float);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXCUSHIONSGIPROC) (Display *dpy, Window window, float cushion);
+#endif
+#ifndef GLX_SGIX_video_resize
+#define GLX_SGIX_video_resize 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern int glXBindChannelToWindowSGIX (Display *, int, int, Window);
+extern int glXChannelRectSGIX (Display *, int, int, int, int, int, int);
+extern int glXQueryChannelRectSGIX (Display *, int, int, int *, int *, int *, int *);
+extern int glXQueryChannelDeltasSGIX (Display *, int, int, int *, int *, int *, int *);
+extern int glXChannelRectSyncSGIX (Display *, int, int, GLenum);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display *display, int screen, int channel, Window window);
+typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int x, int y, int w, int h);
+typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display *display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
+typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display *display, int screen, int channel, int *x, int *y, int *w, int *h);
+typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display *display, int screen, int channel, GLenum synctype);
+#endif
+#ifndef GLX_SGIX_dmbuffer
+#define GLX_SGIX_dmbuffer 1
+#ifdef _DM_BUFFER_H_
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXAssociateDMPbufferSGIX (Display *, GLXPbufferSGIX, DMparams *, DMbuffer);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXASSOCIATEDMPBUFFERSGIXPROC) (Display *dpy, GLXPbufferSGIX pbuffer, DMparams *params, DMbuffer dmbuffer);
+#endif /* _DM_BUFFER_H_ */
+#endif
+#ifndef GLX_SGIX_swap_group
+#define GLX_SGIX_swap_group 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXJoinSwapGroupSGIX (Display *, GLXDrawable, GLXDrawable);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
+#endif
+#ifndef GLX_SGIX_swap_barrier
+#define GLX_SGIX_swap_barrier 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXBindSwapBarrierSGIX (Display *, GLXDrawable, int);
+extern Bool glXQueryMaxSwapBarriersSGIX (Display *, int, int *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
+typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
+#endif
+#ifndef GLX_SUN_get_transparent_index
+#define GLX_SUN_get_transparent_index 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Status glXGetTransparentIndexSUN (Display *, Window, Window, long *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display *dpy, Window overlay, Window underlay, long *pTransparentIndex);
+#endif
+#ifndef GLX_MESA_copy_sub_buffer
+#define GLX_MESA_copy_sub_buffer 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXCopySubBufferMESA (Display *, GLXDrawable, int, int, int, int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display *dpy, GLXDrawable drawable, int x, int y, int width, int height);
+#endif
+#ifndef GLX_MESA_pixmap_colormap
+#define GLX_MESA_pixmap_colormap 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXPixmap glXCreateGLXPixmapMESA (Display *, XVisualInfo *, Pixmap, Colormap);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
+#endif
+#ifndef GLX_MESA_release_buffers
+#define GLX_MESA_release_buffers 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXReleaseBuffersMESA (Display *, GLXDrawable);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display *dpy, GLXDrawable drawable);
+#endif
+#ifndef GLX_MESA_set_3dfx_mode
+#define GLX_MESA_set_3dfx_mode 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXSet3DfxModeMESA (int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXSET3DFXMODEMESAPROC) (int mode);
+#endif
+#ifndef GLX_SGIX_visual_select_group
+#define GLX_SGIX_visual_select_group 1
+#endif
+#ifndef GLX_OML_swap_method
+#define GLX_OML_swap_method 1
+#endif
+#ifndef GLX_OML_sync_control
+#define GLX_OML_sync_control 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern Bool glXGetSyncValuesOML (Display *, GLXDrawable, int64_t *, int64_t *, int64_t *);
+extern Bool glXGetMscRateOML (Display *, GLXDrawable, int32_t *, int32_t *);
+extern int64_t glXSwapBuffersMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t);
+extern Bool glXWaitForMscOML (Display *, GLXDrawable, int64_t, int64_t, int64_t, int64_t *, int64_t *, int64_t *);
+extern Bool glXWaitForSbcOML (Display *, GLXDrawable, int64_t, int64_t *, int64_t *, int64_t *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef Bool ( * PFNGLXGETSYNCVALUESOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t *ust, int64_t *msc, int64_t *sbc);
+typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display *dpy, GLXDrawable drawable, int32_t *numerator, int32_t *denominator);
+typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
+typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc);
+typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display *dpy, GLXDrawable drawable, int64_t target_sbc, int64_t *ust, int64_t *msc, int64_t *sbc);
+#endif
+#ifndef GLX_NV_float_buffer
+#define GLX_NV_float_buffer 1
+#endif
+#ifndef GLX_SGIX_hyperpipe
+#define GLX_SGIX_hyperpipe 1
+typedef struct {
+    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int     networkId;
+} GLXHyperpipeNetworkSGIX;
+typedef struct {
+    char    pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int     channel;
+    unsigned int
+      participationType;
+    int     timeSlice;
+} GLXHyperpipeConfigSGIX;
+typedef struct {
+    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int srcXOrigin, srcYOrigin, srcWidth, srcHeight;
+    int destXOrigin, destYOrigin, destWidth, destHeight;
+} GLXPipeRect;
+typedef struct {
+    char pipeName[GLX_HYPERPIPE_PIPE_NAME_LENGTH_SGIX];
+    int XOrigin, YOrigin, maxHeight, maxWidth;
+} GLXPipeRectLimits;
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern GLXHyperpipeNetworkSGIX * glXQueryHyperpipeNetworkSGIX (Display *, int *);
+extern int glXHyperpipeConfigSGIX (Display *, int, int, GLXHyperpipeConfigSGIX *, int *);
+extern GLXHyperpipeConfigSGIX * glXQueryHyperpipeConfigSGIX (Display *, int, int *);
+extern int glXDestroyHyperpipeConfigSGIX (Display *, int);
+extern int glXBindHyperpipeSGIX (Display *, int);
+extern int glXQueryHyperpipeBestAttribSGIX (Display *, int, int, int, void *, void *);
+extern int glXHyperpipeAttribSGIX (Display *, int, int, int, void *);
+extern int glXQueryHyperpipeAttribSGIX (Display *, int, int, int, void *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef GLXHyperpipeNetworkSGIX * ( * PFNGLXQUERYHYPERPIPENETWORKSGIXPROC) (Display *dpy, int *npipes);
+typedef int ( * PFNGLXHYPERPIPECONFIGSGIXPROC) (Display *dpy, int networkId, int npipes, GLXHyperpipeConfigSGIX *cfg, int *hpId);
+typedef GLXHyperpipeConfigSGIX * ( * PFNGLXQUERYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId, int *npipes);
+typedef int ( * PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC) (Display *dpy, int hpId);
+typedef int ( * PFNGLXBINDHYPERPIPESGIXPROC) (Display *dpy, int hpId);
+typedef int ( * PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList, void *returnAttribList);
+typedef int ( * PFNGLXHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *attribList);
+typedef int ( * PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *returnAttribList);
+#endif
+#ifndef GLX_MESA_agp_offset
+#define GLX_MESA_agp_offset 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern unsigned int glXGetAGPOffsetMESA (const void *);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void *pointer);
+#endif
+#ifndef GLX_EXT_fbconfig_packed_float
+#define GLX_EXT_fbconfig_packed_float 1
+#endif
+#ifndef GLX_EXT_framebuffer_sRGB
+#define GLX_EXT_framebuffer_sRGB 1
+#endif
+#ifndef GLX_EXT_texture_from_pixmap
+#define GLX_EXT_texture_from_pixmap 1
+#ifdef GLX_GLXEXT_PROTOTYPES
+extern void glXBindTexImageEXT (Display *, GLXDrawable, int, const int *);
+extern void glXReleaseTexImageEXT (Display *, GLXDrawable, int);
+#endif /* GLX_GLXEXT_PROTOTYPES */
+typedef void ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
+typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer);
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/linden/libraries/i686-win32/include/GL/wglext.h b/linden/libraries/i686-win32/include/GL/wglext.h
new file mode 100644
index 0000000..18804be
--- /dev/null
+++ b/linden/libraries/i686-win32/include/GL/wglext.h
@@ -0,0 +1,648 @@
+#ifndef __wglext_h_
+#define __wglext_h_
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+** Copyright (c) 2007 The Khronos Group Inc.
+** 
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+** 
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+** 
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+/*************************************************************/
+/* Header file version number */
+/* wglext.h last updated 2007/02/09 */
+/* Current version at http://www.opengl.org/registry/ */
+#define WGL_WGLEXT_VERSION 9
+#ifndef WGL_ARB_buffer_region
+#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001
+#define WGL_BACK_COLOR_BUFFER_BIT_ARB  0x00000002
+#define WGL_DEPTH_BUFFER_BIT_ARB       0x00000004
+#define WGL_STENCIL_BUFFER_BIT_ARB     0x00000008
+#endif
+#ifndef WGL_ARB_multisample
+#define WGL_SAMPLE_BUFFERS_ARB         0x2041
+#define WGL_SAMPLES_ARB                0x2042
+#endif
+#ifndef WGL_ARB_extensions_string
+#endif
+#ifndef WGL_ARB_pixel_format
+#define WGL_NUMBER_PIXEL_FORMATS_ARB   0x2000
+#define WGL_DRAW_TO_WINDOW_ARB         0x2001
+#define WGL_DRAW_TO_BITMAP_ARB         0x2002
+#define WGL_ACCELERATION_ARB           0x2003
+#define WGL_NEED_PALETTE_ARB           0x2004
+#define WGL_NEED_SYSTEM_PALETTE_ARB    0x2005
+#define WGL_SWAP_LAYER_BUFFERS_ARB     0x2006
+#define WGL_SWAP_METHOD_ARB            0x2007
+#define WGL_NUMBER_OVERLAYS_ARB        0x2008
+#define WGL_NUMBER_UNDERLAYS_ARB       0x2009
+#define WGL_TRANSPARENT_ARB            0x200A
+#define WGL_TRANSPARENT_RED_VALUE_ARB  0x2037
+#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038
+#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039
+#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A
+#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B
+#define WGL_SHARE_DEPTH_ARB            0x200C
+#define WGL_SHARE_STENCIL_ARB          0x200D
+#define WGL_SHARE_ACCUM_ARB            0x200E
+#define WGL_SUPPORT_GDI_ARB            0x200F
+#define WGL_SUPPORT_OPENGL_ARB         0x2010
+#define WGL_DOUBLE_BUFFER_ARB          0x2011
+#define WGL_STEREO_ARB                 0x2012
+#define WGL_PIXEL_TYPE_ARB             0x2013
+#define WGL_COLOR_BITS_ARB             0x2014
+#define WGL_RED_BITS_ARB               0x2015
+#define WGL_RED_SHIFT_ARB              0x2016
+#define WGL_GREEN_BITS_ARB             0x2017
+#define WGL_GREEN_SHIFT_ARB            0x2018
+#define WGL_BLUE_BITS_ARB              0x2019
+#define WGL_BLUE_SHIFT_ARB             0x201A
+#define WGL_ALPHA_BITS_ARB             0x201B
+#define WGL_ALPHA_SHIFT_ARB            0x201C
+#define WGL_ACCUM_BITS_ARB             0x201D
+#define WGL_ACCUM_RED_BITS_ARB         0x201E
+#define WGL_ACCUM_GREEN_BITS_ARB       0x201F
+#define WGL_ACCUM_BLUE_BITS_ARB        0x2020
+#define WGL_ACCUM_ALPHA_BITS_ARB       0x2021
+#define WGL_DEPTH_BITS_ARB             0x2022
+#define WGL_STENCIL_BITS_ARB           0x2023
+#define WGL_AUX_BUFFERS_ARB            0x2024
+#define WGL_NO_ACCELERATION_ARB        0x2025
+#define WGL_GENERIC_ACCELERATION_ARB   0x2026
+#define WGL_FULL_ACCELERATION_ARB      0x2027
+#define WGL_SWAP_EXCHANGE_ARB          0x2028
+#define WGL_SWAP_COPY_ARB              0x2029
+#define WGL_SWAP_UNDEFINED_ARB         0x202A
+#define WGL_TYPE_RGBA_ARB              0x202B
+#define WGL_TYPE_COLORINDEX_ARB        0x202C
+#endif
+#ifndef WGL_ARB_make_current_read
+#define ERROR_INVALID_PIXEL_TYPE_ARB   0x2043
+#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
+#endif
+#ifndef WGL_ARB_pbuffer
+#define WGL_DRAW_TO_PBUFFER_ARB        0x202D
+#define WGL_MAX_PBUFFER_PIXELS_ARB     0x202E
+#define WGL_MAX_PBUFFER_WIDTH_ARB      0x202F
+#define WGL_MAX_PBUFFER_HEIGHT_ARB     0x2030
+#define WGL_PBUFFER_LARGEST_ARB        0x2033
+#define WGL_PBUFFER_WIDTH_ARB          0x2034
+#define WGL_PBUFFER_HEIGHT_ARB         0x2035
+#define WGL_PBUFFER_LOST_ARB           0x2036
+#endif
+#ifndef WGL_ARB_render_texture
+#define WGL_BIND_TO_TEXTURE_RGB_ARB    0x2070
+#define WGL_BIND_TO_TEXTURE_RGBA_ARB   0x2071
+#define WGL_TEXTURE_FORMAT_ARB         0x2072
+#define WGL_TEXTURE_TARGET_ARB         0x2073
+#define WGL_MIPMAP_TEXTURE_ARB         0x2074
+#define WGL_TEXTURE_RGB_ARB            0x2075
+#define WGL_TEXTURE_RGBA_ARB           0x2076
+#define WGL_NO_TEXTURE_ARB             0x2077
+#define WGL_TEXTURE_CUBE_MAP_ARB       0x2078
+#define WGL_TEXTURE_1D_ARB             0x2079
+#define WGL_TEXTURE_2D_ARB             0x207A
+#define WGL_MIPMAP_LEVEL_ARB           0x207B
+#define WGL_CUBE_MAP_FACE_ARB          0x207C
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082
+#define WGL_FRONT_LEFT_ARB             0x2083
+#define WGL_FRONT_RIGHT_ARB            0x2084
+#define WGL_BACK_LEFT_ARB              0x2085
+#define WGL_BACK_RIGHT_ARB             0x2086
+#define WGL_AUX0_ARB                   0x2087
+#define WGL_AUX1_ARB                   0x2088
+#define WGL_AUX2_ARB                   0x2089
+#define WGL_AUX3_ARB                   0x208A
+#define WGL_AUX4_ARB                   0x208B
+#define WGL_AUX5_ARB                   0x208C
+#define WGL_AUX6_ARB                   0x208D
+#define WGL_AUX7_ARB                   0x208E
+#define WGL_AUX8_ARB                   0x208F
+#define WGL_AUX9_ARB                   0x2090
+#endif
+#ifndef WGL_ARB_pixel_format_float
+#define WGL_TYPE_RGBA_FLOAT_ARB        0x21A0
+#endif
+#ifndef WGL_EXT_make_current_read
+#define ERROR_INVALID_PIXEL_TYPE_EXT   0x2043
+#endif
+#ifndef WGL_EXT_pixel_format
+#define WGL_NUMBER_PIXEL_FORMATS_EXT   0x2000
+#define WGL_DRAW_TO_WINDOW_EXT         0x2001
+#define WGL_DRAW_TO_BITMAP_EXT         0x2002
+#define WGL_ACCELERATION_EXT           0x2003
+#define WGL_NEED_PALETTE_EXT           0x2004
+#define WGL_NEED_SYSTEM_PALETTE_EXT    0x2005
+#define WGL_SWAP_LAYER_BUFFERS_EXT     0x2006
+#define WGL_SWAP_METHOD_EXT            0x2007
+#define WGL_NUMBER_OVERLAYS_EXT        0x2008
+#define WGL_NUMBER_UNDERLAYS_EXT       0x2009
+#define WGL_TRANSPARENT_EXT            0x200A
+#define WGL_TRANSPARENT_VALUE_EXT      0x200B
+#define WGL_SHARE_DEPTH_EXT            0x200C
+#define WGL_SHARE_STENCIL_EXT          0x200D
+#define WGL_SHARE_ACCUM_EXT            0x200E
+#define WGL_SUPPORT_GDI_EXT            0x200F
+#define WGL_SUPPORT_OPENGL_EXT         0x2010
+#define WGL_DOUBLE_BUFFER_EXT          0x2011
+#define WGL_STEREO_EXT                 0x2012
+#define WGL_PIXEL_TYPE_EXT             0x2013
+#define WGL_COLOR_BITS_EXT             0x2014
+#define WGL_RED_BITS_EXT               0x2015
+#define WGL_RED_SHIFT_EXT              0x2016
+#define WGL_GREEN_BITS_EXT             0x2017
+#define WGL_GREEN_SHIFT_EXT            0x2018
+#define WGL_BLUE_BITS_EXT              0x2019
+#define WGL_BLUE_SHIFT_EXT             0x201A
+#define WGL_ALPHA_BITS_EXT             0x201B
+#define WGL_ALPHA_SHIFT_EXT            0x201C
+#define WGL_ACCUM_BITS_EXT             0x201D
+#define WGL_ACCUM_RED_BITS_EXT         0x201E
+#define WGL_ACCUM_GREEN_BITS_EXT       0x201F
+#define WGL_ACCUM_BLUE_BITS_EXT        0x2020
+#define WGL_ACCUM_ALPHA_BITS_EXT       0x2021
+#define WGL_DEPTH_BITS_EXT             0x2022
+#define WGL_STENCIL_BITS_EXT           0x2023
+#define WGL_AUX_BUFFERS_EXT            0x2024
+#define WGL_NO_ACCELERATION_EXT        0x2025
+#define WGL_GENERIC_ACCELERATION_EXT   0x2026
+#define WGL_FULL_ACCELERATION_EXT      0x2027
+#define WGL_SWAP_EXCHANGE_EXT          0x2028
+#define WGL_SWAP_COPY_EXT              0x2029
+#define WGL_SWAP_UNDEFINED_EXT         0x202A
+#define WGL_TYPE_RGBA_EXT              0x202B
+#define WGL_TYPE_COLORINDEX_EXT        0x202C
+#endif
+#ifndef WGL_EXT_pbuffer
+#define WGL_DRAW_TO_PBUFFER_EXT        0x202D
+#define WGL_MAX_PBUFFER_PIXELS_EXT     0x202E
+#define WGL_MAX_PBUFFER_WIDTH_EXT      0x202F
+#define WGL_MAX_PBUFFER_HEIGHT_EXT     0x2030
+#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT  0x2031
+#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032
+#define WGL_PBUFFER_LARGEST_EXT        0x2033
+#define WGL_PBUFFER_WIDTH_EXT          0x2034
+#define WGL_PBUFFER_HEIGHT_EXT         0x2035
+#endif
+#ifndef WGL_EXT_depth_float
+#define WGL_DEPTH_FLOAT_EXT            0x2040
+#endif
+#ifndef WGL_3DFX_multisample
+#define WGL_SAMPLE_BUFFERS_3DFX        0x2060
+#define WGL_SAMPLES_3DFX               0x2061
+#endif
+#ifndef WGL_EXT_multisample
+#define WGL_SAMPLE_BUFFERS_EXT         0x2041
+#define WGL_SAMPLES_EXT                0x2042
+#endif
+#ifndef WGL_I3D_digital_video_control
+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050
+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051
+#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052
+#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053
+#endif
+#ifndef WGL_I3D_gamma
+#define WGL_GAMMA_TABLE_SIZE_I3D       0x204E
+#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D  0x204F
+#endif
+#ifndef WGL_I3D_genlock
+#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044
+#define WGL_GENLOCK_SOURCE_EXTENAL_SYNC_I3D 0x2045
+#define WGL_GENLOCK_SOURCE_EXTENAL_FIELD_I3D 0x2046
+#define WGL_GENLOCK_SOURCE_EXTENAL_TTL_I3D 0x2047
+#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048
+#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049
+#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A
+#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B
+#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C
+#endif
+#ifndef WGL_I3D_image_buffer
+#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001
+#define WGL_IMAGE_BUFFER_LOCK_I3D      0x00000002
+#endif
+#ifndef WGL_I3D_swap_frame_lock
+#endif
+#ifndef WGL_NV_render_depth_texture
+#define WGL_BIND_TO_TEXTURE_DEPTH_NV   0x20A3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4
+#define WGL_DEPTH_TEXTURE_FORMAT_NV    0x20A5
+#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6
+#define WGL_DEPTH_COMPONENT_NV         0x20A7
+#endif
+#ifndef WGL_NV_render_texture_rectangle
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1
+#define WGL_TEXTURE_RECTANGLE_NV       0x20A2
+#endif
+#ifndef WGL_ATI_pixel_format_float
+#define WGL_TYPE_RGBA_FLOAT_ATI        0x21A0
+#endif
+#ifndef WGL_NV_float_buffer
+#define WGL_FLOAT_COMPONENTS_NV        0x20B0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4
+#define WGL_TEXTURE_FLOAT_R_NV         0x20B5
+#define WGL_TEXTURE_FLOAT_RG_NV        0x20B6
+#define WGL_TEXTURE_FLOAT_RGB_NV       0x20B7
+#define WGL_TEXTURE_FLOAT_RGBA_NV      0x20B8
+#endif
+#ifndef WGL_3DL_stereo_control
+#define WGL_STEREO_EMITTER_ENABLE_3DL  0x2055
+#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056
+#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057
+#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058
+#endif
+#ifndef WGL_EXT_pixel_format_packed_float
+#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8
+#endif
+#ifndef WGL_EXT_framebuffer_sRGB
+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9
+#endif
+/*************************************************************/
+#ifndef WGL_ARB_pbuffer
+DECLARE_HANDLE(HPBUFFERARB);
+#endif
+#ifndef WGL_EXT_pbuffer
+DECLARE_HANDLE(HPBUFFEREXT);
+#endif
+#ifndef WGL_ARB_buffer_region
+#define WGL_ARB_buffer_region 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HANDLE WINAPI wglCreateBufferRegionARB (HDC, int, UINT);
+extern VOID WINAPI wglDeleteBufferRegionARB (HANDLE);
+extern BOOL WINAPI wglSaveBufferRegionARB (HANDLE, int, int, int, int);
+extern BOOL WINAPI wglRestoreBufferRegionARB (HANDLE, int, int, int, int, int, int);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType);
+typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion);
+typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height);
+typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
+#endif
+#ifndef WGL_ARB_multisample
+#define WGL_ARB_multisample 1
+#endif
+#ifndef WGL_ARB_extensions_string
+#define WGL_ARB_extensions_string 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern const char * WINAPI wglGetExtensionsStringARB (HDC);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
+#endif
+#ifndef WGL_ARB_pixel_format
+#define WGL_ARB_pixel_format 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetPixelFormatAttribivARB (HDC, int, int, UINT, const int *, int *);
+extern BOOL WINAPI wglGetPixelFormatAttribfvARB (HDC, int, int, UINT, const int *, FLOAT *);
+extern BOOL WINAPI wglChoosePixelFormatARB (HDC, const int *, const FLOAT *, UINT, int *, UINT *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues);
+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+#endif
+#ifndef WGL_ARB_make_current_read
+#define WGL_ARB_make_current_read 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglMakeContextCurrentARB (HDC, HDC, HGLRC);
+extern HDC WINAPI wglGetCurrentReadDCARB (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void);
+#endif
+#ifndef WGL_ARB_pbuffer
+#define WGL_ARB_pbuffer 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HPBUFFERARB WINAPI wglCreatePbufferARB (HDC, int, int, int, const int *);
+extern HDC WINAPI wglGetPbufferDCARB (HPBUFFERARB);
+extern int WINAPI wglReleasePbufferDCARB (HPBUFFERARB, HDC);
+extern BOOL WINAPI wglDestroyPbufferARB (HPBUFFERARB);
+extern BOOL WINAPI wglQueryPbufferARB (HPBUFFERARB, int, int *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer);
+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC);
+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer);
+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int *piValue);
+#endif
+#ifndef WGL_ARB_render_texture
+#define WGL_ARB_render_texture 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglBindTexImageARB (HPBUFFERARB, int);
+extern BOOL WINAPI wglReleaseTexImageARB (HPBUFFERARB, int);
+extern BOOL WINAPI wglSetPbufferAttribARB (HPBUFFERARB, const int *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int *piAttribList);
+#endif
+#ifndef WGL_ARB_pixel_format_float
+#define WGL_ARB_pixel_format_float 1
+#endif
+#ifndef WGL_EXT_display_color_table
+#define WGL_EXT_display_color_table 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern GLboolean WINAPI wglCreateDisplayColorTableEXT (GLushort);
+extern GLboolean WINAPI wglLoadDisplayColorTableEXT (const GLushort *, GLuint);
+extern GLboolean WINAPI wglBindDisplayColorTableEXT (GLushort);
+extern VOID WINAPI wglDestroyDisplayColorTableEXT (GLushort);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (const GLushort *table, GLuint length);
+typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+#endif
+#ifndef WGL_EXT_extensions_string
+#define WGL_EXT_extensions_string 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern const char * WINAPI wglGetExtensionsStringEXT (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void);
+#endif
+#ifndef WGL_EXT_make_current_read
+#define WGL_EXT_make_current_read 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglMakeContextCurrentEXT (HDC, HDC, HGLRC);
+extern HDC WINAPI wglGetCurrentReadDCEXT (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void);
+#endif
+#ifndef WGL_EXT_pbuffer
+#define WGL_EXT_pbuffer 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern HPBUFFEREXT WINAPI wglCreatePbufferEXT (HDC, int, int, int, const int *);
+extern HDC WINAPI wglGetPbufferDCEXT (HPBUFFEREXT);
+extern int WINAPI wglReleasePbufferDCEXT (HPBUFFEREXT, HDC);
+extern BOOL WINAPI wglDestroyPbufferEXT (HPBUFFEREXT);
+extern BOOL WINAPI wglQueryPbufferEXT (HPBUFFEREXT, int, int *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer);
+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC);
+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer);
+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue);
+#endif
+#ifndef WGL_EXT_pixel_format
+#define WGL_EXT_pixel_format 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetPixelFormatAttribivEXT (HDC, int, int, UINT, int *, int *);
+extern BOOL WINAPI wglGetPixelFormatAttribfvEXT (HDC, int, int, UINT, int *, FLOAT *);
+extern BOOL WINAPI wglChoosePixelFormatEXT (HDC, const int *, const FLOAT *, UINT, int *, UINT *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues);
+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+#endif
+#ifndef WGL_EXT_swap_control
+#define WGL_EXT_swap_control 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglSwapIntervalEXT (int);
+extern int WINAPI wglGetSwapIntervalEXT (void);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
+typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void);
+#endif
+#ifndef WGL_EXT_depth_float
+#define WGL_EXT_depth_float 1
+#endif
+#ifndef WGL_NV_vertex_array_range
+#define WGL_NV_vertex_array_range 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern void* WINAPI wglAllocateMemoryNV (GLsizei, GLfloat, GLfloat, GLfloat);
+extern void WINAPI wglFreeMemoryNV (void *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef void* (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer);
+#endif
+#ifndef WGL_3DFX_multisample
+#define WGL_3DFX_multisample 1
+#endif
+#ifndef WGL_EXT_multisample
+#define WGL_EXT_multisample 1
+#endif
+#ifndef WGL_OML_sync_control
+#define WGL_OML_sync_control 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetSyncValuesOML (HDC, INT64 *, INT64 *, INT64 *);
+extern BOOL WINAPI wglGetMscRateOML (HDC, INT32 *, INT32 *);
+extern INT64 WINAPI wglSwapBuffersMscOML (HDC, INT64, INT64, INT64);
+extern INT64 WINAPI wglSwapLayerBuffersMscOML (HDC, int, INT64, INT64, INT64);
+extern BOOL WINAPI wglWaitForMscOML (HDC, INT64, INT64, INT64, INT64 *, INT64 *, INT64 *);
+extern BOOL WINAPI wglWaitForSbcOML (HDC, INT64, INT64 *, INT64 *, INT64 *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc);
+typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32 *numerator, INT32 *denominator);
+typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
+typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
+typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc);
+typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc);
+#endif
+#ifndef WGL_I3D_digital_video_control
+#define WGL_I3D_digital_video_control 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetDigitalVideoParametersI3D (HDC, int, int *);
+extern BOOL WINAPI wglSetDigitalVideoParametersI3D (HDC, int, const int *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
+typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
+#endif
+#ifndef WGL_I3D_gamma
+#define WGL_I3D_gamma 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetGammaTableParametersI3D (HDC, int, int *);
+extern BOOL WINAPI wglSetGammaTableParametersI3D (HDC, int, const int *);
+extern BOOL WINAPI wglGetGammaTableI3D (HDC, int, USHORT *, USHORT *, USHORT *);
+extern BOOL WINAPI wglSetGammaTableI3D (HDC, int, const USHORT *, const USHORT *, const USHORT *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue);
+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue);
+#endif
+#ifndef WGL_I3D_genlock
+#define WGL_I3D_genlock 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglEnableGenlockI3D (HDC);
+extern BOOL WINAPI wglDisableGenlockI3D (HDC);
+extern BOOL WINAPI wglIsEnabledGenlockI3D (HDC, BOOL *);
+extern BOOL WINAPI wglGenlockSourceI3D (HDC, UINT);
+extern BOOL WINAPI wglGetGenlockSourceI3D (HDC, UINT *);
+extern BOOL WINAPI wglGenlockSourceEdgeI3D (HDC, UINT);
+extern BOOL WINAPI wglGetGenlockSourceEdgeI3D (HDC, UINT *);
+extern BOOL WINAPI wglGenlockSampleRateI3D (HDC, UINT);
+extern BOOL WINAPI wglGetGenlockSampleRateI3D (HDC, UINT *);
+extern BOOL WINAPI wglGenlockSourceDelayI3D (HDC, UINT);
+extern BOOL WINAPI wglGetGenlockSourceDelayI3D (HDC, UINT *);
+extern BOOL WINAPI wglQueryGenlockMaxSourceDelayI3D (HDC, UINT *, UINT *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC);
+typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC);
+typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL *pFlag);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT *uSource);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT *uEdge);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT *uRate);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT *uDelay);
+typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay);
+#endif
+#ifndef WGL_I3D_image_buffer
+#define WGL_I3D_image_buffer 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern LPVOID WINAPI wglCreateImageBufferI3D (HDC, DWORD, UINT);
+extern BOOL WINAPI wglDestroyImageBufferI3D (HDC, LPVOID);
+extern BOOL WINAPI wglAssociateImageBufferEventsI3D (HDC, const HANDLE *, const LPVOID *, const DWORD *, UINT);
+extern BOOL WINAPI wglReleaseImageBufferEventsI3D (HDC, const LPVOID *, UINT);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags);
+typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress);
+typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count);
+typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LPVOID *pAddress, UINT count);
+#endif
+#ifndef WGL_I3D_swap_frame_lock
+#define WGL_I3D_swap_frame_lock 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglEnableFrameLockI3D (void);
+extern BOOL WINAPI wglDisableFrameLockI3D (void);
+extern BOOL WINAPI wglIsEnabledFrameLockI3D (BOOL *);
+extern BOOL WINAPI wglQueryFrameLockMasterI3D (BOOL *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL *pFlag);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag);
+#endif
+#ifndef WGL_I3D_swap_frame_usage
+#define WGL_I3D_swap_frame_usage 1
+#ifdef WGL_WGLEXT_PROTOTYPES
+extern BOOL WINAPI wglGetFrameUsageI3D (float *);
+extern BOOL WINAPI wglBeginFrameTrackingI3D (void);
+extern BOOL WINAPI wglEndFrameTrackingI3D (void);
+extern BOOL WINAPI wglQueryFrameTrackingI3D (DWORD *, DWORD *, float *);
+#endif /* WGL_WGLEXT_PROTOTYPES */
+typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float *pUsage);
+typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
+#endif
+#ifndef WGL_ATI_pixel_format_float
+#define WGL_ATI_pixel_format_float 1
+#endif
+#ifndef WGL_NV_float_buffer
+#define WGL_NV_float_buffer 1
+#endif
+#ifndef WGL_EXT_pixel_format_packed_float
+#define WGL_EXT_pixel_format_packed_float 1
+#endif
+#ifndef WGL_EXT_framebuffer_sRGB
+#define WGL_EXT_framebuffer_sRGB 1
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/linden/libraries/include/llmozlib2.h b/linden/libraries/include/llmozlib2.h
index 1dd71dc..d85caf9 100644
--- a/linden/libraries/include/llmozlib2.h
+++ b/linden/libraries/include/llmozlib2.h
@@ -72,6 +72,15 @@ class LLEmbeddedBrowserWindowEvent
                {
                };
+                // 2 strings passed with the event
+                LLEmbeddedBrowserWindowEvent( int eventWindowIdIn, std::string uriIn, std::string stringValIn, std::string stringVal2In ) :
+                        mEventWindowId( eventWindowIdIn ),
+                        mEventUri( uriIn ),
+                        mStringVal( stringValIn ),
+                        mStringVal2( stringVal2In )
+                {
+                };
                // string and an int passed with the event
                LLEmbeddedBrowserWindowEvent( int eventWindowIdIn, std::string uriIn, std::string stringValIn, int intValIn ) :
                        mEventWindowId( eventWindowIdIn ),
@@ -116,6 +125,11 @@ class LLEmbeddedBrowserWindowEvent
                        return mStringVal;
                };
+                std::string getStringValue2() const
+                {
+                        return mStringVal2;
+                };
                void getRectValue( int& xOut, int& yOut, int& widthOut, int& heightOut ) const
                {
                        xOut = mXVal;
@@ -129,6 +143,7 @@ class LLEmbeddedBrowserWindowEvent
                std::string mEventUri;
                int mIntVal;
                std::string mStringVal;
+                std::string mStringVal2;
                int mXVal;
                int mYVal;
                int mWidthVal;
diff --git a/linden/scripts/messages/message_template.msg b/linden/scripts/messages/message_template.msg
index b9c694b..c5588f4 100644
--- a/linden/scripts/messages/message_template.msg
+++ b/linden/scripts/messages/message_template.msg
@@ -1955,10 +1955,19 @@ version 2.0
 }
-// ObjectPosition
+// DEPRECATED: ObjectPosition
-// viewer -> simulator
+// == Old Behavior ==
+// Set the position on objects
+//
+// == Reason for deprecation ==
+// Unused code path was removed in the move to Havok4
+// Object position, scale and rotation messages were already unified
+// to MultipleObjectUpdate and this message was unused cruft.
+//
+// == New Location ==
+// MultipleObjectUpdate can be used instead.
 {
-        ObjectPosition Medium 4 NotTrusted Zerocoded
+        ObjectPosition Medium 4 NotTrusted Zerocoded Deprecated
        {
                AgentData               Single
                {       AgentID         LLUUID  }
@@ -1972,10 +1981,19 @@ version 2.0
 }
-// ObjectScale
+// DEPRECATED: ObjectScale
-// viewer -> simulator
+// == Old Behavior ==
+// Set the scale on objects
+//
+// == Reason for deprecation ==
+// Unused code path was removed in the move to Havok4
+// Object position, scale and rotation messages were already unified
+// to MultipleObjectUpdate and this message was unused cruft.
+//
+// == New Location ==
+// MultipleObjectUpdate can be used instead.
 {
-        ObjectScale Low 92 NotTrusted Zerocoded
+        ObjectScale Low 92 NotTrusted Zerocoded Deprecated
        {
                AgentData               Single
                {       AgentID         LLUUID  }
author	Jacek Antonelli	2008-08-15 23:45:42 -0500
committer	Jacek Antonelli	2008-08-15 23:45:42 -0500
commit	ce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
tree	ef7b0501c4de4b631a916305cbc2a5fdc125e52d
parent	Second Life viewer sources 1.19.1.4b (diff)
download	meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz